diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/DPSGeneratorModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/DPSGeneratorModel.java index 2c1c42022..c8669f1dd 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/DPSGeneratorModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/DPSGeneratorModel.java @@ -19,6 +19,7 @@ public class DPSGeneratorModel extends GeoModel { @Override public ResourceLocation getTextureResource(DPSGeneratorEntity entity) { - return Mod.loc("textures/entity/dps_generator.png"); + int tier = entity.getEntityData().get(DPSGeneratorEntity.LEVEL); + return Mod.loc("textures/entity/dps_generator_tier_" + tier + ".png"); } } diff --git a/src/main/resources/assets/superbwarfare/geo/dps_generator.geo.json b/src/main/resources/assets/superbwarfare/geo/dps_generator.geo.json index b4c03d488..d0d0223cf 100644 --- a/src/main/resources/assets/superbwarfare/geo/dps_generator.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/dps_generator.geo.json @@ -1,147 +1,41 @@ { - "format_version": "1.12.0", - "minecraft:geometry": [ - { - "description": { - "identifier": "geometry.unknown", - "texture_width": 128, - "texture_height": 128, - "visible_bounds_width": 2, - "visible_bounds_height": 3.5, - "visible_bounds_offset": [ - 0, - 1.25, - 0 - ] - }, - "bones": [ - { - "name": "0", - "pivot": [ - 0, - 0, - 0 - ] - }, - { - "name": "zuo", - "parent": "0", - "pivot": [ - 0, - 0, - 0 - ], - "cubes": [ - { - "origin": [ - -8, - 2, - -1 - ], - "size": [ - 1, - 2, - 2 - ], - "uv": [ - 0, - 29 - ] - }, - { - "origin": [ - -8, - 0, - -4 - ], - "size": [ - 16, - 2, - 8 - ], - "uv": [ - 22, - 21 - ] - }, - { - "origin": [ - 7, - 2, - -1 - ], - "size": [ - 1, - 2, - 2 - ], - "uv": [ - 6, - 29 - ] - } - ] - }, - { - "name": "ba", - "parent": "0", - "pivot": [ - 0, - 3.5, - 0 - ], - "cubes": [ - { - "origin": [ - -7, - 4, - -0.5 - ], - "size": [ - 14, - 28, - 1 - ], - "uv": [ - 0, - 0 - ] - }, - { - "origin": [ - 6, - 3, - -0.5 - ], - "size": [ - 1, - 1, - 1 - ], - "uv": [ - 10, - 29 - ] - }, - { - "origin": [ - -7, - 3, - -0.5 - ], - "size": [ - 1, - 1, - 1 - ], - "uv": [ - 4, - 29 - ] - } - ] - } - ] - } - ] + "format_version": "1.12.0", + "minecraft:geometry": [ + { + "description": { + "identifier": "geometry.unknown", + "texture_width": 64, + "texture_height": 64, + "visible_bounds_width": 2, + "visible_bounds_height": 3.5, + "visible_bounds_offset": [0, 1.25, 0] + }, + "bones": [ + { + "name": "0", + "pivot": [0, 0, 0] + }, + { + "name": "zuo", + "parent": "0", + "pivot": [0, 0, 0], + "cubes": [ + {"origin": [-8, 2, -1], "size": [1, 2, 2], "uv": [30, 0]}, + {"origin": [-8, 0, -4], "size": [16, 2, 8], "uv": [0, 29]}, + {"origin": [7, 2, -1], "size": [1, 2, 2], "uv": [30, 4]} + ] + }, + { + "name": "ba", + "parent": "0", + "pivot": [0, 3.5, 0], + "cubes": [ + {"origin": [-7, 4, -0.5], "size": [14, 28, 1], "uv": [0, 0]}, + {"origin": [6, 3, -0.5], "size": [1, 1, 1], "uv": [30, 8]}, + {"origin": [-7, 3, -0.5], "size": [1, 1, 1], "uv": [30, 10]} + ] + } + ] + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/textures/entity/dps_generator.png b/src/main/resources/assets/superbwarfare/textures/entity/dps_generator.png deleted file mode 100644 index d53314f4c..000000000 Binary files a/src/main/resources/assets/superbwarfare/textures/entity/dps_generator.png and /dev/null differ diff --git a/src/main/resources/assets/superbwarfare/textures/entity/dps_generator_e.png b/src/main/resources/assets/superbwarfare/textures/entity/dps_generator_e.png index 69296f584..42d5db81d 100644 Binary files a/src/main/resources/assets/superbwarfare/textures/entity/dps_generator_e.png and b/src/main/resources/assets/superbwarfare/textures/entity/dps_generator_e.png differ diff --git a/src/main/resources/assets/superbwarfare/textures/entity/dps_generator_tier_0.png b/src/main/resources/assets/superbwarfare/textures/entity/dps_generator_tier_0.png new file mode 100644 index 000000000..051b8cfc1 Binary files /dev/null and b/src/main/resources/assets/superbwarfare/textures/entity/dps_generator_tier_0.png differ