From 72ec08ddfabc66751849cc78a9d42ad6c8d272ea Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Thu, 4 Feb 2021 23:46:59 +0100 Subject: [PATCH] Asset attack - Fixed floor-mounted cogbrackets not having a particle texture - Redesigned clutch, gearshift, seq. gearshift and speed controller with up-to-date palettes --- .../com/simibubi/create/AllBlockPartials.java | 2 + .../java/com/simibubi/create/AllShapes.java | 6 +- .../relays/advanced/SpeedControllerBlock.java | 46 +++- .../advanced/SpeedControllerRenderer.java | 30 ++- .../advanced/SpeedControllerTileEntity.java | 28 ++- .../models/block/bracket/cog/ground.json | 3 +- .../create/models/block/clutch/item.json | 12 +- .../create/models/block/gearshift/block.json | 16 +- .../create/models/block/gearshift/item.json | 12 +- .../rotation_speed_controller/block.json | 171 ++++++-------- .../rotation_speed_controller/bracket.json | 210 ++++++++++++++++++ .../block/rotation_speed_controller/item.json | 178 +++++++-------- .../block/sequenced_gearshift/idle.json | 103 +++------ .../block/sequenced_gearshift/item.json | 160 ++++++------- .../create/textures/block/clutch_off.png | Bin 547 -> 449 bytes .../create/textures/block/clutch_on.png | Bin 435 -> 449 bytes .../assets/create/textures/block/gearbox.png | Bin 439 -> 424 bytes .../create/textures/block/gearshift_off.png | Bin 561 -> 409 bytes .../create/textures/block/gearshift_on.png | Bin 588 -> 413 bytes .../block/rotation_speed_controller.png | Bin 0 -> 378 bytes .../rotation_speed_controller_bracket.png | Bin 0 -> 388 bytes .../block/rotation_speed_controller_top.png | Bin 0 -> 367 bytes .../textures/block/sequenced_gearshift.png | Bin 554 -> 352 bytes .../textures/block/sequenced_gearshift_1.png | Bin 566 -> 369 bytes .../textures/block/sequenced_gearshift_2.png | Bin 574 -> 367 bytes .../textures/block/sequenced_gearshift_3.png | Bin 554 -> 360 bytes .../textures/block/sequenced_gearshift_4.png | Bin 554 -> 351 bytes .../textures/block/sequenced_gearshift_5.png | Bin 548 -> 347 bytes 28 files changed, 573 insertions(+), 404 deletions(-) create mode 100644 src/main/resources/assets/create/models/block/rotation_speed_controller/bracket.json create mode 100644 src/main/resources/assets/create/textures/block/rotation_speed_controller.png create mode 100644 src/main/resources/assets/create/textures/block/rotation_speed_controller_bracket.png create mode 100644 src/main/resources/assets/create/textures/block/rotation_speed_controller_top.png diff --git a/src/main/java/com/simibubi/create/AllBlockPartials.java b/src/main/java/com/simibubi/create/AllBlockPartials.java index 54122026a..f0b558da7 100644 --- a/src/main/java/com/simibubi/create/AllBlockPartials.java +++ b/src/main/java/com/simibubi/create/AllBlockPartials.java @@ -109,6 +109,8 @@ public class AllBlockPartials { SPOUT_TOP = get("spout/top"), SPOUT_MIDDLE = get("spout/middle"), SPOUT_BOTTOM = get("spout/bottom"), + SPEED_CONTROLLER_BRACKET = get("rotation_speed_controller/bracket"), + COUPLING_ATTACHMENT = getEntity("minecart_coupling/attachment"), COUPLING_RING = getEntity("minecart_coupling/ring"), COUPLING_CONNECTOR = getEntity("minecart_coupling/connector") diff --git a/src/main/java/com/simibubi/create/AllShapes.java b/src/main/java/com/simibubi/create/AllShapes.java index ee77c574d..ad49e3edb 100644 --- a/src/main/java/com/simibubi/create/AllShapes.java +++ b/src/main/java/com/simibubi/create/AllShapes.java @@ -41,10 +41,6 @@ public class AllShapes { SAIL_FRAME_COLLISION = shape(0, 5, 0, 16, 9, 16).erase(2, 0, 2, 14, 16, 14) .forDirectional(), SAIL_FRAME = shape(0, 5, 0, 16, 9, 16).forDirectional(), SAIL = shape(0, 5, 0, 16, 10, 16).forDirectional(), - SPEED_CONTROLLER = shape(0, 0, 0, 16, 2, 16).add(1, 1, 1, 15, 15, 15) - .erase(0, 8, 5, 16, 16, 11) - .add(2, 9, 2, 14, 14, 14) - .forHorizontalAxis(), HARVESTER_BASE = shape(0, 2, 0, 16, 14, 3).forDirectional(SOUTH), NOZZLE = shape(2, 0, 2, 14, 14, 14).add(1, 13, 1, 15, 15, 15) .erase(3, 13, 3, 13, 15, 13) @@ -144,6 +140,8 @@ public class AllShapes { BASIN_COLLISION_SHAPE = shape(0, 2, 0, 16, 13, 16).erase(2, 5, 2, 14, 16, 14) .add(2, 0, 2, 14, 2, 14) .build(), + SPEED_CONTROLLER = shape(0, 0, 0, 16, 4, 16).add(1, 1, 1, 15, 13, 15) + .add(0, 8, 0, 16, 14, 16).build(), HEATER_BLOCK_SHAPE = shape(2, 0, 2, 14, 14, 14).add(0, 0, 0, 16, 4, 16) .build(), HEATER_BLOCK_SPECIAL_COLLISION_SHAPE = shape(0, 0, 0, 16, 4, 16).build(), diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/SpeedControllerBlock.java b/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/SpeedControllerBlock.java index 7604042ff..5d9071e98 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/SpeedControllerBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/SpeedControllerBlock.java @@ -1,16 +1,21 @@ package com.simibubi.create.content.contraptions.relays.advanced; +import java.util.function.Predicate; + import com.simibubi.create.AllBlocks; import com.simibubi.create.AllShapes; import com.simibubi.create.AllTileEntities; import com.simibubi.create.content.contraptions.base.HorizontalAxisKineticBlock; import com.simibubi.create.content.contraptions.relays.elementary.CogWheelBlock; import com.simibubi.create.content.contraptions.relays.elementary.CogwheelBlockItem; +import com.simibubi.create.foundation.block.ITE; import com.simibubi.create.foundation.utility.VecHelper; import com.simibubi.create.foundation.utility.placement.IPlacementHelper; import com.simibubi.create.foundation.utility.placement.PlacementHelpers; import com.simibubi.create.foundation.utility.placement.PlacementOffset; + import mcp.MethodsReturnNonnullByDefault; +import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.BlockItemUseContext; @@ -27,9 +32,7 @@ import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import java.util.function.Predicate; - -public class SpeedControllerBlock extends HorizontalAxisKineticBlock { +public class SpeedControllerBlock extends HorizontalAxisKineticBlock implements ITE { private static final int placementHelperId = PlacementHelpers.register(new PlacementHelper()); @@ -41,17 +44,28 @@ public class SpeedControllerBlock extends HorizontalAxisKineticBlock { public TileEntity createTileEntity(BlockState state, IBlockReader world) { return AllTileEntities.ROTATION_SPEED_CONTROLLER.create(); } - + @Override public BlockState getStateForPlacement(BlockItemUseContext context) { - BlockState above = context.getWorld().getBlockState(context.getPos().up()); - if (CogWheelBlock.isLargeCog(above) && above.get(CogWheelBlock.AXIS).isHorizontal()) + BlockState above = context.getWorld() + .getBlockState(context.getPos() + .up()); + if (CogWheelBlock.isLargeCog(above) && above.get(CogWheelBlock.AXIS) + .isHorizontal()) return getDefaultState().with(HORIZONTAL_AXIS, above.get(CogWheelBlock.AXIS) == Axis.X ? Axis.Z : Axis.X); return super.getStateForPlacement(context); } @Override - public ActionResultType onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult ray) { + public void neighborChanged(BlockState state, World world, BlockPos pos, Block p_220069_4_, BlockPos neighbourPos, + boolean p_220069_6_) { + if (neighbourPos.equals(pos.up())) + withTileEntityDo(world, pos, SpeedControllerTileEntity::updateBracket); + } + + @Override + public ActionResultType onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, + BlockRayTraceResult ray) { IPlacementHelper helper = PlacementHelpers.get(placementHelperId); ItemStack heldItem = player.getHeldItem(hand); @@ -72,7 +86,7 @@ public class SpeedControllerBlock extends HorizontalAxisKineticBlock { @Override public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) { - return AllShapes.SPEED_CONTROLLER.get(state.get(HORIZONTAL_AXIS)); + return AllShapes.SPEED_CONTROLLER; } @MethodsReturnNonnullByDefault @@ -90,12 +104,15 @@ public class SpeedControllerBlock extends HorizontalAxisKineticBlock { @Override public PlacementOffset getOffset(World world, BlockState state, BlockPos pos, BlockRayTraceResult ray) { BlockPos newPos = pos.up(); - if (!world.getBlockState(newPos).getMaterial().isReplaceable()) + if (!world.getBlockState(newPos) + .getMaterial() + .isReplaceable()) return PlacementOffset.fail(); Axis newAxis = state.get(HORIZONTAL_AXIS) == Axis.X ? Axis.Z : Axis.X; - if (CogwheelBlockItem.DiagonalCogHelper.hasLargeCogwheelNeighbor(world, newPos, newAxis) || CogwheelBlockItem.DiagonalCogHelper.hasSmallCogwheelNeighbor(world, newPos, newAxis)) + if (CogwheelBlockItem.DiagonalCogHelper.hasLargeCogwheelNeighbor(world, newPos, newAxis) + || CogwheelBlockItem.DiagonalCogHelper.hasSmallCogwheelNeighbor(world, newPos, newAxis)) return PlacementOffset.fail(); return PlacementOffset.success(newPos, s -> s.with(CogWheelBlock.AXIS, newAxis)); @@ -103,7 +120,14 @@ public class SpeedControllerBlock extends HorizontalAxisKineticBlock { @Override public void renderAt(BlockPos pos, BlockState state, BlockRayTraceResult ray, PlacementOffset offset) { - IPlacementHelper.renderArrow(VecHelper.getCenterOf(pos), VecHelper.getCenterOf(offset.getPos()), Direction.getFacingFromAxis(Direction.AxisDirection.POSITIVE, state.get(HORIZONTAL_AXIS) == Axis.X ? Axis.Z : Axis.X)); + IPlacementHelper.renderArrow(VecHelper.getCenterOf(pos), VecHelper.getCenterOf(offset.getPos()), + Direction.getFacingFromAxis(Direction.AxisDirection.POSITIVE, + state.get(HORIZONTAL_AXIS) == Axis.X ? Axis.Z : Axis.X)); } } + + @Override + public Class getTileEntityClass() { + return SpeedControllerTileEntity.class; + } } diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/SpeedControllerRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/SpeedControllerRenderer.java index 0bd5d9096..bf43e7db4 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/SpeedControllerRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/SpeedControllerRenderer.java @@ -1,14 +1,22 @@ package com.simibubi.create.content.contraptions.relays.advanced; import com.mojang.blaze3d.matrix.MatrixStack; +import com.mojang.blaze3d.vertex.IVertexBuilder; +import com.simibubi.create.AllBlockPartials; import com.simibubi.create.CreateClient; import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; import com.simibubi.create.foundation.tileEntity.renderer.SmartTileEntityRenderer; import com.simibubi.create.foundation.utility.SuperByteBuffer; +import net.minecraft.block.BlockState; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; +import net.minecraft.util.Direction; +import net.minecraft.util.Direction.Axis; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; public class SpeedControllerRenderer extends SmartTileEntityRenderer { @@ -18,16 +26,30 @@ public class SpeedControllerRenderer extends SmartTileEntityRenderer type) { super(type); + hasBracket = false; + } + + @Override + public void lazyTick() { + super.lazyTick(); + updateBracket(); } @Override @@ -56,7 +67,7 @@ public class SpeedControllerTileEntity extends KineticTileEntity { } public static float getConveyedSpeed(KineticTileEntity cogWheel, KineticTileEntity speedControllerIn, - boolean targetingController) { + boolean targetingController) { if (!(speedControllerIn instanceof SpeedControllerTileEntity)) return 0; @@ -74,7 +85,7 @@ public class SpeedControllerTileEntity extends KineticTileEntity { } public static float getDesiredOutputSpeed(KineticTileEntity cogWheel, KineticTileEntity speedControllerIn, - boolean targetingController) { + boolean targetingController) { SpeedControllerTileEntity speedController = (SpeedControllerTileEntity) speedControllerIn; float targetSpeed = speedController.targetSpeed.getValue(); float speed = speedControllerIn.getTheoreticalSpeed(); @@ -103,16 +114,25 @@ public class SpeedControllerTileEntity extends KineticTileEntity { return targetSpeed; } + public void updateBracket() { + if (world == null || !world.isRemote) + return; + BlockState stateAbove = world.getBlockState(pos.up()); + hasBracket = AllBlocks.LARGE_COGWHEEL.has(stateAbove) && stateAbove.get(CogWheelBlock.AXIS) + .isHorizontal(); + } + private class ControllerValueBoxTransform extends ValueBoxTransform.Sided { @Override protected Vec3d getSouthLocation() { - return VecHelper.voxelSpace(8, 11.5f, 14); + return VecHelper.voxelSpace(8, 11f, 16); } @Override protected boolean isSideActive(BlockState state, Direction direction) { - if (direction.getAxis().isVertical()) + if (direction.getAxis() + .isVertical()) return false; return state.get(SpeedControllerBlock.HORIZONTAL_AXIS) != direction.getAxis(); } diff --git a/src/main/resources/assets/create/models/block/bracket/cog/ground.json b/src/main/resources/assets/create/models/block/bracket/cog/ground.json index d219fe22e..cb04e2b39 100644 --- a/src/main/resources/assets/create/models/block/bracket/cog/ground.json +++ b/src/main/resources/assets/create/models/block/bracket/cog/ground.json @@ -3,7 +3,8 @@ "parent": "block/block", "textures": { "4": "#plate", - "5": "#bracket" + "5": "#bracket", + "particle": "#plate" }, "elements": [ { diff --git a/src/main/resources/assets/create/models/block/clutch/item.json b/src/main/resources/assets/create/models/block/clutch/item.json index eda38aa09..102f2202d 100644 --- a/src/main/resources/assets/create/models/block/clutch/item.json +++ b/src/main/resources/assets/create/models/block/clutch/item.json @@ -14,11 +14,11 @@ "from": [0, 0, 0], "to": [16, 2, 16], "faces": { - "north": {"uv": [0, 14, 16, 16], "texture": "#0"}, + "north": {"uv": [0, 14, 16, 16], "texture": "#1"}, "east": {"uv": [0, 14, 16, 16], "texture": "#0"}, - "south": {"uv": [0, 14, 16, 16], "texture": "#0"}, + "south": {"uv": [0, 14, 16, 16], "texture": "#1"}, "west": {"uv": [0, 14, 16, 16], "texture": "#0"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#1"}, "down": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#0"} } }, @@ -36,12 +36,12 @@ "from": [0, 14, 0], "to": [16, 16, 16], "faces": { - "north": {"uv": [0, 0, 16, 2], "texture": "#0"}, + "north": {"uv": [0, 0, 16, 2], "texture": "#1"}, "east": {"uv": [0, 0, 16, 2], "texture": "#0"}, - "south": {"uv": [0, 0, 16, 2], "texture": "#0"}, + "south": {"uv": [0, 0, 16, 2], "texture": "#1"}, "west": {"uv": [0, 0, 16, 2], "texture": "#0"}, "up": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0"} + "down": {"uv": [0, 0, 16, 16], "texture": "#1"} } }, { diff --git a/src/main/resources/assets/create/models/block/gearshift/block.json b/src/main/resources/assets/create/models/block/gearshift/block.json index 1189b38c5..01d833677 100644 --- a/src/main/resources/assets/create/models/block/gearshift/block.json +++ b/src/main/resources/assets/create/models/block/gearshift/block.json @@ -14,10 +14,10 @@ "faces": { "north": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#0"}, "east": {"uv": [0, 14, 16, 16], "rotation": 270, "texture": "#0"}, - "south": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#1"}, "west": {"uv": [0, 14, 16, 16], "rotation": 90, "texture": "#0"}, - "up": {"uv": [0, 14, 16, 16], "rotation": 180, "texture": "#0"}, - "down": {"uv": [0, 14, 16, 16], "texture": "#0"} + "up": {"uv": [0, 14, 16, 16], "rotation": 180, "texture": "#1"}, + "down": {"uv": [0, 14, 16, 16], "texture": "#1"} } }, { @@ -34,12 +34,12 @@ "from": [0, 0, 14], "to": [16, 16, 16], "faces": { - "north": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#0"}, + "north": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#1"}, "east": {"uv": [0, 0, 16, 2], "rotation": 270, "texture": "#0"}, "south": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#0"}, "west": {"uv": [0, 0, 16, 2], "rotation": 90, "texture": "#0"}, - "up": {"uv": [0, 0, 16, 2], "rotation": 180, "texture": "#0"}, - "down": {"uv": [0, 0, 16, 2], "texture": "#0"} + "up": {"uv": [0, 0, 16, 2], "rotation": 180, "texture": "#1"}, + "down": {"uv": [0, 0, 16, 2], "texture": "#1"} } }, { @@ -47,7 +47,7 @@ "from": [0, 0, 2], "to": [2, 16, 14], "faces": { - "east": {"uv": [0, 2, 16, 14], "rotation": 270, "texture": "#0"}, + "east": {"uv": [0, 2, 16, 14], "rotation": 270, "texture": "#1"}, "west": {"uv": [0, 2, 16, 14], "rotation": 90, "texture": "#0"}, "up": {"uv": [14, 2, 16, 14], "rotation": 180, "texture": "#0"}, "down": {"uv": [0, 2, 2, 14], "texture": "#0"} @@ -59,7 +59,7 @@ "to": [16, 16, 14], "faces": { "east": {"uv": [0, 2, 16, 14], "rotation": 270, "texture": "#0"}, - "west": {"uv": [0, 2, 16, 14], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 2, 16, 14], "rotation": 90, "texture": "#1"}, "up": {"uv": [0, 2, 2, 14], "rotation": 180, "texture": "#0"}, "down": {"uv": [14, 2, 16, 14], "texture": "#0"} } diff --git a/src/main/resources/assets/create/models/block/gearshift/item.json b/src/main/resources/assets/create/models/block/gearshift/item.json index 52e8f3ac2..13d81d0df 100644 --- a/src/main/resources/assets/create/models/block/gearshift/item.json +++ b/src/main/resources/assets/create/models/block/gearshift/item.json @@ -14,11 +14,11 @@ "from": [0, 0, 0], "to": [16, 2, 16], "faces": { - "north": {"uv": [0, 14, 16, 16], "texture": "#0"}, + "north": {"uv": [0, 14, 16, 16], "texture": "#1"}, "east": {"uv": [0, 14, 16, 16], "texture": "#0"}, - "south": {"uv": [0, 14, 16, 16], "texture": "#0"}, + "south": {"uv": [0, 14, 16, 16], "texture": "#1"}, "west": {"uv": [0, 14, 16, 16], "texture": "#0"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#1"}, "down": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#0"} } }, @@ -36,12 +36,12 @@ "from": [0, 14, 0], "to": [16, 16, 16], "faces": { - "north": {"uv": [0, 0, 16, 2], "texture": "#0"}, + "north": {"uv": [0, 0, 16, 2], "texture": "#1"}, "east": {"uv": [0, 0, 16, 2], "texture": "#0"}, - "south": {"uv": [0, 0, 16, 2], "texture": "#0"}, + "south": {"uv": [0, 0, 16, 2], "texture": "#1"}, "west": {"uv": [0, 0, 16, 2], "texture": "#0"}, "up": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0"} + "down": {"uv": [0, 0, 16, 16], "texture": "#1"} } }, { diff --git a/src/main/resources/assets/create/models/block/rotation_speed_controller/block.json b/src/main/resources/assets/create/models/block/rotation_speed_controller/block.json index be9c98dc7..d4da4d489 100644 --- a/src/main/resources/assets/create/models/block/rotation_speed_controller/block.json +++ b/src/main/resources/assets/create/models/block/rotation_speed_controller/block.json @@ -2,117 +2,86 @@ "credit": "Made with Blockbench", "parent": "create:block/large_wheels", "textures": { + "0": "create:block/rotation_speed_controller", + "3": "create:block/brass_funnel_plating", "4": "create:block/brass_gearbox", - "5": "create:block/brass_casing_side", - "6": "create:block/brass_casing", - "8": "create:block/encased_chain_drive_middle", - "9": "create:block/brass_block", - "particle": "create:block/brass_casing" + "5": "create:block/rotation_speed_controller_top", + "6": "create:block/brass_block", + "particle": "create:block/brass_gearbox" }, "elements": [ - { - "from": [1, 2, 1], - "to": [6, 15, 5], - "faces": { - "north": {"uv": [10, 1, 15, 14], "texture": "#4"}, - "east": {"uv": [12, 1, 16, 14], "texture": "#5"}, - "south": {"uv": [4, 1, 9, 14], "texture": "#6"}, - "west": {"uv": [1, 1, 5, 14], "texture": "#6"}, - "up": {"uv": [1, 10, 5, 15], "rotation": 90, "texture": "#9"} - } - }, - { - "from": [10, 2, 1], - "to": [15, 15, 5], - "faces": { - "north": {"uv": [15, 1, 10, 14], "texture": "#4"}, - "east": {"uv": [5, 1, 1, 14], "texture": "#6"}, - "south": {"uv": [9, 1, 4, 14], "texture": "#6"}, - "west": {"uv": [16, 1, 12, 14], "texture": "#5"}, - "up": {"uv": [1, 1, 5, 6], "rotation": 90, "texture": "#9"} - } - }, - { - "from": [1, 2, 11], - "to": [6, 15, 15], - "faces": { - "north": {"uv": [4, 1, 9, 14], "texture": "#6"}, - "east": {"uv": [0, 1, 4, 14], "texture": "#5"}, - "south": {"uv": [1, 1, 6, 14], "texture": "#4"}, - "west": {"uv": [11, 1, 15, 14], "texture": "#6"}, - "up": {"uv": [11, 10, 15, 15], "rotation": 90, "texture": "#9"} - } - }, - { - "from": [10, 2, 11], - "to": [15, 15, 15], - "faces": { - "north": {"uv": [9, 1, 4, 14], "texture": "#6"}, - "east": {"uv": [15, 1, 11, 14], "texture": "#6"}, - "south": {"uv": [6, 1, 1, 14], "texture": "#4"}, - "west": {"uv": [4, 1, 0, 14], "texture": "#5"}, - "up": {"uv": [11, 1, 15, 6], "rotation": 90, "texture": "#9"} - } - }, - { - "from": [1, 2, 5], - "to": [6, 8, 11], - "faces": { - "north": {"uv": [10, 1, 15, 14], "texture": "#4"}, - "west": {"uv": [5, 8, 11, 14], "texture": "#6"}, - "up": {"uv": [5, 3, 11, 8], "rotation": 90, "texture": "#6"} - } - }, - { - "from": [10, 2, 5], - "to": [15, 8, 11], - "faces": { - "north": {"uv": [15, 1, 10, 14], "texture": "#4"}, - "east": {"uv": [11, 8, 5, 14], "texture": "#6"}, - "up": {"uv": [5, 8, 11, 3], "rotation": 90, "texture": "#6"} - } - }, - { - "from": [10, 9, 5], - "to": [14, 14, 11], - "faces": { - "north": {"uv": [15, 1, 10, 14], "texture": "#4"}, - "east": {"uv": [12, 9, 6, 14], "texture": "#5"}, - "west": {"uv": [12, 9, 6, 14], "texture": "#5"}, - "up": {"uv": [6, 6, 12, 2], "rotation": 90, "texture": "#5"}, - "down": {"uv": [6, 6, 12, 2], "rotation": 90, "texture": "#5"} - } - }, - { - "from": [2, 9, 5], - "to": [6, 14, 11], - "faces": { - "north": {"uv": [10, 1, 15, 14], "texture": "#4"}, - "east": {"uv": [6, 9, 12, 14], "texture": "#5"}, - "west": {"uv": [6, 9, 12, 14], "texture": "#5"}, - "up": {"uv": [6, 2, 12, 6], "rotation": 90, "texture": "#5"}, - "down": {"uv": [6, 2, 12, 6], "rotation": 90, "texture": "#5"} - } - }, { "from": [0, 0, 0], - "to": [16, 2, 16], + "to": [16, 4, 16], "faces": { - "north": {"uv": [0, 14, 16, 16], "texture": "#5"}, - "east": {"uv": [0, 14, 16, 16], "texture": "#5"}, - "south": {"uv": [0, 14, 16, 16], "texture": "#5"}, - "west": {"uv": [0, 14, 16, 16], "texture": "#5"}, - "up": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#4"}, - "down": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#6"} + "north": {"uv": [0, 12, 16, 16], "texture": "#0"}, + "east": {"uv": [0, 12, 16, 16], "texture": "#0"}, + "south": {"uv": [0, 12, 16, 16], "texture": "#0"}, + "west": {"uv": [0, 12, 16, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#4"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#6"} } }, { - "from": [6, 2, 1], - "to": [10, 11, 15], + "from": [0, 8, 0], + "to": [5, 14, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 18, 8]}, "faces": { - "north": {"uv": [6, 5, 10, 14], "texture": "#4"}, - "south": {"uv": [6, 5, 10, 14], "texture": "#4"}, - "up": {"uv": [1, 6, 15, 10], "rotation": 90, "texture": "#8"} + "north": {"uv": [6, 6, 11, 0], "texture": "#0"}, + "east": {"uv": [0, 10, 16, 16], "texture": "#4"}, + "south": {"uv": [0, 0, 5, 6], "texture": "#0"}, + "west": {"uv": [0, 0, 8, 3], "texture": "#3"}, + "up": {"uv": [0, 0, 5, 16], "texture": "#5"}, + "down": {"uv": [0, 0, 5, 16], "texture": "#6"} + } + }, + { + "from": [1, 4, 1], + "to": [15, 12, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 14, 8]}, + "faces": { + "north": {"uv": [1, 4, 15, 12], "texture": "#4"}, + "east": {"uv": [1, 4, 15, 12], "texture": "#0"}, + "south": {"uv": [1, 4, 15, 12], "texture": "#4"}, + "west": {"uv": [1, 4, 15, 12], "texture": "#0"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#5"} + } + }, + { + "from": [11, 8, 0], + "to": [16, 14, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [19, 18, 8]}, + "faces": { + "north": {"uv": [0, 0, 5, 6], "texture": "#0"}, + "east": {"uv": [0, 0, 8, 3], "texture": "#3"}, + "south": {"uv": [6, 6, 11, 0], "texture": "#0"}, + "west": {"uv": [0, 10, 16, 16], "texture": "#4"}, + "up": {"uv": [11, 0, 16, 16], "texture": "#5"}, + "down": {"uv": [11, 0, 16, 16], "texture": "#6"} + } + }, + { + "from": [10, 11, 0], + "to": [11, 14, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [18, 18, 8]}, + "faces": { + "north": {"uv": [5, 0, 6, 3], "texture": "#0"}, + "south": {"uv": [5, 6, 6, 3], "texture": "#0"}, + "west": {"uv": [6, 0, 3, 16], "rotation": 90, "texture": "#5"}, + "up": {"uv": [11, 0, 10, 16], "texture": "#5"}, + "down": {"uv": [15, 0, 16, 16], "texture": "#6"} + } + }, + { + "from": [5, 11, 0], + "to": [6, 14, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [-2, 18, 8]}, + "faces": { + "north": {"uv": [5, 6, 6, 3], "texture": "#0"}, + "east": {"uv": [6, 0, 3, 16], "rotation": 90, "texture": "#5"}, + "south": {"uv": [5, 0, 6, 3], "texture": "#0"}, + "up": {"uv": [6, 0, 5, 16], "texture": "#5"}, + "down": {"uv": [16, 0, 15, 16], "texture": "#6"} } } ] diff --git a/src/main/resources/assets/create/models/block/rotation_speed_controller/bracket.json b/src/main/resources/assets/create/models/block/rotation_speed_controller/bracket.json new file mode 100644 index 000000000..7ca552898 --- /dev/null +++ b/src/main/resources/assets/create/models/block/rotation_speed_controller/bracket.json @@ -0,0 +1,210 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "2": "create:block/brass_casing", + "3": "create:block/brass_casing_side", + "4": "create:block/brass_block", + "5": "create:block/rotation_speed_controller_bracket", + "6": "create:block/rotation_speed_controller", + "particle": "create:block/brass_block" + }, + "elements": [ + { + "from": [11.9, 3, 2], + "to": [14, 6, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 4.5, -24]}, + "faces": { + "north": {"uv": [8, 3, 10, 6], "texture": "#5"}, + "east": {"uv": [10, 3, 14, 6], "texture": "#5"}, + "south": {"uv": [10, 3, 8, 6], "texture": "#5"}, + "up": {"uv": [10, 1, 14, 3], "rotation": 90, "texture": "#5"}, + "down": {"uv": [10, 1, 14, 3], "rotation": 90, "texture": "#5"} + } + }, + { + "from": [4.1, 3, 2], + "to": [11.9, 13, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 4.5, -24]}, + "faces": { + "north": {"uv": [0, 0, 8, 10], "rotation": 180, "texture": "#5"}, + "east": {"uv": [7, 0, 8, 10], "texture": "#5"}, + "south": {"uv": [0, 0, 8, 10], "rotation": 180, "texture": "#5"}, + "west": {"uv": [7, 0, 8, 10], "texture": "#5"}, + "up": {"uv": [8, 6, 16, 10], "texture": "#5"} + } + }, + { + "from": [2, 3, 2], + "to": [4.1, 6, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 4.5, -24]}, + "faces": { + "north": {"uv": [10, 3, 8, 6], "texture": "#5"}, + "south": {"uv": [8, 3, 10, 6], "texture": "#5"}, + "west": {"uv": [10, 3, 14, 6], "texture": "#5"}, + "up": {"uv": [10, 1, 14, 3], "rotation": 270, "texture": "#5"}, + "down": {"uv": [10, 1, 14, 3], "rotation": 270, "texture": "#5"} + } + }, + { + "from": [2, 10, 2], + "to": [4.1, 13, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 11.5, -24]}, + "faces": { + "north": {"uv": [10, 3, 8, 6], "texture": "#5"}, + "south": {"uv": [8, 3, 10, 6], "texture": "#5"}, + "west": {"uv": [10, 3, 14, 6], "texture": "#5"}, + "up": {"uv": [10, 1, 14, 3], "rotation": 270, "texture": "#5"}, + "down": {"uv": [10, 1, 14, 3], "rotation": 270, "texture": "#5"} + } + }, + { + "from": [12.5, 6, 3.5], + "to": [13.5, 14, 4.5], + "rotation": {"angle": 0, "axis": "y", "origin": [20, 14, -16]}, + "faces": { + "north": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#3"}, + "east": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#3"}, + "south": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#3"}, + "west": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#3"}, + "up": {"uv": [13, 9, 14, 10], "texture": "#3"}, + "down": {"uv": [0, 0, 0, 0], "texture": "#4"} + } + }, + { + "from": [11.9, 10, 2], + "to": [14, 13, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [18, 11.5, -24]}, + "faces": { + "north": {"uv": [8, 3, 10, 6], "texture": "#5"}, + "east": {"uv": [10, 3, 14, 6], "texture": "#5"}, + "south": {"uv": [10, 3, 8, 6], "texture": "#5"}, + "up": {"uv": [10, 1, 14, 3], "rotation": 90, "texture": "#5"}, + "down": {"uv": [10, 1, 14, 3], "rotation": 90, "texture": "#5"} + } + }, + { + "from": [2.5, 6, 3.5], + "to": [3.5, 14, 4.5], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 14, -16]}, + "faces": { + "north": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#3"}, + "east": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#3"}, + "south": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#3"}, + "west": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#3"}, + "up": {"uv": [13, 9, 14, 10], "texture": "#3"}, + "down": {"uv": [0, 0, 0, 0], "texture": "#4"} + } + }, + { + "from": [11.9, 3, 10], + "to": [14, 6, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 4.5, -16]}, + "faces": { + "north": {"uv": [8, 3, 10, 6], "texture": "#5"}, + "east": {"uv": [10, 3, 14, 6], "texture": "#5"}, + "south": {"uv": [10, 3, 8, 6], "texture": "#5"}, + "up": {"uv": [10, 1, 14, 3], "rotation": 90, "texture": "#5"}, + "down": {"uv": [10, 1, 14, 3], "rotation": 90, "texture": "#5"} + } + }, + { + "from": [4.1, 3, 10], + "to": [11.9, 13, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 4.5, -16]}, + "faces": { + "north": {"uv": [0, 0, 8, 10], "rotation": 180, "texture": "#5"}, + "east": {"uv": [7, 0, 8, 10], "texture": "#5"}, + "south": {"uv": [0, 0, 8, 10], "rotation": 180, "texture": "#5"}, + "west": {"uv": [7, 0, 8, 10], "texture": "#5"}, + "up": {"uv": [8, 6, 16, 10], "texture": "#5"} + } + }, + { + "from": [2, 3, 10], + "to": [4.1, 6, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 4.5, -16]}, + "faces": { + "north": {"uv": [10, 3, 8, 6], "texture": "#5"}, + "south": {"uv": [8, 3, 10, 6], "texture": "#5"}, + "west": {"uv": [10, 3, 14, 6], "texture": "#5"}, + "up": {"uv": [10, 1, 14, 3], "rotation": 270, "texture": "#5"}, + "down": {"uv": [10, 1, 14, 3], "rotation": 270, "texture": "#5"} + } + }, + { + "from": [2, 10, 10], + "to": [4.1, 13, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 11.5, -16]}, + "faces": { + "north": {"uv": [10, 3, 8, 6], "texture": "#5"}, + "south": {"uv": [8, 3, 10, 6], "texture": "#5"}, + "west": {"uv": [10, 3, 14, 6], "texture": "#5"}, + "up": {"uv": [10, 1, 14, 3], "rotation": 270, "texture": "#5"}, + "down": {"uv": [10, 1, 14, 3], "rotation": 270, "texture": "#5"} + } + }, + { + "from": [12.5, 6, 11.5], + "to": [13.5, 14, 12.5], + "rotation": {"angle": 0, "axis": "y", "origin": [20, 14, -8]}, + "faces": { + "north": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#3"}, + "east": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#3"}, + "south": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#3"}, + "west": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#3"}, + "up": {"uv": [13, 9, 14, 10], "texture": "#3"}, + "down": {"uv": [0, 0, 0, 0], "texture": "#4"} + } + }, + { + "from": [11.9, 10, 10], + "to": [14, 13, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [18, 11.5, -16]}, + "faces": { + "north": {"uv": [8, 3, 10, 6], "texture": "#5"}, + "east": {"uv": [10, 3, 14, 6], "texture": "#5"}, + "south": {"uv": [10, 3, 8, 6], "texture": "#5"}, + "up": {"uv": [10, 1, 14, 3], "rotation": 90, "texture": "#5"}, + "down": {"uv": [10, 1, 14, 3], "rotation": 90, "texture": "#5"} + } + }, + { + "from": [2.5, 6, 11.5], + "to": [3.5, 14, 12.5], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 14, -8]}, + "faces": { + "north": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#3"}, + "east": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#3"}, + "south": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#3"}, + "west": {"uv": [6, 13, 14, 14], "rotation": 90, "texture": "#3"}, + "up": {"uv": [13, 9, 14, 10], "texture": "#3"}, + "down": {"uv": [0, 0, 0, 0], "texture": "#4"} + } + }, + { + "from": [1, -2, 10], + "to": [15, 3, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 1.5, 8]}, + "faces": { + "north": {"uv": [0, 10, 14, 15], "texture": "#5"}, + "east": {"uv": [11, 1, 16, 6], "texture": "#6"}, + "south": {"uv": [0, 10, 14, 15], "texture": "#5"}, + "west": {"uv": [11, 1, 16, 6], "texture": "#6"}, + "up": {"uv": [10, 1, 15, 15], "rotation": 90, "texture": "#2"} + } + }, + { + "from": [1, -2, 1], + "to": [15, 3, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 1.5, 8]}, + "faces": { + "north": {"uv": [14, 10, 0, 15], "texture": "#5"}, + "east": {"uv": [11, 1, 16, 6], "texture": "#6"}, + "south": {"uv": [0, 10, 14, 15], "texture": "#5"}, + "west": {"uv": [11, 1, 16, 6], "texture": "#6"}, + "up": {"uv": [15, 1, 10, 15], "rotation": 90, "texture": "#2"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/rotation_speed_controller/item.json b/src/main/resources/assets/create/models/block/rotation_speed_controller/item.json index 3d97bf020..160965c86 100644 --- a/src/main/resources/assets/create/models/block/rotation_speed_controller/item.json +++ b/src/main/resources/assets/create/models/block/rotation_speed_controller/item.json @@ -1,101 +1,17 @@ { "credit": "Made with Blockbench", - "parent": "block/block", + "parent": "create:block/block", "textures": { "0": "create:block/axis", "3": "create:block/axis_top", "4": "create:block/brass_gearbox", - "5": "create:block/brass_casing_side", - "6": "create:block/brass_casing", - "8": "create:block/encased_chain_drive_middle", "9": "create:block/brass_block", - "particle": "create:block/brass_casing" + "particle": "create:block/brass_gearbox", + "1_0": "create:block/rotation_speed_controller", + "1_3": "create:block/brass_funnel_plating", + "1_5": "create:block/rotation_speed_controller_top" }, "elements": [ - { - "from": [1, 2, 1], - "to": [6, 15, 5], - "faces": { - "north": {"uv": [10, 1, 15, 14], "texture": "#4"}, - "east": {"uv": [12, 1, 16, 14], "texture": "#5"}, - "south": {"uv": [4, 1, 9, 14], "texture": "#6"}, - "west": {"uv": [1, 1, 5, 14], "texture": "#6"}, - "up": {"uv": [1, 10, 5, 15], "rotation": 90, "texture": "#9"} - } - }, - { - "from": [10, 2, 1], - "to": [15, 15, 5], - "faces": { - "north": {"uv": [15, 1, 10, 14], "texture": "#4"}, - "east": {"uv": [5, 1, 1, 14], "texture": "#6"}, - "south": {"uv": [9, 1, 4, 14], "texture": "#6"}, - "west": {"uv": [16, 1, 12, 14], "texture": "#5"}, - "up": {"uv": [1, 1, 5, 6], "rotation": 90, "texture": "#9"} - } - }, - { - "from": [1, 2, 11], - "to": [6, 15, 15], - "faces": { - "north": {"uv": [4, 1, 9, 14], "texture": "#6"}, - "east": {"uv": [0, 1, 4, 14], "texture": "#5"}, - "south": {"uv": [1, 1, 6, 14], "texture": "#4"}, - "west": {"uv": [11, 1, 15, 14], "texture": "#6"}, - "up": {"uv": [11, 10, 15, 15], "rotation": 90, "texture": "#9"} - } - }, - { - "from": [10, 2, 11], - "to": [15, 15, 15], - "faces": { - "north": {"uv": [9, 1, 4, 14], "texture": "#6"}, - "east": {"uv": [15, 1, 11, 14], "texture": "#6"}, - "south": {"uv": [6, 1, 1, 14], "texture": "#4"}, - "west": {"uv": [4, 1, 0, 14], "texture": "#5"}, - "up": {"uv": [11, 1, 15, 6], "rotation": 90, "texture": "#9"} - } - }, - { - "from": [1, 2, 5], - "to": [6, 8, 11], - "faces": { - "north": {"uv": [10, 1, 15, 14], "texture": "#4"}, - "west": {"uv": [5, 8, 11, 14], "texture": "#6"}, - "up": {"uv": [5, 3, 11, 8], "rotation": 90, "texture": "#6"} - } - }, - { - "from": [10, 2, 5], - "to": [15, 8, 11], - "faces": { - "north": {"uv": [15, 1, 10, 14], "texture": "#4"}, - "east": {"uv": [11, 8, 5, 14], "texture": "#6"}, - "up": {"uv": [5, 8, 11, 3], "rotation": 90, "texture": "#6"} - } - }, - { - "from": [2, 9, 5], - "to": [6, 14, 11], - "faces": { - "north": {"uv": [10, 1, 15, 14], "texture": "#4"}, - "east": {"uv": [6, 9, 12, 14], "texture": "#5"}, - "west": {"uv": [6, 9, 12, 14], "texture": "#5"}, - "up": {"uv": [8, 2, 14, 6], "rotation": 90, "texture": "#5"}, - "down": {"uv": [8, 2, 14, 6], "rotation": 90, "texture": "#5"} - } - }, - { - "from": [10, 9, 5], - "to": [14, 14, 11], - "faces": { - "north": {"uv": [15, 1, 10, 14], "texture": "#4"}, - "east": {"uv": [6, 9, 12, 14], "texture": "#5"}, - "west": {"uv": [6, 9, 12, 14], "texture": "#5"}, - "up": {"uv": [8, 2, 14, 6], "rotation": 270, "texture": "#5"}, - "down": {"uv": [8, 2, 14, 6], "rotation": 90, "texture": "#5"} - } - }, { "name": "Axis", "from": [6, 6, 0], @@ -111,24 +27,84 @@ }, { "from": [0, 0, 0], - "to": [16, 2, 16], + "to": [16, 4, 16], "faces": { - "north": {"uv": [0, 14, 16, 16], "texture": "#5"}, - "east": {"uv": [0, 14, 16, 16], "texture": "#5"}, - "south": {"uv": [0, 14, 16, 16], "texture": "#5"}, - "west": {"uv": [0, 14, 16, 16], "texture": "#5"}, - "up": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#4"}, - "down": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#6"} + "north": {"uv": [0, 12, 16, 16], "texture": "#1_0"}, + "east": {"uv": [0, 12, 16, 16], "texture": "#1_0"}, + "south": {"uv": [0, 12, 16, 16], "texture": "#1_0"}, + "west": {"uv": [0, 12, 16, 16], "texture": "#1_0"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#4"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#9"} } }, { - "from": [6, 2, 1], - "to": [10, 11, 15], + "from": [0, 8, 0], + "to": [5, 14, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 18, 8]}, "faces": { - "north": {"uv": [6, 5, 10, 14], "texture": "#4"}, - "south": {"uv": [6, 5, 10, 14], "texture": "#4"}, - "up": {"uv": [1, 6, 15, 10], "rotation": 90, "texture": "#8"} + "north": {"uv": [6, 6, 11, 0], "texture": "#1_0"}, + "east": {"uv": [0, 10, 16, 16], "texture": "#4"}, + "south": {"uv": [0, 0, 5, 6], "texture": "#1_0"}, + "west": {"uv": [0, 0, 8, 3], "texture": "#1_3"}, + "up": {"uv": [0, 0, 5, 16], "texture": "#1_5"}, + "down": {"uv": [0, 0, 5, 16], "texture": "#9"} } + }, + { + "from": [1, 4, 1], + "to": [15, 12, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 14, 8]}, + "faces": { + "north": {"uv": [1, 4, 15, 12], "texture": "#4"}, + "east": {"uv": [1, 4, 15, 12], "texture": "#1_0"}, + "south": {"uv": [1, 4, 15, 12], "texture": "#4"}, + "west": {"uv": [1, 4, 15, 12], "texture": "#1_0"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#1_5"} + } + }, + { + "from": [11, 8, 0], + "to": [16, 14, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [19, 18, 8]}, + "faces": { + "north": {"uv": [0, 0, 5, 6], "texture": "#1_0"}, + "east": {"uv": [0, 0, 8, 3], "texture": "#1_3"}, + "south": {"uv": [6, 6, 11, 0], "texture": "#1_0"}, + "west": {"uv": [0, 10, 16, 16], "texture": "#4"}, + "up": {"uv": [11, 0, 16, 16], "texture": "#1_5"}, + "down": {"uv": [11, 0, 16, 16], "texture": "#9"} + } + }, + { + "from": [10, 11, 0], + "to": [11, 14, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [18, 18, 8]}, + "faces": { + "north": {"uv": [5, 0, 6, 3], "texture": "#1_0"}, + "south": {"uv": [5, 6, 6, 3], "texture": "#1_0"}, + "west": {"uv": [6, 0, 3, 16], "rotation": 90, "texture": "#1_5"}, + "up": {"uv": [11, 0, 10, 16], "texture": "#1_5"}, + "down": {"uv": [15, 0, 16, 16], "texture": "#9"} + } + }, + { + "from": [5, 11, 0], + "to": [6, 14, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [-2, 18, 8]}, + "faces": { + "north": {"uv": [5, 6, 6, 3], "texture": "#1_0"}, + "east": {"uv": [6, 0, 3, 16], "rotation": 90, "texture": "#1_5"}, + "south": {"uv": [5, 0, 6, 3], "texture": "#1_0"}, + "up": {"uv": [6, 0, 5, 16], "texture": "#1_5"}, + "down": {"uv": [16, 0, 15, 16], "texture": "#9"} + } + } + ], + "groups": [0, + { + "name": "block", + "origin": [8, 8, 8], + "children": [1, 2, 3, 4, 5, 6] } ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/sequenced_gearshift/idle.json b/src/main/resources/assets/create/models/block/sequenced_gearshift/idle.json index 25b73b6ec..d1ea1860b 100644 --- a/src/main/resources/assets/create/models/block/sequenced_gearshift/idle.json +++ b/src/main/resources/assets/create/models/block/sequenced_gearshift/idle.json @@ -2,73 +2,44 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "0": "create:block/brass_casing", "1": "create:block/brass_gearbox", "4": "create:block/sequenced_gearshift", "particle": "create:block/brass_gearbox" }, "elements": [ - { - "name": "Core", - "from": [1, 1, 1], - "to": [15, 15, 15], - "faces": { - "north": {"uv": [1, 1, 15, 15], "texture": "#1"}, - "south": {"uv": [1, 1, 15, 15], "texture": "#1"}, - "up": {"uv": [1, 1, 15, 15], "texture": "#4"}, - "down": {"uv": [1, 1, 15, 15], "texture": "#4"} - } - }, - { - "name": "Top", - "from": [0, 14, 0], - "to": [5, 16, 16], - "faces": { - "north": {"uv": [11, 0, 16, 2], "texture": "#0"}, - "east": {"uv": [0, 0, 2, 16], "rotation": 90, "texture": "#4"}, - "south": {"uv": [0, 0, 5, 2], "texture": "#0"}, - "west": {"uv": [0, 0, 2, 16], "rotation": 270, "texture": "#4"}, - "up": {"uv": [0, 0, 5, 16], "texture": "#4"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0"} - } - }, { "name": "Bottom", - "from": [0, 0, 0], - "to": [5, 2, 16], - "faces": { - "north": {"uv": [11, 14, 16, 16], "texture": "#0"}, - "east": {"uv": [2, 0, 0, 16], "rotation": 90, "texture": "#4"}, - "south": {"uv": [0, 14, 5, 16], "texture": "#0"}, - "west": {"uv": [2, 0, 0, 16], "rotation": 90, "texture": "#4"}, - "up": {"uv": [0, 16, 16, 0], "texture": "#0"}, - "down": {"uv": [0, 16, 5, 0], "texture": "#4"} - } - }, - { - "name": "Top", - "from": [11, 14, 0], + "from": [0, 14, 0], "to": [16, 16, 16], "faces": { - "north": {"uv": [16, 0, 11, 2], "texture": "#0"}, - "east": {"uv": [0, 16, 2, 0], "rotation": 90, "texture": "#4"}, - "south": {"uv": [5, 0, 0, 2], "texture": "#0"}, - "west": {"uv": [0, 16, 2, 0], "rotation": 90, "texture": "#4"}, - "up": {"uv": [11, 0, 16, 16], "texture": "#4"}, - "down": {"uv": [16, 0, 0, 16], "texture": "#0"} + "north": {"uv": [0, 14, 16, 16], "rotation": 180, "texture": "#1"}, + "east": {"uv": [0, 14, 16, 16], "rotation": 180, "texture": "#4"}, + "south": {"uv": [0, 14, 16, 16], "rotation": 180, "texture": "#1"}, + "west": {"uv": [0, 14, 16, 16], "rotation": 180, "texture": "#4"}, + "up": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#4"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#1"} } }, { - "name": "Bottom", - "from": [11, 0, 0], + "name": "Core", + "from": [1, 2, 1], + "to": [15, 14, 15], + "faces": { + "north": {"uv": [1, 2, 15, 14], "rotation": 180, "texture": "#1"}, + "south": {"uv": [1, 2, 15, 14], "rotation": 180, "texture": "#1"} + } + }, + { + "name": "Top", + "from": [0, 0, 0], "to": [16, 2, 16], "faces": { - "north": {"uv": [0, 14, 5, 16], "texture": "#0"}, - "east": {"uv": [2, 16, 0, 0], "rotation": 90, "texture": "#4"}, - "south": {"uv": [11, 14, 16, 16], "texture": "#0"}, - "west": {"uv": [2, 16, 0, 0], "rotation": 90, "texture": "#4"}, - "up": {"uv": [16, 16, 0, 0], "texture": "#0"}, - "down": {"uv": [11, 16, 16, 0], "texture": "#4"} + "north": {"uv": [0, 0, 16, 2], "rotation": 180, "texture": "#1"}, + "east": {"uv": [0, 0, 16, 2], "rotation": 180, "texture": "#4"}, + "south": {"uv": [0, 0, 16, 2], "rotation": 180, "texture": "#1"}, + "west": {"uv": [0, 0, 16, 2], "rotation": 180, "texture": "#4"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "down": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#4"} } }, { @@ -76,10 +47,10 @@ "from": [0, 2, 0], "to": [2, 14, 16], "faces": { - "north": {"uv": [14, 2, 16, 14], "texture": "#0"}, - "east": {"uv": [0, 2, 16, 14], "texture": "#0"}, - "south": {"uv": [0, 2, 2, 14], "texture": "#0"}, - "west": {"uv": [0, 2, 16, 14], "texture": "#0"} + "north": {"uv": [0, 2, 2, 14], "rotation": 180, "texture": "#1"}, + "east": {"uv": [0, 2, 16, 14], "rotation": 180, "texture": "#1"}, + "south": {"uv": [14, 2, 16, 14], "rotation": 180, "texture": "#1"}, + "west": {"uv": [0, 2, 16, 14], "rotation": 180, "texture": "#4"} } }, { @@ -87,24 +58,18 @@ "from": [14, 2, 0], "to": [16, 14, 16], "faces": { - "north": {"uv": [0, 2, 2, 14], "texture": "#0"}, - "east": {"uv": [0, 2, 16, 14], "texture": "#0"}, - "south": {"uv": [14, 2, 16, 14], "texture": "#0"}, - "west": {"uv": [0, 2, 16, 14], "texture": "#0"} + "north": {"uv": [14, 2, 16, 14], "rotation": 180, "texture": "#1"}, + "east": {"uv": [0, 2, 16, 14], "rotation": 180, "texture": "#4"}, + "south": {"uv": [0, 2, 2, 14], "rotation": 180, "texture": "#1"}, + "west": {"uv": [0, 2, 16, 14], "rotation": 180, "texture": "#1"} } } ], "groups": [ { - "name": "encased_shaft", + "name": "block", "origin": [8, 8, 8], - "children": [0, 1, 2, 3, 4, 5, 6, - { - "name": "shaft", - "origin": [8, 8, 8], - "children": [] - } - ] + "children": [0, 1, 2, 3, 4] } ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/sequenced_gearshift/item.json b/src/main/resources/assets/create/models/block/sequenced_gearshift/item.json index b87b557db..c6aecc103 100644 --- a/src/main/resources/assets/create/models/block/sequenced_gearshift/item.json +++ b/src/main/resources/assets/create/models/block/sequenced_gearshift/item.json @@ -2,99 +2,13 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "0": "create:block/brass_casing", "1": "create:block/brass_gearbox", "4": "create:block/sequenced_gearshift", - "particle": "create:block/axis", + "particle": "create:block/brass_gearbox", "1_0": "create:block/axis", "1_1": "create:block/axis_top" }, "elements": [ - { - "name": "Core", - "from": [1, 1, 1], - "to": [15, 15, 15], - "faces": { - "north": {"uv": [1, 1, 15, 15], "texture": "#1"}, - "south": {"uv": [1, 1, 15, 15], "texture": "#1"}, - "up": {"uv": [1, 1, 15, 15], "texture": "#4"}, - "down": {"uv": [1, 1, 15, 15], "texture": "#4"} - } - }, - { - "name": "Top", - "from": [0, 14, 0], - "to": [5, 16, 16], - "faces": { - "north": {"uv": [11, 0, 16, 2], "texture": "#0"}, - "east": {"uv": [0, 0, 2, 16], "rotation": 90, "texture": "#4"}, - "south": {"uv": [0, 0, 5, 2], "texture": "#0"}, - "west": {"uv": [0, 0, 2, 16], "rotation": 270, "texture": "#4"}, - "up": {"uv": [0, 0, 5, 16], "texture": "#4"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0"} - } - }, - { - "name": "Bottom", - "from": [0, 0, 0], - "to": [5, 2, 16], - "faces": { - "north": {"uv": [11, 14, 16, 16], "texture": "#0"}, - "east": {"uv": [2, 0, 0, 16], "rotation": 90, "texture": "#4"}, - "south": {"uv": [0, 14, 5, 16], "texture": "#0"}, - "west": {"uv": [2, 0, 0, 16], "rotation": 90, "texture": "#4"}, - "up": {"uv": [0, 16, 16, 0], "texture": "#0"}, - "down": {"uv": [0, 16, 5, 0], "texture": "#4"} - } - }, - { - "name": "Top", - "from": [11, 14, 0], - "to": [16, 16, 16], - "faces": { - "north": {"uv": [16, 0, 11, 2], "texture": "#0"}, - "east": {"uv": [0, 16, 2, 0], "rotation": 90, "texture": "#4"}, - "south": {"uv": [5, 0, 0, 2], "texture": "#0"}, - "west": {"uv": [0, 16, 2, 0], "rotation": 90, "texture": "#4"}, - "up": {"uv": [11, 0, 16, 16], "texture": "#4"}, - "down": {"uv": [16, 0, 0, 16], "texture": "#0"} - } - }, - { - "name": "Bottom", - "from": [11, 0, 0], - "to": [16, 2, 16], - "faces": { - "north": {"uv": [0, 14, 5, 16], "texture": "#0"}, - "east": {"uv": [2, 16, 0, 0], "rotation": 90, "texture": "#4"}, - "south": {"uv": [11, 14, 16, 16], "texture": "#0"}, - "west": {"uv": [2, 16, 0, 0], "rotation": 90, "texture": "#4"}, - "up": {"uv": [16, 16, 0, 0], "texture": "#0"}, - "down": {"uv": [11, 16, 16, 0], "texture": "#4"} - } - }, - { - "name": "SideWest", - "from": [0, 2, 0], - "to": [2, 14, 16], - "faces": { - "north": {"uv": [14, 2, 16, 14], "texture": "#0"}, - "east": {"uv": [0, 2, 16, 14], "texture": "#0"}, - "south": {"uv": [0, 2, 2, 14], "texture": "#0"}, - "west": {"uv": [0, 2, 16, 14], "texture": "#0"} - } - }, - { - "name": "SideEast", - "from": [14, 2, 0], - "to": [16, 14, 16], - "faces": { - "north": {"uv": [0, 2, 2, 14], "texture": "#0"}, - "east": {"uv": [0, 2, 16, 14], "texture": "#0"}, - "south": {"uv": [14, 2, 16, 14], "texture": "#0"}, - "west": {"uv": [0, 2, 16, 14], "texture": "#0"} - } - }, { "name": "Axis", "from": [6, 6, 0], @@ -107,17 +21,85 @@ "up": {"uv": [6, 0, 10, 16], "texture": "#1_0"}, "down": {"uv": [6, 0, 10, 16], "rotation": 180, "texture": "#1_0"} } + }, + { + "name": "Bottom", + "from": [0, 14, 0], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 14, 16, 16], "rotation": 180, "texture": "#1"}, + "east": {"uv": [0, 14, 16, 16], "rotation": 180, "texture": "#4"}, + "south": {"uv": [0, 14, 16, 16], "rotation": 180, "texture": "#1"}, + "west": {"uv": [0, 14, 16, 16], "rotation": 180, "texture": "#4"}, + "up": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#4"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#1"} + } + }, + { + "name": "Core", + "from": [1, 2, 1], + "to": [15, 14, 15], + "faces": { + "north": {"uv": [1, 2, 15, 14], "rotation": 180, "texture": "#1"}, + "south": {"uv": [1, 2, 15, 14], "rotation": 180, "texture": "#1"} + } + }, + { + "name": "Top", + "from": [0, 0, 0], + "to": [16, 2, 16], + "faces": { + "north": {"uv": [0, 0, 16, 2], "rotation": 180, "texture": "#1"}, + "east": {"uv": [0, 0, 16, 2], "rotation": 180, "texture": "#4"}, + "south": {"uv": [0, 0, 16, 2], "rotation": 180, "texture": "#1"}, + "west": {"uv": [0, 0, 16, 2], "rotation": 180, "texture": "#4"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "down": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#4"} + } + }, + { + "name": "SideWest", + "from": [0, 2, 0], + "to": [2, 14, 16], + "faces": { + "north": {"uv": [0, 2, 2, 14], "rotation": 180, "texture": "#1"}, + "east": {"uv": [0, 2, 16, 14], "rotation": 180, "texture": "#1"}, + "south": {"uv": [14, 2, 16, 14], "rotation": 180, "texture": "#1"}, + "west": {"uv": [0, 2, 16, 14], "rotation": 180, "texture": "#4"} + } + }, + { + "name": "SideEast", + "from": [14, 2, 0], + "to": [16, 14, 16], + "faces": { + "north": {"uv": [14, 2, 16, 14], "rotation": 180, "texture": "#1"}, + "east": {"uv": [0, 2, 16, 14], "rotation": 180, "texture": "#4"}, + "south": {"uv": [0, 2, 2, 14], "rotation": 180, "texture": "#1"}, + "west": {"uv": [0, 2, 16, 14], "rotation": 180, "texture": "#1"} + } } ], "groups": [ { "name": "encased_shaft", "origin": [8, 8, 8], - "children": [0, 1, 2, 3, 4, 5, 6, + "children": [ { "name": "shaft", "origin": [8, 8, 8], - "children": [7] + "children": [0] + } + ] + }, + { + "name": "idle", + "origin": [8, 8, 8], + "children": [ + { + "name": "block", + "origin": [8, 8, 8], + "children": [1, 2, 3, 4, 5] } ] } diff --git a/src/main/resources/assets/create/textures/block/clutch_off.png b/src/main/resources/assets/create/textures/block/clutch_off.png index 2988f8b8f0d95477d33b57520ec268b3b6f2de04..802f5bbb70ec53679b3c724ede8a82fcf5a32589 100644 GIT binary patch delta 386 zcmV-|0e$|X1i=H483+Ra001a04^xpLAb*NbOjJcc2Nklm&38q)ILMBf-C)8oTE?oZ>0~wZF~u?GJmwV7gfP%KrW|w1qgQo$`(-$$ zvQb_xZNB+xk*W>2}wL7+9yz-`;L>%RhceXe1cAfg#cS3)b+= gnFpe={-2KsZ<>J&&~6|XDF6Tf07*qoM6N<$f|#F}`2YX_ delta 504 zcmV!;e45{;xGtR)9B&T_18|pJfb>LK+GpOA==y0 z;TpW}jPJ)5s^qH_(GD?0$3%z#BiiV2{jj8-jg2b!y*(T5wLK{*Uy~#?evP7#S)N-K zi<1@hg+*0xD|PgM5yi_a<$nxHWSNu_w~3}TEL6aNyA5?^|HnL-ZSFy%;$@T}MlsUx zcEGSdfAJDr>c8&S>Mb$-GFb?ji&?S`6R|DxI0GZp@0|p}FLrTxF*qIKQeXlaehaMo u)6gy)8;r-ddEWXl`lwT|y#ZOD=d=GH+2XWK1q_Q7nA`0G9v&r2qiT006E40Hgo_%>V#d zJ|b&PEL1xmWJrG~f?+yuQ7cY18(Kdjcvvym;n425$+tSJ%}t*EQCpzhuGe?1eO?es^^ndIaP03vazde7XV`|<{dfvZAls!R?%p3+Y z#%vX_^tt3R<*7__E`%`9CC}4*y}Hi5Z5hVm6aMq)9l>NJv5I1a89=v>Cr1|# z_02=+^Gmfed>Hd(%(pS0>&WuArWD?Wq4A+eNliS0 zXd)##hPRPd!ZYos@40=uw9UZQgI#5LVPDRA{=CPA_Jr`jS<;!ZgFI{dasPRxc4#rk z2T>ED$Zuj`hG5_nt|b32aTD~71{5BFHb6#^yy!RspdCQ8E;XY|m%AT13mQ@^G17nl O0000R#85IKn001a04^sdD00DDSM?wIu&K&8HArpUlP)t-sV`gJoU0Q~S zhkSp4f`x>Cf`WN`d4h+Ac6oPygoaKw99=>pSw138HXB_+A&QWYRXZPLNhokpEM!P1 zZ&53AcXM!3E;BJPLP0@LP*6ogL{vK;Iyg8Q85siu16@KS0000+G8|ezBWq18I5#&v zJUmWLPHavsT0egxvHaai00009a7bBm000ia000ia0czHX2><{9wn;=mR47wTkBbh% zFbG9km@j0uxNco_58c%H|6eHek$9Vsa8fQ8^OLpKewSZ8UEvF$Ia{#23n#$7oL84QU@ zx76?toNlQn>3$coe!R993AE}Ma%-IxZSwzM$$XrcMk3xFxc_Py2=cfj< nfQZh43K6o09{w&`t+n!W@giyzt8`Ln>s<>))`B{UyX{uF4rrEUI;ImrR>y}S&G+yAM8!&sh z1s|{eHYks&7yRyaRBzuNKr(D$249$K$8TB+v7rC3oT=zo4P;jG69iy SsrOU>00005GnQ{Z ze1CwHmX%O99B@)Df?+zBot-QL09864dRjC<0RdV>Bwuy7l?JV&_gRft&ZO% z_OVLnQb<1aZ*7=*vM-5D-NXR#dYoV4^Lt#PZ2&mjP9iyJLjd;=>00000 LNkvXXu0mjf_Hd8| delta 518 zcmV+h0{Q)!1F-~<83+OZ005AYXf}}{Ab$yPNLh0L01m?d01m?e$8V@)0005TNkl_iJD@^BJO%~|DKt#|2W$vZ@~dn23jisE>J`6EDjWmef4g!xU(` zn58&R7>8ULAPIP`8sNA@s@Kxl>W~2PQZc9sZGgi`mefKiME`#C5PUCn?_6zMzwf_4E*ru5X%Q=81+8JBdi^`<+#{9 ztexw$9J3Ll*BEhchS&N5&eS^Adp6S>N^o75_8jX?l}joA0NzL3VFBnUJpcdz07*qo IM6N<$f;R5$N&o-= diff --git a/src/main/resources/assets/create/textures/block/gearshift_on.png b/src/main/resources/assets/create/textures/block/gearshift_on.png index 50faee2c924e85ff7b9c3b820763d5384646888a..65f83e83ec13b35223b8b792597575cbfb3703d5 100644 GIT binary patch delta 369 zcmV-%0gnF61f2tr83+Ra001a04^xpLAb)I7OjJc5GnQ{Z ze1CwHmX%O99B@)Df?+zBot=PsdzSzJeE3IIfj6L%>V$d z0054Pii3T9cvv=lcXWz_f`)>Dcvv!ebaI1#fq-8)cUUqc`>(P9000SaNLh0L0Dlg` z000ic0Tn1pfB*mhx=BPqR47v&j?t3CAP7Z;MAKknP;_zIrtPNx|Bs7h=DwVP!*vb- zr`djLzRhwg;kF)NM20dfM-olFklYb5c1|Yz_~+nvKK3FpA1Xi<4+&I5mj#W)sJ! z=YI|!@8bd`(nTtw*`lkboyENEn%g6`uVqahHy2Tk=(nB2`sEM=2QppRld4Dt}7kK$pu^ zk)|WOF1(pW1sIvlZ*ydChX#Rc9HvD;JI2^`}gYFje;Mi-`fCq@aS0Y^}2l% khVT2l=U8v<+!*r@+Qr8PVGl+DQvd(}07*qoM6N<$f_OgqtN;K2 diff --git a/src/main/resources/assets/create/textures/block/rotation_speed_controller.png b/src/main/resources/assets/create/textures/block/rotation_speed_controller.png new file mode 100644 index 0000000000000000000000000000000000000000..214cd3a9160a0a1d775665acceb0acebcc77df49 GIT binary patch literal 378 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}-0G|-o&RCtM5RHluU7*0HgSkhhdl&g=uWPZpygvHUx~Pu_a`yDPS*Zxx zsSDa_2-;}~%_uYR)E9Tr7F}FpVIarnZzOSen%C|gSD^M|i@!Eli|wQv(p#3zY$V)@7vFKDl_fO soMOG2Urtr0H{J|i=h^9^qPIvsw31`p&eEevK<6=dy85}Sb4q9e00>xNS%LhJ0G|+7D-}TlIX)oI-$=sM#U&shATTg6*g{HOO-)Ktl9`#=$H&J`UC>is z+(lc|PE$xvS2xI9($CMYB1E?-M58lSXK{_i<@M1=rhD({bz9eB2Q-S4`H~2bk|_!D z3;vHAFo@NS%G}-0G|-oiV)qV5RJ}Q9iYJBXZA$H&jl52*cb`Q=<7C0P>W7yKUwU|=-i z+7492S>O>_%)r2R7=#&*=dVZs3U+w9IEH8h`<}lobXb9dCBQ(cd)AVys-OS$-!f$` zw@E4M+nlJ7^i1HMgujd7+UygS_dUGUGGtDzJgDH6x`^e*x5qckwb)!A_Wg8Z&tPpZ zZ~nNpM|&B{>G854!aaqD>x6(@V~9T`zEFQqq(UH4k?v hEiy2yvpd8iKc$niv*kYLU!a>9JYD@<);T3K0RS1(kC*@e literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/create/textures/block/sequenced_gearshift.png b/src/main/resources/assets/create/textures/block/sequenced_gearshift.png index 1e0a9443cbac8793433c58707c722250fd5ff2c2..bcafe5f208face2f5d2dc2f5a07c47f7864bac3d 100644 GIT binary patch delta 308 zcmV-40n7fX1mFUY83+Ra001a04^xpLAb(3xOjJd3Oe>OaH98~_NiP>#HyBSc7bDoWHzpZKBIg%ECT>ODH1Rq4%4q&Kmh?P0sve%7KvRfM*#xFmrGay0ZRb^L@O1% zjYf05>D~YU010qNS#tmY4#5Bb4#5Gqk!$S$005pzL_t(2Q!UTo7K0!N1>gdy41XLs zhwlBKbfEJb|9o98w)xosF%c5%$9ZhqwO@dgl0&}p>ED^fp(HHKuK<03s0t*|=k<1I z8Y4wOntlST7f<*V>l4%fM+HJqTL}l6V7598hL<8r`zLw{SRKCh>YhL!8PIKlHmHoUwXU(gpZ`sQLA@vW^>Trsbz%7ae0{TA)0+60 z!U|{3!(u*Hk}`|Wh!impayE{Pc%f`v&`G54`ROe%rL^6(K=#1Wm2@y^JevRqL`Rrt(kw@?( zN#HERw@n=>ktVXJ!x?kO;xTi{eDr{A>nr1s@PMv*51>$i!ZIihJzzby8yrFdu{_On zZJiVX6mWI7vnK34@Pv{ygXf~@AnTl${Y^K{v<|+#59~}*_T3L2t|j4OU~E^S!`c;IEiN?HBIA8M_+Err!DVToG{%nN4Xe{(|n{Id98#-5Acd+&>RxBW|{cIL#ARp z1)RV`6!ZW88Xw<2AF97bwc|7k{O;A&FXCT<=m&N-^~Npj^@#ug002ovPDHLkV1ije B@j3ti diff --git a/src/main/resources/assets/create/textures/block/sequenced_gearshift_1.png b/src/main/resources/assets/create/textures/block/sequenced_gearshift_1.png index 7a0d375d625e030a72acbca53179541b28277e8f..d5bc2ae415d5267e9d9c8c322c2583536e174f53 100644 GIT binary patch delta 325 zcmV-L0lNOS1n~lp83+Ra001a04^xpLAb(U)OjJd3Oe>OaH98~_NiP>#HyBSc7bDoWHzpZKBIg%ECT>ODH1Rq4%4q&Kmh?P0sve%7KvRfM*#xFmrGay0ZRb^eE={kfrA+@&Bh0>p%T*~9(; X(tio6w@B{G00000NkvXXu0mjf@!5Gh delta 523 zcmV+m0`&dy0=5K@83+OZ005AYXf}}{Ab$yPNLh0L01mU}SL9;7afd1ULE}f-673FL3Ec_&tKS7zAm? z(VniZ?xY?`JY{LqJN0roxpi`q+>;c)dGRQvhKO_$0S}`xE%1s{Napo+{XEP-kQ!7&gMK1+~+}2H|!iETHpeDXE1hUs0C8}+Ld@xkEn|i%#n$~+y zw`=PyRh^m&3Mv=IMc>OBS=zR&oPS)LPmU*gI#fv{<4A_a=uH?C;RN83bHc}!@WMRV@bHn0VyuynFSyul^dlEvH%F*Uzqg6aNxKKLMHk^ob~+b7BAh N002ovPDHLkV1f$z@ZJCb diff --git a/src/main/resources/assets/create/textures/block/sequenced_gearshift_2.png b/src/main/resources/assets/create/textures/block/sequenced_gearshift_2.png index c6f63c36508ca5d4b963d9ae3abcdb8bd0f45769..f6f3304f4cb726876b8c316c5dbe2a14bdc36eb0 100644 GIT binary patch delta 323 zcmV-J0lfac1n&Zn83+Ra001a04^xpLAb(U)OjJd3Oe>OaH98~_NiP>#HyBSc7bDoWHzpZKBIg%ECT>ODH1Rq4%4q&Kmh?P0sve%7KvRfM*#xFmrIub0DS-e%>V$U z002ZQ6|MjPyp2XjcZ5s;000SaNLh0L01m+b01m+cxRGn^0001_Nkl9Hi^>RVc|uA_JFn8`Ksxp_gkLAP->AKnU_o5FMEyqeCimEk$IhBk@W!(2iGb zU3)Z5ppJBCbwDbR$yrA#KN|@NdN8I)`qJbF1nzTf2v$0OuG002ovPDHLkV1fiBbB6!` delta 532 zcmV+v0_*+n0=@*083+OZ005AYXf}}{Ab$yPNLh0L01mSEuks5c^7hpOR)4q7 zj)}|p#V;P+N$;{Qw(WL|+!RE)bF{}L4pbUx7Td~}jceckA<3}5B<0C$!lkl)_x$nm z*VzIKNFRRAGsk{19!FaEYGEp(+DS<p1F`Lb{Y%2tgWJ{l-vgYWB#xqmL2b!qi%+8g%bgZ(H8bQow~n|S5B08b!(32{0d zjJh$iLr)rtXEDAliy%^IqVvKZi`1eHMb;vnYtmG1Yb=u`4 zJ^Q)c&LK4v>!X9XXslL>6mkAz^UUBL@CXMo{Q-4|dcFv16 z57)Q}d_s$FG%$W$i_4*N+E3X6Uk zDthHG9F9p_RB&(h5Ielt!e>#)PeCX2z_$PYHC{izzpMTl+l{1|mlu!EeiQ!^z)wIw W^Eu^HTdx2B002ovPDHLkU;%=_ef0ML diff --git a/src/main/resources/assets/create/textures/block/sequenced_gearshift_3.png b/src/main/resources/assets/create/textures/block/sequenced_gearshift_3.png index 0ed6ea628cc66ed9104107b8ca26d8324fdf742d..95affcedb54c120b6e310a2e624b5a76d0035626 100644 GIT binary patch delta 316 zcmV-C0mJ^P1n2^g83+Ra001a04^xpLAb(L%OjJd3Oe>OaH98~_NiP>#HyBSc7bDoWHzpZKBIg%ECT>ODH1Rq4%4q&Kmh?P0sve%7KvRfmjD2L006|7ORfL_%>V$U z002ZQ6}*i`pd#*y00009a7bBm000ib000ib0l1NC?EnA(ph-kQR47w5k5LlCAb$u2 z6A%*v)>v(bz5hWAaq5geD{mhzc2+zlz92E#b?+Mf*6X@g62E(L?qV4Z+FdbIAn`59w zhC3Ye29<(4di#2W3yeycY}1k+z$r3jEwfAK=Z3eW!-35hAR&|^Zt(}zhzYSZx$nyW O0000<|)Lgv5sbKw`xjA+hHZ_y9hHFJOZZ zVpE_fP2zgSkMVHqK&aRNS6A1^XU_G#XJqmG$(;l>fG7@FFGpz_*310D2=VsieSe~x zC)Zh*r{_J7z3E_!ZP9&>u`-rb+`hKMM-<3JD}thOWz%-&zeqB~TT(opPx+{v-@JeL z{B^#-0%8b%%9#^ColLY6JX)BFRc@rDm={%@YQF}kW{n`u4M=V@!&o=9S66rS*}7U5 zb=|aWi?gL|Ey_-f6}%ov&Fns zv(b1jVrKNDAUTWiZD|87lUS{+e+4`QUI6!i?22frwlI!K58SHrK#GVI+o<>i90RNw zx3a$-QbVz%C$sF?bx28L@ae8!+FvnTMd*nXv`w8!WQ7W@EI2^`7COaH98~_NiP>#HyBSc7bDoWHzpZKBIg%ECT>ODH1Rq4%4q&mjD2L003M#7KvRf%>V$d006|7OQiq+L@O1% zjYe?Af<*uT010qNS#tmY4#5Bb4#5Gqk!$S$005myL_t(2Q#FrK62l+}L=zAbBY#FM zHunA}?NX=C`154n;)b&ma}XBV;}N&*+)rW&0U%xJz^0G$CbHtAB@s|g(v~|fy20Lxvm(O@u?Q##4tPZ;hfcC;Hk}(?80xNTD{PE@l{C}0 z8jcjW7|K;bB$=7(N^Xr-#)D|HAJPZ0&pj?{=tVM)oX6e3aRrlZ=t^qkFpIuq{HK9) zauSY54J^C=ukq>dd7Is8>9q(WE8f4^{R7;^fZs(w`E`?@)K35a002ovPDHLkV1g`( B?Wq6& diff --git a/src/main/resources/assets/create/textures/block/sequenced_gearshift_5.png b/src/main/resources/assets/create/textures/block/sequenced_gearshift_5.png index 628c9f0764d9b583a3cad2208c7fb6d0d2bb10ff..77f9f402d9f163a4ef959831e63aa991b90a014f 100644 GIT binary patch delta 303 zcmV+~0nq-W1lt0T83+Ra001a04^xpLAb&_uOjJd3Oe>OaH98~_NiP>#HyBSc7bDoWHzpZKBIg%mjD2L002HI5-=VP)2~~l003M#7KvRf%>V$d006|7OGGObyp2Y) zqd~R+000SaNLh0L01m+b01m+cxRGn^0001-NklvzMASObBJs)}7&iw?WlpK_+9RAK#9JGXu>m8so5DkF@o$tqiT11+F zsC@#MHlOe-rZ3PAI0q1d_65`<3+Qq%OqU{x^4}3)IlT6C$3&0Ja0D=gK`9)j--xim z9Ms4+wGyDR%vD=o>H6G^mU0E~85{>BgmUF0{{Wm?2|_9+)+PV|002ovPDHLkV1k8e BZs7m` delta 505 zcmVopTsCeA&;o1ceWP^6ggW63%bvcL%90bDyp!<L3KijD2#>@6!RJ40Snx)z(yqJ zJz!HJ^NM_GHH~36Zdh>bqLA|*&{%R9&_ApU1HYdca2i v|CP@Uw?F^kUmy$=95;nJ-re|9gE4@2^t}vhZkDkR00000NkvXXu0mjf4};(4