From a80498b251b286d00f89b476d537a5a25de70cc2 Mon Sep 17 00:00:00 2001 From: rearth Date: Sun, 25 Feb 2024 17:18:48 +0100 Subject: [PATCH] Add proper pulverizer model --- .../entity/UpgradableMachineBlockEntity.java | 5 +- .../machines/PulverizerBlockEntity.java | 16 +- .../models/pulverizer_block.animation.json | 207 +++++++++- .../block/models/pulverizer_block.geo.json | 358 +++--------------- .../oritech/models/item/pulverizer_block.json | 2 +- .../block/models/pulverizer_block.png | Bin 1502 -> 2372 bytes .../data/oritech/recipes/coal_to_emerald.json | 2 +- 7 files changed, 267 insertions(+), 323 deletions(-) diff --git a/src/main/java/rearth/oritech/block/base/entity/UpgradableMachineBlockEntity.java b/src/main/java/rearth/oritech/block/base/entity/UpgradableMachineBlockEntity.java index 140fd3d93..50d64cf18 100644 --- a/src/main/java/rearth/oritech/block/base/entity/UpgradableMachineBlockEntity.java +++ b/src/main/java/rearth/oritech/block/base/entity/UpgradableMachineBlockEntity.java @@ -157,7 +157,10 @@ private List getAllAddons() { // if the candidate is not an addon if (!(candidate.getBlock() instanceof MachineAddonBlock addonBlock) || !(candidateEntity instanceof AddonBlockEntity candidateAddonEntity)) { - openSlots.add(candidatePos); + + // if the block is not part of the machine itself + if (!candidatePos.equals(pos)) + openSlots.add(candidatePos); continue; } diff --git a/src/main/java/rearth/oritech/block/entity/machines/PulverizerBlockEntity.java b/src/main/java/rearth/oritech/block/entity/machines/PulverizerBlockEntity.java index fd77c6387..d8fc22b72 100644 --- a/src/main/java/rearth/oritech/block/entity/machines/PulverizerBlockEntity.java +++ b/src/main/java/rearth/oritech/block/entity/machines/PulverizerBlockEntity.java @@ -33,8 +33,13 @@ public InventorySlotAssignment getSlots() { public List getGuiSlots() { return List.of( new GuiSlot(0, 80, 11), - new GuiSlot(1, 80, 59), - new GuiSlot(2, 100, 59)); + new GuiSlot(1, 70, 59), + new GuiSlot(2, 90, 59)); + } + + @Override + public boolean inputOptionsEnabled() { + return false; } @Override @@ -50,7 +55,12 @@ public int getInventorySize() { @Override public List getAddonSlots() { return List.of( - new Vec3i(0, 0,1) + new Vec3i(-1, 0,0) ); } + + @Override + public float getCoreQuality() { + return 2; + } } diff --git a/src/main/resources/assets/oritech/animations/block/models/pulverizer_block.animation.json b/src/main/resources/assets/oritech/animations/block/models/pulverizer_block.animation.json index 513a6997b..9922491ea 100644 --- a/src/main/resources/assets/oritech/animations/block/models/pulverizer_block.animation.json +++ b/src/main/resources/assets/oritech/animations/block/models/pulverizer_block.animation.json @@ -2,37 +2,224 @@ "format_version": "1.8.0", "animations": { "idle": { - "loop": true + "animation_length": 0.25 }, "working": { "loop": true, "animation_length": 3, "bones": { - "wheel_a": { + "gear": { "rotation": { "0.0": { "vector": [0, 0, 0] }, + "3.0": { + "vector": [0, -960, 0], + "easing": "easeInOutSine" + } + } + }, + "gear2": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "3.0": { + "vector": [0, 960, 0], + "easing": "easeInOutSine" + } + } + }, + "front_frame": { + "position": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.125": { + "vector": [0, 0, 0.04], + "easing": "easeInOutElastic", + "easingArgs": [2] + }, + "0.2917": { + "vector": [0, 0, -0.04], + "easing": "easeInOutElastic", + "easingArgs": [2] + }, + "0.4583": { + "vector": [0, 0, 0.04], + "easing": "easeInOutElastic", + "easingArgs": [2] + }, + "0.625": { + "vector": [0, 0, -0.04], + "easing": "easeInOutElastic", + "easingArgs": [2] + }, + "0.7917": { + "vector": [0, 0, 0.04], + "easing": "easeInOutElastic", + "easingArgs": [2] + }, + "0.9583": { + "vector": [0, 0, -0.04], + "easing": "easeInOutElastic", + "easingArgs": [2] + }, + "1.1667": { + "vector": [0, 0, -0.04], + "easing": "easeInOutElastic", + "easingArgs": [2] + }, + "1.3333": { + "vector": [0, 0, 0.04], + "easing": "easeInOutElastic", + "easingArgs": [2] + }, "1.5": { - "vector": [180, 0, 0], - "easing": "easeInQuad" + "vector": [0, 0, -0.04], + "easing": "easeInOutElastic", + "easingArgs": [2] + }, + "1.625": { + "vector": [0, 0, 0.04], + "easing": "easeInOutElastic", + "easingArgs": [2] + }, + "1.7917": { + "vector": [0, 0, -0.04], + "easing": "easeInOutElastic", + "easingArgs": [2] + }, + "1.9583": { + "vector": [0, 0, 0.04], + "easing": "easeInOutElastic", + "easingArgs": [2] + }, + "2.125": { + "vector": [0, 0, -0.04], + "easing": "easeInOutElastic", + "easingArgs": [2] + }, + "2.2917": { + "vector": [0, 0, 0.04], + "easing": "easeInOutElastic", + "easingArgs": [2] + }, + "2.4583": { + "vector": [0, 0, -0.04], + "easing": "easeInOutElastic", + "easingArgs": [2] + }, + "2.625": { + "vector": [0, 0, 0.04], + "easing": "easeInOutElastic", + "easingArgs": [2] + }, + "2.7917": { + "vector": [0, 0, -0.04], + "easing": "easeInOutElastic", + "easingArgs": [2] }, "3.0": { - "vector": [360, 0, 0], - "easing": "easeOutQuad" + "vector": [0, 0, 0] } } }, - "wheel_b": { + "beam_inner": { "rotation": { "0.0": { "vector": [0, 0, 0] }, - "1.5": { - "vector": [270, 0, 0] + "3.0": { + "vector": [0, 2700, 0] + } + } + }, + "top_holder": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.125": { + "vector": [0, -2, 0], + "easing": "easeInBounce" + }, + "0.25": { + "vector": [0, 1, 0], + "easing": "easeInBounce" + }, + "0.375": { + "vector": [0, -4, 0], + "easing": "easeInBounce" + }, + "0.5": { + "vector": [0, 0.45313, -2] + }, + "0.5417": { + "vector": [0, 1, 0], + "easing": "easeInBounce" + }, + "0.7083": { + "vector": [0, -1, 0], + "easing": "easeInBounce" + }, + "0.875": { + "vector": [0, 1, 0], + "easing": "easeInBounce" + }, + "1.0417": { + "vector": [0, -2, 0], + "easing": "easeInBounce" + }, + "1.0833": { + "vector": [0, 0.52083, 1] + }, + "1.1667": { + "vector": [0, 1, 0], + "easing": "easeInBounce" + }, + "1.2917": { + "vector": [0, -4, 0], + "easing": "easeInBounce" + }, + "1.4583": { + "vector": [0, 1, 0], + "easing": "easeInBounce" + }, + "1.625": { + "vector": [0, -1, 0], + "easing": "easeInBounce" + }, + "1.7917": { + "vector": [0, 1, 0], + "easing": "easeInBounce" + }, + "1.9583": { + "vector": [0, -2, -2.5], + "easing": "easeInBounce" + }, + "2.0833": { + "vector": [0, 1, -2.5], + "easing": "easeInBounce" + }, + "2.2083": { + "vector": [0, -4, 0], + "easing": "easeInBounce" + }, + "2.375": { + "vector": [0, 1, 0], + "easing": "easeInBounce" + }, + "2.5417": { + "vector": [0, -1, 2.5], + "easing": "easeInBounce" + }, + "2.7083": { + "vector": [0, 1, 0], + "easing": "easeInBounce" }, "3.0": { - "vector": [720, 0, 0] + "vector": [0, 0, 0] } } } diff --git a/src/main/resources/assets/oritech/geo/block/models/pulverizer_block.geo.json b/src/main/resources/assets/oritech/geo/block/models/pulverizer_block.geo.json index 7c7838149..5952e3b9c 100644 --- a/src/main/resources/assets/oritech/geo/block/models/pulverizer_block.geo.json +++ b/src/main/resources/assets/oritech/geo/block/models/pulverizer_block.geo.json @@ -4,334 +4,78 @@ { "description": { "identifier": "geometry.unknown", - "texture_width": 64, - "texture_height": 64, - "visible_bounds_width": 2, - "visible_bounds_height": 2.5, - "visible_bounds_offset": [0, 0.75, 0] + "texture_width": 128, + "texture_height": 128, + "visible_bounds_width": 3, + "visible_bounds_height": 3.5, + "visible_bounds_offset": [0, 1.25, 0] }, "bones": [ { - "name": "top_main", + "name": "bb_main", "pivot": [0, 0, 0], "cubes": [ - { - "origin": [-7, 6, -7], - "size": [6, 10, 15], - "uv": { - "north": {"uv": [38, 10], "uv_size": [6, 10]}, - "east": {"uv": [16, 28], "uv_size": [15, 10]}, - "south": {"uv": [12, 38], "uv_size": [6, 10]}, - "west": {"uv": [30, 0], "uv_size": [15, 10]}, - "up": {"uv": [0, 32], "uv_size": [6, 15]}, - "down": {"uv": [6, 47], "uv_size": [6, -15]} - } - }, - { - "origin": [-8, 1, -8], - "size": [1, 15, 1], - "uv": { - "north": {"uv": [28, 43], "uv_size": [1, 15]}, - "east": {"uv": [29, 43], "uv_size": [1, 15]}, - "south": {"uv": [24, 45], "uv_size": [1, 15]}, - "west": {"uv": [3, 47], "uv_size": [1, 15]}, - "up": {"uv": [17, 49], "uv_size": [1, 1]}, - "down": {"uv": [42, 51], "uv_size": [1, -1]} - } - }, - { - "origin": [-2, 6, -8], - "size": [1, 10, 1], - "uv": { - "north": {"uv": [10, 47], "uv_size": [1, 10]}, - "east": {"uv": [11, 47], "uv_size": [1, 10]}, - "south": {"uv": [30, 47], "uv_size": [1, 10]}, - "west": {"uv": [31, 47], "uv_size": [1, 10]}, - "up": {"uv": [37, 53], "uv_size": [1, 1]}, - "down": {"uv": [38, 54], "uv_size": [1, -1]} - } - }, - { - "origin": [-7, 15, -8], - "size": [5, 1, 1], - "uv": { - "north": {"uv": [52, 23], "uv_size": [5, 1]}, - "east": {"uv": [39, 53], "uv_size": [1, 1]}, - "south": {"uv": [37, 52], "uv_size": [5, 1]}, - "west": {"uv": [53, 39], "uv_size": [1, 1]}, - "up": {"uv": [52, 38], "uv_size": [5, 1]}, - "down": {"uv": [52, 52], "uv_size": [5, -1]} - } - }, - { - "origin": [-8, 1, 7], - "size": [1, 15, 1], - "uv": { - "north": {"uv": [4, 47], "uv_size": [1, 15]}, - "east": {"uv": [5, 47], "uv_size": [1, 15]}, - "south": {"uv": [6, 47], "uv_size": [1, 15]}, - "west": {"uv": [7, 47], "uv_size": [1, 15]}, - "up": {"uv": [43, 50], "uv_size": [1, 1]}, - "down": {"uv": [53, 34], "uv_size": [1, -1]} - } - }, - { - "origin": [-8, 15, -7], - "size": [1, 1, 14], - "uv": { - "north": {"uv": [53, 34], "uv_size": [1, 1]}, - "east": {"uv": [45, 6], "uv_size": [14, 1]}, - "south": {"uv": [53, 35], "uv_size": [1, 1]}, - "west": {"uv": [45, 7], "uv_size": [14, 1]}, - "up": {"uv": [8, 47], "uv_size": [1, 14]}, - "down": {"uv": [9, 61], "uv_size": [1, -14]} - } - } + {"origin": [-6, 0, -7], "size": [13, 2, 14], "pivot": [0, 8, 0], "rotation": [0, 90, 0], "uv": [20, 0]}, + {"origin": [-8, 0, -8], "size": [2, 16, 16], "pivot": [0, 8, 0], "rotation": [0, 90, 0], "uv": [0, 0]}, + {"origin": [-6, 2, -5], "size": [2, 11, 2], "pivot": [0, 8, 0], "rotation": [0, 90, 0], "uv": [32, 44]}, + {"origin": [-6, 2, 3], "size": [2, 11, 2], "pivot": [0, 8, 0], "rotation": [0, 90, 0], "uv": [8, 0]}, + {"origin": [4.85891, 4.6861, -4], "size": [4, 2, 9], "pivot": [0, 8, 0], "rotation": [90, 52.5, 90], "uv": [40, 16]}, + {"origin": [-6, 12.99, -6], "size": [5, 2, 12], "pivot": [0, 8, 0], "rotation": [0, 90, 0], "uv": [-1, 35]} ] }, { - "name": "base", - "pivot": [0, 0, 0], + "name": "gear", + "pivot": [-3.49667, 3.02, 0.49667], + "rotation": [90, 0, 0], + "cubes": [ + {"origin": [-3, 4.51667, -0.43333], "size": [5, 5, 2], "pivot": [0, 3.51667, 5.47667], "rotation": [0, 0, -90], "uv": [20, 7]}, + {"origin": [-1.99, 3.50667, -0.53333], "size": [3, 7, 1], "pivot": [0, 3.51667, 5.47667], "rotation": [0, 0, -90], "uv": [48, 48]}, + {"origin": [-4, 5.51667, 0.45667], "size": [7, 3, 1], "pivot": [0, 3.51667, 5.47667], "rotation": [0, 0, -90], "uv": [40, 44]} + ] + }, + { + "name": "gear2", + "pivot": [3.50333, 3.02, 0.50333], + "rotation": [90, -90, 0], + "cubes": [ + {"origin": [4, -3.48333, -0.42667], "size": [5, 5, 2], "pivot": [3, -0.48333, 5.48333], "rotation": [0, 0, -90], "uv": [20, 0]}, + {"origin": [5.01, -4.48333, -0.52667], "size": [3, 7, 1], "pivot": [3, -0.48333, 5.48333], "rotation": [0, 0, -90], "uv": [40, 16]}, + {"origin": [3, -2.49333, 0.46333], "size": [7, 3, 1], "pivot": [3, -0.48333, 5.48333], "rotation": [0, 0, -90], "uv": [40, 27]} + ] + }, + { + "name": "top_holder", + "pivot": [-4.5, 15, 0], "cubes": [ - { - "origin": [-8, 0, -8], - "size": [16, 1, 16], - "uv": { - "north": {"uv": [45, 0], "uv_size": [16, 1]}, - "east": {"uv": [45, 1], "uv_size": [16, 1]}, - "south": {"uv": [45, 2], "uv_size": [16, 1]}, - "west": {"uv": [45, 3], "uv_size": [16, 1]}, - "up": {"uv": [0, 0], "uv_size": [16, 16]}, - "down": {"uv": [0, 32], "uv_size": [16, -16]} - } - }, - { - "origin": [-7, 1, -7], - "size": [14, 4, 14], - "uv": { - "north": {"uv": [38, 20], "uv_size": [14, 4]}, - "east": {"uv": [39, 24], "uv_size": [14, 4]}, - "south": {"uv": [39, 28], "uv_size": [14, 4]}, - "west": {"uv": [39, 32], "uv_size": [14, 4]}, - "up": {"uv": [16, 0], "uv_size": [14, 14]}, - "down": {"uv": [16, 28], "uv_size": [14, -14]} - } - }, - { - "origin": [-7, 5, -8], - "size": [8, 1, 16], - "uv": { - "north": {"uv": [48, 18], "uv_size": [8, 1]}, - "east": {"uv": [45, 4], "uv_size": [16, 1]}, - "south": {"uv": [48, 19], "uv_size": [8, 1]}, - "west": {"uv": [45, 5], "uv_size": [16, 1]}, - "up": {"uv": [30, 10], "uv_size": [8, 16]}, - "down": {"uv": [31, 42], "uv_size": [8, -16]} - } - }, - { - "origin": [0, 1, -8], - "size": [1, 4, 1], - "uv": { - "north": {"uv": [30, 38], "uv_size": [1, 4]}, - "east": {"uv": [47, 52], "uv_size": [1, 4]}, - "south": {"uv": [48, 52], "uv_size": [1, 4]}, - "west": {"uv": [49, 52], "uv_size": [1, 4]}, - "up": {"uv": [40, 53], "uv_size": [1, 1]}, - "down": {"uv": [53, 41], "uv_size": [1, -1]} - } - }, - { - "origin": [0, 1, 7], - "size": [1, 4, 1], - "uv": { - "north": {"uv": [52, 52], "uv_size": [1, 4]}, - "east": {"uv": [12, 53], "uv_size": [1, 4]}, - "south": {"uv": [13, 53], "uv_size": [1, 4]}, - "west": {"uv": [14, 53], "uv_size": [1, 4]}, - "up": {"uv": [41, 53], "uv_size": [1, 1]}, - "down": {"uv": [42, 54], "uv_size": [1, -1]} - } - } + {"origin": [-6, 14, -3], "size": [9, 2, 6], "pivot": [0, 8, 0], "rotation": [0, 90, 0], "uv": [21, 36]} ] }, { - "name": "wheel_a", - "pivot": [0.5, 10.5, 0.5], + "name": "beam", + "pivot": [0, 8.8, 0], + "rotation": [0, -45, 0], "cubes": [ - { - "origin": [-1, 7, -3], - "size": [3, 7, 7], - "uv": { - "north": {"uv": [35, 42], "uv_size": [3, 7]}, - "east": {"uv": [18, 38], "uv_size": [7, 7]}, - "south": {"uv": [25, 43], "uv_size": [3, 7]}, - "west": {"uv": [39, 36], "uv_size": [7, 7]}, - "up": {"uv": [38, 43], "uv_size": [3, 7]}, - "down": {"uv": [41, 50], "uv_size": [3, -7]} - } - }, - { - "origin": [-1, 14, -1], - "size": [3, 2, 3], - "uv": { - "north": {"uv": [32, 50], "uv_size": [3, 2]}, - "east": {"uv": [51, 12], "uv_size": [3, 2]}, - "south": {"uv": [51, 14], "uv_size": [3, 2]}, - "west": {"uv": [51, 16], "uv_size": [3, 2]}, - "up": {"uv": [32, 47], "uv_size": [3, 3]}, - "down": {"uv": [48, 15], "uv_size": [3, -3]} - } - }, - { - "origin": [-1, 5, -1], - "size": [3, 2, 3], - "uv": { - "north": {"uv": [51, 41], "uv_size": [3, 2]}, - "east": {"uv": [42, 51], "uv_size": [3, 2]}, - "south": {"uv": [51, 43], "uv_size": [3, 2]}, - "west": {"uv": [51, 45], "uv_size": [3, 2]}, - "up": {"uv": [48, 15], "uv_size": [3, 3]}, - "down": {"uv": [48, 46], "uv_size": [3, -3]} - } - }, - { - "origin": [-1, 9, -5], - "size": [3, 3, 2], - "uv": { - "north": {"uv": [44, 48], "uv_size": [3, 3]}, - "east": {"uv": [45, 51], "uv_size": [2, 3]}, - "south": {"uv": [48, 46], "uv_size": [3, 3]}, - "west": {"uv": [50, 51], "uv_size": [2, 3]}, - "up": {"uv": [51, 47], "uv_size": [3, 2]}, - "down": {"uv": [0, 54], "uv_size": [3, -2]} - } - }, - { - "origin": [-1, 9, 4], - "size": [3, 3, 2], - "uv": { - "north": {"uv": [35, 49], "uv_size": [3, 3]}, - "east": {"uv": [52, 20], "uv_size": [2, 3]}, - "south": {"uv": [49, 36], "uv_size": [3, 3]}, - "west": {"uv": [32, 52], "uv_size": [2, 3]}, - "up": {"uv": [34, 52], "uv_size": [3, 2]}, - "down": {"uv": [52, 38], "uv_size": [3, -2]} - } - } + {"origin": [1, 2, -2], "size": [1, 12, 1], "pivot": [0, 8, 0], "rotation": [0, 90, 0], "uv": [0, 34]}, + {"origin": [1, 4, 1], "size": [1, 10, 1], "pivot": [0, 8, 0], "rotation": [0, 90, 0], "uv": [44, 48]}, + {"origin": [-2, 2, 1], "size": [1, 12, 1], "pivot": [0, 8, 0], "rotation": [0, 90, 0], "uv": [40, 48]}, + {"origin": [-2, 4, -2], "size": [1, 10, 1], "pivot": [0, 8, 0], "rotation": [0, 90, 0], "uv": [4, 34]} ] }, { - "name": "wheel_b", - "parent": "wheel_a", - "pivot": [4.16667, 10.5, 0.5], + "name": "beam_inner", + "parent": "beam", + "pivot": [0, 8, 0], "cubes": [ - { - "origin": [3, 8, -2], - "size": [3, 5, 5], - "uv": { - "north": {"uv": [18, 45], "uv_size": [3, 5]}, - "east": {"uv": [25, 38], "uv_size": [5, 5]}, - "south": {"uv": [21, 45], "uv_size": [3, 5]}, - "west": {"uv": [30, 42], "uv_size": [5, 5]}, - "up": {"uv": [46, 36], "uv_size": [3, 5]}, - "down": {"uv": [0, 52], "uv_size": [3, -5]} - } - }, - { - "origin": [1, 9, -1], - "size": [3, 3, 3], - "uv": { - "north": {"uv": [47, 49], "uv_size": [3, 3]}, - "east": {"uv": [12, 50], "uv_size": [3, 3]}, - "south": {"uv": [15, 50], "uv_size": [3, 3]}, - "west": {"uv": [18, 50], "uv_size": [3, 3]}, - "up": {"uv": [21, 50], "uv_size": [3, 3]}, - "down": {"uv": [25, 53], "uv_size": [3, -3]} - } - }, - { - "origin": [3, 13, 0], - "size": [3, 1, 1], - "uv": { - "north": {"uv": [12, 37], "uv_size": [3, 1]}, - "east": {"uv": [30, 26], "uv_size": [1, 1]}, - "south": {"uv": [53, 10], "uv_size": [3, 1]}, - "west": {"uv": [30, 27], "uv_size": [1, 1]}, - "up": {"uv": [53, 11], "uv_size": [3, 1]}, - "down": {"uv": [15, 54], "uv_size": [3, -1]} - } - }, - { - "origin": [3, 7, 0], - "size": [3, 1, 1], - "uv": { - "north": {"uv": [18, 53], "uv_size": [3, 1]}, - "east": {"uv": [15, 37], "uv_size": [1, 1]}, - "south": {"uv": [21, 53], "uv_size": [3, 1]}, - "west": {"uv": [38, 24], "uv_size": [1, 1]}, - "up": {"uv": [53, 24], "uv_size": [3, 1]}, - "down": {"uv": [25, 54], "uv_size": [3, -1]} - } - }, - { - "origin": [3, 10, -3], - "size": [3, 1, 1], - "uv": { - "north": {"uv": [53, 25], "uv_size": [3, 1]}, - "east": {"uv": [38, 25], "uv_size": [1, 1]}, - "south": {"uv": [53, 26], "uv_size": [3, 1]}, - "west": {"uv": [38, 42], "uv_size": [1, 1]}, - "up": {"uv": [53, 27], "uv_size": [3, 1]}, - "down": {"uv": [53, 29], "uv_size": [3, -1]} - } - }, - { - "origin": [3, 10, 3], - "size": [3, 1, 1], - "uv": { - "north": {"uv": [53, 29], "uv_size": [3, 1]}, - "east": {"uv": [17, 48], "uv_size": [1, 1]}, - "south": {"uv": [53, 30], "uv_size": [3, 1]}, - "west": {"uv": [47, 48], "uv_size": [1, 1]}, - "up": {"uv": [53, 31], "uv_size": [3, 1]}, - "down": {"uv": [53, 33], "uv_size": [3, -1]} - } - } + {"origin": [-1, 2, -1], "size": [2, 12, 2], "pivot": [0, 8, 0], "rotation": [0, 90, 0], "uv": [0, 0]} ] }, { - "name": "podest", - "pivot": [3, 7.92836, 0.79813], + "name": "front_frame", + "pivot": [5, 1, -7], "cubes": [ - { - "origin": [1, 5, -6], - "size": [4, 2, 5], - "pivot": [4, 6, -1.5], - "rotation": [40, 0, 0], - "uv": { - "north": {"uv": [49, 39], "uv_size": [4, 2]}, - "east": {"uv": [45, 8], "uv_size": [5, 2]}, - "south": {"uv": [50, 8], "uv_size": [4, 2]}, - "west": {"uv": [46, 41], "uv_size": [5, 2]}, - "up": {"uv": [12, 32], "uv_size": [4, 5]}, - "down": {"uv": [44, 15], "uv_size": [4, -5]} - } - }, - { - "origin": [1, 5.92836, 2.29813], - "size": [4, 2, 5], - "pivot": [3, 7.92836, 0.79813], - "rotation": [-40, 0, 0], - "uv": { - "north": {"uv": [38, 50], "uv_size": [4, 2]}, - "east": {"uv": [48, 10], "uv_size": [5, 2]}, - "south": {"uv": [50, 49], "uv_size": [4, 2]}, - "west": {"uv": [12, 48], "uv_size": [5, 2]}, - "up": {"uv": [44, 15], "uv_size": [4, 5]}, - "down": {"uv": [44, 48], "uv_size": [4, -5]} - } - } + {"origin": [-6, 1, 6], "size": [3, 2, 2], "pivot": [0, 8, 0], "rotation": [0, -90, 0], "uv": [45, 36]}, + {"origin": [6, 1, -8], "size": [2, 2, 16], "pivot": [0, 8, 0], "rotation": [0, 90, 0], "uv": [20, 18]}, + {"origin": [3, 1, 6], "size": [3, 2, 2], "pivot": [0, 8, 0], "rotation": [0, 90, 0], "uv": [45, 36]} ] } ] diff --git a/src/main/resources/assets/oritech/models/item/pulverizer_block.json b/src/main/resources/assets/oritech/models/item/pulverizer_block.json index 563b93050..82ee365cc 100644 --- a/src/main/resources/assets/oritech/models/item/pulverizer_block.json +++ b/src/main/resources/assets/oritech/models/item/pulverizer_block.json @@ -62,7 +62,7 @@ 0 ], "translation": [ - 1, + 0, -1, 0 ], diff --git a/src/main/resources/assets/oritech/textures/block/models/pulverizer_block.png b/src/main/resources/assets/oritech/textures/block/models/pulverizer_block.png index 2f5450202518e9b726697410702529749d639ab4..e395a09957f2468a218cb1625dbe29bcb69e3a2d 100644 GIT binary patch literal 2372 zcmbuB`9BnT7stPrwAd;#VHiTXGEHa<+3!qtk`$>%H9QoVY-JluD*F~@L}Of6*FJJf zvJ4`jv5hUe$&5X_#%>zvOo=a={E{O~@}Hr6J>$E1z{0EEpzL2``L>cG&s*u}&$TU(NBo_~=M#zfXP&wteKYy3d

D8F@8bu(miZDT|CnSAQ*??x9sfR&^Ga3^50 zLf&-IVi5(hm%?epJ%kcY0L1+b0n5o8&m-V<1o{=Wiw7jT@q2!pEjSJo17YfSL{(PI zn-N|FJ8>#1Jb~IjVQfqrU$WAXzI!vTD2ZO2A(=2I7P!|y&r(`yYBo3of>$Fdy2vv; zK=mDj2Lu{5msal!gUu^b^WZz`PHKn|VrF2q4^9m=fpT{U=Rw#f|5z8UE8Qu5I98)F zLj$;jqAGWQ;=IOlJvuELCM-ojmlxfUkF8z=!ml?z^I*f>S>u0_t{n=S7qS^sSRg@?D$)3!C?o43b9$}G!?kiB?YeTg0EdQV$ zX57F2Ft&o3a=Sywr2Hs;?AO?!%66|`B8^P?y&>$NAKRutQLyJ?$@)4s;?dACv0;=;J8x1Y|XXuR_rwcBTtEMNxVR{ zBelC`GStqnTyR|aq2=`OdGX?yllno*o>p>`mLIN_y^L2~K5K~K*r9Iu3QdM}Cy+OA z!!&YwR+f4vgxDQROe(V<`GR1Wl{;n5;pw?Q7phKfZ_@tgRAEX7Me1@{oLQzhs&(wr zuYmvqz}$1k+gJ7fW1i<(+$kjIc@LSaRX-?J$_cJme^p+?iqsE&(A$>l-75ahdqdD( z2t+9cd3m!>_|&Pu|2@W6-u}KEk8hf=?C@r}%VhcamJ@pzt3*QN)i^1%U??xxT?mKq zp0n>8jh1C~mRi3E>uw)UdH;6D;pqqnD6smLFSpN0$BvpV~Y5p~b)N3Rh=) z>}y`e4F}7de|G6$Z*Cy8+(*@SZHx7dT2J-d^NQo`;LcnDO}0us7Ps%372l6$eg)4_3C@wqe z#US;&WX@33o!d1{CkB0R6k`r+6{lRJ9~q1xe`Y*< zK4$_AdVD6yS2M$kgE-TQb&(#C9G-HM0HJ!Jbx6YtALg{9*~UL?)8ATYi1pSZPo8t- zts|?Wa>%7FpC2aHS6*TJ!e5#J51~R<3#cMCBsjFK-Ys6=a>_Vk=oCIOn^Lj&FMq&S zo2BxjmL31lWqNwXS1eg1n3VD5>KKi+ytXCk-E`iutC^HYbcwY3&3g}dF@9Mxdhx&9 zDn;c&shR@{q-{r%FC7ItC$eR|Xr`5!i&qkN<(n<0Bdeix$>~VL17hg(yyLNCXT(`o zx)O$D9(udxU14%ql=P-{UL7861#3(B6WBKAw6&byevoOrk=I_T?T#8Jb9zJ9QD-hoMC6gCjlbWT zSj+Uy2px)gbC!AO-s>}hFUl{K;LlDbJN>>mpV*m~9pK!`U7 zl|V=%rdPw!u^5H&z1h60x_aCNGk>)m0CSMF;ooryN9=U6R_zzwI`>-Adr0 zWwY`cub#=Qi%-)zKV?w(i;Cg_F-q8LO`9^dg+rT!L|yEL-($=(J-$12ZwoF5wlsf{ z&XbokT<47T2BAm0r&A33+|9-0#Qx?D5NB$h8fEl7N|4%BRnGg~08|AH*pI9CYk5qd zhRBoog^EPkLt@E|YPknaaqRw#s2q>NDAdaUd}?i+Cz67ZcpcFXx$Y%ybF0Ta%>2Mr z#yd_T8I;734f{#5APf*pfEH|8AVxCMNFIN`zG}o`!(mf9h?Rk>9wTX{!Vrjm{6s`^ z4g}FixM+t;dw#00_kN1r?Wmx|Qlv(l{7bL(%h+By_4=1+HQlwu(l^cY(n88=K9A~> zyyCmU3}CRdS77#qKsvbL5VB+pRXmCAI-3NAs#l5W5oZ+fwFXw)a5gG#zzGS9Hh$8% za($|ey$GS6UeyGKC)``CHYb8XD!!-@6I6?ZfSo}sRECXlN57aB( zn3vwNSS_8EWRhvsn6$??Cmm;-7~lzj{y^FGXc#JaYNTO55HbIMJ^RAtnaQSj@EAiz R556N{cEuV){qx@Q{{otxh~oeN literal 1502 zcmV<41tI#0P)000H0NklM$irwZG{lb%L1yR$RWN^-x0*d5KzesAWzH}Ab! zqp^Og($0eb$E-!Qi;V!#Jp078yiU)D_Dlps!}$BxMWfYFe5}&WM+pD`K`KK-p**wq z?sQ(${|c_>>-7BH=5rnXkiKyRFHEh+Bw#rOsSKPQ(_i8Q8LbBPr=GgYm4?ndel<8{ zfs^hdtjq%=u@xY&v?TmG)8ECL;3Hk%EIt5$)4dmx7DDm@sDo9Z>&Df)&F3A>J~#OtQ(p~z zUBW6P?|_#2$4{GVN>t? z4>$^wNKAl%{a_R-?L6v_Bzyz_(`Yrc!s$_fHC#@GvbHVJAHWre5>YPtsNwrQpa4=N z7LASqvFu^8!CWXvZ!HVD4m4!hM%Wcunr?7~-nd z=5*mcdw)?q)O|O(4$+555M{N%=+fI)$FWJ(#9|@VUh$e*f>cJmq&I0BK%B+cg9Jkf zKw%7b5vxd8A7?Yhy60gH0=F#y*eI6)pyGKT&CZnsc=FDm*SzWfOXMmBXCl~o8&dau zKWp1~LF`pv{CL_|xVxwxisGtxD)nw+Ph1MFgeVpjhYF{s3-{GMj4qI<@B5Zz^&+Tx z%~4>d;e}LmLlI)VBx~E2WeqUYXuXiiQ8}r~(Mlcwjv#6R^mbENUMR~*O^##M0^o}oL!Nby;i$Z~0<7W=`H_KR))N18 zA_|vFg$BSRKYUFDkq*K!YtR}elL0Z-lloEMe{Tc-0b;-X7-Y_EFaQ7m07*qoM6N<$ Ef~b7eTL1t6 diff --git a/src/main/resources/data/oritech/recipes/coal_to_emerald.json b/src/main/resources/data/oritech/recipes/coal_to_emerald.json index aec14991e..bc205f33c 100644 --- a/src/main/resources/data/oritech/recipes/coal_to_emerald.json +++ b/src/main/resources/data/oritech/recipes/coal_to_emerald.json @@ -11,5 +11,5 @@ "Count": 1 } ], - "time": 15 + "time": 60 } \ No newline at end of file