Migrate simple CIT textures

Gamemode4Dev · Nov 14, 2023 · 7ff496a · 7ff496a
1 parent d4be07b
commit 7ff496a
Show file tree

Hide file tree

Showing 36 changed files with 8 additions and 65 deletions.
diff --git a/gm4_orb_of_ankou/assets/gm4_orb_of_ankou/optifine/cit/fire_sprite.properties b/gm4_orb_of_ankou/assets/gm4_orb_of_ankou/optifine/cit/fire_sprite.properties
@@ -0,0 +1,4 @@
+type=armor
+matchItems=golden_helmet
+texture.gold_layer_1=fire_sprite_layer_1
+nbt.CustomModelData=$entity/fire_sprite
diff --git a/...ifine/cit/orb_of_ankou/gold_6_layer_1.png → ...nkou/optifine/cit/fire_sprite_layer_1.png b/...ifine/cit/orb_of_ankou/gold_6_layer_1.png → ...nkou/optifine/cit/fire_sprite_layer_1.png
diff --git a/gm4_resource_pack/assets/minecraft/optifine/cit/orb_of_ankou/golden_helmet_6.properties b/gm4_resource_pack/assets/minecraft/optifine/cit/orb_of_ankou/golden_helmet_6.properties
diff --git a/...esource_pack/assets/minecraft/optifine/cit/sky_dimension/diamond_20_layer_1.png b/...esource_pack/assets/minecraft/optifine/cit/sky_dimension/diamond_20_layer_1.png
diff --git a/...esource_pack/assets/minecraft/optifine/cit/sky_dimension/diamond_20_layer_2.png b/...esource_pack/assets/minecraft/optifine/cit/sky_dimension/diamond_20_layer_2.png
diff --git a/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/diamond_boots_20.properties b/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/diamond_boots_20.properties
diff --git a/...esource_pack/assets/minecraft/optifine/cit/sky_dimension/diamond_chestplate_20.properties b/...esource_pack/assets/minecraft/optifine/cit/sky_dimension/diamond_chestplate_20.properties
diff --git a/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/diamond_helmet_20.properties b/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/diamond_helmet_20.properties
diff --git a/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/diamond_leggings_20.properties b/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/diamond_leggings_20.properties
diff --git a/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/gold_7_layer_1.png b/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/gold_7_layer_1.png
diff --git a/...source_pack/assets/minecraft/optifine/cit/sky_dimension/gold_7_layer_1_anim.png b/...source_pack/assets/minecraft/optifine/cit/sky_dimension/gold_7_layer_1_anim.png
diff --git a/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/gold_7_layer_2.png b/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/gold_7_layer_2.png
diff --git a/...source_pack/assets/minecraft/optifine/cit/sky_dimension/gold_7_layer_2_anim.png b/...source_pack/assets/minecraft/optifine/cit/sky_dimension/gold_7_layer_2_anim.png
diff --git a/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/golden_boots_7.properties b/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/golden_boots_7.properties
diff --git a/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/golden_chestplate_7.properties b/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/golden_chestplate_7.properties
diff --git a/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/golden_helmet_7.properties b/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/golden_helmet_7.properties
diff --git a/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/golden_leggings_7.properties b/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/golden_leggings_7.properties
diff --git a/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/iron_1_layer_1.png b/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/iron_1_layer_1.png
diff --git a/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/iron_chestplate_1.properties b/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/iron_chestplate_1.properties
diff --git a/...resource_pack/assets/minecraft/optifine/cit/sky_dimension/leather_1_layer_1.png b/...resource_pack/assets/minecraft/optifine/cit/sky_dimension/leather_1_layer_1.png
diff --git a/..._pack/assets/minecraft/optifine/cit/sky_dimension/leather_1_layer_1_overlay.png b/..._pack/assets/minecraft/optifine/cit/sky_dimension/leather_1_layer_1_overlay.png
diff --git a/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/leather_helmet_1.properties b/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/leather_helmet_1.properties
diff --git a/...ource_pack/assets/minecraft/optifine/cit/sky_dimension/netherite_20_layer_1.png b/...ource_pack/assets/minecraft/optifine/cit/sky_dimension/netherite_20_layer_1.png
diff --git a/...ource_pack/assets/minecraft/optifine/cit/sky_dimension/netherite_20_layer_2.png b/...ource_pack/assets/minecraft/optifine/cit/sky_dimension/netherite_20_layer_2.png
diff --git a/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/netherite_boots_20.properties b/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/netherite_boots_20.properties
diff --git a/...ource_pack/assets/minecraft/optifine/cit/sky_dimension/netherite_chestplate_20.properties b/...ource_pack/assets/minecraft/optifine/cit/sky_dimension/netherite_chestplate_20.properties
diff --git a/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/netherite_helmet_20.properties b/gm4_resource_pack/assets/minecraft/optifine/cit/sky_dimension/netherite_helmet_20.properties
diff --git a/...esource_pack/assets/minecraft/optifine/cit/sky_dimension/netherite_leggings_20.properties b/...esource_pack/assets/minecraft/optifine/cit/sky_dimension/netherite_leggings_20.properties
diff --git a/...tifine/cit/scuba_gear/flippers.properties → ...uba_gear/optifine/cit/flippers.properties b/...tifine/cit/scuba_gear/flippers.properties → ...uba_gear/optifine/cit/flippers.properties
@@ -2,4 +2,4 @@ type=armor
 matchItems=leather_boots
 texture.leather_layer_1=flippers_layer_1
 texture.leather_layer_1_overlay=flippers_layer_1_overlay
