Work around Minecraft Directory/Texture Duplicate Name Bug (#22)

* Update .gitignore

* Prepend entity to texture paths

* Update .gitignore

* Bump version

.gitignore

@@ -1,14 +1,14 @@
 .idea/
 GeyserOptionalPack.mcpack
+GeyserOptionalPack.zip
 # Java Edition textures that should not be submitted to Git
-textures/entity/iron_golem/iron_golem_crackiness_high.png
-textures/entity/iron_golem/iron_golem_crackiness_low.png
-textures/entity/iron_golem/iron_golem_crackiness_medium.png
-textures/entity/arrow/spectral_arrow.png
-textures/entity/rabbit/caerbannog.png
-textures/particle/damage.png
-textures/particle/flash.png
-textures/particle/nautilus.png
-textures/particle/bubble_pop.png
-textures/particle/sweep_attack.png
-textures/entity/illager/illusioner.png
+textures/geyser/entity/iron_golem/iron_golem_crackiness_high.png
+textures/geyser/entity/iron_golem/iron_golem_crackiness_low.png
+textures/geyser/entity/iron_golem/iron_golem_crackiness_medium.png
+textures/geyser/entity/arrow/spectral_arrow.png
+textures/geyser/entity/rabbit/caerbannog.png
+textures/geyser/particle/damage.png
+textures/geyser/particle/flash.png
+textures/geyser/particle/nautilus.png
+textures/geyser/particle/sweep_attack.png
+textures/geyser/entity/illager/illusioner.png

entity/arrow.entity.json

@@ -8,7 +8,7 @@
       },
       "textures": {
         "default": "textures/entity/arrows",
-        "spectral": "textures/entity/arrow/spectral_arrow"
+        "spectral": "textures/geyser/entity/arrow/spectral_arrow"
       },
       "geometry": {
         "default": "geometry.arrow"

entity/evocation_illager.entity.json

@@ -9,7 +9,7 @@
       },
       "textures": {
         "default": "textures/entity/illager/evoker",
-        "illusioner": "textures/entity/illager/illusioner"
+        "illusioner": "textures/geyser/entity/illager/illusioner"
       },
       "geometry": {
         "default": "geometry.evoker.v1.8"

entity/iron_golem.entity.json

@@ -5,10 +5,10 @@
       "identifier": "minecraft:iron_golem",
       "materials": { "default": "tropicalfish" },
       "textures": {
-        "crackiness_none": "textures/entity/iron_golem/iron_golem_crackiness_none",
-        "crackiness_low": "textures/entity/iron_golem/iron_golem_crackiness_low",
-        "crackiness_medium": "textures/entity/iron_golem/iron_golem_crackiness_medium",
-        "crackiness_high": "textures/entity/iron_golem/iron_golem_crackiness_high",
+        "crackiness_none": "textures/geyser/entity/iron_golem/iron_golem_crackiness_none",
+        "crackiness_low": "textures/geyser/entity/iron_golem/iron_golem_crackiness_low",
+        "crackiness_medium": "textures/geyser/entity/iron_golem/iron_golem_crackiness_medium",
+        "crackiness_high": "textures/geyser/entity/iron_golem/iron_golem_crackiness_high",
         "bottom_layer": "textures/entity/iron_golem"
       },
       "geometry": {

entity/rabbit.entity.json

@@ -13,7 +13,7 @@
         "gold": "textures/entity/rabbit/gold",
         "salt": "textures/entity/rabbit/salt",
         "toast": "textures/entity/rabbit/toast",
-        "caerbannog": "textures/entity/rabbit/caerbannog"
+        "caerbannog": "textures/geyser/entity/rabbit/caerbannog"
       },
       "geometry": {
         "default": "geometry.rabbit.v1.8"

manifest.json

@@ -4,7 +4,7 @@
         "description": "Optional Bedrock resource pack to extend Geyser functionality",
         "name": "GeyserOptionalPack",
         "uuid": "e5f5c938-a701-11eb-b2a3-047d7bb283ba",
-        "version": [1, 0, 3],
+        "version": [1, 0, 4],
         "min_engine_version": [ 1, 16, 0 ]
     },
     "modules": [
@@ -12,7 +12,7 @@
             "description": "GeyserOptionalPack",
             "type": "resources",
             "uuid": "eebb4ea8-a701-11eb-95ba-047d7bb283ba",
-            "version": [1, 0, 3]
+            "version": [1, 0, 4]
         }
     ]
 }

