25w03a

gradle.properties

@@ -4,7 +4,7 @@ org.gradle.parallel=true
 
 # Fabric Properties
 minecraft_version=25w03a
-yarn_mappings=25w03a+build.1
+yarn_mappings=25w03a+build.2
 loader_version=0.16.10
 
 # Mod Properties
@@ -13,4 +13,4 @@ maven_group=net.nova.big_swords
 mod_id=big_swords
 
 # Dependencies
-fabric_version=0.114.3+1.21.5
+fabric_version=0.114.4+1.21.5

run/options.txt

@@ -1,4 +1,4 @@
-version:4298
+version:4304
 ao:true
 biomeBlendRadius:2
 enableVsync:true

src/client/java/net/nova/big_swords/BSClient.java

@@ -6,9 +6,7 @@
 import net.fabricmc.fabric.api.resource.ResourcePackActivationType;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.render.RenderLayer;
-import net.minecraft.client.render.item.property.numeric.NumericProperties;
 import net.minecraft.text.Text;
-import net.nova.big_swords.client.render.item.BloodLevelModelProperty;
 import net.nova.big_swords.init.BSBlocks;
 
 import static net.nova.big_swords.BigSwordsR.MODID;
@@ -24,8 +22,6 @@ public class BSClient implements ClientModInitializer {
 
     @Override
     public void onInitializeClient() {
-        NumericProperties.ID_MAPPER.put(BigSwordsR.rl("blood_level"), BloodLevelModelProperty.CODEC);
-
         BlockRenderLayerMap.INSTANCE.putBlock(BSBlocks.BIOMASS, RenderLayer.getCutout());
 
         for (String packId : RESOURCE_PACKS) {

src/client/java/net/nova/big_swords/data/models/BSItemModelGenerator.java

@@ -4,9 +4,9 @@
 import net.fabricmc.api.Environment;
 import net.minecraft.client.data.*;
 import net.minecraft.client.render.item.model.ItemModel;
-import net.minecraft.client.render.item.model.RangeDispatchItemModel;
 import net.minecraft.client.render.item.model.SelectItemModel;
 import net.minecraft.client.render.item.property.bool.UsingItemProperty;
+import net.minecraft.client.render.item.property.select.ComponentProperty;
 import net.minecraft.client.render.item.property.select.TrimMaterialProperty;
 import net.minecraft.component.DataComponentTypes;
 import net.minecraft.component.type.EquippableComponent;
@@ -19,9 +19,9 @@
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.util.Identifier;
 import net.nova.big_swords.BigSwordsR;
-import net.nova.big_swords.client.render.item.BloodLevelModelProperty;
 import net.nova.big_swords.data.BSTrimMaterials;
 import net.nova.big_swords.equipment.BSEquipmentAssets;
+import net.nova.big_swords.init.BSDataComponentTypes;
 import net.nova.big_swords.init.BSItems;
 
 import java.util.ArrayList;
@@ -43,7 +43,7 @@ public class BSItemModelGenerator extends ItemModelGenerator {
             new BSItemModelGenerator.TrimMaterial("lapis", ArmorTrimMaterials.LAPIS, Map.of()),
             new BSItemModelGenerator.TrimMaterial("amethyst", ArmorTrimMaterials.AMETHYST, Map.of()),
             new BSItemModelGenerator.TrimMaterial("resin", ArmorTrimMaterials.RESIN, Map.of()),
-            new BSItemModelGenerator.TrimMaterial("livingmetal", BSTrimMaterials.LIVINGMETAL, Map.of())
+            new BSItemModelGenerator.TrimMaterial("livingmetal", BSTrimMaterials.LIVINGMETAL, Map.of(BSEquipmentAssets.LIVINGMETAL, "livingmetal_darker"))
     );
 
     public BSItemModelGenerator(ItemModelOutput output, BiConsumer<Identifier, ModelSupplier> modelCollector) {
@@ -153,23 +153,22 @@ public void register() {
 
     // Methods
     public void registerBloodVial(Item item) {
-        List<RangeDispatchItemModel.Entry> list = new ArrayList<>();
+        List<SelectItemModel.SwitchCase<Integer>> list = new ArrayList<>();
         ItemModel.Unbaked basicModel = ItemModels.basic(Models.GENERATED.upload(
                 BigSwordsR.rl("item/vial"),
                 TextureMap.layer0(BigSwordsR.rl("item/vial")),
                 modelCollector
         ));
-        list.add(ItemModels.rangeDispatchEntry(basicModel, 0.0F));
 
-        for (int i = 1; i < 10; i++) {
+        for (int i = 1; i < 9; i++) {
             ItemModel.Unbaked bloodModel = ItemModels.basic(Models.GENERATED.upload(
                     ModelIds.getItemSubModelId(item, "_" + i),
                     TextureMap.layer0(TextureMap.getSubId(item, "_" + (i - 1))),
                     modelCollector
             ));
-            list.add(ItemModels.rangeDispatchEntry(bloodModel, (float) i));
+            list.add(ItemModels.switchCase(i, bloodModel));
         }
-        output.accept(item, ItemModels.rangeDispatch(new BloodLevelModelProperty(), list));
+        output.accept(item, ItemModels.select(new ComponentProperty<>(BSDataComponentTypes.BLOOD_LEVEL), basicModel, list));
     }
 
     public Identifier registerSubModelWith(Item item, String suffix, Model model) {
@@ -213,7 +212,8 @@ public void registerArmor(Item item, RegistryKey<EquipmentAsset> equipmentKey) {
     }
 
     @Environment(EnvType.CLIENT)
-    record TrimMaterial(String name, RegistryKey<ArmorTrimMaterial> materialKey, Map<RegistryKey<EquipmentAsset>, String> overrideArmorMaterials) {
+    record TrimMaterial(String name, RegistryKey<ArmorTrimMaterial> materialKey,
+                        Map<RegistryKey<EquipmentAsset>, String> overrideArmorMaterials) {
         public String texture(RegistryKey<EquipmentAsset> equipmentKey) {
             return overrideArmorMaterials.getOrDefault(equipmentKey, this.name);
         }

src/main/generated/assets/big_swords/items/blood_vial.json

@@ -1,78 +1,69 @@
 {
   "model": {
-    "type": "minecraft:range_dispatch",
-    "entries": [
-      {
-        "model": {
-          "type": "minecraft:model",
-          "model": "big_swords:item/vial"
-        },
-        "threshold": 0.0
-      },
+    "type": "minecraft:select",
+    "cases": [
       {
         "model": {
           "type": "minecraft:model",
           "model": "big_swords:item/blood_vial_1"
         },
-        "threshold": 1.0
+        "when": 1
       },
       {
         "model": {
           "type": "minecraft:model",
           "model": "big_swords:item/blood_vial_2"
         },
-        "threshold": 2.0
+        "when": 2
       },
       {
         "model": {
           "type": "minecraft:model",
           "model": "big_swords:item/blood_vial_3"
         },
-        "threshold": 3.0
+        "when": 3
       },
       {
         "model": {
           "type": "minecraft:model",
           "model": "big_swords:item/blood_vial_4"
         },
-        "threshold": 4.0
+        "when": 4
       },
       {
         "model": {
           "type": "minecraft:model",
           "model": "big_swords:item/blood_vial_5"
         },
-        "threshold": 5.0
+        "when": 5
       },
       {
         "model": {
           "type": "minecraft:model",
           "model": "big_swords:item/blood_vial_6"
         },
-        "threshold": 6.0
+        "when": 6
       },
       {
         "model": {
           "type": "minecraft:model",
           "model": "big_swords:item/blood_vial_7"
         },
-        "threshold": 7.0
+        "when": 7
       },
       {
         "model": {
           "type": "minecraft:model",
           "model": "big_swords:item/blood_vial_8"
         },
-        "threshold": 8.0
-      },
-      {
-        "model": {
-          "type": "minecraft:model",
-          "model": "big_swords:item/blood_vial_9"
-        },
-        "threshold": 9.0
+        "when": 8
       }
     ],
-    "property": "big_swords:blood_level"
+    "component": "big_swords:blood_level",
+    "fallback": {
+      "type": "minecraft:model",
+      "model": "big_swords:item/vial"
+    },
+    "property": "minecraft:component"
   }
 }

src/main/generated/assets/big_swords/models/item/livingmetal_boots_livingmetal_trim.json

@@ -2,6 +2,6 @@
   "parent": "minecraft:item/generated",
   "textures": {
     "layer0": "big_swords:item/livingmetal_boots",
-    "layer1": "minecraft:trims/items/boots_trim_livingmetal"
+    "layer1": "minecraft:trims/items/boots_trim_livingmetal_darker"
   }
 }

src/main/generated/assets/big_swords/models/item/livingmetal_chestplate_livingmetal_trim.json

@@ -2,6 +2,6 @@
   "parent": "minecraft:item/generated",
   "textures": {
     "layer0": "big_swords:item/livingmetal_chestplate",
-    "layer1": "minecraft:trims/items/chestplate_trim_livingmetal"
+    "layer1": "minecraft:trims/items/chestplate_trim_livingmetal_darker"
   }
 }

src/main/generated/assets/big_swords/models/item/livingmetal_helmet_livingmetal_trim.json

@@ -2,6 +2,6 @@
   "parent": "minecraft:item/generated",
   "textures": {
     "layer0": "big_swords:item/livingmetal_helmet",
-    "layer1": "minecraft:trims/items/helmet_trim_livingmetal"
+    "layer1": "minecraft:trims/items/helmet_trim_livingmetal_darker"
   }
 }

src/main/generated/assets/big_swords/models/item/livingmetal_leggings_livingmetal_trim.json

@@ -2,6 +2,6 @@
   "parent": "minecraft:item/generated",
   "textures": {
     "layer0": "big_swords:item/livingmetal_leggings",
-    "layer1": "minecraft:trims/items/leggings_trim_livingmetal"
+    "layer1": "minecraft:trims/items/leggings_trim_livingmetal_darker"
   }
 }

src/main/generated/data/big_swords/recipe/ender_big_sword_smithing.json

@@ -3,7 +3,6 @@
   "addition": "minecraft:ender_eye",
   "base": "big_swords:obsidian_big_sword",
   "result": {
-    "count": 1,
     "id": "big_swords:ender_big_sword"
   },
   "template": "big_swords:ender_upgrade_smithing_template"

src/main/generated/data/big_swords/recipe/ender_shield_smithing.json

@@ -3,7 +3,6 @@
   "addition": "minecraft:ender_eye",
   "base": "big_swords:netherite_shield",
   "result": {
-    "count": 1,
     "id": "big_swords:ender_shield"
   },
   "template": "big_swords:ender_upgrade_smithing_template"

src/main/generated/data/big_swords/recipe/gilded_ender_shield_smithing.json

@@ -3,7 +3,6 @@
   "addition": "minecraft:ender_eye",
   "base": "big_swords:gilded_netherite_shield",
   "result": {
-    "count": 1,
     "id": "big_swords:gilded_ender_shield"
   },
   "template": "big_swords:ender_upgrade_smithing_template"

src/main/generated/data/big_swords/recipe/gilded_netherite_shield_smithing.json

@@ -3,7 +3,6 @@
   "addition": "#minecraft:netherite_tool_materials",
   "base": "big_swords:gilded_diamond_shield",
   "result": {
-    "count": 1,
     "id": "big_swords:gilded_netherite_shield"
   },
   "template": "minecraft:netherite_upgrade_smithing_template"

src/main/generated/data/big_swords/recipe/netherite_big_sword_smithing.json

@@ -3,7 +3,6 @@
   "addition": "minecraft:netherite_block",
   "base": "big_swords:diamond_big_sword",
   "result": {
-    "count": 1,
     "id": "big_swords:netherite_big_sword"
   },
   "template": "minecraft:netherite_upgrade_smithing_template"

src/main/generated/data/big_swords/recipe/netherite_glaive_smithing.json

@@ -3,7 +3,6 @@
   "addition": "#minecraft:netherite_tool_materials",
   "base": "big_swords:diamond_glaive",
   "result": {
-    "count": 1,
     "id": "big_swords:netherite_glaive"
   },
   "template": "minecraft:netherite_upgrade_smithing_template"

src/main/generated/data/big_swords/recipe/netherite_scythe_smithing.json

@@ -3,7 +3,6 @@
   "addition": "#minecraft:netherite_tool_materials",
   "base": "big_swords:diamond_scythe",
   "result": {
-    "count": 1,
     "id": "big_swords:netherite_scythe"
   },
   "template": "minecraft:netherite_upgrade_smithing_template"

src/main/generated/data/big_swords/recipe/netherite_shield_smithing.json

@@ -3,7 +3,6 @@
   "addition": "#minecraft:netherite_tool_materials",
   "base": "big_swords:diamond_shield",
   "result": {
-    "count": 1,
     "id": "big_swords:netherite_shield"
   },
   "template": "minecraft:netherite_upgrade_smithing_template"