From 0c47b9d4d01d2f18a92d0c05a595c5ffdad75a9b Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Thu, 30 Mar 2023 15:56:19 +0200 Subject: [PATCH] Revert: We drill block you --- .../java/com/simibubi/create/AllBlocks.java | 1 - .../com/simibubi/create/AllPartialModels.java | 1 - .../java/com/simibubi/create/AllShapes.java | 3 - .../com/simibubi/create/AllSpriteShifts.java | 5 - .../components/actors/DrillBlock.java | 2 +- .../components/actors/DrillRenderer.java | 88 +---- .../models/block/mechanical_drill/block.json | 118 ++++--- .../models/block/mechanical_drill/head.json | 193 +++++++---- .../models/block/mechanical_drill/head_2.json | 89 ------ .../block/mechanical_drill/head_top.json | 85 ----- .../models/block/mechanical_drill/item.json | 301 ++++++++++++------ .../mechanical_drill/mechanical_drill.json | 102 ------ .../block/mechanical_drill/old/block.json | 77 ----- .../block/mechanical_drill/old/head.json | 160 ---------- .../block/mechanical_drill/old/item.json | 233 -------------- .../block/mechanical_drill_animation.png | Bin 4402 -> 0 bytes .../block/mechanical_drill_animation_2.png | Bin 4409 -> 0 bytes .../block/mechanical_drill_animation_top.png | Bin 2309 -> 0 bytes .../textures/block/mechanical_drill_head.png | Bin 1470 -> 0 bytes .../block/mechanical_drill_head_2.png | Bin 1498 -> 0 bytes .../block/mechanical_drill_head_top.png | Bin 1578 -> 0 bytes .../textures/block/mechanical_drill_side.png | Bin 377 -> 0 bytes .../textures/block/mechanical_drill_top.png | Bin 333 -> 0 bytes 23 files changed, 402 insertions(+), 1056 deletions(-) delete mode 100644 src/main/resources/assets/create/models/block/mechanical_drill/head_2.json delete mode 100644 src/main/resources/assets/create/models/block/mechanical_drill/head_top.json delete mode 100644 src/main/resources/assets/create/models/block/mechanical_drill/mechanical_drill.json delete mode 100644 src/main/resources/assets/create/models/block/mechanical_drill/old/block.json delete mode 100644 src/main/resources/assets/create/models/block/mechanical_drill/old/head.json delete mode 100644 src/main/resources/assets/create/models/block/mechanical_drill/old/item.json delete mode 100644 src/main/resources/assets/create/textures/block/mechanical_drill_animation.png delete mode 100644 src/main/resources/assets/create/textures/block/mechanical_drill_animation_2.png delete mode 100644 src/main/resources/assets/create/textures/block/mechanical_drill_animation_top.png delete mode 100644 src/main/resources/assets/create/textures/block/mechanical_drill_head.png delete mode 100644 src/main/resources/assets/create/textures/block/mechanical_drill_head_2.png delete mode 100644 src/main/resources/assets/create/textures/block/mechanical_drill_head_top.png delete mode 100644 src/main/resources/assets/create/textures/block/mechanical_drill_side.png delete mode 100644 src/main/resources/assets/create/textures/block/mechanical_drill_top.png diff --git a/src/main/java/com/simibubi/create/AllBlocks.java b/src/main/java/com/simibubi/create/AllBlocks.java index 2a8b7a64e..6ec2659e7 100644 --- a/src/main/java/com/simibubi/create/AllBlocks.java +++ b/src/main/java/com/simibubi/create/AllBlocks.java @@ -1303,7 +1303,6 @@ public class AllBlocks { .blockstate(BlockStateGen.directionalBlockProvider(true)) .transform(BlockStressDefaults.setImpact(4.0)) .onRegister(movementBehaviour(new DrillMovementBehaviour())) - .addLayer(() -> RenderType::cutoutMipped) .item() .transform(customItemModel()) .register(); diff --git a/src/main/java/com/simibubi/create/AllPartialModels.java b/src/main/java/com/simibubi/create/AllPartialModels.java index 8e01ad381..9deb48108 100644 --- a/src/main/java/com/simibubi/create/AllPartialModels.java +++ b/src/main/java/com/simibubi/create/AllPartialModels.java @@ -45,7 +45,6 @@ public class AllPartialModels { GAUGE_INDICATOR = block("gauge/indicator"), GAUGE_HEAD_SPEED = block("gauge/speedometer/head"), GAUGE_HEAD_STRESS = block("gauge/stressometer/head"), BEARING_TOP = block("bearing/top"), BEARING_TOP_WOODEN = block("bearing/top_wooden"), DRILL_HEAD = block("mechanical_drill/head"), - DRILL_HEAD_2 = block("mechanical_drill/head_2"), DRILL_HEAD_TOP = block("mechanical_drill/head_top"), HARVESTER_BLADE = block("mechanical_harvester/blade"), DEPLOYER_POLE = block("deployer/pole"), DEPLOYER_HAND_POINTING = block("deployer/hand_pointing"), DEPLOYER_HAND_PUNCHING = block("deployer/hand_punching"), diff --git a/src/main/java/com/simibubi/create/AllShapes.java b/src/main/java/com/simibubi/create/AllShapes.java index 69d5ed112..be1ab8d6f 100644 --- a/src/main/java/com/simibubi/create/AllShapes.java +++ b/src/main/java/com/simibubi/create/AllShapes.java @@ -162,9 +162,6 @@ public class AllShapes { PLACARD = shape(2, 0, 2, 14, 3, 14).forDirectional(UP), - DRILL = shape(0, 0, 0, 16, 8, 16).add(3, 0, 3, 13, 16, 13) - .forDirectional(UP), - TRACK_ORTHO = shape(TrackVoxelShapes.orthogonal()).forHorizontal(NORTH), TRACK_ASC = shape(TrackVoxelShapes.ascending()).forHorizontal(SOUTH), TRACK_DIAG = shape(TrackVoxelShapes.diagonal()).forHorizontal(SOUTH), diff --git a/src/main/java/com/simibubi/create/AllSpriteShifts.java b/src/main/java/com/simibubi/create/AllSpriteShifts.java index aacd6b0e2..7d767013f 100644 --- a/src/main/java/com/simibubi/create/AllSpriteShifts.java +++ b/src/main/java/com/simibubi/create/AllSpriteShifts.java @@ -72,11 +72,6 @@ public class AllSpriteShifts { public static final SpriteShiftEntry ELEVATOR_BELT = get("block/elevator_pulley_belt", "block/elevator_pulley_belt_scroll"), ELEVATOR_COIL = get("block/elevator_pulley_coil", "block/elevator_pulley_coil_scroll"); - - public static final SpriteShiftEntry - DRILL = get("block/mechanical_drill_head", "block/mechanical_drill_animation"), - DRILL_2 = get("block/mechanical_drill_head_2", "block/mechanical_drill_animation_2"), - DRILL_TOP = get("block/mechanical_drill_head_top", "block/mechanical_drill_animation_top"); public static final SpriteShiftEntry BELT = get("block/belt", "block/belt_scroll"), BELT_OFFSET = get("block/belt_offset", "block/belt_scroll"), diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillBlock.java index 83043375a..04e5d19f5 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillBlock.java @@ -60,7 +60,7 @@ public class DrillBlock extends DirectionalKineticBlock implements IBE { @@ -31,86 +25,32 @@ public class DrillRenderer extends KineticBlockEntityRenderer } @Override - protected void renderSafe(DrillBlockEntity be, float partialTicks, PoseStack ms, MultiBufferSource buffer, - int light, int overlay) { - super.renderSafe(be, partialTicks, ms, buffer, light, overlay); - if (Backend.canUseInstancing(be.getLevel())) - return; - - BlockState blockState = be.getBlockState(); - renderStationary(be, ms, buffer, light, blockState, AllPartialModels.DRILL_HEAD, AllSpriteShifts.DRILL); - renderStationary(be, ms, buffer, light, blockState, AllPartialModels.DRILL_HEAD_2, AllSpriteShifts.DRILL_2); - renderStationary(be, ms, buffer, light, blockState, AllPartialModels.DRILL_HEAD_TOP, AllSpriteShifts.DRILL_TOP); - } - - protected static void renderStationary(DrillBlockEntity be, PoseStack ms, MultiBufferSource buffer, int light, - BlockState blockState, PartialModel partial, SpriteShiftEntry spriteShift) { - SuperByteBuffer superBuffer = - CachedBufferer.partialFacingVertical(partial, blockState, blockState.getValue(DrillBlock.FACING)) - .light(light); - applyScroll(be.getLevel(), Math.abs(be.getSpeed()) / 64, spriteShift, superBuffer); - superBuffer.renderInto(ms, buffer.getBuffer(RenderType.solid())); + protected SuperByteBuffer getRotatedModel(DrillBlockEntity be, BlockState state) { + return CachedBufferer.partialFacing(AllPartialModels.DRILL_HEAD, state); } public static void renderInContraption(MovementContext context, VirtualRenderWorld renderWorld, ContraptionMatrices matrices, MultiBufferSource buffer) { BlockState state = context.state; + SuperByteBuffer superBuffer = CachedBufferer.partial(AllPartialModels.DRILL_HEAD, state); Direction facing = state.getValue(DrillBlock.FACING); - float speed = (float) Math.min(2.5f, Math.abs( - context.contraption.stalled || !VecHelper.isVecPointingTowards(context.relativeMotion, facing.getOpposite()) - ? context.getAnimationSpeed() / 128 - : 0)); - float time = AnimationTickHolder.getRenderTime() / 20; - float angle = (float) (((time * speed * 256) % 360)); - SuperByteBuffer superBuffer = CachedBufferer.partial(AllPartialModels.SHAFT_HALF, state); - superBuffer.transform(matrices.getModel()) + float speed = (float) (context.contraption.stalled + || !VecHelper.isVecPointingTowards(context.relativeMotion, facing + .getOpposite()) ? context.getAnimationSpeed() : 0); + float time = AnimationTickHolder.getRenderTime() / 20; + float angle = (float) (((time * speed) % 360)); + + superBuffer + .transform(matrices.getModel()) .centre() - .rotateY(AngleHelper.horizontalAngle(facing) + 180) + .rotateY(AngleHelper.horizontalAngle(facing)) .rotateX(AngleHelper.verticalAngle(facing)) .rotateZ(angle) .unCentre() - .light(matrices.getWorld(), ContraptionRenderDispatcher.getContraptionWorldLight(context, renderWorld)) + .light(matrices.getWorld(), + ContraptionRenderDispatcher.getContraptionWorldLight(context, renderWorld)) .renderInto(matrices.getViewProjection(), buffer.getBuffer(RenderType.solid())); - - renderMoving(context, renderWorld, matrices, buffer, state, facing, speed, AllPartialModels.DRILL_HEAD, - AllSpriteShifts.DRILL); - renderMoving(context, renderWorld, matrices, buffer, state, facing, speed, AllPartialModels.DRILL_HEAD_2, - AllSpriteShifts.DRILL_2); - renderMoving(context, renderWorld, matrices, buffer, state, facing, speed, AllPartialModels.DRILL_HEAD_TOP, - AllSpriteShifts.DRILL_TOP); - } - - protected static void renderMoving(MovementContext context, VirtualRenderWorld renderWorld, - ContraptionMatrices matrices, MultiBufferSource buffer, BlockState state, Direction facing, float speed, - PartialModel partial, SpriteShiftEntry spriteShift) { - SuperByteBuffer superBuffer = CachedBufferer.partial(partial, state); - superBuffer.transform(matrices.getModel()) - .centre() - .rotateY(AngleHelper.horizontalAngle(facing)) - .rotateX(AngleHelper.verticalAngle(facing) + 90) - .unCentre() - .light(matrices.getWorld(), ContraptionRenderDispatcher.getContraptionWorldLight(context, renderWorld)); - applyScroll(renderWorld, speed, spriteShift, superBuffer); - superBuffer.renderInto(matrices.getViewProjection(), buffer.getBuffer(RenderType.solid())); - } - - public static void applyScroll(Level level, float speed, SpriteShiftEntry spriteShift, - SuperByteBuffer superBuffer) { - float spriteSize = spriteShift.getTarget() - .getV1() - - spriteShift.getTarget() - .getV0(); - float time = AnimationTickHolder.getRenderTime(level); - int frame = (int) (speed * time); - float scroll = ((frame % 8) / 8f) * spriteSize; - superBuffer.shiftUVScrolling(spriteShift, scroll); - } - - @Override - protected SuperByteBuffer getRotatedModel(DrillBlockEntity be, BlockState state) { - return CachedBufferer.partialFacing(AllPartialModels.SHAFT_HALF, state, state.getValue(DrillBlock.FACING) - .getOpposite()); } } diff --git a/src/main/resources/assets/create/models/block/mechanical_drill/block.json b/src/main/resources/assets/create/models/block/mechanical_drill/block.json index ea14f6b35..3a4cf2dec 100644 --- a/src/main/resources/assets/create/models/block/mechanical_drill/block.json +++ b/src/main/resources/assets/create/models/block/mechanical_drill/block.json @@ -1,81 +1,77 @@ { "credit": "Made with Blockbench", + "parent": "block/block", "textures": { - "0": "create:block/funnel/andesite_funnel_frame", - "1": "create:block/gearbox", - "2": "create:block/mechanical_drill_side", - "3": "create:block/mechanical_drill_top", - "particle": "create:block/gearbox" + "10": "create:block/andesite_casing_very_short", + "gearbox_top": "create:block/gearbox_top", + "particle": "create:block/gearbox", + "gearbox": "create:block/gearbox", + "andesite_casing_short": "create:block/andesite_casing_short" }, "elements": [ { - "name": "drill casing", - "from": [0, 0, 0], - "to": [16, 8, 16], + "name": "Body", + "from": [2, 1, 2], + "to": [14, 9, 14], "faces": { - "north": {"uv": [0, 8, 16, 16], "texture": "#2"}, - "east": {"uv": [0, 8, 16, 16], "texture": "#2"}, - "south": {"uv": [0, 8, 16, 16], "texture": "#2"}, - "west": {"uv": [0, 8, 16, 16], "texture": "#2"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#3"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0"} + "up": {"uv": [2, 2, 14, 14], "texture": "#gearbox"}, + "down": {"uv": [2, 2, 14, 14], "rotation": 180, "texture": "#gearbox"} } }, { - "name": "drill casing insert", - "from": [2, 1, 2], - "to": [14, 0, 14], + "name": "Bottom", + "from": [0, 0, 14], + "to": [16, 10, 16], "faces": { - "north": {"uv": [2, 14, 14, 15], "texture": "#0"}, - "east": {"uv": [14, 2, 15, 14], "rotation": 270, "texture": "#0"}, - "south": {"uv": [2, 1, 14, 2], "texture": "#0"}, - "west": {"uv": [1, 2, 2, 14], "rotation": 90, "texture": "#0"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#1"} + "north": {"uv": [0, 4, 16, 16], "rotation": 180, "texture": "#andesite_casing_short"}, + "east": {"uv": [14, 6, 16, 16], "rotation": 180, "texture": "#10"}, + "south": {"uv": [0, 6, 16, 16], "texture": "#10"}, + "west": {"uv": [14, 6, 16, 16], "texture": "#10"}, + "up": {"uv": [0, 14, 16, 16], "texture": "#gearbox_top"}, + "down": {"uv": [0, 14, 16, 16], "rotation": 180, "texture": "#gearbox_top"} + } + }, + { + "name": "Top", + "from": [0, 0, 0], + "to": [16, 10, 2], + "faces": { + "north": {"uv": [0, 6, 16, 16], "rotation": 180, "texture": "#10"}, + "east": {"uv": [0, 6, 2, 16], "rotation": 180, "texture": "#10"}, + "south": {"uv": [0, 4, 16, 16], "texture": "#andesite_casing_short"}, + "west": {"uv": [0, 6, 2, 16], "texture": "#10"}, + "up": {"uv": [0, 0, 16, 2], "texture": "#gearbox_top"}, + "down": {"uv": [0, 0, 16, 2], "rotation": 180, "texture": "#gearbox_top"} + } + }, + { + "name": "Side", + "from": [0, 0, 2], + "to": [2, 10, 14], + "faces": { + "east": {"uv": [2, 4, 14, 16], "rotation": 180, "texture": "#andesite_casing_short"}, + "west": {"uv": [2, 6, 14, 16], "texture": "#10"}, + "up": {"uv": [0, 2, 2, 14], "texture": "#gearbox_top"}, + "down": {"uv": [14, 2, 16, 14], "rotation": 180, "texture": "#gearbox_top"} + } + }, + { + "name": "Side", + "from": [14, 0, 2], + "to": [16, 10, 14], + "faces": { + "east": {"uv": [2, 6, 14, 16], "rotation": 180, "texture": "#10"}, + "west": {"uv": [2, 4, 14, 16], "rotation": 180, "texture": "#andesite_casing_short"}, + "up": {"uv": [14, 2, 16, 14], "texture": "#gearbox_top"}, + "down": {"uv": [0, 2, 2, 14], "rotation": 180, "texture": "#gearbox_top"} } } ], - "display": { - "thirdperson_righthand": { - "rotation": [75, 45, 0], - "translation": [0, 2.5, 0], - "scale": [0.375, 0.375, 0.375] - }, - "thirdperson_lefthand": { - "rotation": [75, 45, 0], - "translation": [0, 2.5, 0], - "scale": [0.375, 0.375, 0.375] - }, - "firstperson_righthand": { - "rotation": [0, 45, 0], - "scale": [0.4, 0.4, 0.4] - }, - "firstperson_lefthand": { - "rotation": [0, 225, 0], - "scale": [0.4, 0.4, 0.4] - }, - "ground": { - "translation": [0, 3, 0], - "scale": [0.25, 0.25, 0.25] - }, - "gui": { - "rotation": [30, 135, 90], - "translation": [-0.75, 0, 0], - "scale": [0.625, 0.625, 0.625] - }, - "head": { - "rotation": [0, 180, 0], - "translation": [0, 13, 7] - }, - "fixed": { - "scale": [0.5, 0.5, 0.5] - } - }, "groups": [ { "name": "casing", - "origin": [0, 0, 0], - "color": 0, - "children": [0, 1] + "origin": [8, 8, 8], + "children": [0, 1, 2, 3, 4] } ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/mechanical_drill/head.json b/src/main/resources/assets/create/models/block/mechanical_drill/head.json index e2f84eb1f..72d61cc98 100644 --- a/src/main/resources/assets/create/models/block/mechanical_drill/head.json +++ b/src/main/resources/assets/create/models/block/mechanical_drill/head.json @@ -1,89 +1,160 @@ { "credit": "Made with Blockbench", + "parent": "block/block", "textures": { - "4": "create:block/mechanical_drill_head", - "particle": "create:block/funnel/andesite_funnel_frame" + "0": "create:block/axis_top", + "1": "create:block/axis", + "2": "block/anvil", + "7": "block/polished_andesite", + "10": "create:block/andesite_casing_very_short", + "particle": "block/anvil" }, "elements": [ { - "name": "Drill head 1", - "from": [2, 8, 2], - "to": [14, 12, 14], + "name": "Axle", + "from": [6, 6, 0], + "to": [10, 10, 4], "faces": { - "north": {"uv": [2, 12, 14, 16], "texture": "#4"}, - "south": {"uv": [2, 12, 14, 16], "texture": "#4"} + "north": {"uv": [6, 6, 10, 10], "texture": "#0"}, + "east": {"uv": [6, 12, 10, 16], "rotation": 90, "texture": "#1"}, + "west": {"uv": [6, 0, 10, 4], "rotation": 270, "texture": "#1"}, + "up": {"uv": [6, 12, 10, 16], "texture": "#1"}, + "down": {"uv": [6, 0, 10, 4], "rotation": 180, "texture": "#1"} } }, { - "name": "Drill head 2", - "from": [3, 12, 3], - "to": [13, 16, 13], + "name": "Core", + "from": [5, 5, 9], + "to": [11, 11, 12], + "rotation": {"angle": 45, "axis": "z", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [3, 8, 13, 12], "texture": "#4"}, - "south": {"uv": [3, 8, 13, 12], "texture": "#4"} + "north": {"uv": [0, 0, 6, 6], "texture": "#7"}, + "east": {"uv": [0, 2, 6, 5], "rotation": 270, "texture": "#10"}, + "south": {"uv": [5, 0, 11, 6], "texture": "#2"}, + "west": {"uv": [0, 2, 6, 5], "rotation": 90, "texture": "#10"}, + "up": {"uv": [0, 2, 6, 5], "rotation": 180, "texture": "#10"}, + "down": {"uv": [0, 2, 6, 5], "texture": "#10"} } }, { - "name": "Drill head 3", - "from": [4, 16, 4], - "to": [12, 20, 12], + "name": "Top", + "from": [6, 11, 9], + "to": [10, 13, 13], + "rotation": {"angle": -45, "axis": "z", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [4, 4, 12, 8], "texture": "#4"}, - "south": {"uv": [4, 4, 12, 8], "texture": "#4"} + "north": {"uv": [0, 0, 4, 2], "texture": "#10"}, + "east": {"uv": [0, 1, 4, 3], "texture": "#10"}, + "south": {"uv": [0, 0, 2, 4], "rotation": 90, "texture": "#10"}, + "west": {"uv": [0, 1, 4, 3], "texture": "#10"}, + "up": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#10"}, + "down": {"uv": [0, 0, 4, 4], "texture": "#10"} } }, { - "name": "Drill head 4", - "from": [5, 20, 5], - "to": [11, 24, 11], + "name": "Bottom", + "from": [6, 3, 9], + "to": [10, 5, 13], + "rotation": {"angle": -45, "axis": "z", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [5, 0, 11, 4], "texture": "#4"}, - "south": {"uv": [5, 0, 11, 4], "texture": "#4"} + "north": {"uv": [0, 0, 4, 2], "texture": "#10"}, + "east": {"uv": [0, 1, 4, 3], "rotation": 180, "texture": "#10"}, + "south": {"uv": [0, 0, 2, 4], "rotation": 90, "texture": "#10"}, + "west": {"uv": [0, 1, 4, 3], "rotation": 180, "texture": "#10"}, + "up": {"uv": [0, 0, 4, 4], "texture": "#10"}, + "down": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#10"} + } + }, + { + "name": "Left", + "from": [3, 6, 9], + "to": [5, 10, 13], + "rotation": {"angle": -45, "axis": "z", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 4], "texture": "#10"}, + "east": {"uv": [0, 0, 4, 4], "texture": "#10"}, + "south": {"uv": [0, 0, 2, 4], "texture": "#10"}, + "west": {"uv": [0, 0, 4, 4], "texture": "#10"}, + "up": {"uv": [0, 1, 4, 3], "rotation": 270, "texture": "#10"}, + "down": {"uv": [0, 1, 4, 3], "rotation": 270, "texture": "#10"} + } + }, + { + "name": "Right", + "from": [11, 6, 9], + "to": [13, 10, 13], + "rotation": {"angle": -45, "axis": "z", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 4], "texture": "#10"}, + "east": {"uv": [0, 0, 4, 4], "texture": "#10"}, + "south": {"uv": [0, 0, 2, 4], "texture": "#10"}, + "west": {"uv": [0, 0, 4, 4], "texture": "#10"}, + "up": {"uv": [0, 1, 4, 3], "rotation": 90, "texture": "#10"}, + "down": {"uv": [0, 1, 4, 3], "rotation": 90, "texture": "#10"} + } + }, + { + "name": "Bit1", + "from": [5.5, 5.5, 12], + "to": [10.5, 10.5, 14], + "rotation": {"angle": 45, "axis": "z", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [0, 0, 5, 5], "texture": "#2"}, + "east": {"uv": [0, 0, 5, 2], "rotation": 90, "texture": "#2"}, + "south": {"uv": [1, 2, 6, 7], "texture": "#2"}, + "west": {"uv": [0, 0, 5, 2], "rotation": 270, "texture": "#2"}, + "up": {"uv": [0, 0, 5, 2], "texture": "#2"}, + "down": {"uv": [0, 0, 5, 2], "texture": "#2"} + } + }, + { + "name": "Bit2", + "from": [6, 6, 14], + "to": [10, 10, 16], + "rotation": {"angle": 45, "axis": "z", "origin": [8, 8, 7]}, + "faces": { + "north": {"uv": [0, 0, 4, 4], "texture": "#2"}, + "east": {"uv": [0, 0, 4, 2], "rotation": 90, "texture": "#2"}, + "south": {"uv": [0, 0, 4, 4], "texture": "#2"}, + "west": {"uv": [0, 0, 4, 2], "rotation": 270, "texture": "#2"}, + "up": {"uv": [0, 0, 4, 2], "texture": "#2"}, + "down": {"uv": [0, 0, 4, 2], "rotation": 180, "texture": "#2"} + } + }, + { + "name": "Bit3", + "from": [6.5, 6.5, 16], + "to": [9.5, 9.5, 18], + "rotation": {"angle": -45, "axis": "z", "origin": [8, 8, 7]}, + "faces": { + "north": {"uv": [0, 0, 3, 3], "texture": "#2"}, + "east": {"uv": [0, 0, 2, 3], "texture": "#2"}, + "south": {"uv": [0, 0, 3, 3], "texture": "#2"}, + "west": {"uv": [0, 0, 3, 2], "rotation": 270, "texture": "#2"}, + "up": {"uv": [0, 0, 3, 2], "texture": "#2"}, + "down": {"uv": [0, 0, 3, 2], "texture": "#2"} + } + }, + { + "name": "Bit4", + "from": [7, 7, 18], + "to": [9, 9, 20], + "rotation": {"angle": 45, "axis": "z", "origin": [8, 8, 7]}, + "faces": { + "north": {"uv": [0, 0, 2, 2], "texture": "#2"}, + "east": {"uv": [0, 0, 2, 2], "texture": "#2"}, + "south": {"uv": [5, 5, 7, 7], "texture": "#2"}, + "west": {"uv": [0, 0, 2, 2], "texture": "#2"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#2"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#2"} } } ], - "display": { - "thirdperson_righthand": { - "rotation": [75, 45, 0], - "translation": [0, 2.5, 0], - "scale": [0.375, 0.375, 0.375] - }, - "thirdperson_lefthand": { - "rotation": [75, 45, 0], - "translation": [0, 2.5, 0], - "scale": [0.375, 0.375, 0.375] - }, - "firstperson_righthand": { - "rotation": [0, 45, 0], - "scale": [0.4, 0.4, 0.4] - }, - "firstperson_lefthand": { - "rotation": [0, 225, 0], - "scale": [0.4, 0.4, 0.4] - }, - "ground": { - "translation": [0, 3, 0], - "scale": [0.25, 0.25, 0.25] - }, - "gui": { - "rotation": [30, 135, 90], - "translation": [-0.75, 0, 0], - "scale": [0.625, 0.625, 0.625] - }, - "head": { - "rotation": [0, 180, 0], - "translation": [0, 13, 7] - }, - "fixed": { - "scale": [0.5, 0.5, 0.5] - } - }, + "display": {}, "groups": [ { - "name": "drill head", + "name": "head", "origin": [8, 8, 8], - "color": 0, - "children": [0, 1, 2, 3] + "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] } ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/mechanical_drill/head_2.json b/src/main/resources/assets/create/models/block/mechanical_drill/head_2.json deleted file mode 100644 index d672ef306..000000000 --- a/src/main/resources/assets/create/models/block/mechanical_drill/head_2.json +++ /dev/null @@ -1,89 +0,0 @@ -{ - "credit": "Made with Blockbench", - "textures": { - "5": "create:block/mechanical_drill_head_2", - "particle": "create:block/funnel/andesite_funnel_frame" - }, - "elements": [ - { - "name": "Drill head 1", - "from": [2, 8, 2], - "to": [14, 12, 14], - "faces": { - "east": {"uv": [2, 12, 14, 16], "texture": "#5"}, - "west": {"uv": [2, 12, 14, 16], "texture": "#5"} - } - }, - { - "name": "Drill head 2", - "from": [3, 12, 3], - "to": [13, 16, 13], - "faces": { - "east": {"uv": [3, 8, 13, 12], "texture": "#5"}, - "west": {"uv": [3, 8, 13, 12], "texture": "#5"} - } - }, - { - "name": "Drill head 3", - "from": [4, 16, 4], - "to": [12, 20, 12], - "faces": { - "east": {"uv": [4, 4, 12, 8], "texture": "#5"}, - "west": {"uv": [4, 4, 12, 8], "texture": "#5"} - } - }, - { - "name": "Drill head 4", - "from": [5, 20, 5], - "to": [11, 24, 11], - "faces": { - "east": {"uv": [5, 0, 11, 4], "texture": "#5"}, - "west": {"uv": [5, 0, 11, 4], "texture": "#5"} - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [75, 45, 0], - "translation": [0, 2.5, 0], - "scale": [0.375, 0.375, 0.375] - }, - "thirdperson_lefthand": { - "rotation": [75, 45, 0], - "translation": [0, 2.5, 0], - "scale": [0.375, 0.375, 0.375] - }, - "firstperson_righthand": { - "rotation": [0, 45, 0], - "scale": [0.4, 0.4, 0.4] - }, - "firstperson_lefthand": { - "rotation": [0, 225, 0], - "scale": [0.4, 0.4, 0.4] - }, - "ground": { - "translation": [0, 3, 0], - "scale": [0.25, 0.25, 0.25] - }, - "gui": { - "rotation": [30, 135, 90], - "translation": [-0.75, 0, 0], - "scale": [0.625, 0.625, 0.625] - }, - "head": { - "rotation": [0, 180, 0], - "translation": [0, 13, 7] - }, - "fixed": { - "scale": [0.5, 0.5, 0.5] - } - }, - "groups": [ - { - "name": "drill head", - "origin": [8, 8, 8], - "color": 0, - "children": [0, 1, 2, 3] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/mechanical_drill/head_top.json b/src/main/resources/assets/create/models/block/mechanical_drill/head_top.json deleted file mode 100644 index 736e29b4f..000000000 --- a/src/main/resources/assets/create/models/block/mechanical_drill/head_top.json +++ /dev/null @@ -1,85 +0,0 @@ -{ - "credit": "Made with Blockbench", - "textures": { - "6": "create:block/mechanical_drill_head_top", - "particle": "create:block/funnel/andesite_funnel_frame" - }, - "elements": [ - { - "name": "Drill head 1", - "from": [2, 8, 2], - "to": [14, 12, 14], - "faces": { - "up": {"uv": [2, 2, 14, 14], "texture": "#6"} - } - }, - { - "name": "Drill head 2", - "from": [3, 12, 3], - "to": [13, 16, 13], - "faces": { - "up": {"uv": [3, 3, 13, 13], "texture": "#6"} - } - }, - { - "name": "Drill head 3", - "from": [4, 16, 4], - "to": [12, 20, 12], - "faces": { - "up": {"uv": [4, 4, 12, 12], "texture": "#6"} - } - }, - { - "name": "Drill head 4", - "from": [5, 20, 5], - "to": [11, 24, 11], - "faces": { - "up": {"uv": [5, 5, 11, 11], "texture": "#6"} - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [75, 45, 0], - "translation": [0, 2.5, 0], - "scale": [0.375, 0.375, 0.375] - }, - "thirdperson_lefthand": { - "rotation": [75, 45, 0], - "translation": [0, 2.5, 0], - "scale": [0.375, 0.375, 0.375] - }, - "firstperson_righthand": { - "rotation": [0, 45, 0], - "scale": [0.4, 0.4, 0.4] - }, - "firstperson_lefthand": { - "rotation": [0, 225, 0], - "scale": [0.4, 0.4, 0.4] - }, - "ground": { - "translation": [0, 3, 0], - "scale": [0.25, 0.25, 0.25] - }, - "gui": { - "rotation": [30, 135, 90], - "translation": [-0.75, 0, 0], - "scale": [0.625, 0.625, 0.625] - }, - "head": { - "rotation": [0, 180, 0], - "translation": [0, 13, 7] - }, - "fixed": { - "scale": [0.5, 0.5, 0.5] - } - }, - "groups": [ - { - "name": "drill head", - "origin": [8, 8, 8], - "color": 0, - "children": [0, 1, 2, 3] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/mechanical_drill/item.json b/src/main/resources/assets/create/models/block/mechanical_drill/item.json index 6e3fe17da..725b4ed4a 100644 --- a/src/main/resources/assets/create/models/block/mechanical_drill/item.json +++ b/src/main/resources/assets/create/models/block/mechanical_drill/item.json @@ -1,138 +1,233 @@ { "credit": "Made with Blockbench", + "parent": "create:block/block", "textures": { - "0": "create:block/funnel/andesite_funnel_frame", - "1": "create:block/gearbox", - "2": "create:block/mechanical_drill_side", - "3": "create:block/mechanical_drill_top", - "4": "create:block/mechanical_drill_head", - "5": "create:block/mechanical_drill_head_2", - "6": "create:block/mechanical_drill_head_top", - "particle": "create:block/funnel/andesite_funnel_frame" + "0": "create:block/axis_top", + "1": "create:block/axis", + "2": "block/anvil", + "7": "block/polished_andesite", + "10": "create:block/andesite_casing_very_short", + "particle": "block/anvil", + "gearbox_top": "create:block/gearbox_top", + "gearbox": "create:block/gearbox", + "andesite_casing_short": "create:block/andesite_casing_short" }, "elements": [ { - "name": "drill casing", + "name": "Axle", + "from": [6, 6, 0], + "to": [10, 10, 4], + "faces": { + "north": {"uv": [6, 6, 10, 10], "texture": "#0"}, + "east": {"uv": [6, 12, 10, 16], "rotation": 90, "texture": "#1"}, + "west": {"uv": [6, 0, 10, 4], "rotation": 270, "texture": "#1"}, + "up": {"uv": [6, 12, 10, 16], "texture": "#1"}, + "down": {"uv": [6, 0, 10, 4], "rotation": 180, "texture": "#1"} + } + }, + { + "name": "Core", + "from": [5, 5, 9], + "to": [11, 11, 12], + "rotation": {"angle": 45, "axis": "z", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [0, 0, 6, 6], "texture": "#7"}, + "east": {"uv": [0, 2, 6, 5], "rotation": 270, "texture": "#10"}, + "south": {"uv": [5, 0, 11, 6], "texture": "#2"}, + "west": {"uv": [0, 2, 6, 5], "rotation": 90, "texture": "#10"}, + "up": {"uv": [0, 2, 6, 5], "rotation": 180, "texture": "#10"}, + "down": {"uv": [0, 2, 6, 5], "texture": "#10"} + } + }, + { + "name": "Top", + "from": [6, 11, 9], + "to": [10, 13, 13], + "rotation": {"angle": -45, "axis": "z", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [0, 0, 4, 2], "texture": "#10"}, + "east": {"uv": [0, 1, 4, 3], "texture": "#10"}, + "south": {"uv": [0, 0, 2, 4], "rotation": 90, "texture": "#10"}, + "west": {"uv": [0, 1, 4, 3], "texture": "#10"}, + "up": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#10"}, + "down": {"uv": [0, 0, 4, 4], "texture": "#10"} + } + }, + { + "name": "Bottom", + "from": [6, 3, 9], + "to": [10, 5, 13], + "rotation": {"angle": -45, "axis": "z", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [0, 0, 4, 2], "texture": "#10"}, + "east": {"uv": [0, 1, 4, 3], "rotation": 180, "texture": "#10"}, + "south": {"uv": [0, 0, 2, 4], "rotation": 90, "texture": "#10"}, + "west": {"uv": [0, 1, 4, 3], "rotation": 180, "texture": "#10"}, + "up": {"uv": [0, 0, 4, 4], "texture": "#10"}, + "down": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#10"} + } + }, + { + "name": "Left", + "from": [3, 6, 9], + "to": [5, 10, 13], + "rotation": {"angle": -45, "axis": "z", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 4], "texture": "#10"}, + "east": {"uv": [0, 0, 4, 4], "texture": "#10"}, + "south": {"uv": [0, 0, 2, 4], "texture": "#10"}, + "west": {"uv": [0, 0, 4, 4], "texture": "#10"}, + "up": {"uv": [0, 1, 4, 3], "rotation": 270, "texture": "#10"}, + "down": {"uv": [0, 1, 4, 3], "rotation": 270, "texture": "#10"} + } + }, + { + "name": "Right", + "from": [11, 6, 9], + "to": [13, 10, 13], + "rotation": {"angle": -45, "axis": "z", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [0, 0, 2, 4], "texture": "#10"}, + "east": {"uv": [0, 0, 4, 4], "texture": "#10"}, + "south": {"uv": [0, 0, 2, 4], "texture": "#10"}, + "west": {"uv": [0, 0, 4, 4], "texture": "#10"}, + "up": {"uv": [0, 1, 4, 3], "rotation": 90, "texture": "#10"}, + "down": {"uv": [0, 1, 4, 3], "rotation": 90, "texture": "#10"} + } + }, + { + "name": "Bit1", + "from": [5.5, 5.5, 12], + "to": [10.5, 10.5, 14], + "rotation": {"angle": 45, "axis": "z", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [0, 0, 5, 5], "texture": "#2"}, + "east": {"uv": [0, 0, 5, 2], "rotation": 90, "texture": "#2"}, + "south": {"uv": [1, 2, 6, 7], "texture": "#2"}, + "west": {"uv": [0, 0, 5, 2], "rotation": 270, "texture": "#2"}, + "up": {"uv": [0, 0, 5, 2], "texture": "#2"}, + "down": {"uv": [0, 0, 5, 2], "texture": "#2"} + } + }, + { + "name": "Bit2", + "from": [6, 6, 14], + "to": [10, 10, 16], + "rotation": {"angle": 45, "axis": "z", "origin": [8, 8, 7]}, + "faces": { + "north": {"uv": [0, 0, 4, 4], "texture": "#2"}, + "east": {"uv": [0, 0, 4, 2], "rotation": 90, "texture": "#2"}, + "south": {"uv": [0, 0, 4, 4], "texture": "#2"}, + "west": {"uv": [0, 0, 4, 2], "rotation": 270, "texture": "#2"}, + "up": {"uv": [0, 0, 4, 2], "texture": "#2"}, + "down": {"uv": [0, 0, 4, 2], "rotation": 180, "texture": "#2"} + } + }, + { + "name": "Bit3", + "from": [6.5, 6.5, 16], + "to": [9.5, 9.5, 18], + "rotation": {"angle": -45, "axis": "z", "origin": [8, 8, 7]}, + "faces": { + "north": {"uv": [0, 0, 3, 3], "texture": "#2"}, + "east": {"uv": [0, 0, 2, 3], "texture": "#2"}, + "south": {"uv": [0, 0, 3, 3], "texture": "#2"}, + "west": {"uv": [0, 0, 3, 2], "rotation": 270, "texture": "#2"}, + "up": {"uv": [0, 0, 3, 2], "texture": "#2"}, + "down": {"uv": [0, 0, 3, 2], "texture": "#2"} + } + }, + { + "name": "Bit4", + "from": [7, 7, 18], + "to": [9, 9, 20], + "rotation": {"angle": 45, "axis": "z", "origin": [8, 8, 7]}, + "faces": { + "north": {"uv": [0, 0, 2, 2], "texture": "#2"}, + "east": {"uv": [0, 0, 2, 2], "texture": "#2"}, + "south": {"uv": [5, 5, 7, 7], "texture": "#2"}, + "west": {"uv": [0, 0, 2, 2], "texture": "#2"}, + "up": {"uv": [0, 0, 2, 2], "texture": "#2"}, + "down": {"uv": [0, 0, 2, 2], "texture": "#2"} + } + }, + { + "name": "Body", + "from": [2, 2, 1], + "to": [14, 14, 9], + "faces": { + "north": {"uv": [2, 2, 14, 14], "texture": "#gearbox"}, + "south": {"uv": [2, 2, 14, 14], "texture": "#gearbox"} + } + }, + { + "name": "Bottom", "from": [0, 0, 0], - "to": [16, 8, 16], + "to": [16, 2, 10], "faces": { - "north": {"uv": [0, 8, 16, 16], "texture": "#2"}, - "east": {"uv": [0, 8, 16, 16], "texture": "#2"}, - "south": {"uv": [0, 8, 16, 16], "texture": "#2"}, - "west": {"uv": [0, 8, 16, 16], "texture": "#2"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#3"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0"} + "north": {"uv": [0, 14, 16, 16], "texture": "#gearbox_top"}, + "east": {"uv": [14, 6, 16, 16], "rotation": 90, "texture": "#10"}, + "south": {"uv": [0, 14, 16, 16], "texture": "#gearbox_top"}, + "west": {"uv": [14, 6, 16, 16], "rotation": 90, "texture": "#10"}, + "up": {"uv": [0, 4, 16, 16], "texture": "#andesite_casing_short"}, + "down": {"uv": [0, 6, 16, 16], "texture": "#10"} } }, { - "name": "drill casing insert", - "from": [2, 1, 2], - "to": [14, 0, 14], + "name": "Top", + "from": [0, 14, 0], + "to": [16, 16, 10], "faces": { - "north": {"uv": [2, 14, 14, 15], "texture": "#0"}, - "east": {"uv": [14, 2, 15, 14], "rotation": 270, "texture": "#0"}, - "south": {"uv": [2, 1, 14, 2], "texture": "#0"}, - "west": {"uv": [1, 2, 2, 14], "rotation": 90, "texture": "#0"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#1"} + "north": {"uv": [0, 0, 16, 2], "texture": "#gearbox_top"}, + "east": {"uv": [0, 6, 2, 16], "rotation": 90, "texture": "#10"}, + "south": {"uv": [0, 0, 16, 2], "texture": "#gearbox_top"}, + "west": {"uv": [0, 6, 2, 16], "rotation": 90, "texture": "#10"}, + "up": {"uv": [0, 6, 16, 16], "texture": "#10"}, + "down": {"uv": [0, 4, 16, 16], "texture": "#andesite_casing_short"} } }, { - "name": "Drill head 1", - "from": [2, 8, 2], - "to": [14, 12, 14], + "name": "Side", + "from": [0, 2, 0], + "to": [2, 14, 10], "faces": { - "north": {"uv": [2, 12, 14, 16], "texture": "#4"}, - "east": {"uv": [2, 12, 14, 16], "texture": "#5"}, - "south": {"uv": [2, 12, 14, 16], "texture": "#4"}, - "west": {"uv": [2, 12, 14, 16], "texture": "#5"}, - "up": {"uv": [2, 2, 14, 14], "texture": "#6"} + "north": {"uv": [14, 2, 16, 14], "texture": "#gearbox_top"}, + "east": {"uv": [2, 4, 14, 16], "rotation": 90, "texture": "#andesite_casing_short"}, + "south": {"uv": [0, 2, 2, 14], "texture": "#gearbox_top"}, + "west": {"uv": [2, 6, 14, 16], "rotation": 90, "texture": "#10"} } }, { - "name": "Drill head 2", - "from": [3, 12, 3], - "to": [13, 16, 13], + "name": "Side", + "from": [14, 2, 0], + "to": [16, 14, 10], "faces": { - "north": {"uv": [3, 8, 13, 12], "texture": "#4"}, - "east": {"uv": [3, 8, 13, 12], "texture": "#5"}, - "south": {"uv": [3, 8, 13, 12], "texture": "#4"}, - "west": {"uv": [3, 8, 13, 12], "texture": "#5"}, - "up": {"uv": [3, 3, 13, 13], "texture": "#6"} - } - }, - { - "name": "Drill head 3", - "from": [4, 16, 4], - "to": [12, 20, 12], - "faces": { - "north": {"uv": [4, 4, 12, 8], "texture": "#4"}, - "east": {"uv": [4, 4, 12, 8], "texture": "#5"}, - "south": {"uv": [4, 4, 12, 8], "texture": "#4"}, - "west": {"uv": [4, 4, 12, 8], "texture": "#5"}, - "up": {"uv": [4, 4, 12, 12], "texture": "#6"} - } - }, - { - "name": "Drill head 4", - "from": [5, 20, 5], - "to": [11, 24, 11], - "faces": { - "north": {"uv": [5, 0, 11, 4], "texture": "#4"}, - "east": {"uv": [5, 0, 11, 4], "texture": "#5"}, - "south": {"uv": [5, 0, 11, 4], "texture": "#4"}, - "west": {"uv": [5, 0, 11, 4], "texture": "#5"}, - "up": {"uv": [5, 5, 11, 11], "texture": "#6"} + "north": {"uv": [0, 2, 2, 14], "texture": "#gearbox_top"}, + "east": {"uv": [2, 6, 14, 16], "rotation": 90, "texture": "#10"}, + "south": {"uv": [14, 2, 16, 14], "texture": "#gearbox_top"}, + "west": {"uv": [2, 4, 14, 16], "rotation": 270, "texture": "#andesite_casing_short"} } } ], "display": { - "thirdperson_righthand": { - "rotation": [75, 45, 0], - "translation": [0, 2.5, 0], - "scale": [0.375, 0.375, 0.375] - }, - "thirdperson_lefthand": { - "rotation": [75, 45, 0], - "translation": [0, 2.5, 0], - "scale": [0.375, 0.375, 0.375] - }, - "firstperson_righthand": { - "rotation": [0, 45, 0], - "scale": [0.4, 0.4, 0.4] - }, - "firstperson_lefthand": { - "rotation": [0, 225, 0], - "scale": [0.4, 0.4, 0.4] - }, - "ground": { - "translation": [0, 3, 0], - "scale": [0.25, 0.25, 0.25] - }, - "gui": { - "rotation": [30, 135, 90], - "translation": [-0.75, 0, 0], - "scale": [0.625, 0.625, 0.625] - }, - "head": { - "rotation": [0, 180, 0], - "translation": [0, 13, 7] - }, "fixed": { + "rotation": [0, 180, 0], + "translation": [0, 0, -1.75], "scale": [0.5, 0.5, 0.5] } }, "groups": [ { - "name": "casing", - "origin": [0, 0, 0], - "color": 0, - "children": [0, 1] - }, - { - "name": "drill head", + "name": "head", "origin": [8, 8, 8], "color": 0, - "children": [2, 3, 4, 5] + "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] + }, + { + "name": "casing", + "origin": [8, 8, 8], + "color": 0, + "children": [10, 11, 12, 13, 14] } ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/mechanical_drill/mechanical_drill.json b/src/main/resources/assets/create/models/block/mechanical_drill/mechanical_drill.json deleted file mode 100644 index ec37b74de..000000000 --- a/src/main/resources/assets/create/models/block/mechanical_drill/mechanical_drill.json +++ /dev/null @@ -1,102 +0,0 @@ -{ - "credit": "Made with Blockbench", - "textures": { - "0": "create:block/funnel/andesite_funnel_frame", - "1": "create:block/gearbox", - "2": "mechanical_drill_side", - "3": "mechanical_drill_top", - "4": "mechanical_drill_animation", - "5": "mechanical_drill_animation_2", - "6": "mechanical_drill_animation_top", - "particle": "create:block/funnel/andesite_funnel_frame" - }, - "elements": [ - { - "name": "drill casing", - "from": [0, 0, 0], - "to": [16, 8, 16], - "faces": { - "north": {"uv": [0, 8, 16, 16], "texture": "#2"}, - "east": {"uv": [0, 8, 16, 16], "texture": "#2"}, - "south": {"uv": [0, 8, 16, 16], "texture": "#2"}, - "west": {"uv": [0, 8, 16, 16], "texture": "#2"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#3"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0"} - } - }, - { - "name": "drill casing insert", - "from": [2, 1, 2], - "to": [14, 0, 14], - "faces": { - "north": {"uv": [2, 14, 14, 15], "texture": "#0"}, - "east": {"uv": [14, 2, 15, 14], "rotation": 270, "texture": "#0"}, - "south": {"uv": [2, 1, 14, 2], "texture": "#0"}, - "west": {"uv": [1, 2, 2, 14], "rotation": 90, "texture": "#0"}, - "down": {"uv": [2, 2, 14, 14], "texture": "#1"} - } - }, - { - "name": "Drill head 1", - "from": [2, 8, 2], - "to": [14, 12, 14], - "faces": { - "north": {"uv": [2, 12, 14, 16], "texture": "#4"}, - "east": {"uv": [2, 12, 14, 16], "texture": "#5"}, - "south": {"uv": [2, 12, 14, 16], "texture": "#4"}, - "west": {"uv": [2, 12, 14, 16], "texture": "#5"}, - "up": {"uv": [2, 2, 14, 14], "texture": "#6"} - } - }, - { - "name": "Drill head 2", - "from": [3, 12, 3], - "to": [13, 16, 13], - "faces": { - "north": {"uv": [3, 8, 13, 12], "texture": "#4"}, - "east": {"uv": [3, 8, 13, 12], "texture": "#5"}, - "south": {"uv": [3, 8, 13, 12], "texture": "#4"}, - "west": {"uv": [3, 8, 13, 12], "texture": "#5"}, - "up": {"uv": [3, 3, 13, 13], "texture": "#6"} - } - }, - { - "name": "Drill head 3", - "from": [4, 16, 4], - "to": [12, 20, 12], - "faces": { - "north": {"uv": [4, 4, 12, 8], "texture": "#4"}, - "east": {"uv": [4, 4, 12, 8], "texture": "#5"}, - "south": {"uv": [4, 4, 12, 8], "texture": "#4"}, - "west": {"uv": [4, 4, 12, 8], "texture": "#5"}, - "up": {"uv": [4, 4, 12, 12], "texture": "#6"} - } - }, - { - "name": "Drill head 4", - "from": [5, 20, 5], - "to": [11, 24, 11], - "faces": { - "north": {"uv": [5, 0, 11, 4], "texture": "#4"}, - "east": {"uv": [5, 0, 11, 4], "texture": "#5"}, - "south": {"uv": [5, 0, 11, 4], "texture": "#4"}, - "west": {"uv": [5, 0, 11, 4], "texture": "#5"}, - "up": {"uv": [5, 5, 11, 11], "texture": "#6"} - } - } - ], - "groups": [ - { - "name": "casing", - "origin": [0, 0, 0], - "color": 0, - "children": [0, 1] - }, - { - "name": "drill head", - "origin": [8, 8, 8], - "color": 0, - "children": [2, 3, 4, 5] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/mechanical_drill/old/block.json b/src/main/resources/assets/create/models/block/mechanical_drill/old/block.json deleted file mode 100644 index 3a4cf2dec..000000000 --- a/src/main/resources/assets/create/models/block/mechanical_drill/old/block.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "10": "create:block/andesite_casing_very_short", - "gearbox_top": "create:block/gearbox_top", - "particle": "create:block/gearbox", - "gearbox": "create:block/gearbox", - "andesite_casing_short": "create:block/andesite_casing_short" - }, - "elements": [ - { - "name": "Body", - "from": [2, 1, 2], - "to": [14, 9, 14], - "faces": { - "up": {"uv": [2, 2, 14, 14], "texture": "#gearbox"}, - "down": {"uv": [2, 2, 14, 14], "rotation": 180, "texture": "#gearbox"} - } - }, - { - "name": "Bottom", - "from": [0, 0, 14], - "to": [16, 10, 16], - "faces": { - "north": {"uv": [0, 4, 16, 16], "rotation": 180, "texture": "#andesite_casing_short"}, - "east": {"uv": [14, 6, 16, 16], "rotation": 180, "texture": "#10"}, - "south": {"uv": [0, 6, 16, 16], "texture": "#10"}, - "west": {"uv": [14, 6, 16, 16], "texture": "#10"}, - "up": {"uv": [0, 14, 16, 16], "texture": "#gearbox_top"}, - "down": {"uv": [0, 14, 16, 16], "rotation": 180, "texture": "#gearbox_top"} - } - }, - { - "name": "Top", - "from": [0, 0, 0], - "to": [16, 10, 2], - "faces": { - "north": {"uv": [0, 6, 16, 16], "rotation": 180, "texture": "#10"}, - "east": {"uv": [0, 6, 2, 16], "rotation": 180, "texture": "#10"}, - "south": {"uv": [0, 4, 16, 16], "texture": "#andesite_casing_short"}, - "west": {"uv": [0, 6, 2, 16], "texture": "#10"}, - "up": {"uv": [0, 0, 16, 2], "texture": "#gearbox_top"}, - "down": {"uv": [0, 0, 16, 2], "rotation": 180, "texture": "#gearbox_top"} - } - }, - { - "name": "Side", - "from": [0, 0, 2], - "to": [2, 10, 14], - "faces": { - "east": {"uv": [2, 4, 14, 16], "rotation": 180, "texture": "#andesite_casing_short"}, - "west": {"uv": [2, 6, 14, 16], "texture": "#10"}, - "up": {"uv": [0, 2, 2, 14], "texture": "#gearbox_top"}, - "down": {"uv": [14, 2, 16, 14], "rotation": 180, "texture": "#gearbox_top"} - } - }, - { - "name": "Side", - "from": [14, 0, 2], - "to": [16, 10, 14], - "faces": { - "east": {"uv": [2, 6, 14, 16], "rotation": 180, "texture": "#10"}, - "west": {"uv": [2, 4, 14, 16], "rotation": 180, "texture": "#andesite_casing_short"}, - "up": {"uv": [14, 2, 16, 14], "texture": "#gearbox_top"}, - "down": {"uv": [0, 2, 2, 14], "rotation": 180, "texture": "#gearbox_top"} - } - } - ], - "groups": [ - { - "name": "casing", - "origin": [8, 8, 8], - "children": [0, 1, 2, 3, 4] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/mechanical_drill/old/head.json b/src/main/resources/assets/create/models/block/mechanical_drill/old/head.json deleted file mode 100644 index 72d61cc98..000000000 --- a/src/main/resources/assets/create/models/block/mechanical_drill/old/head.json +++ /dev/null @@ -1,160 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "create:block/axis_top", - "1": "create:block/axis", - "2": "block/anvil", - "7": "block/polished_andesite", - "10": "create:block/andesite_casing_very_short", - "particle": "block/anvil" - }, - "elements": [ - { - "name": "Axle", - "from": [6, 6, 0], - "to": [10, 10, 4], - "faces": { - "north": {"uv": [6, 6, 10, 10], "texture": "#0"}, - "east": {"uv": [6, 12, 10, 16], "rotation": 90, "texture": "#1"}, - "west": {"uv": [6, 0, 10, 4], "rotation": 270, "texture": "#1"}, - "up": {"uv": [6, 12, 10, 16], "texture": "#1"}, - "down": {"uv": [6, 0, 10, 4], "rotation": 180, "texture": "#1"} - } - }, - { - "name": "Core", - "from": [5, 5, 9], - "to": [11, 11, 12], - "rotation": {"angle": 45, "axis": "z", "origin": [8, 8, 8]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#7"}, - "east": {"uv": [0, 2, 6, 5], "rotation": 270, "texture": "#10"}, - "south": {"uv": [5, 0, 11, 6], "texture": "#2"}, - "west": {"uv": [0, 2, 6, 5], "rotation": 90, "texture": "#10"}, - "up": {"uv": [0, 2, 6, 5], "rotation": 180, "texture": "#10"}, - "down": {"uv": [0, 2, 6, 5], "texture": "#10"} - } - }, - { - "name": "Top", - "from": [6, 11, 9], - "to": [10, 13, 13], - "rotation": {"angle": -45, "axis": "z", "origin": [8, 8, 8]}, - "faces": { - "north": {"uv": [0, 0, 4, 2], "texture": "#10"}, - "east": {"uv": [0, 1, 4, 3], "texture": "#10"}, - "south": {"uv": [0, 0, 2, 4], "rotation": 90, "texture": "#10"}, - "west": {"uv": [0, 1, 4, 3], "texture": "#10"}, - "up": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#10"}, - "down": {"uv": [0, 0, 4, 4], "texture": "#10"} - } - }, - { - "name": "Bottom", - "from": [6, 3, 9], - "to": [10, 5, 13], - "rotation": {"angle": -45, "axis": "z", "origin": [8, 8, 8]}, - "faces": { - "north": {"uv": [0, 0, 4, 2], "texture": "#10"}, - "east": {"uv": [0, 1, 4, 3], "rotation": 180, "texture": "#10"}, - "south": {"uv": [0, 0, 2, 4], "rotation": 90, "texture": "#10"}, - "west": {"uv": [0, 1, 4, 3], "rotation": 180, "texture": "#10"}, - "up": {"uv": [0, 0, 4, 4], "texture": "#10"}, - "down": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#10"} - } - }, - { - "name": "Left", - "from": [3, 6, 9], - "to": [5, 10, 13], - "rotation": {"angle": -45, "axis": "z", "origin": [8, 8, 8]}, - "faces": { - "north": {"uv": [0, 0, 2, 4], "texture": "#10"}, - "east": {"uv": [0, 0, 4, 4], "texture": "#10"}, - "south": {"uv": [0, 0, 2, 4], "texture": "#10"}, - "west": {"uv": [0, 0, 4, 4], "texture": "#10"}, - "up": {"uv": [0, 1, 4, 3], "rotation": 270, "texture": "#10"}, - "down": {"uv": [0, 1, 4, 3], "rotation": 270, "texture": "#10"} - } - }, - { - "name": "Right", - "from": [11, 6, 9], - "to": [13, 10, 13], - "rotation": {"angle": -45, "axis": "z", "origin": [8, 8, 8]}, - "faces": { - "north": {"uv": [0, 0, 2, 4], "texture": "#10"}, - "east": {"uv": [0, 0, 4, 4], "texture": "#10"}, - "south": {"uv": [0, 0, 2, 4], "texture": "#10"}, - "west": {"uv": [0, 0, 4, 4], "texture": "#10"}, - "up": {"uv": [0, 1, 4, 3], "rotation": 90, "texture": "#10"}, - "down": {"uv": [0, 1, 4, 3], "rotation": 90, "texture": "#10"} - } - }, - { - "name": "Bit1", - "from": [5.5, 5.5, 12], - "to": [10.5, 10.5, 14], - "rotation": {"angle": 45, "axis": "z", "origin": [8, 8, 8]}, - "faces": { - "north": {"uv": [0, 0, 5, 5], "texture": "#2"}, - "east": {"uv": [0, 0, 5, 2], "rotation": 90, "texture": "#2"}, - "south": {"uv": [1, 2, 6, 7], "texture": "#2"}, - "west": {"uv": [0, 0, 5, 2], "rotation": 270, "texture": "#2"}, - "up": {"uv": [0, 0, 5, 2], "texture": "#2"}, - "down": {"uv": [0, 0, 5, 2], "texture": "#2"} - } - }, - { - "name": "Bit2", - "from": [6, 6, 14], - "to": [10, 10, 16], - "rotation": {"angle": 45, "axis": "z", "origin": [8, 8, 7]}, - "faces": { - "north": {"uv": [0, 0, 4, 4], "texture": "#2"}, - "east": {"uv": [0, 0, 4, 2], "rotation": 90, "texture": "#2"}, - "south": {"uv": [0, 0, 4, 4], "texture": "#2"}, - "west": {"uv": [0, 0, 4, 2], "rotation": 270, "texture": "#2"}, - "up": {"uv": [0, 0, 4, 2], "texture": "#2"}, - "down": {"uv": [0, 0, 4, 2], "rotation": 180, "texture": "#2"} - } - }, - { - "name": "Bit3", - "from": [6.5, 6.5, 16], - "to": [9.5, 9.5, 18], - "rotation": {"angle": -45, "axis": "z", "origin": [8, 8, 7]}, - "faces": { - "north": {"uv": [0, 0, 3, 3], "texture": "#2"}, - "east": {"uv": [0, 0, 2, 3], "texture": "#2"}, - "south": {"uv": [0, 0, 3, 3], "texture": "#2"}, - "west": {"uv": [0, 0, 3, 2], "rotation": 270, "texture": "#2"}, - "up": {"uv": [0, 0, 3, 2], "texture": "#2"}, - "down": {"uv": [0, 0, 3, 2], "texture": "#2"} - } - }, - { - "name": "Bit4", - "from": [7, 7, 18], - "to": [9, 9, 20], - "rotation": {"angle": 45, "axis": "z", "origin": [8, 8, 7]}, - "faces": { - "north": {"uv": [0, 0, 2, 2], "texture": "#2"}, - "east": {"uv": [0, 0, 2, 2], "texture": "#2"}, - "south": {"uv": [5, 5, 7, 7], "texture": "#2"}, - "west": {"uv": [0, 0, 2, 2], "texture": "#2"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#2"}, - "down": {"uv": [0, 0, 2, 2], "texture": "#2"} - } - } - ], - "display": {}, - "groups": [ - { - "name": "head", - "origin": [8, 8, 8], - "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/mechanical_drill/old/item.json b/src/main/resources/assets/create/models/block/mechanical_drill/old/item.json deleted file mode 100644 index 725b4ed4a..000000000 --- a/src/main/resources/assets/create/models/block/mechanical_drill/old/item.json +++ /dev/null @@ -1,233 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "create:block/block", - "textures": { - "0": "create:block/axis_top", - "1": "create:block/axis", - "2": "block/anvil", - "7": "block/polished_andesite", - "10": "create:block/andesite_casing_very_short", - "particle": "block/anvil", - "gearbox_top": "create:block/gearbox_top", - "gearbox": "create:block/gearbox", - "andesite_casing_short": "create:block/andesite_casing_short" - }, - "elements": [ - { - "name": "Axle", - "from": [6, 6, 0], - "to": [10, 10, 4], - "faces": { - "north": {"uv": [6, 6, 10, 10], "texture": "#0"}, - "east": {"uv": [6, 12, 10, 16], "rotation": 90, "texture": "#1"}, - "west": {"uv": [6, 0, 10, 4], "rotation": 270, "texture": "#1"}, - "up": {"uv": [6, 12, 10, 16], "texture": "#1"}, - "down": {"uv": [6, 0, 10, 4], "rotation": 180, "texture": "#1"} - } - }, - { - "name": "Core", - "from": [5, 5, 9], - "to": [11, 11, 12], - "rotation": {"angle": 45, "axis": "z", "origin": [8, 8, 8]}, - "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#7"}, - "east": {"uv": [0, 2, 6, 5], "rotation": 270, "texture": "#10"}, - "south": {"uv": [5, 0, 11, 6], "texture": "#2"}, - "west": {"uv": [0, 2, 6, 5], "rotation": 90, "texture": "#10"}, - "up": {"uv": [0, 2, 6, 5], "rotation": 180, "texture": "#10"}, - "down": {"uv": [0, 2, 6, 5], "texture": "#10"} - } - }, - { - "name": "Top", - "from": [6, 11, 9], - "to": [10, 13, 13], - "rotation": {"angle": -45, "axis": "z", "origin": [8, 8, 8]}, - "faces": { - "north": {"uv": [0, 0, 4, 2], "texture": "#10"}, - "east": {"uv": [0, 1, 4, 3], "texture": "#10"}, - "south": {"uv": [0, 0, 2, 4], "rotation": 90, "texture": "#10"}, - "west": {"uv": [0, 1, 4, 3], "texture": "#10"}, - "up": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#10"}, - "down": {"uv": [0, 0, 4, 4], "texture": "#10"} - } - }, - { - "name": "Bottom", - "from": [6, 3, 9], - "to": [10, 5, 13], - "rotation": {"angle": -45, "axis": "z", "origin": [8, 8, 8]}, - "faces": { - "north": {"uv": [0, 0, 4, 2], "texture": "#10"}, - "east": {"uv": [0, 1, 4, 3], "rotation": 180, "texture": "#10"}, - "south": {"uv": [0, 0, 2, 4], "rotation": 90, "texture": "#10"}, - "west": {"uv": [0, 1, 4, 3], "rotation": 180, "texture": "#10"}, - "up": {"uv": [0, 0, 4, 4], "texture": "#10"}, - "down": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#10"} - } - }, - { - "name": "Left", - "from": [3, 6, 9], - "to": [5, 10, 13], - "rotation": {"angle": -45, "axis": "z", "origin": [8, 8, 8]}, - "faces": { - "north": {"uv": [0, 0, 2, 4], "texture": "#10"}, - "east": {"uv": [0, 0, 4, 4], "texture": "#10"}, - "south": {"uv": [0, 0, 2, 4], "texture": "#10"}, - "west": {"uv": [0, 0, 4, 4], "texture": "#10"}, - "up": {"uv": [0, 1, 4, 3], "rotation": 270, "texture": "#10"}, - "down": {"uv": [0, 1, 4, 3], "rotation": 270, "texture": "#10"} - } - }, - { - "name": "Right", - "from": [11, 6, 9], - "to": [13, 10, 13], - "rotation": {"angle": -45, "axis": "z", "origin": [8, 8, 8]}, - "faces": { - "north": {"uv": [0, 0, 2, 4], "texture": "#10"}, - "east": {"uv": [0, 0, 4, 4], "texture": "#10"}, - "south": {"uv": [0, 0, 2, 4], "texture": "#10"}, - "west": {"uv": [0, 0, 4, 4], "texture": "#10"}, - "up": {"uv": [0, 1, 4, 3], "rotation": 90, "texture": "#10"}, - "down": {"uv": [0, 1, 4, 3], "rotation": 90, "texture": "#10"} - } - }, - { - "name": "Bit1", - "from": [5.5, 5.5, 12], - "to": [10.5, 10.5, 14], - "rotation": {"angle": 45, "axis": "z", "origin": [8, 8, 8]}, - "faces": { - "north": {"uv": [0, 0, 5, 5], "texture": "#2"}, - "east": {"uv": [0, 0, 5, 2], "rotation": 90, "texture": "#2"}, - "south": {"uv": [1, 2, 6, 7], "texture": "#2"}, - "west": {"uv": [0, 0, 5, 2], "rotation": 270, "texture": "#2"}, - "up": {"uv": [0, 0, 5, 2], "texture": "#2"}, - "down": {"uv": [0, 0, 5, 2], "texture": "#2"} - } - }, - { - "name": "Bit2", - "from": [6, 6, 14], - "to": [10, 10, 16], - "rotation": {"angle": 45, "axis": "z", "origin": [8, 8, 7]}, - "faces": { - "north": {"uv": [0, 0, 4, 4], "texture": "#2"}, - "east": {"uv": [0, 0, 4, 2], "rotation": 90, "texture": "#2"}, - "south": {"uv": [0, 0, 4, 4], "texture": "#2"}, - "west": {"uv": [0, 0, 4, 2], "rotation": 270, "texture": "#2"}, - "up": {"uv": [0, 0, 4, 2], "texture": "#2"}, - "down": {"uv": [0, 0, 4, 2], "rotation": 180, "texture": "#2"} - } - }, - { - "name": "Bit3", - "from": [6.5, 6.5, 16], - "to": [9.5, 9.5, 18], - "rotation": {"angle": -45, "axis": "z", "origin": [8, 8, 7]}, - "faces": { - "north": {"uv": [0, 0, 3, 3], "texture": "#2"}, - "east": {"uv": [0, 0, 2, 3], "texture": "#2"}, - "south": {"uv": [0, 0, 3, 3], "texture": "#2"}, - "west": {"uv": [0, 0, 3, 2], "rotation": 270, "texture": "#2"}, - "up": {"uv": [0, 0, 3, 2], "texture": "#2"}, - "down": {"uv": [0, 0, 3, 2], "texture": "#2"} - } - }, - { - "name": "Bit4", - "from": [7, 7, 18], - "to": [9, 9, 20], - "rotation": {"angle": 45, "axis": "z", "origin": [8, 8, 7]}, - "faces": { - "north": {"uv": [0, 0, 2, 2], "texture": "#2"}, - "east": {"uv": [0, 0, 2, 2], "texture": "#2"}, - "south": {"uv": [5, 5, 7, 7], "texture": "#2"}, - "west": {"uv": [0, 0, 2, 2], "texture": "#2"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#2"}, - "down": {"uv": [0, 0, 2, 2], "texture": "#2"} - } - }, - { - "name": "Body", - "from": [2, 2, 1], - "to": [14, 14, 9], - "faces": { - "north": {"uv": [2, 2, 14, 14], "texture": "#gearbox"}, - "south": {"uv": [2, 2, 14, 14], "texture": "#gearbox"} - } - }, - { - "name": "Bottom", - "from": [0, 0, 0], - "to": [16, 2, 10], - "faces": { - "north": {"uv": [0, 14, 16, 16], "texture": "#gearbox_top"}, - "east": {"uv": [14, 6, 16, 16], "rotation": 90, "texture": "#10"}, - "south": {"uv": [0, 14, 16, 16], "texture": "#gearbox_top"}, - "west": {"uv": [14, 6, 16, 16], "rotation": 90, "texture": "#10"}, - "up": {"uv": [0, 4, 16, 16], "texture": "#andesite_casing_short"}, - "down": {"uv": [0, 6, 16, 16], "texture": "#10"} - } - }, - { - "name": "Top", - "from": [0, 14, 0], - "to": [16, 16, 10], - "faces": { - "north": {"uv": [0, 0, 16, 2], "texture": "#gearbox_top"}, - "east": {"uv": [0, 6, 2, 16], "rotation": 90, "texture": "#10"}, - "south": {"uv": [0, 0, 16, 2], "texture": "#gearbox_top"}, - "west": {"uv": [0, 6, 2, 16], "rotation": 90, "texture": "#10"}, - "up": {"uv": [0, 6, 16, 16], "texture": "#10"}, - "down": {"uv": [0, 4, 16, 16], "texture": "#andesite_casing_short"} - } - }, - { - "name": "Side", - "from": [0, 2, 0], - "to": [2, 14, 10], - "faces": { - "north": {"uv": [14, 2, 16, 14], "texture": "#gearbox_top"}, - "east": {"uv": [2, 4, 14, 16], "rotation": 90, "texture": "#andesite_casing_short"}, - "south": {"uv": [0, 2, 2, 14], "texture": "#gearbox_top"}, - "west": {"uv": [2, 6, 14, 16], "rotation": 90, "texture": "#10"} - } - }, - { - "name": "Side", - "from": [14, 2, 0], - "to": [16, 14, 10], - "faces": { - "north": {"uv": [0, 2, 2, 14], "texture": "#gearbox_top"}, - "east": {"uv": [2, 6, 14, 16], "rotation": 90, "texture": "#10"}, - "south": {"uv": [14, 2, 16, 14], "texture": "#gearbox_top"}, - "west": {"uv": [2, 4, 14, 16], "rotation": 270, "texture": "#andesite_casing_short"} - } - } - ], - "display": { - "fixed": { - "rotation": [0, 180, 0], - "translation": [0, 0, -1.75], - "scale": [0.5, 0.5, 0.5] - } - }, - "groups": [ - { - "name": "head", - "origin": [8, 8, 8], - "color": 0, - "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] - }, - { - "name": "casing", - "origin": [8, 8, 8], - "color": 0, - "children": [10, 11, 12, 13, 14] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/textures/block/mechanical_drill_animation.png b/src/main/resources/assets/create/textures/block/mechanical_drill_animation.png deleted file mode 100644 index 77bc8271a2fdd2d1bb8fda456c568ae24daef310..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4402 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 diff --git a/src/main/resources/assets/create/textures/block/mechanical_drill_animation_2.png b/src/main/resources/assets/create/textures/block/mechanical_drill_animation_2.png deleted file mode 100644 index 76dc64aaec4ee0d9583a8aa31d32e5c3aec7a299..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4409 zcmV-95ytL`P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+O3#vjw87ZhX2_Wph!<@=hP z^7H!#KYtZoE3ftQrnaw7>(~3=*UQfd!Le_l0$(@6yVDR3s&>^!sD{ z`nmUvd;PP!)r2<4XH%agp6}amq0y!Keoc5PKb^nzeNLW(Wp-}qq@9fC&NG)>)6FfP zC$D_7=fmsHn;Kj3qP&)}OMTxPRm&{9rkZPuXTC-2tf!7z>MmYuZBH#fwd8l*`L4I~ zVC9p!v}A6U`O1HNK7Vz=-+A7<6FthA-RCb{P*(|fP)1BHesdWE$@gn+{cZ5~^XKvW zHrUDp``hNh23NArEv)BX*s3o8D%W*hKlsXeVru0@Nn`C!F}X5=B)Rr1IcX`HbE{=A zphe}Swqi^m_g)S~mR74Un*okko9}3TuPwcN-iIp8r&p=UY-U{ytF;b(v<)z{dhM%I>(%IE!JG^S$*;C z#T9E=v1-k_iKz{nwl?tDZTBr(_tlIP)ye4wN2m-d$XM`1Ezb+O4zw=Ln@ii(TDF`~@56;|=rIk}MUUCYR=|<1=#|mv zLapp!>$#Tt4ft51X_DM%a5>$;l~B<-CTn>u$E9SqaT_~e>BZE`_PhLSt8-gE_SSEX zKc7<70C8>8&Y0jxZSOLD)V7WgbtWY*&n8_c^ZP&;gKzh4H<&qd~jZz@B-jW;SN^Yrg4c8W3&0P~4Fn#y6C-WQh0*&1jOG;nARt$?%#rC-7}q*QccT51Sjz6ZP=wR)xw za9Qb}Ds+I_$Y1Cv#d`gk|3jb0u{$$?iT`oM;CM2bWJGKmcr}691Lr2Kw4PhfMDu9GZ z*jloXa0Cvkmvgu~Sry8m_w%P;Gf2A;&&7>!poM523nlJ234Ps^CS+lU z%FfVt(^zkHTv;?lXKqG4mtRDu*D=>qZz&=d8B>LsFi5#C+T4FMB-z{ z4-v3?AP+>t=AADEGlvWbDuRye_iOz$V?`>zs2D;pUvvy^32~WYdZ4m0(?jD$cOw$f z+x(>sXa`9GcWM>;YJ<_iXIWD2-<0}(3^#K}eCY6nAOoUmAYs%-X% z7c*^K0wO=R2^@o{0fs^aBm;~As4PeGq~UV~54Cwlx4Ll&I-)JV`hakkNKNHDBnuGN z7s2V<^S#TL>({b=Y`-#E%dfj)drA;YvU!F>MO@3UtlA{{3PcEV!vMB{3&^RG^jHtk^Zin`4+_ljB9P`5yJlG$6 zep!uRtWc-QVhgb&*yy;V8U(#4{*Oq|d!zaA+)y}T<<*z$4{W!E4Byc?3Q#L?FTy%V z1`imTkkl}fET|R%hXh4c7%2mWJ{JL7H?{uI^fb&)E&1R=2b0}Ns*#Zd4hG$2Au;46 zWQ~l4c%dKMcY1jZK%C2sqbSGjn_*7w5h@`*da=$8rV>L-J1gKkM@RhYe94Gn1X%Hd zFvLcv^QT0r9)sB~e2_+rfG#?O(B_Cp9LB=#`wPro;XavY9|D@e&WWg*w zkPO=(b3@^^5C7KBpb-g-uBqVXF46tbzelWzSj@-vbdtUdBKd*00QCxflr!TF^9tk< zc7RA8h%svK08BS539iTJ_X&maXD=9vG#(WIDsiYrmht2{Z)nmi!k(oaQrHX^zg&4a zUi5V3HTxN^XAdHOJE29Pe3EIv8SJR$d07ArVxZ$SL%0D>3KJkQ8phUzB)`#fCr&RO2l+J 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 diff --git a/src/main/resources/assets/create/textures/block/mechanical_drill_head.png b/src/main/resources/assets/create/textures/block/mechanical_drill_head.png deleted file mode 100644 index 8442af9c80bd8f067025769fa350db5ce0da1f19..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1470 zcmV;v1ws0WP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+O1bvk}D|;{O1&N1SBDr<4`OS?*?=HNtP_fI$f;GrbmI1SM!?=2peT;hyDw6~}2e$A0}^ZR^gf0KE-z~}|N ztjXZ^s_gmG-d{Z&Jy{@qctNgh_4{ZJjPV4;uVB)Y`(F zZeVzTC7G{zw1AId9A-;s(Pmr7*=mbD&=6;1DcCG|dCO9L!@?$ga3_fYS7YmMvaC+KY z0T=Vofd-8-zF`JIsBhhL5`4DnF?YfW6x2y`!~wHCmWxB_7F#j{KwzinSA0>ZLp7dJ z;;^>@3<)H#o2vD?qXn@z5qBj<7f02{dh4dCenLppS}| z0Bw?Fh~=Cjeu9gLp{$}#RlNp{nlu|P-g))j2S0Ky2MI1{@F9d4Qpi!FiyD0lF~$^g z;v`5(O+JMbQ%X5w&+JUrjJGo^az6Nw!yS6~BOLKaM=l7T;))huLWw1nT)9ehRjaR| z#+qtw)DTLhxu(sx&|*t1cf?wk?z(p0LytZ6e5tlo{nmb=8g12hDmCoFr5a{K7>=e3 z8g)j8W>AbBLGdsYKtS`*%tmsKhjK$Rn;2Q443IjssbsSu4+&i()=rmpH|0Lo&4BB7 zy74ExNL2i=~iR!1c)Q?ZqWgHtQWKCHKxIcAW}Yw)t~p2mO=WP{X{=QNIc zuD9&R$YjrU8b&LnuT{^|l;>8e(24Q2B9K+#t_Nl0);g#!t2(GAHhTb0G-H0Rj0 zVy;4VC*?1cq}Eqz8RQ{*S<~c#^fSdTXk5&H&N=;BdLPY=o078O=-T(jq0d!JMQvg8b*k%9#00Cl4 zM??UK1szBL000SaNLh0L01m?d01m?e$8V@)00007bV*G`2j>GA0Urq0+i0Nx003%9 zL_t&t*JEH{U{o@8U;qKG^dbcaW1$j6gmKjh2qSUns)b-iN^8_^Fe9m`3&KcIFX{rT zb#XE-NdPjqMbwK_z>HljPA(t@*RE9yTR@D)U7@R12?7~yjiI5dK>FKUTpGcQ-C)1~ Y07w`icCghhV*mgE07*qoM6N<$g0GUWaR2}S diff --git a/src/main/resources/assets/create/textures/block/mechanical_drill_head_2.png b/src/main/resources/assets/create/textures/block/mechanical_drill_head_2.png deleted file mode 100644 index 0707385475f205baa0da4613b555da1511c1e7b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1498 zcmV<01tt24P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+O3yqlH({4M*nk)IRd$`9S5;Q%nj!F^RYV%BKTME&Ss>Rj{Csf8dz>x*MLU?rK$JX*k?!+V%5p+%c*A+^;Od!Q9c#3Z(pQZP&bhh8`AI;ipV z62;jL%8&qo^(2lw*}xo#R5$`qhUP5F2MCaJT%jbZhzFYpKf>8q6KKk^<28;@0Usw` z0@x(UfTil-KS3jWC_8cLobxWY=#tCEi&yWw_rZ^t%Rzz$7kmgIh7@v?sL@3qLyR%S zoHz+W(j}iliYcX>ab{MNUB>DRiJT8U1r(vb_?r)Y7-mr!C!C0DLewYutS zsIjJ+8#TC+Y1&-#EwtED%N@SfrE7QH_t0ZcJzvx|)wlKs)M!)VNovT2iyB5l7#qzk zXyh3;n1L88fp{1M;Ltpn*+{B9$PH#TF`~jTlyrklC7TU-Ak;?eI$i7@7+CY?{1q`+-^=nXpV^D+-5Atswd^-(u#NVQgM6AN!sUKVJ_RxRkXHIgdvV z`=fe{H^a#y$Q1u9k?^7{(AY@n{NWIR?6+PjdxQ|jmZ89Ho|BwNjSeM(6MUHYCiS+r8nOM z)o{FSM4Q@9^VdOY(0m)Cj`6dt!yO3o{sim}` zh<`B!(n!n8l%5~R`qmjGvYl_uuRFoy?%f84?-{Auby{X^TZi#lHyI5G+U3HGT(BK5 zg;%GFr>Wydz04hbe$wl7l4G5Upbf6>2ph&+(WZ1o7{x09y(|wb8cKC1&%Cgh&%8cz z%zjxzk=riCO!y@Jq$pC?3Wod{;yurPcsOe6T&?5FsGh!5ma&IsOA)!2@Nq`ur%X^~6*CpMMGhZ;vBnimwiFX~V8x}u&jzw zb(>q|dQ{G(ffKjH|3p3t?zt;Y^;sW0?arvu7GA0Uri1V@0L_003r5L_t&t*JEH{U{qP9zyJb_L0$_W zjC3t1qbw03rC8n}31)1XmR<>F>|R<95m~)zDVV{z%4HSUAWq2;m(?3U4Ds|J2t%-< zT?k~Nrl5F7;#80^fo181Aja-Rfr5fy1{g2^04shUwh<@YssI2007*qoM6N<$f*S|6 A*#H0l diff --git a/src/main/resources/assets/create/textures/block/mechanical_drill_head_top.png b/src/main/resources/assets/create/textures/block/mechanical_drill_head_top.png deleted file mode 100644 index 8e114e762dd3031c10ded181a7725ec3a8c69035..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1578 zcmV+_2G#kAP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+Rav5cI7Ax{AU%j1SBCI%fUR(nH|jXrwkZ7_oh4P z?)exy2@V#hP?aQ`_Rrtl{Dq4xS>rTBpS-uYTylvs9-_Ukw#GR}){Vc{Me8q_PhXra z1f$H!;MQAN^OwEfBR2Zv1?kHI*>3phIOH|YmOmiUWP^QP@&4_-#@^dJU3MN}@bgg9 zg}JtY;eja0SmtpD{3@QqxD)PZvn}LowZ$H|3ngL_+sRQil&Mprim^}uM#qf7Mw;9@>`pfike{)HI`p}u(25#a0Imw6B?U{FVxBMzADF}FCBZf(gBfWS^MPJL0R zCu=-Z;^12Wh6EH?Pom_>2IfHIgd+&bK+fX$00X4T6(HG(cyJS;BlyOeK*N@m=R8sc z{HS;d;3i21SmLXHw$)aYY~ zF{YRkCqYVT@+qX4Qpy=Vvol#UR%ck`eDEQMJM{2JIO36xTp*v~iWXl&i6xa>xk`0a ztFNKPnrd#;ASKgW)8<=fv89$fwAQ7&uHE<0V^2MA))uR8_b;$Ui!~lhopxcfhS?C# zjm8#q))_rH17qw6jE9o}2%1mMY$WISWbWk5CPr2$1EikZRI=HS2ZgQ?Yp2cK&D^(n zGl=z9yzzIKGbeTb0ds7cyzur3YxS&zWiU3g@QkSyWM2<9bA*zjiPCJJ|F~n$q8|SG zXnt#6H$L`6D`2*Ep8w2n8n4qNbfcU5q+@SqlADo3Jy@fz<3!R4#o5Qgnspf3*u`H$mKx2B3tD;SG)z#D;YU3IQ?oNRNbeG=&VLjs+mLu_wh%6T>`gM&NvYpcT&Hp^zQ3vB!d)=k%Fb*+WDNxZ!$_GO|aM%@~d2IqQ6q{L}Zpu(_c zyYh~3@{KaEY4skn!u6f5e?hNwAO8V@x>1%OWSn} z#d*IUfXx?(KLIQga0XzJ^*WwqMqUYLm@^0sh0#!td% zqQuA1W42RS!pYWrf%w~i%>cC2b+VpsN%EA9uxrZ;GAZ5)EAtT|1z%?Km~V}hyi%I7 zU5;Nz>b~CblBnj&nX=tqCqw!_obKGvWk`F^7Sc@G=bY3>LBH$#*ANZls#s4iszrtoU%nF&_&%dOMkJHD(=ix7nL~)l;&3o&5*4?-XZ)qxt-KG;LPu;Ei~ZJa-8pl8E0uO0KHVZM&_ zt!=HsWk&z};kxgS=1({HzifohLFmu?3#S&xg^$9!MF0Q*Bv4FLMF0Q*?D6y1+}^~< z$y{S-QB_%2TwzL0P;h;MsIRh&n4JIs0Hj08KmY&$0d!JMQvg8b*k%9#00Cl4M??UK z1szBL000SaNLh0L01m?d01m?e$8V@)00007bV*G`2j>GA0Ure3Z6t~S0044HL_t&t z*JBW1fC2>=!@#AyJha?{fnma`NrIL$y%-o4Om{C2_o`%IXqY}z(Acwxfx%&_NvCFE zAp=8zsi~6)h*2Oe?x+$R3}#H4;T#DxNPUX2;7p({hUrU6%S%9vB{L@rYOVq@T7Wi` cyD(q^0J}^cRRC)UKL7v#07*qoM6N<$g7|v$q5uE@ diff --git a/src/main/resources/assets/create/textures/block/mechanical_drill_side.png b/src/main/resources/assets/create/textures/block/mechanical_drill_side.png deleted file mode 100644 index 6497f57bfc8bf3bbd991f8d45597e78aa0d3d954..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 377 zcmV-<0fzpGP)5%@0003PNkl&yyG8Xh0sp``F-Xjr!ZP%lw+A7j#*CE$}ug-Ci^R7=J>iStWKE zzVgt1iO~mKoz-z^hOsHikO{oOS&`|Rgk#&R-oK{a*hK9K+ljb=~ zo0G*BplF~)@$mSxZgStK1FTH|cYv|Q6SWk_S!?k`gwg8|YYVf8Fr7};hLuF*9|QOW X{XE z)7O>#IWv>6iOS|u%X2`XH=ZtzAsXlRPV)CY>>zOTvhQUB?-;iT4i$0lYtF2;niZmd z1>Rm?_h99Nqtn#>9=`A(CrIp-W5?0%+1EBAdW(AGaXIs74_`ml%&KHha zygxcyq{EiMg~wk#FwA=CB>TJar@t<=YtcXNf6j9LcQ4h+C$}bK|5X;8Xt8ary+POG zx}~ZI?5C(Lid%Zv`^rCtV&zRXsi&Vi)<6AM7=7+ji3VejWclZ`)5l^qZau#3?UV0& ddL_LZ^j8;j*Qf2@c^c?%22WQ%mvv4FO#nnpht&W8