1.21.4 fixes (#44)

* Fixed 1.21.4 update

Author: imBuzz

build.gradle.kts

@@ -21,7 +21,7 @@ publishing {
     publications.create<MavenPublication>("maven") {
         groupId = "net.worldseed.multipart"
         artifactId = "WorldSeedEntityEngine"
-        version = "11.2.3"
+        version = "11.3.1"
 
         from(components["java"])
     }

src/main/java/net/worldseed/resourcepack/PackBuilder.java

@@ -42,6 +42,7 @@ public static ConfigJson Generate(Path bbmodel, Path resourcepack, Path modelDat
         Files.createDirectories(texturePathMobs);
         Files.createDirectories(modelPathMobs);
         Files.createDirectories(baseModelPath);
+        Files.createDirectories(resourcepack.resolve("assets/minecraft/models/"));
 
         JsonObject modelMappings = writeCustomModels(entityModels, modelDataPath, texturePathMobs, modelPathMobs, baseModelPath);
 
@@ -106,7 +107,17 @@ private static JsonObject writeCustomModels(List<Model> entityModels, Path model
         }
 
         thumbnailMap.add("overrides", overrides.build());
-        Files.writeString(baseModelPath.resolve("ink_sac.json"), thumbnailMap.build().toString(), Charset.defaultCharset());
+
+        Files.writeString(baseModelPath.resolve("ink_sac.json"),
+                Json.createObjectBuilder()
+                        .add("model", Json.createObjectBuilder()
+                                .add("type", "minecraft:model")
+                                .add("model", "minecraft:item/ink_sac"))
+                        .build().toString(), Charset.defaultCharset());
+
+        Path inkSacTargetPath = baseModelPath.resolve("../models/item/ink_sac.json");
+        Files.createDirectories(inkSacTargetPath.getParent());
+        Files.writeString(inkSacTargetPath, thumbnailMap.build().toString(), Charset.defaultCharset());
 
         ModelParser.ModelEngineFiles modelData = ModelParser.parse(res.values(), modelPathMobs);
 

src/main/java/net/worldseed/resourcepack/multipart/parser/ModelParser.java

@@ -117,10 +117,10 @@ public static ModelEngineFiles parse(Collection<ModelGenerator.BBEntityModel> da
         // fallback model
         final JsonObjectBuilder modelFallback = Json.createObjectBuilder();
         modelFallback.add("type", "model");
-        modelFallback.add("model", "item/" + ModelEngine.getModelMaterial().name().toLowerCase());
+        modelFallback.add("model", "minecraft:item/" + ModelEngine.getModelMaterial().key().value().toLowerCase());
         model.add("fallback", modelFallback);
 
-        JsonObject itemFile = model.build();
+        JsonObject itemFile = Json.createObjectBuilder().add("model", model).build();
 
         return new ModelEngineFiles(mappingsToJson(), itemFile, models);
     }