GeyserMC-Mirror/GeyserOptionalPack
1
0
Fork 0
mirror of https://github.com/GeyserMC/GeyserOptionalPack.git synced 2025-12-19 14:59:14 +00:00
Code Issues Releases Activity

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

Browse Source 
* Update .gitignore

* Prepend entity to texture paths

* Update .gitignore

* Bump version
This commit is contained in:
Kas-tle
2021-07-02 08:21:57 -07:00
committed by GitHub
parent e87fb96cb8
commit 90ba61cb20
13 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
.gitignore vendored
View File

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

2
entity/arrow.entity.json
View File

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

2
entity/evocation_illager.entity.json
View File

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

8
entity/iron_golem.entity.json
View File

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

2
entity/rabbit.entity.json
View File

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

4
manifest.json
View File

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

4
particles/damage_indicator.particle.json
View File

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

4
particles/flash.particle.json
View File

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

4
particles/nautilus.particle.json
View File

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

4
particles/sweep_attack.particle.json
View File

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

2
prepare_pack.sh
View File

@@ -14,7 +14,7 @@ while read -r p || [ -n "$p" ]; do
done <required_files.txt done <required_files.txt
# Create required sprites with Imagemagick # 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 client.jar
rm -r extracted rm -r extracted

18
required_files.txt
View File

@@ -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_high.png textures/geyser/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_low.png textures/geyser/entity/iron_golem/
assets/minecraft/textures/entity/iron_golem/iron_golem_crackiness_medium.png textures/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/entity/arrow/ assets/minecraft/textures/entity/projectiles/spectral_arrow.png textures/geyser/entity/arrow/
assets/minecraft/textures/entity/rabbit/caerbannog.png textures/entity/rabbit/ assets/minecraft/textures/entity/rabbit/caerbannog.png textures/geyser/entity/rabbit/
assets/minecraft/textures/particle/damage.png textures/particle/ assets/minecraft/textures/particle/damage.png textures/geyser/particle/
assets/minecraft/textures/particle/flash.png textures/particle/ assets/minecraft/textures/particle/flash.png textures/geyser/particle/
assets/minecraft/textures/particle/nautilus.png textures/particle/ assets/minecraft/textures/particle/nautilus.png textures/geyser/particle/
assets/minecraft/textures/entity/illager/illusioner.png textures/entity/illager/ assets/minecraft/textures/entity/illager/illusioner.png textures/geyser/entity/illager/

0
textures/entity/iron_golem/iron_golem_crackiness_none.png → textures/geyser/entity/iron_golem/iron_golem_crackiness_none.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB