Merge remote-tracking branch 'origin/v2-1.21.9' into v2-1.21.9

# Conflicts:
#	src/main/java/com/acethewildfire/acesbs/KNOWN_ISSUES
#	src/main/java/com/acethewildfire/acesbs/datagen/ModBlockTagProvider.java
#	src/main/java/com/acethewildfire/acesbs/datagen/ModItemTagProvider.java

build.gradle

@@ -35,10 +35,10 @@ dependencies {
 	// Fabric API. This is technically optional, but you probably want it anyway.
 	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 
-	modCompileOnly "me.shedaniel:RoughlyEnoughItems-api-fabric:16.0.777"
+	// SHITS FUCKED NO MORE REI
-	modRuntimeOnly "me.shedaniel:RoughlyEnoughItems-fabric:16.0.777"
+//	modApi "me.shedaniel:RoughlyEnoughItems-fabric:17.0.807"
-	modApi "dev.architectury:architectury-fabric:13.0.8"
+//	modApi "dev.architectury:architectury-fabric:14.0.4"
-	modApi "me.shedaniel.cloth:cloth-config-fabric:15.0.140"
+//	modApi "me.shedaniel.cloth:cloth-config-fabric:16.0.143"
 }
 
 processResources {

gradle.properties

@@ -4,15 +4,15 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.21.1
+minecraft_version=1.21.9
-yarn_mappings=1.21.1+build.3
+yarn_mappings=1.21.9+build.1
-loader_version=0.18.4
+loader_version=0.17.3
 loom_version=1.15-SNAPSHOT
 
 # Fabric API
-fabric_version=0.116.8+1.21.1
+fabric_version=0.134.1+1.21.9
 
 # Mod Properties
-mod_version=2.0.0
+mod_version=2.0.3
 maven_group=com.acethewildfire.acesbs
 archives_base_name=acesbs

src/main/generated/assets/acesbs/items/aquarium_gravel.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:item/aquarium_gravel"
+  }
+}

src/main/generated/assets/acesbs/items/ashen_armor_trim_smithing_template.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:item/ashen_armor_trim_smithing_template"
+  }
+}

src/main/generated/assets/acesbs/items/ashen_steel.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:item/ashen_steel"
+  }
+}

src/main/generated/assets/acesbs/items/ashen_steel_axe.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:item/ashen_steel_axe"
+  }
+}

src/main/generated/assets/acesbs/items/ashen_steel_block.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:block/ashen_steel_block"
+  }
+}

src/main/generated/assets/acesbs/items/ashen_steel_boots.json

@@ -0,0 +1,89 @@
+{
+  "model": {
+    "type": "minecraft:select",
+    "cases": [
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/ashen_steel_boots_quartz_trim"
+        },
+        "when": "minecraft:quartz"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/ashen_steel_boots_iron_trim"
+        },
+        "when": "minecraft:iron"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/ashen_steel_boots_netherite_trim"
+        },
+        "when": "minecraft:netherite"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/ashen_steel_boots_redstone_trim"
+        },
+        "when": "minecraft:redstone"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/ashen_steel_boots_copper_trim"
+        },
+        "when": "minecraft:copper"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/ashen_steel_boots_gold_trim"
+        },
+        "when": "minecraft:gold"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/ashen_steel_boots_emerald_trim"
+        },
+        "when": "minecraft:emerald"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/ashen_steel_boots_diamond_trim"
+        },
+        "when": "minecraft:diamond"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/ashen_steel_boots_lapis_trim"
+        },
+        "when": "minecraft:lapis"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/ashen_steel_boots_amethyst_trim"
+        },
+        "when": "minecraft:amethyst"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/ashen_steel_boots_resin_trim"
+        },
+        "when": "minecraft:resin"
+      }
+    ],
+    "fallback": {
+      "type": "minecraft:model",
+      "model": "acesbs:item/ashen_steel_boots"
+    },
+    "property": "minecraft:trim_material"
+  }
+}

src/main/generated/assets/acesbs/items/ashen_steel_chestplate.json

@@ -0,0 +1,89 @@
+{
+  "model": {
+    "type": "minecraft:select",
+    "cases": [
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/ashen_steel_chestplate_quartz_trim"
+        },
+        "when": "minecraft:quartz"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/ashen_steel_chestplate_iron_trim"
+        },
+        "when": "minecraft:iron"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/ashen_steel_chestplate_netherite_trim"
+        },
+        "when": "minecraft:netherite"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/ashen_steel_chestplate_redstone_trim"
+        },
+        "when": "minecraft:redstone"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/ashen_steel_chestplate_copper_trim"
+        },
+        "when": "minecraft:copper"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/ashen_steel_chestplate_gold_trim"
+        },
+        "when": "minecraft:gold"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/ashen_steel_chestplate_emerald_trim"
+        },
+        "when": "minecraft:emerald"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/ashen_steel_chestplate_diamond_trim"
+        },
+        "when": "minecraft:diamond"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/ashen_steel_chestplate_lapis_trim"
+        },
+        "when": "minecraft:lapis"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/ashen_steel_chestplate_amethyst_trim"
+        },
+        "when": "minecraft:amethyst"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/ashen_steel_chestplate_resin_trim"
+        },
+        "when": "minecraft:resin"
+      }
+    ],
+    "fallback": {
+      "type": "minecraft:model",
+      "model": "acesbs:item/ashen_steel_chestplate"
+    },
+    "property": "minecraft:trim_material"
+  }
+}

src/main/generated/assets/acesbs/items/ashen_steel_hammer.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:item/ashen_steel_hammer"
+  }
+}

src/main/generated/assets/acesbs/items/ashen_steel_helmet.json

@@ -0,0 +1,89 @@
+{
+  "model": {
+    "type": "minecraft:select",
+    "cases": [
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/ashen_steel_helmet_quartz_trim"
+        },
+        "when": "minecraft:quartz"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/ashen_steel_helmet_iron_trim"
+        },
+        "when": "minecraft:iron"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/ashen_steel_helmet_netherite_trim"
+        },
+        "when": "minecraft:netherite"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/ashen_steel_helmet_redstone_trim"
+        },
+        "when": "minecraft:redstone"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/ashen_steel_helmet_copper_trim"
+        },
+        "when": "minecraft:copper"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/ashen_steel_helmet_gold_trim"
+        },
+        "when": "minecraft:gold"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/ashen_steel_helmet_emerald_trim"
+        },
+        "when": "minecraft:emerald"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/ashen_steel_helmet_diamond_trim"
+        },
+        "when": "minecraft:diamond"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/ashen_steel_helmet_lapis_trim"
+        },
+        "when": "minecraft:lapis"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/ashen_steel_helmet_amethyst_trim"
+        },
+        "when": "minecraft:amethyst"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/ashen_steel_helmet_resin_trim"
+        },
+        "when": "minecraft:resin"
+      }
+    ],
+    "fallback": {
+      "type": "minecraft:model",
+      "model": "acesbs:item/ashen_steel_helmet"
+    },
+    "property": "minecraft:trim_material"
+  }
+}

src/main/generated/assets/acesbs/items/ashen_steel_hoe.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:item/ashen_steel_hoe"
+  }
+}

src/main/generated/assets/acesbs/items/ashen_steel_leggings.json

@@ -0,0 +1,89 @@
+{
+  "model": {
+    "type": "minecraft:select",
+    "cases": [
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/ashen_steel_leggings_quartz_trim"
+        },
+        "when": "minecraft:quartz"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/ashen_steel_leggings_iron_trim"
+        },
+        "when": "minecraft:iron"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/ashen_steel_leggings_netherite_trim"
+        },
+        "when": "minecraft:netherite"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/ashen_steel_leggings_redstone_trim"
+        },
+        "when": "minecraft:redstone"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/ashen_steel_leggings_copper_trim"
+        },
+        "when": "minecraft:copper"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/ashen_steel_leggings_gold_trim"
+        },
+        "when": "minecraft:gold"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/ashen_steel_leggings_emerald_trim"
+        },
+        "when": "minecraft:emerald"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/ashen_steel_leggings_diamond_trim"
+        },
+        "when": "minecraft:diamond"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/ashen_steel_leggings_lapis_trim"
+        },
+        "when": "minecraft:lapis"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/ashen_steel_leggings_amethyst_trim"
+        },
+        "when": "minecraft:amethyst"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/ashen_steel_leggings_resin_trim"
+        },
+        "when": "minecraft:resin"
+      }
+    ],
+    "fallback": {
+      "type": "minecraft:model",
+      "model": "acesbs:item/ashen_steel_leggings"
+    },
+    "property": "minecraft:trim_material"
+  }
+}

src/main/generated/assets/acesbs/items/ashen_steel_pickaxe.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:item/ashen_steel_pickaxe"
+  }
+}

src/main/generated/assets/acesbs/items/ashen_steel_shovel.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:item/ashen_steel_shovel"
+  }
+}

src/main/generated/assets/acesbs/items/ashen_steel_sword.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:item/ashen_steel_sword"
+  }
+}

src/main/generated/assets/acesbs/items/berserkers_pauldron.json

@@ -0,0 +1,89 @@
+{
+  "model": {
+    "type": "minecraft:select",
+    "cases": [
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/berserkers_pauldron_quartz_trim"
+        },
+        "when": "minecraft:quartz"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/berserkers_pauldron_iron_trim"
+        },
+        "when": "minecraft:iron"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/berserkers_pauldron_netherite_trim"
+        },
+        "when": "minecraft:netherite"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/berserkers_pauldron_redstone_trim"
+        },
+        "when": "minecraft:redstone"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/berserkers_pauldron_copper_trim"
+        },
+        "when": "minecraft:copper"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/berserkers_pauldron_gold_trim"
+        },
+        "when": "minecraft:gold"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/berserkers_pauldron_emerald_trim"
+        },
+        "when": "minecraft:emerald"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/berserkers_pauldron_diamond_trim"
+        },
+        "when": "minecraft:diamond"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/berserkers_pauldron_lapis_trim"
+        },
+        "when": "minecraft:lapis"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/berserkers_pauldron_amethyst_trim"
+        },
+        "when": "minecraft:amethyst"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/berserkers_pauldron_resin_trim"
+        },
+        "when": "minecraft:resin"
+      }
+    ],
+    "fallback": {
+      "type": "minecraft:model",
+      "model": "acesbs:item/berserkers_pauldron"
+    },
+    "property": "minecraft:trim_material"
+  }
+}

src/main/generated/assets/acesbs/items/bricked_up.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:item/bricked_up"
+  }
+}

src/main/generated/assets/acesbs/items/cooked_lemon.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:item/cooked_lemon"
+  }
+}

src/main/generated/assets/acesbs/items/crab_rave_music_disc.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:item/crab_rave_music_disc"
+  }
+}

src/main/generated/assets/acesbs/items/crystal_entropy.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:block/crystal_entropy"
+  }
+}

src/main/generated/assets/acesbs/items/crystal_entropy_pane.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:item/crystal_entropy_pane"
+  }
+}

src/main/generated/assets/acesbs/items/deepslate_entropy_ore.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:block/deepslate_entropy_ore"
+  }
+}

src/main/generated/assets/acesbs/items/dust_of_order.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:item/dust_of_order"
+  }
+}

src/main/generated/assets/acesbs/items/endtropy_ore.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:block/endtropy_ore"
+  }
+}

src/main/generated/assets/acesbs/items/entropy_ore.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:block/entropy_ore"
+  }
+}

src/main/generated/assets/acesbs/items/evil_block.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:block/evil_block"
+  }
+}

src/main/generated/assets/acesbs/items/fractal_diamond.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:item/fractal_diamond"
+  }
+}

src/main/generated/assets/acesbs/items/fren_spawn_egg.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:item/fren_spawn_egg"
+  }
+}

src/main/generated/assets/acesbs/items/green_bricks.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:item/green_bricks"
+  }
+}

src/main/generated/assets/acesbs/items/hellfire_diamond.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:item/hellfire_diamond"
+  }
+}

src/main/generated/assets/acesbs/items/infernal_ashes.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:item/infernal_ashes"
+  }
+}

src/main/generated/assets/acesbs/items/infernal_ashes_block.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:block/infernal_ashes_block"
+  }
+}

src/main/generated/assets/acesbs/items/infernal_ashes_ore.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:block/infernal_ashes_ore"
+  }
+}

src/main/generated/assets/acesbs/items/infernal_beef.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:item/infernal_beef"
+  }
+}

src/main/generated/assets/acesbs/items/ingot_of_order.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:item/ingot_of_order"
+  }
+}

src/main/generated/assets/acesbs/items/kaupen_bow.json

@@ -0,0 +1,35 @@
+{
+  "model": {
+    "type": "minecraft:condition",
+    "on_false": {
+      "type": "minecraft:model",
+      "model": "acesbs:item/kaupen_bow"
+    },
+    "on_true": {
+      "type": "minecraft:range_dispatch",
+      "entries": [
+        {
+          "model": {
+            "type": "minecraft:model",
+            "model": "acesbs:item/kaupen_bow_pulling_1"
+          },
+          "threshold": 0.65
+        },
+        {
+          "model": {
+            "type": "minecraft:model",
+            "model": "acesbs:item/kaupen_bow_pulling_2"
+          },
+          "threshold": 0.9
+        }
+      ],
+      "fallback": {
+        "type": "minecraft:model",
+        "model": "acesbs:item/kaupen_bow_pulling_0"
+      },
+      "property": "minecraft:use_duration",
+      "scale": 0.05
+    },
+    "property": "minecraft:using_item"
+  }
+}

src/main/generated/assets/acesbs/items/lemon.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:item/lemon"
+  }
+}

src/main/generated/assets/acesbs/items/lemonwood_button.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:block/lemonwood_button_inventory"
+  }
+}

src/main/generated/assets/acesbs/items/lemonwood_door.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:item/lemonwood_door"
+  }
+}

src/main/generated/assets/acesbs/items/lemonwood_fence.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:block/lemonwood_fence_inventory"
+  }
+}

src/main/generated/assets/acesbs/items/lemonwood_fence_gate.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:block/lemonwood_fence_gate"
+  }
+}

src/main/generated/assets/acesbs/items/lemonwood_leaves.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:block/lemonwood_leaves"
+  }
+}

src/main/generated/assets/acesbs/items/lemonwood_log.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:block/lemonwood_log"
+  }
+}

src/main/generated/assets/acesbs/items/lemonwood_planks.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:block/lemonwood_planks"
+  }
+}

src/main/generated/assets/acesbs/items/lemonwood_pressure_plate.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:block/lemonwood_pressure_plate"
+  }
+}

src/main/generated/assets/acesbs/items/lemonwood_sapling.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:block/lemonwood_sapling"
+  }
+}

