diff --git a/src/main/java/com/gw/dm/model/ModelHissingDemon.java b/src/main/java/com/gw/dm/model/ModelHissingDemon.java index fc2eb85..9cb0bd7 100644 --- a/src/main/java/com/gw/dm/model/ModelHissingDemon.java +++ b/src/main/java/com/gw/dm/model/ModelHissingDemon.java @@ -54,8 +54,8 @@ public class ModelHissingDemon extends ModelBase { public ModelHissingDemon() { - textureWidth = 96; - textureHeight = 96; + textureWidth = 128; + textureHeight = 128; head = hbone = new ModelRenderer(this); hbone.setRotationPoint(0.0F, 1.0F, 0.0F); diff --git a/src/main/resources/assets/dungeonmobs/animations/hissing_demon.json b/src/main/resources/assets/dungeonmobs/animations/hissing_demon.json index f3d66a5..5218ec1 100644 --- a/src/main/resources/assets/dungeonmobs/animations/hissing_demon.json +++ b/src/main/resources/assets/dungeonmobs/animations/hissing_demon.json @@ -6,26 +6,53 @@ "bones": { "ab1": { "rotation": { - "0.0": {"pre": [0, 0, 0], "post": [0, 0, 0]}, - "0.0417": [60, -7.5, 0], - "0.0833": [97.5, -20, -40], - "0.125": [125.63, 1.25, -40], - "0.1667": [56.25, -14.17, 0], - "0.2083": [0, 0, 0] + "0.0": { + "pre": { + "vector": [0, 0, 0] + }, + "post": { + "vector": [0, 0, 0] + } + }, + "0.0417": { + "vector": [60, -7.5, 0] + }, + "0.0833": { + "vector": [97.5, -20, -40] + }, + "0.125": { + "vector": [125.63, 1.25, -40] + }, + "0.1667": { + "vector": [56.25, -14.17, 0] + }, + "0.2083": { + "vector": [0, 0, 0] + } } } } }, "animation.hd.swinga4": { - "animation_length": 0.16667, + "animation_length": 0.1667, "bones": { "ab4": { "rotation": { - "0.0": [0, 0, 0], - "0.0417": [70, 27.5, 0], - "0.0833": [100, 50, 0], - "0.125": [147.5, 50, -30], - "0.1667": [247.5, 50, -30] + "0.0": { + "vector": [0, 0, 0] + }, + "0.0417": { + "vector": [70, 27.5, 0] + }, + "0.0833": { + "vector": [100, 50, 0] + }, + "0.125": { + "vector": [147.5, 50, -30] + }, + "0.1667": { + "vector": [247.5, 50, -30] + } } } } @@ -35,63 +62,90 @@ "bones": { "ab2": { "rotation": { - "0.0": [0, 0, 0], - "0.0417": [0, -32.5, -35], - "0.0833": [0, -70, -102.5], - "0.125": [0, -65, -242.5], - "0.1667": [0, -72.5, -275] + "0.0": { + "vector": [0, 0, 0] + }, + "0.0417": { + "vector": [27.5, -50, 37.5] + }, + "0.0833": { + "vector": [27.5, -72.5, 37.5] + }, + "0.125": { + "vector": [27.5, -50, 37.5] + } } }, - "ab4": { - "rotation": [0, 0, 0] + "arm5_r1": { + "rotation": { + "vector": [0, 0, 0] + } } } }, "animation.hd.swinga5": { - "animation_length": 0.20833, + "animation_length": 0.125, "bones": { "ab5": { "rotation": { - "0.0": [0, 0, 0], - "0.0417": [0, 52.5, 45], - "0.0833": [0, 65, 92.5], - "0.125": [0, 65, 147.5], - "0.1667": [0, 57.5, 205], - "0.2083": [0, 60, 322.5] + "0.0": { + "vector": [0, 0, 0] + }, + "0.0417": { + "vector": [27.5, 50, -37.5] + }, + "0.0833": { + "vector": [27.5, 72, -37.5] + }, + "0.125": { + "vector": [0, 0, -37.5] + } } } } }, "animation.hd.swinga3": { - "animation_length": 0.20833, + "animation_length": 0.125, "bones": { "ab3": { "rotation": { - "0.0": [0, 0, 0], - "0.0417": [-27.5, -65, 0], - "0.0833": [-62.5, -95, 0], - "0.125": [-190, -95, 0], - "0.1667": [-300, -95, 0], - "0.2083": [0, 0, 0] + "0.0": { + "vector": [0, 0, 0] + }, + "0.0417": { + "vector": [-15, -37.5, 0] + }, + "0.0833": { + "vector": [-15, -50, -20] + }, + "0.125": { + "vector": [0, -37.5, -15] + } } } } }, "animation.hd.swinga6": { - "animation_length": 0.20833, + "animation_length": 0.125, "bones": { "ab6": { "rotation": { - "0.0": [0, 0, 0], - "0.0417": [-40, 37.5, 0], - "0.0833": [-62.5, 50, 0], - "0.125": [-150, 50, 0], - "0.1667": [-192.5, 55, 0], - "0.2083": [-360, 0, 0] + "0.0": { + "vector": [0, 0, 0] + }, + "0.0417": { + "vector": [-15, 37.5, 0] + }, + "0.0833": { + "vector": [-15, 50, 20] + }, + "0.125": { + "vector": [0, 37.5, 15] + } } } } } }, "geckolib_format_version": 2 -} \ No newline at end of file +} diff --git a/src/main/resources/assets/dungeonmobs/geo/hissing_demon.json b/src/main/resources/assets/dungeonmobs/geo/hissing_demon.json index 83c9b4f..ee08d49 100644 --- a/src/main/resources/assets/dungeonmobs/geo/hissing_demon.json +++ b/src/main/resources/assets/dungeonmobs/geo/hissing_demon.json @@ -4,8 +4,8 @@ { "description": { "identifier": "geometry.unknown", - "texture_width": 96, - "texture_height": 96, + "texture_width": 128, + "texture_height": 128, "visible_bounds_width": 6, "visible_bounds_height": 4.5, "visible_bounds_offset": [0, 1.75, 0] @@ -29,7 +29,11 @@ "pivot": [-6, 31, 3], "rotation": [0, 0, 135.00032], "cubes": [ - {"origin": [-8.5, 15, 0.75], "size": [4, 18, 4], "uv": [0, 61]} + {"origin": [-8.5, 15, 0.75], "size": [4, 18, 4], "uv": [0, 61]}, + {"origin": [-9, 16, 2], "size": [6, 1, 1], "uv": [78, 1]}, + {"origin": [-10, 16, -1], "size": [1, 1, 7], "uv": [91, 10]}, + {"origin": [-22, 16, 1], "size": [12, 1, 3], "uv": [88, 4]}, + {"origin": [-23, 16, 2], "size": [1, 1, 1], "uv": [120, 6]} ] }, { @@ -43,7 +47,10 @@ "pivot": [-6, 28.5, 3], "rotation": [0, 0, 90.00021], "cubes": [ - {"origin": [-7.75, 10.25, 0.75], "size": [4, 18, 4], "uv": [21, 61]} + {"origin": [-7.75, 10.25, 0.75], "size": [4, 18, 4], "uv": [21, 61]}, + {"origin": [-14, 12, 2], "size": [11, 1, 1], "uv": [78, 1]}, + {"origin": [-18, 12, -1], "size": [4, 1, 4], "uv": [90, 20]}, + {"origin": [-18, 12, -3], "size": [6, 1, 2], "uv": [90, 25]} ] }, { @@ -57,7 +64,11 @@ "pivot": [-6, 26, 3], "rotation": [0, 0, 45.00011], "cubes": [ - {"origin": [-8.25, 9.25, 0.75], "size": [4, 18, 5], "uv": [0, 61]} + {"origin": [-8.25, 9.25, 0.75], "size": [4, 18, 5], "uv": [0, 61]}, + {"origin": [-9, 11, 2], "size": [6, 1, 1], "pivot": [-6, 31, 3], "rotation": [0, -90, 0], "uv": [78, 1]}, + {"origin": [-10, 11, -1], "size": [1, 1, 7], "pivot": [-6, 31, 3], "rotation": [0, -90, 0], "uv": [91, 10]}, + {"origin": [-22, 11, 1], "size": [12, 1, 3], "pivot": [-6, 31, 3], "rotation": [0, -90, 0], "uv": [84, 31]}, + {"origin": [-23, 11, 2], "size": [1, 1, 1], "pivot": [-6, 31, 3], "rotation": [0, -90, 0], "uv": [116, 31]} ] }, { @@ -71,7 +82,10 @@ "pivot": [6, 31, 0], "rotation": [0, 0, -135.00032], "cubes": [ - {"origin": [4, 15, 0.75], "size": [4, 18, 5], "uv": [0, 61]} + {"origin": [4, 15, 0.75], "size": [4, 18, 5], "uv": [0, 61]}, + {"origin": [3, 30, 17], "size": [11, 1, 1], "pivot": [-6, 31, 3], "rotation": [-90, 0, 0], "uv": [78, 1]}, + {"origin": [14, 17, 3], "size": [4, 1, 4], "pivot": [5, 17, 3], "rotation": [180, 0, 0], "uv": [88, 38]}, + {"origin": [12, 39, 7], "size": [6, 1, 2], "pivot": [-6, 28, 3], "rotation": [180, 0, 0], "uv": [88, 45]} ] }, { @@ -88,6 +102,17 @@ {"origin": [4.25, 10.25, 0.75], "size": [4, 18, 4], "uv": [21, 61]} ] }, + { + "name": "w5", + "parent": "arm5_r1", + "pivot": [8, 13, 2], + "cubes": [ + {"origin": [3, 12, 2], "size": [6, 1, 1], "uv": [78, 1]}, + {"origin": [9, 12, -1], "size": [1, 1, 7], "uv": [91, 10]}, + {"origin": [10, 12, 1], "size": [12, 1, 3], "uv": [88, 4]}, + {"origin": [22, 12, 2], "size": [1, 1, 1], "uv": [120, 6]} + ] + }, { "name": "ab6", "pivot": [4, 27, 0], @@ -102,6 +127,18 @@ {"origin": [3.75, 10.25, 0.75], "size": [4, 18, 5], "uv": [0, 61]} ] }, + { + "name": "w6", + "parent": "arm6_r1", + "pivot": [5, 13, 1], + "rotation": [0, 90, 0], + "cubes": [ + {"origin": [0, 12, 1], "size": [6, 1, 1], "uv": [78, 1]}, + {"origin": [6, 12, -2], "size": [1, 1, 7], "uv": [91, 10]}, + {"origin": [7, 12, 0], "size": [12, 1, 3], "uv": [88, 4]}, + {"origin": [19, 12, 1], "size": [1, 1, 1], "uv": [120, 6]} + ] + }, { "name": "t1", "pivot": [0, 9, 6], diff --git a/src/main/resources/assets/dungeonmobs/textures/entity/hissing_demon.png b/src/main/resources/assets/dungeonmobs/textures/entity/hissing_demon.png index f47d847..028c2d7 100644 Binary files a/src/main/resources/assets/dungeonmobs/textures/entity/hissing_demon.png and b/src/main/resources/assets/dungeonmobs/textures/entity/hissing_demon.png differ