Merge remote-tracking branch 'refs/remotes/origin/main' into 1.20.4-f…

…abric

CHANGELOG.md

@@ -1,3 +1,3 @@
 ### What's New:
 
-* Added `hasContext` function to expressions. Allows checking if loot context has the required parameter: `if(hasContext("tool"), "Hi", "Bye")`
+* Slightly improved error messages returned by `cmd:arithmetica`.

build.gradle

@@ -167,18 +167,6 @@ sourcesJar {
     from delombok
 }
 
-tasks.register('printVersionName') {
-    doLast {
-        println "${project.mod_version} (${project.minecraft_version})"
-    }
-}
-
-tasks.register('printVersion') {
-    doLast {
-        println version
-    }
-}
-
 // configure the maven publication
 publishing {
     publications {
@@ -219,6 +207,14 @@ publishMods {
         requires("fabric-api")
         embeds("dark-matter")
     }
+    curseforge {
+        projectId = "1009687"
+        accessToken = providers.environmentVariable("CURSEFORGE_TOKEN")
+        minecraftVersions.add("${project.minecraft_version}")
+
+        requires("fabric-api")
+        embeds("dark-matter")
+    }
     github {
         repository = "constellation-mc/commander"
         accessToken = providers.environmentVariable("GITHUB_TOKEN")

gradle.properties

@@ -6,7 +6,7 @@ minecraft_version=1.20.4
 yarn_mappings=1.20.4+build.3
 loader_version=0.15.9
 # Mod Properties
-mod_version=0.3.1
+mod_version=0.3.2
 maven_group=me.melontini
 archives_base_name=commander
 # Dependencies

src/main/java/me/melontini/commander/impl/event/data/types/ExtractionTypes.java

@@ -6,16 +6,15 @@
 import me.melontini.dark_matter.api.data.codecs.ExtraCodecs;
 import net.minecraft.loot.context.LootContextParameter;
 import net.minecraft.util.Identifier;
-
-import java.util.Objects;
+import org.jetbrains.annotations.Nullable;
 
 public class ExtractionTypes {
 
     private static final BiMap<Identifier, LootContextParameter<?>> KNOWN_PARAMETERS = HashBiMap.create();
     public static final Codec<LootContextParameter<?>> CODEC = ExtraCodecs.mapLookup(Identifier.CODEC, KNOWN_PARAMETERS);
 
-    public static LootContextParameter<?> getParameter(Identifier identifier) {
-        return Objects.requireNonNull(KNOWN_PARAMETERS.get(identifier), () -> "No such loot context parameter %s!".formatted(identifier));
+    public static @Nullable LootContextParameter<?> getParameter(Identifier identifier) {
+        return KNOWN_PARAMETERS.get(identifier);
     }
 
     public static void register(LootContextParameter<?> parameter) {

src/main/java/me/melontini/commander/impl/expression/EvalUtils.java

@@ -157,11 +157,19 @@ public static class MapBasedDataAccessor implements DataAccessorIfc {
 
         @Override
         public @Nullable EvaluationValue getData(String variable) {
-            var id = new Identifier(variable.replace("__idcl__", ":"));
+            var r = Identifier.validate(variable.replace("__idcl__", ":"));
+            if (r.error().isPresent()) {
+                throw new CmdEvalException("%s - %s".formatted(variable.replace("__idcl__", ":"), r.error().orElseThrow().message()));
+            }
+
+            var id = r.result().orElseThrow();
             var func = overrides.get(id);
             if (func != null) return CONFIGURATION.getEvaluationValueConverter().convertObject(func.apply(LOCAL.get()), CONFIGURATION);
 
-            var object = LOCAL.get().get(ExtractionTypes.getParameter(id));
+            var param = ExtractionTypes.getParameter(id);
+            if (param == null) throw new CmdEvalException("%s is not a registered loot context parameter!".formatted(id));
+
+            var object = LOCAL.get().get(param);
             if (object == null) return null;
             return CONFIGURATION.getEvaluationValueConverter().convertObject(object, CONFIGURATION);
         }