src/main/generated/assets/acesbs/items/lemonwood_slab.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:block/lemonwood_slab"
+  }
+}

src/main/generated/assets/acesbs/items/lemonwood_stairs.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:block/lemonwood_stairs"
+  }
+}

src/main/generated/assets/acesbs/items/lemonwood_trapdoor.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:block/lemonwood_trapdoor_bottom"
+  }
+}

src/main/generated/assets/acesbs/items/lemonwood_wall.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:block/lemonwood_wall_inventory"
+  }
+}

src/main/generated/assets/acesbs/items/lemonwood_wood.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:block/lemonwood_wood"
+  }
+}

src/main/generated/assets/acesbs/items/lizard_button.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:block/lizard_button_inventory"
+  }
+}

src/main/generated/assets/acesbs/items/lizard_planks.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:block/lizard_planks"
+  }
+}

src/main/generated/assets/acesbs/items/mote_of_order.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:item/mote_of_order"
+  }
+}

src/main/generated/assets/acesbs/items/oracle_lemon.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:item/oracle_lemon"
+  }
+}

src/main/generated/assets/acesbs/items/potted_lemonwood_sapling.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:block/potted_lemonwood_sapling"
+  }
+}

src/main/generated/assets/acesbs/items/prisma_armor_trim_smithing_template.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:item/prisma_armor_trim_smithing_template"
+  }
+}

src/main/generated/assets/acesbs/items/prisma_steel.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:item/prisma_steel"
+  }
+}

src/main/generated/assets/acesbs/items/prisma_steel_axe.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:item/prisma_steel_axe"
+  }
+}

src/main/generated/assets/acesbs/items/prisma_steel_block.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:block/prisma_steel_block"
+  }
+}

src/main/generated/assets/acesbs/items/prisma_steel_boots.json

@@ -0,0 +1,89 @@
+{
+  "model": {
+    "type": "minecraft:select",
+    "cases": [
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/prisma_steel_boots_quartz_trim"
+        },
+        "when": "minecraft:quartz"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/prisma_steel_boots_iron_trim"
+        },
+        "when": "minecraft:iron"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/prisma_steel_boots_netherite_trim"
+        },
+        "when": "minecraft:netherite"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/prisma_steel_boots_redstone_trim"
+        },
+        "when": "minecraft:redstone"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/prisma_steel_boots_copper_trim"
+        },
+        "when": "minecraft:copper"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/prisma_steel_boots_gold_trim"
+        },
+        "when": "minecraft:gold"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/prisma_steel_boots_emerald_trim"
+        },
+        "when": "minecraft:emerald"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/prisma_steel_boots_diamond_trim"
+        },
+        "when": "minecraft:diamond"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/prisma_steel_boots_lapis_trim"
+        },
+        "when": "minecraft:lapis"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/prisma_steel_boots_amethyst_trim"
+        },
+        "when": "minecraft:amethyst"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/prisma_steel_boots_resin_trim"
+        },
+        "when": "minecraft:resin"
+      }
+    ],
+    "fallback": {
+      "type": "minecraft:model",
+      "model": "acesbs:item/prisma_steel_boots"
+    },
+    "property": "minecraft:trim_material"
+  }
+}

src/main/generated/assets/acesbs/items/prisma_steel_chestplate.json

@@ -0,0 +1,89 @@
+{
+  "model": {
+    "type": "minecraft:select",
+    "cases": [
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/prisma_steel_chestplate_quartz_trim"
+        },
+        "when": "minecraft:quartz"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/prisma_steel_chestplate_iron_trim"
+        },
+        "when": "minecraft:iron"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/prisma_steel_chestplate_netherite_trim"
+        },
+        "when": "minecraft:netherite"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/prisma_steel_chestplate_redstone_trim"
+        },
+        "when": "minecraft:redstone"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/prisma_steel_chestplate_copper_trim"
+        },
+        "when": "minecraft:copper"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/prisma_steel_chestplate_gold_trim"
+        },
+        "when": "minecraft:gold"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/prisma_steel_chestplate_emerald_trim"
+        },
+        "when": "minecraft:emerald"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/prisma_steel_chestplate_diamond_trim"
+        },
+        "when": "minecraft:diamond"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/prisma_steel_chestplate_lapis_trim"
+        },
+        "when": "minecraft:lapis"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/prisma_steel_chestplate_amethyst_trim"
+        },
+        "when": "minecraft:amethyst"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/prisma_steel_chestplate_resin_trim"
+        },
+        "when": "minecraft:resin"
+      }
+    ],
+    "fallback": {
+      "type": "minecraft:model",
+      "model": "acesbs:item/prisma_steel_chestplate"
+    },
+    "property": "minecraft:trim_material"
+  }
+}

src/main/generated/assets/acesbs/items/prisma_steel_hammer.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:item/prisma_steel_hammer"
+  }
+}

src/main/generated/assets/acesbs/items/prisma_steel_helmet.json

