Update Mixson to try and fix version conflicts.

- Update Mixson to try and fix version conflicts

Author: gniftygnome

build.gradle

@@ -24,7 +24,7 @@ dependencies {
 
     includeMod "cloth-config", "me.shedaniel.cloth:cloth-config-fabric:${project.clothconfig_version}"
 
-    includeMod "mixson", "com.github.ramixin:mixson:${project.mixson_version}"
+    includeMod "mixson", "com.github.ramixin:mixson-fabric:${project.mixson_version}"
 
     if (findProject(':cinderscapes-worldgen') != null) {
         includeMod "biolith", "com.terraformersmc:biolith-fabric:${biolith_version}"

client/src/main/java/com/terraformersmc/cinderscapes/init/CinderscapesArmorTrimItemModels.java

@@ -5,9 +5,9 @@
 import com.google.gson.JsonObject;
 import com.terraformersmc.cinderscapes.Cinderscapes;
 import net.minecraft.util.Identifier;
-import net.ramixin.mixson.Mixson;
-import net.ramixin.mixson.events.ModificationEvent;
-import org.jetbrains.annotations.NotNull;
+import net.ramixin.mixson.inline.EventContext;
+import net.ramixin.mixson.inline.Mixson;
+import net.ramixin.mixson.inline.MixsonEvent;
 
 import java.util.List;
 
@@ -37,12 +37,14 @@ public static void init() {
     }
 
     private static void registerAddTrimsToArmor(String armor, String armorMaterial) {
-        Mixson.registerModificationEvent(
-                Identifier.ofVanilla("items/" + armorMaterial + "_" + armor),
-                Identifier.of(Cinderscapes.MOD_ID, "add_trims_to_" + armorMaterial + "_" + armor),
-                new ModificationEvent() {
+        Mixson.registerEvent(
+                Mixson.DEFAULT_PRIORITY,
+                "minecraft:items/" + armorMaterial + "_" + armor,
+                Cinderscapes.MOD_ID + ":add_trims_to_" + armorMaterial + "_" + armor,
+                new MixsonEvent<>() {
                     @Override
-                    public @NotNull JsonElement run(JsonElement elem) {
+                    public void runEvent(EventContext<JsonElement> context) {
+                        JsonElement elem = context.getFile();
                         JsonObject root = elem.getAsJsonObject();
                         JsonObject model = root.getAsJsonObject("model");
                         JsonArray cases = model.getAsJsonArray("cases");
@@ -57,25 +59,26 @@ private static void registerAddTrimsToArmor(String armor, String armorMaterial)
 
                             cases.add(newCase);
                         });
-
-                        return elem;
                     }
 
                     @Override
                     public int ordinal() {
                         return 0;
                     }
-                }
+                },
+                false
         );
     }
 
     private static void registerAddTrimsToAtlas(String name) {
-        Mixson.registerModificationEvent(
-                Identifier.ofVanilla("atlases/" + name),
-                Identifier.of(Cinderscapes.MOD_ID, "add_trims_to_" + name + "_atlas"),
-                new ModificationEvent() {
+        Mixson.registerEvent(
+                Mixson.DEFAULT_PRIORITY,
+                "minecraft:atlases/" + name,
+                Cinderscapes.MOD_ID + ":add_trims_to_" + name + "_atlas",
+                new MixsonEvent<>() {
                     @Override
-                    public @NotNull JsonElement run(JsonElement elem) {
+                    public void runEvent(EventContext<JsonElement> context) {
+                        JsonElement elem = context.getFile();
                         JsonObject root = elem.getAsJsonObject();
                         JsonArray sources = root.getAsJsonArray("sources");
 
@@ -92,15 +95,14 @@ private static void registerAddTrimsToAtlas(String name) {
                                 break;
                             }
                         }
-
-                        return elem;
                     }
 
                     @Override
                     public int ordinal() {
                         return 0;
                     }
-                }
+                },
+                false
         );
     }
 

gradle.properties

@@ -6,22 +6,22 @@ archive_name=cinderscapes
 minecraft_version=1.21.4
 yarn_mappings=1.21.4+build.8
 loader_version=0.16.9
-fabric_version=0.114.1+1.21.4
+fabric_version=0.114.3+1.21.4
 
 # Terraform modules
-terraform_biome_remapper_api_version=13.0.0-alpha.2
-terraform_shapes_api_version=13.0.0-alpha.2
-terraform_surfaces_api_version=13.0.0-alpha.2
-terraform_wood_api_version=13.0.0-alpha.2
+terraform_biome_remapper_api_version=13.0.0-beta.1
+terraform_shapes_api_version=13.0.0-beta.1
+terraform_surfaces_api_version=13.0.0-beta.1
+terraform_wood_api_version=13.0.0-beta.1
 
 # Biolith for worldgen module and testing
 biolith_version=3.2.0
 
 # Other Things
 clothconfig_version=17.0.144
-mixson_version=v0.1.4-fabric
-modmenu_version=13.0.0
-vistas_version=2.8.0
+mixson_version=v1.3.1.1
+modmenu_version=13.0.3
+vistas_version=2.9.0
 
 # Project Metadata
 project_name=Cinderscapes