From cb366a287a8dd39cac66165a3138d4fbb55d0f74 Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Wed, 28 Aug 2019 19:45:41 +0200 Subject: [PATCH] Clutch vs Gearshift - Gearshifter -> Gearshift - Added the Clutch, using the prior model of the Gearshift - New Model for Gearshift - Generalized conditional shaft connectors for rendering --- .../java/com/simibubi/create/AllBlocks.java | 6 +++-- .../com/simibubi/create/AllTileEntities.java | 21 ++++++++------- .../contraptions/RotationPropagator.java | 10 ++++--- .../contraptions/base/KineticTileEntity.java | 2 +- .../contraptions/relays/ClutchBlock.java | 25 ++++++++++++++++++ .../contraptions/relays/ClutchTileEntity.java | 23 ++++++++++++++++ ...rshifterBlock.java => GearshiftBlock.java} | 18 ++++++++++--- .../relays/GearshiftTileEntity.java | 23 ++++++++++++++++ .../relays/GearshifterTileEntity.java | 12 --------- .../relays/SidedAxisTunnelTileEntity.java | 16 +++++++++++ ...=> SidedAxisTunnelTileEntityRenderer.java} | 12 ++++----- .../assets/create/blockstates/clutch.json | 14 ++++++++++ .../assets/create/blockstates/gearshift.json | 14 ++++++++++ .../create/blockstates/gearshifter.json | 15 ----------- .../resources/assets/create/lang/en_us.json | 3 ++- .../create/models/block/clutch_off.json | 7 +++++ .../assets/create/models/block/clutch_on.json | 7 +++++ ...earshifter_off.json => gearshift_off.json} | 4 +-- .../create/models/block/gearshift_on.json | 7 +++++ .../create/models/block/gearshifter_on.json | 8 ------ .../assets/create/models/item/clutch.json | 3 +++ .../assets/create/models/item/gearshift.json | 3 +++ .../create/models/item/gearshifter.json | 3 --- .../{gearshifter_off.png => clutch_off.png} | Bin .../{gearshifter_on.png => clutch_on.png} | Bin .../create/textures/block/gearshift_off.png | Bin 0 -> 561 bytes .../create/textures/block/gearshift_on.png | Bin 0 -> 588 bytes 27 files changed, 189 insertions(+), 67 deletions(-) create mode 100644 src/main/java/com/simibubi/create/modules/contraptions/relays/ClutchBlock.java create mode 100644 src/main/java/com/simibubi/create/modules/contraptions/relays/ClutchTileEntity.java rename src/main/java/com/simibubi/create/modules/contraptions/relays/{GearshifterBlock.java => GearshiftBlock.java} (72%) create mode 100644 src/main/java/com/simibubi/create/modules/contraptions/relays/GearshiftTileEntity.java delete mode 100644 src/main/java/com/simibubi/create/modules/contraptions/relays/GearshifterTileEntity.java create mode 100644 src/main/java/com/simibubi/create/modules/contraptions/relays/SidedAxisTunnelTileEntity.java rename src/main/java/com/simibubi/create/modules/contraptions/relays/{GearshifterTileEntityRenderer.java => SidedAxisTunnelTileEntityRenderer.java} (85%) create mode 100644 src/main/resources/assets/create/blockstates/clutch.json create mode 100644 src/main/resources/assets/create/blockstates/gearshift.json delete mode 100644 src/main/resources/assets/create/blockstates/gearshifter.json create mode 100644 src/main/resources/assets/create/models/block/clutch_off.json create mode 100644 src/main/resources/assets/create/models/block/clutch_on.json rename src/main/resources/assets/create/models/block/{gearshifter_off.json => gearshift_off.json} (96%) create mode 100644 src/main/resources/assets/create/models/block/gearshift_on.json delete mode 100644 src/main/resources/assets/create/models/block/gearshifter_on.json create mode 100644 src/main/resources/assets/create/models/item/clutch.json create mode 100644 src/main/resources/assets/create/models/item/gearshift.json delete mode 100644 src/main/resources/assets/create/models/item/gearshifter.json rename src/main/resources/assets/create/textures/block/{gearshifter_off.png => clutch_off.png} (100%) rename src/main/resources/assets/create/textures/block/{gearshifter_on.png => clutch_on.png} (100%) create mode 100644 src/main/resources/assets/create/textures/block/gearshift_off.png create mode 100644 src/main/resources/assets/create/textures/block/gearshift_on.png diff --git a/src/main/java/com/simibubi/create/AllBlocks.java b/src/main/java/com/simibubi/create/AllBlocks.java index 8703cb967..b52a90ef8 100644 --- a/src/main/java/com/simibubi/create/AllBlocks.java +++ b/src/main/java/com/simibubi/create/AllBlocks.java @@ -20,10 +20,11 @@ import com.simibubi.create.modules.contraptions.redstone.ContactBlock; import com.simibubi.create.modules.contraptions.relays.AxisBlock; import com.simibubi.create.modules.contraptions.relays.AxisTunnelBlock; import com.simibubi.create.modules.contraptions.relays.BeltBlock; +import com.simibubi.create.modules.contraptions.relays.ClutchBlock; import com.simibubi.create.modules.contraptions.relays.CogWheelBlock; import com.simibubi.create.modules.contraptions.relays.EncasedBeltBlock; import com.simibubi.create.modules.contraptions.relays.GearboxBlock; -import com.simibubi.create.modules.contraptions.relays.GearshifterBlock; +import com.simibubi.create.modules.contraptions.relays.GearshiftBlock; import com.simibubi.create.modules.economy.ShopShelfBlock; import com.simibubi.create.modules.gardens.CocoaLogBlock; import com.simibubi.create.modules.logistics.block.ExtractorBlock; @@ -66,7 +67,8 @@ public enum AllBlocks { LARGE_GEAR(new CogWheelBlock(true)), AXIS_TUNNEL(new AxisTunnelBlock()), ENCASED_BELT(new EncasedBeltBlock()), - GEARSHIFTER(new GearshifterBlock()), + CLUTCH(new ClutchBlock()), + GEARSHIFT(new GearshiftBlock()), GEARBOX(new GearboxBlock()), BELT(new BeltBlock()), BELT_PULLEY(new RenderUtilityAxisBlock()), diff --git a/src/main/java/com/simibubi/create/AllTileEntities.java b/src/main/java/com/simibubi/create/AllTileEntities.java index 032c24a73..ad73131fb 100644 --- a/src/main/java/com/simibubi/create/AllTileEntities.java +++ b/src/main/java/com/simibubi/create/AllTileEntities.java @@ -17,16 +17,17 @@ import com.simibubi.create.modules.contraptions.relays.AxisTunnelTileEntity; import com.simibubi.create.modules.contraptions.relays.AxisTunnelTileEntityRenderer; import com.simibubi.create.modules.contraptions.relays.BeltTileEntity; import com.simibubi.create.modules.contraptions.relays.BeltTileEntityRenderer; +import com.simibubi.create.modules.contraptions.relays.ClutchTileEntity; import com.simibubi.create.modules.contraptions.relays.GearboxTileEntity; import com.simibubi.create.modules.contraptions.relays.GearboxTileEntityRenderer; -import com.simibubi.create.modules.contraptions.relays.GearshifterTileEntity; -import com.simibubi.create.modules.contraptions.relays.GearshifterTileEntityRenderer; +import com.simibubi.create.modules.contraptions.relays.GearshiftTileEntity; +import com.simibubi.create.modules.contraptions.relays.SidedAxisTunnelTileEntityRenderer; import com.simibubi.create.modules.economy.ShopShelfTileEntity; import com.simibubi.create.modules.logistics.block.ExtractorTileEntity; import com.simibubi.create.modules.logistics.block.FlexcrateTileEntity; import com.simibubi.create.modules.logistics.block.LinkedExtractorTileEntity; -import com.simibubi.create.modules.logistics.block.RedstoneBridgeTileEntity; import com.simibubi.create.modules.logistics.block.LinkedTileEntityRenderer; +import com.simibubi.create.modules.logistics.block.RedstoneBridgeTileEntity; import com.simibubi.create.modules.logistics.block.StockswitchTileEntity; import com.simibubi.create.modules.schematics.block.SchematicTableTileEntity; import com.simibubi.create.modules.schematics.block.SchematicannonRenderer; @@ -57,7 +58,9 @@ public enum AllTileEntities { MOTOR(MotorTileEntity::new, AllBlocks.MOTOR), GEARBOX(GearboxTileEntity::new, AllBlocks.GEARBOX), TURNTABLE(TurntableTileEntity::new, AllBlocks.TURNTABLE), AXIS_TUNNEL(AxisTunnelTileEntity::new, AllBlocks.AXIS_TUNNEL, AllBlocks.ENCASED_BELT), - GEARSHIFTER(GearshifterTileEntity::new, AllBlocks.GEARSHIFTER), BELT(BeltTileEntity::new, AllBlocks.BELT), + CLUTCH(ClutchTileEntity::new, AllBlocks.CLUTCH), + GEARSHIFT(GearshiftTileEntity::new, AllBlocks.GEARSHIFT), + BELT(BeltTileEntity::new, AllBlocks.BELT), MECHANICAL_PISTON(MechanicalPistonTileEntity::new, AllBlocks.MECHANICAL_PISTON, AllBlocks.STICKY_MECHANICAL_PISTON), DRILL(DrillTileEntity::new, AllBlocks.DRILL), CRUSHING_WHEEL(CrushingWheelTileEntity::new, AllBlocks.CRUSHING_WHEEL), @@ -67,15 +70,14 @@ public enum AllTileEntities { // Logistics REDSTONE_BRIDGE(RedstoneBridgeTileEntity::new, AllBlocks.REDSTONE_BRIDGE), STOCKSWITCH(StockswitchTileEntity::new, AllBlocks.STOCKSWITCH), - FLEXCRATE(FlexcrateTileEntity::new, AllBlocks.FLEXCRATE), - EXTRACTOR(ExtractorTileEntity::new, AllBlocks.EXTRACTOR), + FLEXCRATE(FlexcrateTileEntity::new, AllBlocks.FLEXCRATE), EXTRACTOR(ExtractorTileEntity::new, AllBlocks.EXTRACTOR), LINKED_EXTRACTOR(LinkedExtractorTileEntity::new, AllBlocks.LINKED_EXTRACTOR), - + // Economy SHOP_SHELF(ShopShelfTileEntity::new, AllBlocks.SHOP_SHELF), ; - + private Supplier supplier; public TileEntityType type; private AllBlocks[] blocks; @@ -108,7 +110,8 @@ public enum AllTileEntities { bind(MotorTileEntity.class, new MotorTileEntityRenderer()); bind(AxisTunnelTileEntity.class, new AxisTunnelTileEntityRenderer()); bind(GearboxTileEntity.class, new GearboxTileEntityRenderer()); - bind(GearshifterTileEntity.class, new GearshifterTileEntityRenderer()); + bind(GearshiftTileEntity.class, new SidedAxisTunnelTileEntityRenderer()); + bind(ClutchTileEntity.class, new SidedAxisTunnelTileEntityRenderer()); bind(BeltTileEntity.class, new BeltTileEntityRenderer()); bind(MechanicalPistonTileEntity.class, new MechanicalPistonTileEntityRenderer()); bind(DrillTileEntity.class, new KineticTileEntityRenderer()); diff --git a/src/main/java/com/simibubi/create/modules/contraptions/RotationPropagator.java b/src/main/java/com/simibubi/create/modules/contraptions/RotationPropagator.java index 5fb3472ce..3fb72cba9 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/RotationPropagator.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/RotationPropagator.java @@ -9,7 +9,7 @@ import com.simibubi.create.modules.contraptions.base.KineticTileEntity; import com.simibubi.create.modules.contraptions.relays.BeltTileEntity; import com.simibubi.create.modules.contraptions.relays.EncasedBeltBlock; import com.simibubi.create.modules.contraptions.relays.GearboxTileEntity; -import com.simibubi.create.modules.contraptions.relays.GearshifterTileEntity; +import com.simibubi.create.modules.contraptions.relays.SidedAxisTunnelTileEntity; import net.minecraft.block.BlockState; import net.minecraft.state.IProperty; @@ -86,7 +86,7 @@ public class RotationPropagator { return 0; } - private static int getAxisModifier(KineticTileEntity te, Direction direction) { + private static float getAxisModifier(KineticTileEntity te, Direction direction) { if (!te.hasSource()) return 1; Direction source = te.getSourceFacing(); @@ -95,8 +95,8 @@ public class RotationPropagator { return direction.getAxis() == source.getAxis() ? direction == source ? 1 : -1 : direction.getAxisDirection() == source.getAxisDirection() ? -1 : 1; - if (te instanceof GearshifterTileEntity) - return source == direction ? 1 : te.getBlockState().get(BlockStateProperties.POWERED) ? -1 : 1; + if (te instanceof SidedAxisTunnelTileEntity) + return ((SidedAxisTunnelTileEntity) te).getRotationSpeedModifier(direction); return 1; } @@ -199,6 +199,8 @@ public class RotationPropagator { public static void handleRemoved(World worldIn, BlockPos pos, KineticTileEntity removedTE) { if (worldIn.isRemote) return; + if (removedTE == null) + return; if (removedTE.getSpeed() == 0) return; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/base/KineticTileEntity.java b/src/main/java/com/simibubi/create/modules/contraptions/base/KineticTileEntity.java index c3d531ef6..9a8f6c76a 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/base/KineticTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/base/KineticTileEntity.java @@ -88,7 +88,7 @@ public abstract class KineticTileEntity extends SyncedTileEntity { this.speed = speed; if (hasWorld() && speed != 0 && world.isRemote) { Random r = getWorld().rand; - for (int i = 0; i < 10; i++) { + for (int i = 0; i < 2; i++) { float x = getPos().getX() + (r.nextFloat() - .5f) / 2f + .5f; float y = getPos().getY() + (r.nextFloat() - .5f) / 2f + .5f; float z = getPos().getZ() + (r.nextFloat() - .5f) / 2f + .5f; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/ClutchBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/ClutchBlock.java new file mode 100644 index 000000000..13a7b20ca --- /dev/null +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/ClutchBlock.java @@ -0,0 +1,25 @@ +package com.simibubi.create.modules.contraptions.relays; + +import com.simibubi.create.foundation.utility.ItemDescription; +import com.simibubi.create.foundation.utility.ItemDescription.Palette; + +import net.minecraft.block.BlockState; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockReader; + +public class ClutchBlock extends GearshiftBlock { + + @Override + public TileEntity createTileEntity(BlockState state, IBlockReader world) { + return new ClutchTileEntity(); + } + + @Override + public ItemDescription getDescription() { + Palette color = Palette.Red; + return new ItemDescription(color).withSummary("A controllable rotation switch for connected shafts.") + .withBehaviour("When Powered", h("Stops", color) + " conveying rotation to the other side.") + .createTabs(); + } + +} diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/ClutchTileEntity.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/ClutchTileEntity.java new file mode 100644 index 000000000..0c57385b4 --- /dev/null +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/ClutchTileEntity.java @@ -0,0 +1,23 @@ +package com.simibubi.create.modules.contraptions.relays; + +import com.simibubi.create.AllTileEntities; + +import net.minecraft.state.properties.BlockStateProperties; +import net.minecraft.util.Direction; + +public class ClutchTileEntity extends SidedAxisTunnelTileEntity { + + public ClutchTileEntity() { + super(AllTileEntities.CLUTCH.type); + } + + @Override + public float getRotationSpeedModifier(Direction face) { + if (hasSource()) { + if (face != getSourceFacing() && getBlockState().get(BlockStateProperties.POWERED)) + return 0; + } + return 1; + } + +} diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/GearshifterBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/GearshiftBlock.java similarity index 72% rename from src/main/java/com/simibubi/create/modules/contraptions/relays/GearshifterBlock.java rename to src/main/java/com/simibubi/create/modules/contraptions/relays/GearshiftBlock.java index 4a8591211..3367ca445 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/GearshifterBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/GearshiftBlock.java @@ -1,5 +1,7 @@ package com.simibubi.create.modules.contraptions.relays; +import com.simibubi.create.foundation.utility.ItemDescription; +import com.simibubi.create.foundation.utility.ItemDescription.Palette; import com.simibubi.create.modules.contraptions.RotationPropagator; import com.simibubi.create.modules.contraptions.base.KineticTileEntity; @@ -15,20 +17,27 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -public class GearshifterBlock extends AxisTunnelBlock { +public class GearshiftBlock extends AxisTunnelBlock { public static final BooleanProperty POWERED = BlockStateProperties.POWERED; - public GearshifterBlock() { + public GearshiftBlock() { super(); setDefaultState(getDefaultState().with(POWERED, false)); } @Override public TileEntity createTileEntity(BlockState state, IBlockReader world) { - return new GearshifterTileEntity(); + return new GearshiftTileEntity(); } + @Override + public ItemDescription getDescription() { + Palette color = Palette.Red; + return new ItemDescription(color).withSummary("A controllable rotation switch for connected shafts.") + .withBehaviour("When Powered", h("Reverses", color) + " the incoming rotation on the other side.").createTabs(); + } + @Override protected void fillStateContainer(Builder builder) { builder.add(POWERED); @@ -49,8 +58,9 @@ public class GearshifterBlock extends AxisTunnelBlock { boolean previouslyPowered = state.get(POWERED); if (previouslyPowered != worldIn.isBlockPowered(pos)) { - RotationPropagator.handleRemoved(worldIn, pos, (KineticTileEntity) worldIn.getTileEntity(pos)); worldIn.setBlockState(pos, state.cycle(POWERED), 2); + if (!previouslyPowered) + RotationPropagator.handleRemoved(worldIn, pos, (KineticTileEntity) worldIn.getTileEntity(pos)); } } diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/GearshiftTileEntity.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/GearshiftTileEntity.java new file mode 100644 index 000000000..542ac7f7f --- /dev/null +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/GearshiftTileEntity.java @@ -0,0 +1,23 @@ +package com.simibubi.create.modules.contraptions.relays; + +import com.simibubi.create.AllTileEntities; + +import net.minecraft.state.properties.BlockStateProperties; +import net.minecraft.util.Direction; + +public class GearshiftTileEntity extends SidedAxisTunnelTileEntity { + + public GearshiftTileEntity() { + super(AllTileEntities.GEARSHIFT.type); + } + + @Override + public float getRotationSpeedModifier(Direction face) { + if (hasSource()) { + if (face != getSourceFacing() && getBlockState().get(BlockStateProperties.POWERED)) + return -1; + } + return 1; + } + +} diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/GearshifterTileEntity.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/GearshifterTileEntity.java deleted file mode 100644 index e9f878b7f..000000000 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/GearshifterTileEntity.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.simibubi.create.modules.contraptions.relays; - -import com.simibubi.create.AllTileEntities; -import com.simibubi.create.modules.contraptions.base.KineticTileEntity; - -public class GearshifterTileEntity extends KineticTileEntity { - - public GearshifterTileEntity() { - super(AllTileEntities.GEARSHIFTER.type); - } - -} diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/SidedAxisTunnelTileEntity.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/SidedAxisTunnelTileEntity.java new file mode 100644 index 000000000..e7605f427 --- /dev/null +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/SidedAxisTunnelTileEntity.java @@ -0,0 +1,16 @@ +package com.simibubi.create.modules.contraptions.relays; + +import com.simibubi.create.modules.contraptions.base.KineticTileEntity; + +import net.minecraft.tileentity.TileEntityType; +import net.minecraft.util.Direction; + +public abstract class SidedAxisTunnelTileEntity extends KineticTileEntity { + + public SidedAxisTunnelTileEntity(TileEntityType typeIn) { + super(typeIn); + } + + public abstract float getRotationSpeedModifier(Direction face); + +} diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/GearshifterTileEntityRenderer.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/SidedAxisTunnelTileEntityRenderer.java similarity index 85% rename from src/main/java/com/simibubi/create/modules/contraptions/relays/GearshifterTileEntityRenderer.java rename to src/main/java/com/simibubi/create/modules/contraptions/relays/SidedAxisTunnelTileEntityRenderer.java index 525d57dcd..d5c696c00 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/GearshifterTileEntityRenderer.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/SidedAxisTunnelTileEntityRenderer.java @@ -13,7 +13,7 @@ import net.minecraft.util.Direction.Axis; import net.minecraft.util.math.BlockPos; import net.minecraftforge.client.model.animation.Animation; -public class GearshifterTileEntityRenderer extends KineticTileEntityRenderer { +public class SidedAxisTunnelTileEntityRenderer extends KineticTileEntityRenderer { @Override public void renderTileEntityFast(KineticTileEntity te, double x, double y, double z, float partialTicks, @@ -33,12 +33,12 @@ public class GearshifterTileEntityRenderer extends KineticTileEntityRenderer { float offset = getRotationOffsetForPosition(te, pos, axis); float angle = (time * te.getSpeed()) % 360; + float modifier = 1; + + if (te instanceof SidedAxisTunnelTileEntity) + modifier = ((SidedAxisTunnelTileEntity) te).getRotationSpeedModifier(direction); - if (te.hasSource()) { - if (direction != te.getSourceFacing() && te.getBlockState().get(BlockStateProperties.POWERED)) - angle = -angle; - } - + angle *= modifier; angle += offset; angle = angle / 180f * (float) Math.PI; diff --git a/src/main/resources/assets/create/blockstates/clutch.json b/src/main/resources/assets/create/blockstates/clutch.json new file mode 100644 index 000000000..e18f6dd35 --- /dev/null +++ b/src/main/resources/assets/create/blockstates/clutch.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "variants": { + "powered" : { + "true": { "model": "create:block/clutch_on" }, + "false": { "model": "create:block/clutch_off" } + }, + "axis": { + "y": { "x": 90 }, + "x": { "y": 90 }, + "z": {} + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/gearshift.json b/src/main/resources/assets/create/blockstates/gearshift.json new file mode 100644 index 000000000..3bbde498e --- /dev/null +++ b/src/main/resources/assets/create/blockstates/gearshift.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "variants": { + "powered" : { + "true": { "model": "create:block/gearshift_on" }, + "false": { "model": "create:block/gearshift_off" } + }, + "axis": { + "x": { "y": 90 }, + "y": { "x": 90 }, + "z": {} + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/gearshifter.json b/src/main/resources/assets/create/blockstates/gearshifter.json deleted file mode 100644 index 4f5e00c5f..000000000 --- a/src/main/resources/assets/create/blockstates/gearshifter.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "forgemarker": 1, - "defaults": { - "model": "create:block/gearshifter_off" - }, - "variants": { - "powered=false,axis=y": { "model": "create:block/gearshifter_off", "x": 90 }, - "powered=false,axis=z": { "model": "create:block/gearshifter_off" }, - "powered=false,axis=x": { "model": "create:block/gearshifter_off", "y": 90 }, - - "powered=true,axis=y": { "model": "create:block/gearshifter_on", "x": 90 }, - "powered=true,axis=z": { "model": "create:block/gearshifter_on" }, - "powered=true,axis=x": { "model": "create:block/gearshifter_on", "y": 90 } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/lang/en_us.json b/src/main/resources/assets/create/lang/en_us.json index 5ef5546e7..6946d01c6 100644 --- a/src/main/resources/assets/create/lang/en_us.json +++ b/src/main/resources/assets/create/lang/en_us.json @@ -15,7 +15,8 @@ "block.create.large_gear": "Large Cogwheel", "block.create.turntable": "Turntable", "block.create.gearbox": "Gearbox", - "block.create.gearshifter": "Gearshifter", + "block.create.gearshift": "Gearshift", + "block.create.clutch": "Clutch", "block.create.axis": "Axis", "block.create.encased_belt": "Encased Belt", "block.create.axis_tunnel": "Encased Axis", diff --git a/src/main/resources/assets/create/models/block/clutch_off.json b/src/main/resources/assets/create/models/block/clutch_off.json new file mode 100644 index 000000000..8e4ab3138 --- /dev/null +++ b/src/main/resources/assets/create/models/block/clutch_off.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/gearshift_off", + "textures": { + "0": "create:block/clutch_off", + "particle": "create:block/clutch_off" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/clutch_on.json b/src/main/resources/assets/create/models/block/clutch_on.json new file mode 100644 index 000000000..da96aacb3 --- /dev/null +++ b/src/main/resources/assets/create/models/block/clutch_on.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/gearshift_off", + "textures": { + "0": "create:block/clutch_on", + "particle": "create:block/clutch_on" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/gearshifter_off.json b/src/main/resources/assets/create/models/block/gearshift_off.json similarity index 96% rename from src/main/resources/assets/create/models/block/gearshifter_off.json rename to src/main/resources/assets/create/models/block/gearshift_off.json index 83471c17e..7c69551d5 100644 --- a/src/main/resources/assets/create/models/block/gearshifter_off.json +++ b/src/main/resources/assets/create/models/block/gearshift_off.json @@ -2,9 +2,9 @@ "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", "parent": "block/cube", "textures": { - "0": "create:block/gearshifter_off", + "0": "create:block/gearshift_off", "1": "create:block/gearbox", - "particle": "create:block/gearshifter_off" + "particle": "create:block/gearshift_off" }, "elements": [ { diff --git a/src/main/resources/assets/create/models/block/gearshift_on.json b/src/main/resources/assets/create/models/block/gearshift_on.json new file mode 100644 index 000000000..dd6c3b2e1 --- /dev/null +++ b/src/main/resources/assets/create/models/block/gearshift_on.json @@ -0,0 +1,7 @@ +{ + "parent": "create:block/gearshift_off", + "textures": { + "0": "create:block/gearshift_on", + "particle": "create:block/gearshift_on" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/gearshifter_on.json b/src/main/resources/assets/create/models/block/gearshifter_on.json deleted file mode 100644 index a74b273b6..000000000 --- a/src/main/resources/assets/create/models/block/gearshifter_on.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "parent": "create:block/gearshifter_off", - "textures": { - "0": "create:block/gearshifter_on", - "particle": "create:block/gearshifter_on" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/clutch.json b/src/main/resources/assets/create/models/item/clutch.json new file mode 100644 index 000000000..f36f45866 --- /dev/null +++ b/src/main/resources/assets/create/models/item/clutch.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/clutch_off" +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/gearshift.json b/src/main/resources/assets/create/models/item/gearshift.json new file mode 100644 index 000000000..74acd75da --- /dev/null +++ b/src/main/resources/assets/create/models/item/gearshift.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/gearshift_off" +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/gearshifter.json b/src/main/resources/assets/create/models/item/gearshifter.json deleted file mode 100644 index 25662231e..000000000 --- a/src/main/resources/assets/create/models/item/gearshifter.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create:block/gearshifter_off" -} \ No newline at end of file diff --git a/src/main/resources/assets/create/textures/block/gearshifter_off.png b/src/main/resources/assets/create/textures/block/clutch_off.png similarity index 100% rename from src/main/resources/assets/create/textures/block/gearshifter_off.png rename to src/main/resources/assets/create/textures/block/clutch_off.png diff --git a/src/main/resources/assets/create/textures/block/gearshifter_on.png b/src/main/resources/assets/create/textures/block/clutch_on.png similarity index 100% rename from src/main/resources/assets/create/textures/block/gearshifter_on.png rename to src/main/resources/assets/create/textures/block/clutch_on.png diff --git a/src/main/resources/assets/create/textures/block/gearshift_off.png b/src/main/resources/assets/create/textures/block/gearshift_off.png new file mode 100644 index 0000000000000000000000000000000000000000..e9504c00bd44880b514956bedc4584bd6ab0e8f6 GIT binary patch literal 561 zcmV-10?z%3P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0mey0K~y+TMN+#? z!!Q)JowSLeNt)7>A_gQR#8CJMb_Ql7CM3Rsfq{QvW#v1dLP9(S1_~)OP#{g3#2ouZ z`8UuPIqL32_|Pj4>O(ox$#Jn)O#B@GLKw&jPRA z>GsQP2G8d-+1T8g#BbmakM}mh`q;cW@q@ z>N^5Ipj&a+qA0$9=i~uy@1NW45QNlbQJ`6EDjWmef4g!xU(`n58&R7>8UL zAPIP`8sNA@s@Kxl>W~2PQZc9sZGgi`mefKiME`#J+t3K_g5hu(mjMobSzwRnXL{P5@y%Liu|^*+WUtR1-JxY#_bo$It5vk{}$ z7;$fg*ZKj@)H>FCHq#qQa9x-79P3S$ODX>V-bdVF0q7__00000NkvXXu0mjf_E+;l literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/create/textures/block/gearshift_on.png b/src/main/resources/assets/create/textures/block/gearshift_on.png new file mode 100644 index 0000000000000000000000000000000000000000..50faee2c924e85ff7b9c3b820763d5384646888a GIT binary patch literal 588 zcmV-S0<-;zP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0pUqRK~y+TO;XEl z(@+qd`|#r?envGBRH6Z-wg^~IB$j+gC03RA2w1~^!IBLNs9;g4YFQwfs&SJjj&JOk zV~;CwB#-CLndiMDPTrjqML|Tym@Lb}C|t}JEMa6!r_){|Qb(_j4iBCt{&0UX3Dc1f zT4@o7Nt%tr!7z&AMl}1ACxPQ6JK1b@qmkaum*Y<#zY$e$9zEPkkY*Fdr{{kT9`EM) z?D8TXeK|iPdhq@ODB0Dai0CB_QY}{-wg5lRekVx^BeSlnVU%bczeA!ik=Bm!WYaW6 zqAW{}fst88TOmr~3!*)E389pNlv28`dw(a`y%*ugY+Y~r008G-taY%~A_hub*O1Iw z+g_%`&{esHhPp=6wga-l)iw@v7?}+N%yL%&_}WP%MpqaEF*vdWz*bFz?0o>bd`(nT ztw*`lkboyENEn%g6`uVqahHy2Tk=(nB2`sEM=2QppRld4DoW%)m&;X=rX##AyqQJ? z7@5s)b7XIa27!-fz{Nv4j?f*+^f+W>g*=veRdx_uLd@B6&xSa0s! a81oO>#m5F=Mgda*0000