@@ -0,0 +1,89 @@
+{
+  "model": {
+    "type": "minecraft:select",
+    "cases": [
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/prisma_steel_helmet_quartz_trim"
+        },
+        "when": "minecraft:quartz"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/prisma_steel_helmet_iron_trim"
+        },
+        "when": "minecraft:iron"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/prisma_steel_helmet_netherite_trim"
+        },
+        "when": "minecraft:netherite"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/prisma_steel_helmet_redstone_trim"
+        },
+        "when": "minecraft:redstone"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/prisma_steel_helmet_copper_trim"
+        },
+        "when": "minecraft:copper"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/prisma_steel_helmet_gold_trim"
+        },
+        "when": "minecraft:gold"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/prisma_steel_helmet_emerald_trim"
+        },
+        "when": "minecraft:emerald"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/prisma_steel_helmet_diamond_trim"
+        },
+        "when": "minecraft:diamond"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/prisma_steel_helmet_lapis_trim"
+        },
+        "when": "minecraft:lapis"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/prisma_steel_helmet_amethyst_trim"
+        },
+        "when": "minecraft:amethyst"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/prisma_steel_helmet_resin_trim"
+        },
+        "when": "minecraft:resin"
+      }
+    ],
+    "fallback": {
+      "type": "minecraft:model",
+      "model": "acesbs:item/prisma_steel_helmet"
+    },
+    "property": "minecraft:trim_material"
+  }
+}

src/main/generated/assets/acesbs/items/prisma_steel_hoe.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:item/prisma_steel_hoe"
+  }
+}

src/main/generated/assets/acesbs/items/prisma_steel_leggings.json

@@ -0,0 +1,89 @@
+{
+  "model": {
+    "type": "minecraft:select",
+    "cases": [
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/prisma_steel_leggings_quartz_trim"
+        },
+        "when": "minecraft:quartz"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/prisma_steel_leggings_iron_trim"
+        },
+        "when": "minecraft:iron"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/prisma_steel_leggings_netherite_trim"
+        },
+        "when": "minecraft:netherite"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/prisma_steel_leggings_redstone_trim"
+        },
+        "when": "minecraft:redstone"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/prisma_steel_leggings_copper_trim"
+        },
+        "when": "minecraft:copper"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/prisma_steel_leggings_gold_trim"
+        },
+        "when": "minecraft:gold"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/prisma_steel_leggings_emerald_trim"
+        },
+        "when": "minecraft:emerald"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/prisma_steel_leggings_diamond_trim"
+        },
+        "when": "minecraft:diamond"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/prisma_steel_leggings_lapis_trim"
+        },
+        "when": "minecraft:lapis"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/prisma_steel_leggings_amethyst_trim"
+        },
+        "when": "minecraft:amethyst"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/prisma_steel_leggings_resin_trim"
+        },
+        "when": "minecraft:resin"
+      }
+    ],
+    "fallback": {
+      "type": "minecraft:model",
+      "model": "acesbs:item/prisma_steel_leggings"
+    },
+    "property": "minecraft:trim_material"
+  }
+}

src/main/generated/assets/acesbs/items/prisma_steel_pickaxe.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:item/prisma_steel_pickaxe"
+  }
+}

src/main/generated/assets/acesbs/items/prisma_steel_shovel.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:item/prisma_steel_shovel"
+  }
+}

src/main/generated/assets/acesbs/items/prisma_steel_sword.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:item/prisma_steel_sword"
+  }
+}

src/main/generated/assets/acesbs/items/raw_endtropy.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:item/raw_endtropy"
+  }
+}

src/main/generated/assets/acesbs/items/raw_endtropy_block.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:block/raw_endtropy_block"
+  }
+}

src/main/generated/assets/acesbs/items/raw_entropy.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:item/raw_entropy"
+  }
+}

src/main/generated/assets/acesbs/items/sovs_plate_carrier.json

@@ -0,0 +1,89 @@
+{
+  "model": {
+    "type": "minecraft:select",
+    "cases": [
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/sovs_plate_carrier_quartz_trim"
+        },
+        "when": "minecraft:quartz"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/sovs_plate_carrier_iron_trim"
+        },
+        "when": "minecraft:iron"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/sovs_plate_carrier_netherite_trim"
+        },
+        "when": "minecraft:netherite"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/sovs_plate_carrier_redstone_trim"
+        },
+        "when": "minecraft:redstone"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/sovs_plate_carrier_copper_trim"
+        },
+        "when": "minecraft:copper"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/sovs_plate_carrier_gold_trim"
+        },
+        "when": "minecraft:gold"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/sovs_plate_carrier_emerald_trim"
+        },
+        "when": "minecraft:emerald"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/sovs_plate_carrier_diamond_trim"
+        },
+        "when": "minecraft:diamond"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/sovs_plate_carrier_lapis_trim"
+        },
+        "when": "minecraft:lapis"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/sovs_plate_carrier_amethyst_trim"
+        },
+        "when": "minecraft:amethyst"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/sovs_plate_carrier_resin_trim"
+        },
+        "when": "minecraft:resin"
+      }
+    ],
+    "fallback": {
+      "type": "minecraft:model",
+      "model": "acesbs:item/sovs_plate_carrier"
+    },
+    "property": "minecraft:trim_material"
+  }
+}

src/main/generated/assets/acesbs/items/stable_endtropy.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:item/stable_endtropy"
+  }
+}

src/main/generated/assets/acesbs/items/stable_endtropy_block.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:block/stable_endtropy_block"
+  }
+}

src/main/generated/assets/acesbs/items/stable_entropy.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:item/stable_entropy"
+  }
+}

src/main/generated/assets/acesbs/items/stable_entropy_block.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:block/stable_entropy_block"
+  }
+}

src/main/generated/assets/acesbs/items/stripped_lemonwood_log.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:block/stripped_lemonwood_log"
+  }
+}

src/main/generated/assets/acesbs/items/stripped_lemonwood_wood.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:block/stripped_lemonwood_wood"
+  }
+}

src/main/generated/assets/acesbs/items/thot_begone.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:item/thot_begone"
+  }
+}

src/main/generated/assets/acesbs/items/tobacco.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:item/tobacco"
+  }
+}

src/main/generated/assets/acesbs/items/tobacco_seeds.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:item/tobacco_seeds"
+  }
+}

src/main/generated/assets/acesbs/items/vulgar_bones_spawn_egg.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "acesbs:item/vulgar_bones_spawn_egg"
+  }
+}

src/main/generated/assets/acesbs/items/wand.json

@@ -0,0 +1,15 @@
+{
+  "model": {
+    "type": "minecraft:condition",
+    "component": "acesbs:coordinates",
+    "on_false": {
+      "type": "minecraft:model",
+      "model": "acesbs:item/wand"
+    },
+    "on_true": {
+      "type": "minecraft:model",
+      "model": "acesbs:item/wand_used"
+    },
+    "property": "minecraft:has_component"
+  }
+}

src/main/generated/assets/acesbs/items/wildfire_boots.json

@@ -0,0 +1,89 @@
+{
+  "model": {
+    "type": "minecraft:select",
+    "cases": [
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/wildfire_boots_quartz_trim"
+        },
+        "when": "minecraft:quartz"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/wildfire_boots_iron_trim"
+        },
+        "when": "minecraft:iron"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/wildfire_boots_netherite_trim"
+        },
+        "when": "minecraft:netherite"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/wildfire_boots_redstone_trim"
+        },
+        "when": "minecraft:redstone"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/wildfire_boots_copper_trim"
+        },
+        "when": "minecraft:copper"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/wildfire_boots_gold_trim"
+        },
+        "when": "minecraft:gold"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/wildfire_boots_emerald_trim"
+        },
+        "when": "minecraft:emerald"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/wildfire_boots_diamond_trim"
+        },
+        "when": "minecraft:diamond"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/wildfire_boots_lapis_trim"
+        },
+        "when": "minecraft:lapis"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/wildfire_boots_amethyst_trim"
+        },
+        "when": "minecraft:amethyst"
+      },
+      {
+        "model": {
+          "type": "minecraft:model",
+          "model": "acesbs:item/wildfire_boots_resin_trim"
+        },
+        "when": "minecraft:resin"
+      }
+    ],
+    "fallback": {
+      "type": "minecraft:model",
+      "model": "acesbs:item/wildfire_boots"
+    },
+    "property": "minecraft:trim_material"
+  }
+}

src/main/generated/assets/acesbs/models/item/ashen_steel_block.json

@@ -1,3 +0,0 @@
-{
-  "parent": "acesbs:block/ashen_steel_block"
-}

src/main/generated/assets/acesbs/models/item/ashen_steel_boots.json

@@ -1,67 +1,5 @@
 {
   "parent": "minecraft:item/generated",
-  "overrides": [
-    {
-      "model": "acesbs:item/ashen_steel_boots_quartz_trim",
-      "predicate": {
-        "trim_type": 0.1
-      }
-    },
-    {
-      "model": "acesbs:item/ashen_steel_boots_iron_trim",
-      "predicate": {
-        "trim_type": 0.2
-      }
-    },
-    {
-      "model": "acesbs:item/ashen_steel_boots_netherite_trim",
-      "predicate": {
-        "trim_type": 0.3
-      }
-    },
-    {
-      "model": "acesbs:item/ashen_steel_boots_redstone_trim",
-      "predicate": {
-        "trim_type": 0.4
-      }
-    },
-    {
-      "model": "acesbs:item/ashen_steel_boots_copper_trim",
-      "predicate": {
-        "trim_type": 0.5
-      }
-    },
-    {
-      "model": "acesbs:item/ashen_steel_boots_gold_trim",
-      "predicate": {
-        "trim_type": 0.6
-      }
-    },
-    {
-      "model": "acesbs:item/ashen_steel_boots_emerald_trim",
-      "predicate": {
-        "trim_type": 0.7
-      }
-    },
-    {
-      "model": "acesbs:item/ashen_steel_boots_diamond_trim",
-      "predicate": {
-        "trim_type": 0.8
-      }
-    },
-    {
-      "model": "acesbs:item/ashen_steel_boots_lapis_trim",
-      "predicate": {
-        "trim_type": 0.9
-      }
-    },
-    {
-      "model": "acesbs:item/ashen_steel_boots_amethyst_trim",
-      "predicate": {
-        "trim_type": 1.0
-      }
-    }
-  ],
   "textures": {
     "layer0": "acesbs:item/ashen_steel_boots"
   }

src/main/generated/assets/acesbs/models/item/ashen_steel_boots_resin_trim.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "acesbs:item/ashen_steel_boots",
+    "layer1": "minecraft:trims/items/boots_trim_resin"
+  }
+}

