EAP

gradle.properties

@@ -12,7 +12,7 @@ parchment_mappings_version=2025.01.05
 minecraft_version=1.21.4
 minecraft_version_range=[1.21.4, 1.22)
 
-neo_version=21.4.54-beta
+neo_version=21.4.57-beta
 neo_version_range=[21.4,)
 loader_version_range=[4,)
 

src/generated/resources/assets/big_swords/equipment/biomass.json

@@ -2,12 +2,12 @@
   "layers": {
     "humanoid": [
       {
-        "texture": "big_swords:biomass"
+        "texture": "minecraft:biomass"
       }
     ],
     "humanoid_leggings": [
       {
-        "texture": "big_swords:biomass"
+        "texture": "minecraft:biomass"
       }
     ]
   }

src/generated/resources/assets/big_swords/equipment/livingmetal.json

@@ -2,12 +2,12 @@
   "layers": {
     "humanoid": [
       {
-        "texture": "big_swords:livingmetal"
+        "texture": "minecraft:livingmetal"
       }
     ],
     "humanoid_leggings": [
       {
-        "texture": "big_swords:livingmetal"
+        "texture": "minecraft:livingmetal"
       }
     ]
   }

src/main/java/net/nova/big_swords/data/models/BSEquipmentModelProvider.java

@@ -2,49 +2,21 @@
 
 import net.minecraft.client.data.models.EquipmentAssetProvider;
 import net.minecraft.client.resources.model.EquipmentClientInfo;
-import net.minecraft.data.CachedOutput;
-import net.minecraft.data.DataProvider;
 import net.minecraft.data.PackOutput;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.world.item.equipment.EquipmentAsset;
-import net.nova.big_swords.BigSwordsR;
 import net.nova.big_swords.equipment.BSEquipmentAssets;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.CompletableFuture;
 import java.util.function.BiConsumer;
 
 public class BSEquipmentModelProvider extends EquipmentAssetProvider {
-    private final PackOutput.PathProvider pathProvider;
-
     public BSEquipmentModelProvider(PackOutput output) {
         super(output);
-        this.pathProvider = output.createPathProvider(PackOutput.Target.RESOURCE_PACK, "equipment");
-    }
-
-    public static void bootstrap(BiConsumer<ResourceKey<EquipmentAsset>, EquipmentClientInfo> consumer) {
-        consumer.accept(BSEquipmentAssets.LIVINGMETAL, onlyHumanoid("livingmetal"));
-        consumer.accept(BSEquipmentAssets.BIOMASS, onlyHumanoid("biomass"));
-    }
-
-    public static EquipmentClientInfo onlyHumanoid(String name) {
-        return EquipmentClientInfo.builder().addHumanoidLayers(BigSwordsR.rl(name)).build();
-    }
-
-    @Override
-    public CompletableFuture<?> run(CachedOutput output) {
-        Map<ResourceKey<EquipmentAsset>, EquipmentClientInfo> map = new HashMap<>();
-        bootstrap((id, model) -> {
-            if (map.putIfAbsent(id, model) != null) {
-                throw new IllegalStateException("Tried to register equipment model twice for id: " + id);
-            }
-        });
-        return DataProvider.saveAll(output, EquipmentClientInfo.CODEC, this.pathProvider::json, map);
     }
 
     @Override
-    public String getName() {
-        return "Big Swords Equipment Model Definitions";
+    protected void registerModels(BiConsumer<ResourceKey<EquipmentAsset>, EquipmentClientInfo> output) {
+        output.accept(BSEquipmentAssets.LIVINGMETAL, onlyHumanoid("livingmetal"));
+        output.accept(BSEquipmentAssets.BIOMASS, onlyHumanoid("biomass"));
     }
 }