particles/damage_indicator.particle.json

@@ -5,7 +5,7 @@
 			"identifier": "geyseropt:damage_indicator",
 			"basic_render_parameters": {
 				"material": "particles_alpha",
-				"texture": "textures/particle/damage"
+				"texture": "textures/geyser/particle/damage"
 			}
 		},
 		"components": {

particles/flash.particle.json

@@ -5,7 +5,7 @@
 			"identifier": "geyseropt:flash",
 			"basic_render_parameters": {
 				"material": "particles_blend",
-				"texture": "textures/particle/flash"
+				"texture": "textures/geyser/particle/flash"
 			}
 		},
 		"components": {

particles/nautilus.particle.json

@@ -5,7 +5,7 @@
 			"identifier": "geyseropt:nautilus",
 			"basic_render_parameters": {
 				"material": "particles_alpha",
-				"texture": "textures/particle/nautilus"
+				"texture": "textures/geyser/particle/nautilus"
 			}
 		},
 		"components": {

particles/sweep_attack.particle.json

@@ -5,7 +5,7 @@
 			"identifier": "geyseropt:sweep_attack",
 			"basic_render_parameters": {
 				"material": "particles_alpha",
-				"texture": "textures/particle/sweep_attack"
+				"texture": "textures/geyser/particle/sweep_attack"
 			}
 		},
 		"components": {

prepare_pack.sh

@@ -14,7 +14,7 @@ while read -r p || [ -n "$p" ]; do
 done <required_files.txt
 
 # Create required sprites with Imagemagick
-convert -append extracted/assets/minecraft/textures/particle/sweep_*.png -define png:format=png8 textures/particle/sweep_attack.png
+convert -append extracted/assets/minecraft/textures/particle/sweep_*.png -define png:format=png8 textures/geyser/particle/sweep_attack.png
 
 rm client.jar
 rm -r extracted

required_files.txt

@@ -1,9 +1,9 @@
-assets/minecraft/textures/entity/iron_golem/iron_golem_crackiness_high.png textures/entity/iron_golem/
-assets/minecraft/textures/entity/iron_golem/iron_golem_crackiness_low.png textures/entity/iron_golem/
-assets/minecraft/textures/entity/iron_golem/iron_golem_crackiness_medium.png textures/entity/iron_golem/
-assets/minecraft/textures/entity/projectiles/spectral_arrow.png textures/entity/arrow/
-assets/minecraft/textures/entity/rabbit/caerbannog.png textures/entity/rabbit/
-assets/minecraft/textures/particle/damage.png textures/particle/
-assets/minecraft/textures/particle/flash.png textures/particle/
-assets/minecraft/textures/particle/nautilus.png textures/particle/
-assets/minecraft/textures/entity/illager/illusioner.png textures/entity/illager/
+assets/minecraft/textures/entity/iron_golem/iron_golem_crackiness_high.png textures/geyser/entity/iron_golem/
+assets/minecraft/textures/entity/iron_golem/iron_golem_crackiness_low.png textures/geyser/entity/iron_golem/
+assets/minecraft/textures/entity/iron_golem/iron_golem_crackiness_medium.png textures/geyser/entity/iron_golem/
+assets/minecraft/textures/entity/projectiles/spectral_arrow.png textures/geyser/entity/arrow/
+assets/minecraft/textures/entity/rabbit/caerbannog.png textures/geyser/entity/rabbit/
+assets/minecraft/textures/particle/damage.png textures/geyser/particle/
+assets/minecraft/textures/particle/flash.png textures/geyser/particle/
+assets/minecraft/textures/particle/nautilus.png textures/geyser/particle/
+assets/minecraft/textures/entity/illager/illusioner.png textures/geyser/entity/illager/