src/main/generated/assets/acesbs/models/item/ashen_steel_chestplate.json

@@ -1,67 +1,5 @@
 {
   "parent": "minecraft:item/generated",
-  "overrides": [
-    {
-      "model": "acesbs:item/ashen_steel_chestplate_quartz_trim",
-      "predicate": {
-        "trim_type": 0.1
-      }
-    },
-    {
-      "model": "acesbs:item/ashen_steel_chestplate_iron_trim",
-      "predicate": {
-        "trim_type": 0.2
-      }
-    },
-    {
-      "model": "acesbs:item/ashen_steel_chestplate_netherite_trim",
-      "predicate": {
-        "trim_type": 0.3
-      }
-    },
-    {
-      "model": "acesbs:item/ashen_steel_chestplate_redstone_trim",
-      "predicate": {
-        "trim_type": 0.4
-      }
-    },
-    {
-      "model": "acesbs:item/ashen_steel_chestplate_copper_trim",
-      "predicate": {
-        "trim_type": 0.5
-      }
-    },
-    {
-      "model": "acesbs:item/ashen_steel_chestplate_gold_trim",
-      "predicate": {
-        "trim_type": 0.6
-      }
-    },
-    {
-      "model": "acesbs:item/ashen_steel_chestplate_emerald_trim",
-      "predicate": {
-        "trim_type": 0.7
-      }
-    },
-    {
-      "model": "acesbs:item/ashen_steel_chestplate_diamond_trim",
-      "predicate": {
-        "trim_type": 0.8
-      }
-    },
-    {
-      "model": "acesbs:item/ashen_steel_chestplate_lapis_trim",
-      "predicate": {
-        "trim_type": 0.9
-      }
-    },
-    {
-      "model": "acesbs:item/ashen_steel_chestplate_amethyst_trim",
-      "predicate": {
-        "trim_type": 1.0
-      }
-    }
-  ],
   "textures": {
     "layer0": "acesbs:item/ashen_steel_chestplate"
   }

src/main/generated/assets/acesbs/models/item/ashen_steel_chestplate_resin_trim.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "acesbs:item/ashen_steel_chestplate",
+    "layer1": "minecraft:trims/items/chestplate_trim_resin"
+  }
+}

src/main/generated/assets/acesbs/models/item/ashen_steel_helmet.json

@@ -1,67 +1,5 @@
 {
   "parent": "minecraft:item/generated",
-  "overrides": [
-    {
-      "model": "acesbs:item/ashen_steel_helmet_quartz_trim",
-      "predicate": {
-        "trim_type": 0.1
-      }
-    },
-    {
-      "model": "acesbs:item/ashen_steel_helmet_iron_trim",
-      "predicate": {
-        "trim_type": 0.2
-      }
-    },
-    {
-      "model": "acesbs:item/ashen_steel_helmet_netherite_trim",
-      "predicate": {
-        "trim_type": 0.3
-      }
-    },
-    {
-      "model": "acesbs:item/ashen_steel_helmet_redstone_trim",
-      "predicate": {
-        "trim_type": 0.4
-      }
-    },
-    {
-      "model": "acesbs:item/ashen_steel_helmet_copper_trim",
-      "predicate": {
-        "trim_type": 0.5
-      }
-    },
-    {
-      "model": "acesbs:item/ashen_steel_helmet_gold_trim",
-      "predicate": {
-        "trim_type": 0.6
-      }
-    },
-    {
-      "model": "acesbs:item/ashen_steel_helmet_emerald_trim",
-      "predicate": {
-        "trim_type": 0.7
-      }
-    },
-    {
-      "model": "acesbs:item/ashen_steel_helmet_diamond_trim",
-      "predicate": {
-        "trim_type": 0.8
-      }
-    },
-    {
-      "model": "acesbs:item/ashen_steel_helmet_lapis_trim",
-      "predicate": {
-        "trim_type": 0.9
-      }
-    },
-    {
-      "model": "acesbs:item/ashen_steel_helmet_amethyst_trim",
-      "predicate": {
-        "trim_type": 1.0
-      }
-    }
-  ],
   "textures": {
     "layer0": "acesbs:item/ashen_steel_helmet"
   }

src/main/generated/assets/acesbs/models/item/ashen_steel_helmet_resin_trim.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "acesbs:item/ashen_steel_helmet",
+    "layer1": "minecraft:trims/items/helmet_trim_resin"
+  }
+}

