diff --git a/src/generated/resources/assets/exdeorum/models/item/mechanical_hammer.json b/src/generated/resources/assets/exdeorum/models/item/mechanical_hammer.json index 17f008c8..a35353c0 100644 --- a/src/generated/resources/assets/exdeorum/models/item/mechanical_hammer.json +++ b/src/generated/resources/assets/exdeorum/models/item/mechanical_hammer.json @@ -1,3 +1,3 @@ { - "parent": "exdeorum:block/mechanical_hammer" + "parent": "exdeorum:block/mechanical_hammer_off" } \ No newline at end of file diff --git a/src/main/resources/assets/exdeorum/blockstates/mechanical_hammer.json b/src/main/resources/assets/exdeorum/blockstates/mechanical_hammer.json index 3fe455ff..c37f7512 100644 --- a/src/main/resources/assets/exdeorum/blockstates/mechanical_hammer.json +++ b/src/main/resources/assets/exdeorum/blockstates/mechanical_hammer.json @@ -1,10 +1,34 @@ { "variants": { - "running=false": { + "facing=east,running=false": { + "model": "exdeorum:block/mechanical_hammer_off", + "y": 90 + }, + "facing=east,running=true": { + "model": "exdeorum:block/mechanical_hammer_on", + "y": 90 + }, + "facing=north,running=false": { "model": "exdeorum:block/mechanical_hammer_off" }, - "running=true": { + "facing=north,running=true": { "model": "exdeorum:block/mechanical_hammer_on" + }, + "facing=south,running=false": { + "model": "exdeorum:block/mechanical_hammer_off", + "y": 180 + }, + "facing=south,running=true": { + "model": "exdeorum:block/mechanical_hammer_on", + "y": 180 + }, + "facing=west,running=false": { + "model": "exdeorum:block/mechanical_hammer_off", + "y": 270 + }, + "facing=west,running=true": { + "model": "exdeorum:block/mechanical_hammer_on", + "y": 270 } } } \ No newline at end of file diff --git a/src/main/resources/assets/exdeorum/models/block/mechanical_hammer_off.json b/src/main/resources/assets/exdeorum/models/block/mechanical_hammer_off.json index a56fbca2..139ca47a 100644 --- a/src/main/resources/assets/exdeorum/models/block/mechanical_hammer_off.json +++ b/src/main/resources/assets/exdeorum/models/block/mechanical_hammer_off.json @@ -1,8 +1,9 @@ { - "parent": "minecraft:block/orientable", + "parent": "minecraft:block/orientable_with_bottom", "textures": { "front": "exdeorum:block/mechanical_hammer_front", "side": "exdeorum:block/mechanical_hammer_side", - "top": "exdeorum:block/mechanical_hammer_top" + "top": "exdeorum:block/mechanical_hammer_top", + "bottom": "exdeorum:block/mechanical_hammer_bottom" } } \ No newline at end of file diff --git a/src/main/resources/assets/exdeorum/models/block/mechanical_hammer_on.json b/src/main/resources/assets/exdeorum/models/block/mechanical_hammer_on.json index 93d6b3f4..0f2af075 100644 --- a/src/main/resources/assets/exdeorum/models/block/mechanical_hammer_on.json +++ b/src/main/resources/assets/exdeorum/models/block/mechanical_hammer_on.json @@ -1,8 +1,9 @@ { - "parent": "minecraft:block/orientable", + "parent": "minecraft:block/orientable_with_bottom", "textures": { "front": "exdeorum:block/mechanical_hammer_front_on", "side": "exdeorum:block/mechanical_hammer_side", - "top": "exdeorum:block/mechanical_hammer_top" + "top": "exdeorum:block/mechanical_hammer_top", + "bottom": "exdeorum:block/mechanical_hammer_bottom" } } \ No newline at end of file diff --git a/src/main/resources/assets/exdeorum/textures/block/mechanical_hammer_bottom.png b/src/main/resources/assets/exdeorum/textures/block/mechanical_hammer_bottom.png new file mode 100644 index 00000000..6fb79de0 Binary files /dev/null and b/src/main/resources/assets/exdeorum/textures/block/mechanical_hammer_bottom.png differ diff --git a/src/main/resources/assets/exdeorum/textures/block/mechanical_hammer_front.png b/src/main/resources/assets/exdeorum/textures/block/mechanical_hammer_front.png index b1be1bac..14076e8e 100644 Binary files a/src/main/resources/assets/exdeorum/textures/block/mechanical_hammer_front.png and b/src/main/resources/assets/exdeorum/textures/block/mechanical_hammer_front.png differ diff --git a/src/main/resources/assets/exdeorum/textures/block/mechanical_hammer_front_on.png b/src/main/resources/assets/exdeorum/textures/block/mechanical_hammer_front_on.png index 03af2409..63ff5f64 100644 Binary files a/src/main/resources/assets/exdeorum/textures/block/mechanical_hammer_front_on.png and b/src/main/resources/assets/exdeorum/textures/block/mechanical_hammer_front_on.png differ diff --git a/src/main/resources/assets/exdeorum/textures/block/mechanical_hammer_front_on.png.mcmeta b/src/main/resources/assets/exdeorum/textures/block/mechanical_hammer_front_on.png.mcmeta deleted file mode 100644 index 09eaec92..00000000 --- a/src/main/resources/assets/exdeorum/textures/block/mechanical_hammer_front_on.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "animation": { - "interpolate": false, - "frametime": 4 - } -} diff --git a/src/main/resources/assets/exdeorum/textures/block/mechanical_hammer_side.png b/src/main/resources/assets/exdeorum/textures/block/mechanical_hammer_side.png index 2831d662..6d161971 100644 Binary files a/src/main/resources/assets/exdeorum/textures/block/mechanical_hammer_side.png and b/src/main/resources/assets/exdeorum/textures/block/mechanical_hammer_side.png differ diff --git a/src/main/resources/assets/exdeorum/textures/block/mechanical_hammer_top.pdn b/src/main/resources/assets/exdeorum/textures/block/mechanical_hammer_top.pdn new file mode 100644 index 00000000..e46a32ea Binary files /dev/null and b/src/main/resources/assets/exdeorum/textures/block/mechanical_hammer_top.pdn differ diff --git a/src/main/resources/assets/exdeorum/textures/block/mechanical_hammer_top.png b/src/main/resources/assets/exdeorum/textures/block/mechanical_hammer_top.png index 3e9bf095..44d2a58a 100644 Binary files a/src/main/resources/assets/exdeorum/textures/block/mechanical_hammer_top.png and b/src/main/resources/assets/exdeorum/textures/block/mechanical_hammer_top.png differ