-nbt.CustomModelData=regex:(2|3420002)
+nbt.CustomModelData=$item/flippers
diff --git a/...ifine/cit/scuba_gear/flippers_layer_1.png → ...ba_gear/optifine/cit/flippers_layer_1.png b/...ifine/cit/scuba_gear/flippers_layer_1.png → ...ba_gear/optifine/cit/flippers_layer_1.png
diff --git a/...t/scuba_gear/flippers_layer_1_overlay.png → ...optifine/cit/flippers_layer_1_overlay.png b/...t/scuba_gear/flippers_layer_1_overlay.png → ...optifine/cit/flippers_layer_1_overlay.png
diff --git a/...fine/cit/scuba_gear/scuba_tank.properties → ...a_gear/optifine/cit/scuba_tank.properties b/...fine/cit/scuba_gear/scuba_tank.properties → ...a_gear/optifine/cit/scuba_tank.properties
@@ -1,4 +1,4 @@
 type=armor
 matchItems=golden_chestplate
 texture.gold_layer_1=scuba_tank_layer_1
-nbt.CustomModelData=regex:(1|3420001)
+nbt.CustomModelData=$item/scuba_tank
diff --git a/...ine/cit/scuba_gear/scuba_tank_layer_1.png → ..._gear/optifine/cit/scuba_tank_layer_1.png b/...ine/cit/scuba_gear/scuba_tank_layer_1.png → ..._gear/optifine/cit/scuba_tank_layer_1.png
diff --git a/gm4_scuba_gear/beet.yaml b/gm4_scuba_gear/beet.yaml
@@ -40,7 +40,7 @@ meta:
         template: generated_overlay
       - item: golden_chestplate
         reference: item/scuba_tank
-        tempalte: generated
+        template: generated
       - item: player_head
         reference: item/scuba_helmet
         template: generated

diff --git a/...ine/cit/sunken_treasure/waders.properties → ...n_treasure/optifine/cit/waders.properties b/...ine/cit/sunken_treasure/waders.properties → ...n_treasure/optifine/cit/waders.properties
@@ -1,4 +1,4 @@
 type=armor
 matchItems=golden_boots
 texture.gold_layer_1=waders_layer_1
-nbt.CustomModelData=regex:(1|3420001)
+nbt.CustomModelData=$item/waders
diff --git a/...ne/cit/sunken_treasure/waders_layer_1.png → ..._treasure/optifine/cit/waders_layer_1.png b/...ne/cit/sunken_treasure/waders_layer_1.png → ..._treasure/optifine/cit/waders_layer_1.png