src/main/generated/assets/acesbs/models/item/ashen_steel_leggings.json

@@ -1,67 +1,5 @@
 {
   "parent": "minecraft:item/generated",
-  "overrides": [
-    {
-      "model": "acesbs:item/ashen_steel_leggings_quartz_trim",
-      "predicate": {
-        "trim_type": 0.1
-      }
-    },
-    {
-      "model": "acesbs:item/ashen_steel_leggings_iron_trim",
-      "predicate": {
-        "trim_type": 0.2
-      }
-    },
-    {
-      "model": "acesbs:item/ashen_steel_leggings_netherite_trim",
-      "predicate": {
-        "trim_type": 0.3
-      }
-    },
-    {
-      "model": "acesbs:item/ashen_steel_leggings_redstone_trim",
-      "predicate": {
-        "trim_type": 0.4
-      }
-    },
-    {
-      "model": "acesbs:item/ashen_steel_leggings_copper_trim",
-      "predicate": {
-        "trim_type": 0.5
-      }
-    },
-    {
-      "model": "acesbs:item/ashen_steel_leggings_gold_trim",
-      "predicate": {
-        "trim_type": 0.6
-      }
-    },
-    {
-      "model": "acesbs:item/ashen_steel_leggings_emerald_trim",
-      "predicate": {
-        "trim_type": 0.7
-      }
-    },
-    {
-      "model": "acesbs:item/ashen_steel_leggings_diamond_trim",
-      "predicate": {
-        "trim_type": 0.8
-      }
-    },
-    {
-      "model": "acesbs:item/ashen_steel_leggings_lapis_trim",
-      "predicate": {
-        "trim_type": 0.9
-      }
-    },
-    {
-      "model": "acesbs:item/ashen_steel_leggings_amethyst_trim",
-      "predicate": {
-        "trim_type": 1.0
-      }
-    }
-  ],
   "textures": {
     "layer0": "acesbs:item/ashen_steel_leggings"
   }

src/main/generated/assets/acesbs/models/item/ashen_steel_leggings_resin_trim.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "acesbs:item/ashen_steel_leggings",
+    "layer1": "minecraft:trims/items/leggings_trim_resin"
+  }
+}

src/main/generated/assets/acesbs/models/item/berserkers_pauldron.json

@@ -1,67 +1,5 @@
 {
   "parent": "minecraft:item/generated",
-  "overrides": [
-    {
-      "model": "acesbs:item/berserkers_pauldron_quartz_trim",
-      "predicate": {
-        "trim_type": 0.1
-      }
-    },
-    {
-      "model": "acesbs:item/berserkers_pauldron_iron_trim",
-      "predicate": {
-        "trim_type": 0.2
-      }
-    },
-    {
-      "model": "acesbs:item/berserkers_pauldron_netherite_trim",
-      "predicate": {
-        "trim_type": 0.3
-      }
-    },
-    {
-      "model": "acesbs:item/berserkers_pauldron_redstone_trim",
-      "predicate": {
-        "trim_type": 0.4
-      }
-    },
-    {
-      "model": "acesbs:item/berserkers_pauldron_copper_trim",
-      "predicate": {
-        "trim_type": 0.5
-      }
-    },
-    {
-      "model": "acesbs:item/berserkers_pauldron_gold_trim",
-      "predicate": {
-        "trim_type": 0.6
-      }
-    },
-    {
-      "model": "acesbs:item/berserkers_pauldron_emerald_trim",
-      "predicate": {
-        "trim_type": 0.7
-      }
-    },
-    {
-      "model": "acesbs:item/berserkers_pauldron_diamond_trim",
-      "predicate": {
-        "trim_type": 0.8
-      }
-    },
-    {
-      "model": "acesbs:item/berserkers_pauldron_lapis_trim",
-      "predicate": {
-        "trim_type": 0.9
-      }
-    },
-    {
-      "model": "acesbs:item/berserkers_pauldron_amethyst_trim",
-      "predicate": {
-        "trim_type": 1.0
-      }
-    }
-  ],
   "textures": {
     "layer0": "acesbs:item/berserkers_pauldron"
   }

src/main/generated/assets/acesbs/models/item/berserkers_pauldron_resin_trim.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "acesbs:item/berserkers_pauldron",
+    "layer1": "minecraft:trims/items/chestplate_trim_resin"
+  }
+}

src/main/generated/assets/acesbs/models/item/crystal_entropy.json

@@ -1,3 +0,0 @@
-{
-  "parent": "acesbs:block/crystal_entropy"
-}

src/main/generated/assets/acesbs/models/item/deepslate_entropy_ore.json

@@ -1,3 +0,0 @@
-{
-  "parent": "acesbs:block/deepslate_entropy_ore"
-}

src/main/generated/assets/acesbs/models/item/endtropy_ore.json

@@ -1,3 +0,0 @@
-{
-  "parent": "acesbs:block/endtropy_ore"
-}