From 0d6499bda707809d1a69492e815adaa4d1c47cac Mon Sep 17 00:00:00 2001 From: IThundxr Date: Sun, 19 Nov 2023 15:50:57 -0500 Subject: [PATCH] Switched Up! - Replace switches with new model & texture - Rename TileEntity -> BlockEntity --- .../content/switches/SwitchDisplaySource.java | 2 +- .../content/switches/TrackSwitch.java | 2 +- .../content/switches/TrackSwitchBlock.java | 16 +- ...ntity.java => TrackSwitchBlockEntity.java} | 4 +- .../content/switches/TrackSwitchRenderer.java | 16 +- .../mixin/MixinAbstractBogeyBlock.java | 4 +- ...ava => MixinStandardBogeyBlockEntity.java} | 2 +- ...ava => MixinBogeyBlockEntityRenderer.java} | 2 +- .../railways/ponder/TrainScenes.java | 18 +- .../railways/registry/CRBlockEntities.java | 6 +- .../block/track_switch_andesite/handle.json | 8 +- .../block/track_switch_andesite/item.json | 15 +- .../block/track_switch_brass/block.json | 175 +++++++------ .../models/block/track_switch_brass/flag.json | 76 ++---- .../models/block/track_switch_brass/item.json | 247 +++++++++--------- .../track_switch/andesite_casing_xxshort.png | Bin 420 -> 345 bytes .../track_switch/brass_casing_xxshort.png | Bin 250 -> 0 bytes .../block/track_switch/brass_switch.png | Bin 0 -> 1025 bytes .../block/track_switch/brass_switch_top.png | Bin 483 -> 0 bytes .../resources/railways-common.mixins.json | 4 +- 20 files changed, 289 insertions(+), 308 deletions(-) rename common/src/main/java/com/railwayteam/railways/content/switches/{TrackSwitchTileEntity.java => TrackSwitchBlockEntity.java} (98%) rename common/src/main/java/com/railwayteam/railways/mixin/{MixinStandardBogeyTileEntity.java => MixinStandardBogeyBlockEntity.java} (92%) rename common/src/main/java/com/railwayteam/railways/mixin/client/{MixinBogeyTileEntityRenderer.java => MixinBogeyBlockEntityRenderer.java} (97%) delete mode 100644 common/src/main/resources/assets/railways/textures/block/track_switch/brass_casing_xxshort.png create mode 100644 common/src/main/resources/assets/railways/textures/block/track_switch/brass_switch.png delete mode 100644 common/src/main/resources/assets/railways/textures/block/track_switch/brass_switch_top.png diff --git a/common/src/main/java/com/railwayteam/railways/content/switches/SwitchDisplaySource.java b/common/src/main/java/com/railwayteam/railways/content/switches/SwitchDisplaySource.java index 67b78441f..8725b42f1 100644 --- a/common/src/main/java/com/railwayteam/railways/content/switches/SwitchDisplaySource.java +++ b/common/src/main/java/com/railwayteam/railways/content/switches/SwitchDisplaySource.java @@ -9,7 +9,7 @@ public class SwitchDisplaySource extends SingleLineDisplaySource { @Override protected MutableComponent provideLine(DisplayLinkContext context, DisplayTargetStats stats) { - if (context.getSourceBlockEntity() instanceof TrackSwitchTileEntity sw) { + if (context.getSourceBlockEntity() instanceof TrackSwitchBlockEntity sw) { return Components.translatable("railways.display_source.switch."+sw.getState().getSerializedName()); } return Components.empty(); diff --git a/common/src/main/java/com/railwayteam/railways/content/switches/TrackSwitch.java b/common/src/main/java/com/railwayteam/railways/content/switches/TrackSwitch.java index ed5ab051b..bd3340e60 100644 --- a/common/src/main/java/com/railwayteam/railways/content/switches/TrackSwitch.java +++ b/common/src/main/java/com/railwayteam/railways/content/switches/TrackSwitch.java @@ -130,7 +130,7 @@ public boolean canCoexistWith(EdgePointType otherType, boolean front) { public void blockEntityAdded(BlockEntity tile, boolean front) { super.blockEntityAdded(tile, front); - if (tile instanceof TrackSwitchTileEntity te) { + if (tile instanceof TrackSwitchBlockEntity te) { te.calculateExits(this); automatic = te.isAutomatic(); locked = te.isLocked(); diff --git a/common/src/main/java/com/railwayteam/railways/content/switches/TrackSwitchBlock.java b/common/src/main/java/com/railwayteam/railways/content/switches/TrackSwitchBlock.java index d37e0a95b..6b34c24c0 100644 --- a/common/src/main/java/com/railwayteam/railways/content/switches/TrackSwitchBlock.java +++ b/common/src/main/java/com/railwayteam/railways/content/switches/TrackSwitchBlock.java @@ -36,7 +36,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -public abstract class TrackSwitchBlock extends HorizontalDirectionalBlock implements IBE, IWrenchable { +public abstract class TrackSwitchBlock extends HorizontalDirectionalBlock implements IBE, IWrenchable { boolean isAutomatic; // public static final Property STATE = EnumProperty.create("state", SwitchState.class); public static final BooleanProperty LOCKED = BlockStateProperties.LOCKED; @@ -183,12 +183,12 @@ public BlockState getStateForPlacement(BlockPlaceContext context) { } @Override - public Class getBlockEntityClass() { - return TrackSwitchTileEntity.class; + public Class getBlockEntityClass() { + return TrackSwitchBlockEntity.class; } @Override - public BlockEntityType getBlockEntityType() { + public BlockEntityType getBlockEntityType() { return isAutomatic ? CRBlockEntities.BRASS_SWITCH.get() : CRBlockEntities.ANDESITE_SWITCH.get(); @@ -234,7 +234,7 @@ public void onRemove(BlockState state, Level level, BlockPos pos, BlockState new return InteractionResult.SUCCESS; } - TrackSwitchTileEntity te = getBlockEntity(level, pos); + TrackSwitchBlockEntity te = getBlockEntity(level, pos); if (te != null) { if (player.getGameProfile() == ConductorEntity.FAKE_PLAYER_PROFILE) { return te.onProjectileHit() ? InteractionResult.CONSUME : InteractionResult.SUCCESS; @@ -250,7 +250,7 @@ public void onRemove(BlockState state, Level level, BlockPos pos, BlockState new public void onProjectileHit(Level level, BlockState state, BlockHitResult hit, Projectile projectile) { super.onProjectileHit(level, state, hit, projectile); - TrackSwitchTileEntity te = getBlockEntity(level, hit.getBlockPos()); + TrackSwitchBlockEntity te = getBlockEntity(level, hit.getBlockPos()); if (te != null) { te.onProjectileHit(); } @@ -263,7 +263,7 @@ public void onProjectileHit(Level level, BlockState state, BlockHitResult hit, P public void neighborChanged(BlockState state, Level level, BlockPos pos, Block block, BlockPos fromPos, boolean isMoving) { super.neighborChanged(state, level, pos, block, fromPos, isMoving); - TrackSwitchTileEntity te = getBlockEntity(level, pos); + TrackSwitchBlockEntity te = getBlockEntity(level, pos); if (te != null) { te.checkRedstoneInputs(); } @@ -286,7 +286,7 @@ public boolean hasAnalogOutputSignal(@NotNull BlockState state) { */ @Override public int getAnalogOutputSignal(@NotNull BlockState state, @NotNull Level level, @NotNull BlockPos pos) { - if (level.getBlockEntity(pos) instanceof TrackSwitchTileEntity te) + if (level.getBlockEntity(pos) instanceof TrackSwitchBlockEntity te) return te.getTargetAnalogOutput(); return 0; } diff --git a/common/src/main/java/com/railwayteam/railways/content/switches/TrackSwitchTileEntity.java b/common/src/main/java/com/railwayteam/railways/content/switches/TrackSwitchBlockEntity.java similarity index 98% rename from common/src/main/java/com/railwayteam/railways/content/switches/TrackSwitchTileEntity.java rename to common/src/main/java/com/railwayteam/railways/content/switches/TrackSwitchBlockEntity.java index d07676547..5f829ac8d 100644 --- a/common/src/main/java/com/railwayteam/railways/content/switches/TrackSwitchTileEntity.java +++ b/common/src/main/java/com/railwayteam/railways/content/switches/TrackSwitchBlockEntity.java @@ -47,7 +47,7 @@ import static net.minecraft.world.level.block.HorizontalDirectionalBlock.FACING; -public class TrackSwitchTileEntity extends SmartBlockEntity implements ITransformableBlockEntity, IHaveGoggleInformation { +public class TrackSwitchBlockEntity extends SmartBlockEntity implements ITransformableBlockEntity, IHaveGoggleInformation { public TrackTargetingBehaviour edgePoint; private SwitchState state; private int lastAnalogOutput = 0; @@ -111,7 +111,7 @@ public TrackSwitch getSwitch() { final LerpedFloat lerpedAngle = LerpedFloat.angular().chase(0.0, 0.3, LerpedFloat.Chaser.EXP); - public TrackSwitchTileEntity(BlockEntityType type, BlockPos pos, BlockState state) { + public TrackSwitchBlockEntity(BlockEntityType type, BlockPos pos, BlockState state) { super(type, pos, state); } diff --git a/common/src/main/java/com/railwayteam/railways/content/switches/TrackSwitchRenderer.java b/common/src/main/java/com/railwayteam/railways/content/switches/TrackSwitchRenderer.java index db16b7133..c5f568719 100644 --- a/common/src/main/java/com/railwayteam/railways/content/switches/TrackSwitchRenderer.java +++ b/common/src/main/java/com/railwayteam/railways/content/switches/TrackSwitchRenderer.java @@ -3,7 +3,7 @@ import com.jozufozu.flywheel.util.transform.TransformStack; import com.mojang.blaze3d.vertex.PoseStack; import com.railwayteam.railways.content.switches.TrackSwitchBlock.SwitchState; -import com.railwayteam.railways.content.switches.TrackSwitchTileEntity.PonderData; +import com.railwayteam.railways.content.switches.TrackSwitchBlockEntity.PonderData; import com.railwayteam.railways.registry.CRBlockPartials; import com.railwayteam.railways.util.CustomTrackOverlayRendering; import com.simibubi.create.content.trains.track.ITrackBlock; @@ -26,13 +26,13 @@ import java.util.Map; -public class TrackSwitchRenderer extends SmartBlockEntityRenderer { +public class TrackSwitchRenderer extends SmartBlockEntityRenderer { public TrackSwitchRenderer(Context ctx) { super(ctx); } @Override - protected void renderSafe(TrackSwitchTileEntity te, float partialTicks, PoseStack ms, MultiBufferSource buffer, int light, int overlay) { + protected void renderSafe(TrackSwitchBlockEntity te, float partialTicks, PoseStack ms, MultiBufferSource buffer, int light, int overlay) { super.renderSafe(te, partialTicks, ms, buffer, light, overlay); renderFlagState(te, partialTicks, ms, buffer, light); renderTrackOverlay(te, ms, buffer, light, overlay, te.edgePoint); @@ -60,7 +60,7 @@ private void renderPonderData(PonderWorld ponderWorld, SwitchState state, Ponder ms.popPose(); } - private void renderFlagState(TrackSwitchTileEntity te, float partialTicks, PoseStack ms, MultiBufferSource buffer, + private void renderFlagState(TrackSwitchBlockEntity te, float partialTicks, PoseStack ms, MultiBufferSource buffer, int light) { BlockState state = te.getBlockState(); ms.pushPose(); @@ -84,11 +84,9 @@ private void renderFlagState(TrackSwitchTileEntity te, float partialTicks, PoseS // Rotate just enough to touch the front or back edge if (te.isReverseLeft() || (te.isNormal() && te.exitCount == 2 && te.hasExit(SwitchState.REVERSE_RIGHT))) { -// buf = buf.rotate(Direction.NORTH, -1.1f); - te.lerpedAngle.updateChaseTarget(-1.1f); + te.lerpedAngle.updateChaseTarget(-0.40f); } else if (te.isReverseRight() || (te.isNormal() && te.exitCount == 2 && te.hasExit(SwitchState.REVERSE_LEFT))) { -// buf = buf.rotate(Direction.NORTH, 1.1f); - te.lerpedAngle.updateChaseTarget(1.1f); + te.lerpedAngle.updateChaseTarget(0.40f); } else { te.lerpedAngle.updateChaseTarget(0.0f); } @@ -124,7 +122,7 @@ private void renderFlagState(TrackSwitchTileEntity te, float partialTicks, PoseS ms.popPose(); } - private void renderTrackOverlay(TrackSwitchTileEntity te, PoseStack ms, MultiBufferSource buffer, + private void renderTrackOverlay(TrackSwitchBlockEntity te, PoseStack ms, MultiBufferSource buffer, int light, int overlay, TrackTargetingBehaviour target) { BlockPos pos = te.getBlockPos(); boolean offsetToSide = CustomTrackOverlayRendering.overlayWillOverlap(target); diff --git a/common/src/main/java/com/railwayteam/railways/mixin/MixinAbstractBogeyBlock.java b/common/src/main/java/com/railwayteam/railways/mixin/MixinAbstractBogeyBlock.java index a20b90db6..10df7f23c 100644 --- a/common/src/main/java/com/railwayteam/railways/mixin/MixinAbstractBogeyBlock.java +++ b/common/src/main/java/com/railwayteam/railways/mixin/MixinAbstractBogeyBlock.java @@ -53,11 +53,11 @@ private void placeCorrectedBlock(BlockState state, Level level, BlockPos pos, Pl level.setBlock(pos, targetState, 3); BlockEntity newBlockEntity = level.getBlockEntity(pos); - if (!(newBlockEntity instanceof AbstractBogeyBlockEntity newTileEntity)) { + if (!(newBlockEntity instanceof AbstractBogeyBlockEntity newBlockEntity)) { cir.setReturnValue(InteractionResult.FAIL); return; } - newTileEntity.setBogeyData(oldData); + newBlockEntity.setBogeyData(oldData); } } diff --git a/common/src/main/java/com/railwayteam/railways/mixin/MixinStandardBogeyTileEntity.java b/common/src/main/java/com/railwayteam/railways/mixin/MixinStandardBogeyBlockEntity.java similarity index 92% rename from common/src/main/java/com/railwayteam/railways/mixin/MixinStandardBogeyTileEntity.java rename to common/src/main/java/com/railwayteam/railways/mixin/MixinStandardBogeyBlockEntity.java index 3f100d2fe..5955feb56 100644 --- a/common/src/main/java/com/railwayteam/railways/mixin/MixinStandardBogeyTileEntity.java +++ b/common/src/main/java/com/railwayteam/railways/mixin/MixinStandardBogeyBlockEntity.java @@ -6,7 +6,7 @@ import org.spongepowered.asm.mixin.Mixin; @Mixin(value = StandardBogeyBlockEntity.class, remap = false) -public class MixinStandardBogeyTileEntity implements IStandardBogeyTEVirtualCoupling { +public class MixinStandardBogeyBlockEntity implements IStandardBogeyTEVirtualCoupling { private double coupling = -1; @Override public void setCouplingDistance(double distance) { diff --git a/common/src/main/java/com/railwayteam/railways/mixin/client/MixinBogeyTileEntityRenderer.java b/common/src/main/java/com/railwayteam/railways/mixin/client/MixinBogeyBlockEntityRenderer.java similarity index 97% rename from common/src/main/java/com/railwayteam/railways/mixin/client/MixinBogeyTileEntityRenderer.java rename to common/src/main/java/com/railwayteam/railways/mixin/client/MixinBogeyBlockEntityRenderer.java index b6fe2fe7d..83bb9f3b5 100644 --- a/common/src/main/java/com/railwayteam/railways/mixin/client/MixinBogeyTileEntityRenderer.java +++ b/common/src/main/java/com/railwayteam/railways/mixin/client/MixinBogeyBlockEntityRenderer.java @@ -13,7 +13,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(value = BogeyBlockEntityRenderer.class, remap = false) -public class MixinBogeyTileEntityRenderer { +public class MixinBogeyBlockEntityRenderer { @Inject(method = "renderSafe", at = @At("RETURN"), remap = false) private void railways$renderVirtualCoupling(T te, float partialTicks, PoseStack ms, MultiBufferSource buffer, int light, int overlay, CallbackInfo ci) { if (te instanceof StandardBogeyBlockEntity sbte && te instanceof IStandardBogeyTEVirtualCoupling virtualCoupling) { diff --git a/common/src/main/java/com/railwayteam/railways/ponder/TrainScenes.java b/common/src/main/java/com/railwayteam/railways/ponder/TrainScenes.java index 023ccb166..4e1cb207a 100644 --- a/common/src/main/java/com/railwayteam/railways/ponder/TrainScenes.java +++ b/common/src/main/java/com/railwayteam/railways/ponder/TrainScenes.java @@ -5,8 +5,8 @@ import com.railwayteam.railways.content.coupling.coupler.TrackCouplerBlockEntity; import com.railwayteam.railways.content.switches.TrackSwitchBlock.SwitchConstraint; import com.railwayteam.railways.content.switches.TrackSwitchBlock.SwitchState; -import com.railwayteam.railways.content.switches.TrackSwitchTileEntity; -import com.railwayteam.railways.content.switches.TrackSwitchTileEntity.PonderData; +import com.railwayteam.railways.content.switches.TrackSwitchBlockEntity; +import com.railwayteam.railways.content.switches.TrackSwitchBlockEntity.PonderData; import com.railwayteam.railways.mixin_interfaces.IStandardBogeyTEVirtualCoupling; import com.railwayteam.railways.registry.CRBlocks; import com.simibubi.create.AllBlockEntityTypes; @@ -542,7 +542,7 @@ public static void trackSwitch(SceneBuilder scene, SceneBuildingUtil util) { @Override protected void onHitBlock(@NotNull BlockHitResult result) { super.onHitBlock(result); - if (level.getBlockEntity(result.getBlockPos()) instanceof TrackSwitchTileEntity switchBE) { + if (level.getBlockEntity(result.getBlockPos()) instanceof TrackSwitchBlockEntity switchBE) { switchBE.setStatePonder(switchBE.getState().nextStateForPonder(SwitchConstraint.NONE)); int output = switchBE.getTargetAnalogOutput(); @@ -586,8 +586,8 @@ public boolean isComplete() { return true; } - private Optional getSwitch(PonderScene scene) { - if (scene.getWorld().getBlockEntity(switchPos) instanceof TrackSwitchTileEntity switchBE) + private Optional getSwitch(PonderScene scene) { + if (scene.getWorld().getBlockEntity(switchPos) instanceof TrackSwitchBlockEntity switchBE) return Optional.of(switchBE); return Optional.empty(); } @@ -612,8 +612,8 @@ public boolean isComplete() { return true; } - private Optional getSwitch(PonderScene scene) { - if (scene.getWorld().getBlockEntity(switchPos) instanceof TrackSwitchTileEntity switchBE) + private Optional getSwitch(PonderScene scene) { + if (scene.getWorld().getBlockEntity(switchPos) instanceof TrackSwitchBlockEntity switchBE) return Optional.of(switchBE); return Optional.empty(); } @@ -638,8 +638,8 @@ public boolean isComplete() { return true; } - private Optional getSwitch(PonderScene scene) { - if (scene.getWorld().getBlockEntity(switchPos) instanceof TrackSwitchTileEntity switchBE) + private Optional getSwitch(PonderScene scene) { + if (scene.getWorld().getBlockEntity(switchPos) instanceof TrackSwitchBlockEntity switchBE) return Optional.of(switchBE); return Optional.empty(); } diff --git a/common/src/main/java/com/railwayteam/railways/registry/CRBlockEntities.java b/common/src/main/java/com/railwayteam/railways/registry/CRBlockEntities.java index d0476e022..c1abcb703 100644 --- a/common/src/main/java/com/railwayteam/railways/registry/CRBlockEntities.java +++ b/common/src/main/java/com/railwayteam/railways/registry/CRBlockEntities.java @@ -16,7 +16,7 @@ import com.railwayteam.railways.content.smokestack.DieselSmokeStackBlockEntity; import com.railwayteam.railways.content.smokestack.DieselSmokeStackRenderer; import com.railwayteam.railways.content.switches.TrackSwitchRenderer; -import com.railwayteam.railways.content.switches.TrackSwitchTileEntity; +import com.railwayteam.railways.content.switches.TrackSwitchBlockEntity; import com.simibubi.create.content.trains.bogey.BogeyBlockEntityRenderer; import com.simibubi.create.foundation.data.CreateRegistrate; import com.tterrag.registrate.util.entry.BlockEntityEntry; @@ -34,12 +34,12 @@ public class CRBlockEntities { .renderer(() -> TrackCouplerRenderer::new) .register(); - public static final BlockEntityEntry ANDESITE_SWITCH = REGISTRATE.blockEntity("track_switch_andesite", TrackSwitchTileEntity::new) + public static final BlockEntityEntry ANDESITE_SWITCH = REGISTRATE.blockEntity("track_switch_andesite", TrackSwitchBlockEntity::new) .validBlocks(CRBlocks.ANDESITE_SWITCH) .renderer(() -> TrackSwitchRenderer::new) .register(); - public static final BlockEntityEntry BRASS_SWITCH = REGISTRATE.blockEntity("track_switch_brass", TrackSwitchTileEntity::new) + public static final BlockEntityEntry BRASS_SWITCH = REGISTRATE.blockEntity("track_switch_brass", TrackSwitchBlockEntity::new) .validBlocks(CRBlocks.BRASS_SWITCH) .renderer(() -> TrackSwitchRenderer::new) .register(); diff --git a/common/src/main/resources/assets/railways/models/block/track_switch_andesite/handle.json b/common/src/main/resources/assets/railways/models/block/track_switch_andesite/handle.json index 9bb886861..20dce62c1 100644 --- a/common/src/main/resources/assets/railways/models/block/track_switch_andesite/handle.json +++ b/common/src/main/resources/assets/railways/models/block/track_switch_andesite/handle.json @@ -1,6 +1,6 @@ { "credit": "Made with Blockbench", - "parent": "railways:block/track_switch_andesite/block", + "parent": "andesite-track-switch", "textures": { "0": "railways:block/track_switch/axis", "1": "railways:block/track_switch/axis_top", @@ -9,8 +9,8 @@ "elements": [ { "name": "grip", - "from": [7, 8.5, 12], - "to": [9, 18.5, 13], + "from": [7.01, 8.5, 12], + "to": [8.99, 18.5, 13], "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 16, 14]}, "faces": { "north": {"uv": [7, 0, 9, 10], "texture": "#0"}, @@ -44,4 +44,4 @@ "children": [0, 1] } ] -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/railways/models/block/track_switch_andesite/item.json b/common/src/main/resources/assets/railways/models/block/track_switch_andesite/item.json index 85ac9d7fa..0421cc9d0 100644 --- a/common/src/main/resources/assets/railways/models/block/track_switch_andesite/item.json +++ b/common/src/main/resources/assets/railways/models/block/track_switch_andesite/item.json @@ -44,12 +44,12 @@ "to": [7, 26, 12], "rotation": {"angle": 0, "axis": "y", "origin": [0, -4, 0]}, "faces": { - "north": {"uv": [0, 0, 1, 16], "texture": "#5"}, - "east": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#5"}, - "south": {"uv": [15, 0, 16, 16], "texture": "#5"}, - "west": {"uv": [0, 0, 16, 16], "texture": "#5"}, - "up": {"uv": [0, 0, 16, 1], "rotation": 90, "texture": "#5"}, - "down": {"uv": [0, 15, 16, 16], "rotation": 90, "texture": "#5"} + "north": {"uv": [0, 0, 1, 8], "texture": "#5"}, + "east": {"uv": [0, 0, 8, 8], "rotation": 90, "texture": "#5"}, + "south": {"uv": [7, 0, 8, 8], "texture": "#5"}, + "west": {"uv": [0, 0, 8, 8], "texture": "#5"}, + "up": {"uv": [0, 0, 8, 1], "rotation": 90, "texture": "#5"}, + "down": {"uv": [0, 7, 8, 8], "rotation": 90, "texture": "#5"} } }, { @@ -208,21 +208,18 @@ "name": "flag", "origin": [0, 0, 0], "color": 0, - "nbt": "{}", "children": [0, 1, 2] }, { "name": "handle", "origin": [8, 8, 8], "color": 0, - "nbt": "{}", "children": [3, 4] }, { "name": "base", "origin": [8, 8, 8], "color": 0, - "nbt": "{}", "children": [5, 6, 7, 8, 9, 10] } ] diff --git a/common/src/main/resources/assets/railways/models/block/track_switch_brass/block.json b/common/src/main/resources/assets/railways/models/block/track_switch_brass/block.json index a537c87cb..ee03f6840 100644 --- a/common/src/main/resources/assets/railways/models/block/track_switch_brass/block.json +++ b/common/src/main/resources/assets/railways/models/block/track_switch_brass/block.json @@ -1,9 +1,9 @@ { "credit": "Made with Blockbench", + "texture_size": [32, 32], "textures": { - "1": "railways:block/track_switch/brass_casing_xxshort", - "2": "railways:block/track_switch/brass_switch_top", - "4": "create:block/brass_casing", + "0": "railways:block/track_switch/brass_switch", + "1": "create:block/brass_casing", "particle": "create:block/brass_casing" }, "elements": [ @@ -12,12 +12,25 @@ "from": [0, 0, 0], "to": [16, 5, 16], "faces": { - "north": {"uv": [0, 11, 16, 16], "texture": "#1"}, - "east": {"uv": [0, 11, 16, 16], "texture": "#1"}, - "south": {"uv": [0, 11, 16, 16], "texture": "#1"}, - "west": {"uv": [0, 11, 16, 16], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#2"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#4"} + "north": {"uv": [0, 8, 8, 10.5], "texture": "#0"}, + "east": {"uv": [0, 8, 8, 10.5], "texture": "#0"}, + "south": {"uv": [0, 8, 8, 10.5], "texture": "#0"}, + "west": {"uv": [0, 8, 8, 10.5], "texture": "#0"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#0"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#1"} + } + }, + { + "name": "hinge", + "from": [7, 5, 9], + "to": [9, 7, 10], + "faces": { + "north": {"uv": [3.5, 4.5, 4.5, 5.5], "texture": "#0"}, + "east": {"uv": [3.5, 4.5, 4, 5.5], "texture": "#0"}, + "south": {"uv": [3.5, 4.5, 4.5, 5.5], "texture": "#0"}, + "west": {"uv": [4, 4.5, 4.5, 5.5], "texture": "#0"}, + "up": {"uv": [3.5, 5, 4.5, 5.5], "texture": "#0"}, + "down": {"uv": [3.5, 4.5, 4.5, 5], "texture": "#0"} } }, { @@ -25,77 +38,101 @@ "from": [7, 5, 6], "to": [9, 7, 7], "faces": { - "north": {"uv": [7, 1, 9, 3], "texture": "#1"}, - "east": {"uv": [7, 1, 8, 3], "texture": "#1"}, - "south": {"uv": [7, 1, 9, 3], "texture": "#1"}, - "west": {"uv": [7, 1, 8, 3], "texture": "#1"}, - "up": {"uv": [7, 1, 9, 2], "texture": "#1"}, - "down": {"uv": [7, 1, 9, 2], "texture": "#1"} + "north": {"uv": [3.5, 4.5, 4.5, 5.5], "texture": "#0"}, + "east": {"uv": [3.5, 4.5, 4, 5.5], "texture": "#0"}, + "south": {"uv": [3.5, 4.5, 4.5, 5.5], "texture": "#0"}, + "west": {"uv": [4, 4.5, 4.5, 5.5], "texture": "#0"}, + "up": {"uv": [3.5, 5, 4.5, 5.5], "texture": "#0"}, + "down": {"uv": [3.5, 4.5, 4.5, 5], "texture": "#0"} } }, { - "name": "hinge", - "from": [7, 5, 9], - "to": [9, 7, 10], + "from": [3, 13, 6], + "to": [13, 15, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 11.5, 6.5]}, "faces": { - "north": {"uv": [7, 1, 9, 3], "texture": "#1"}, - "east": {"uv": [7, 1, 8, 3], "texture": "#1"}, - "south": {"uv": [7, 1, 9, 3], "texture": "#1"}, - "west": {"uv": [7, 1, 8, 3], "texture": "#1"}, - "up": {"uv": [7, 1, 9, 2], "texture": "#1"}, - "down": {"uv": [7, 1, 9, 2], "texture": "#1"} + "north": {"uv": [15, 2, 16, 7], "rotation": 90, "texture": "#0"}, + "south": {"uv": [15, 2, 16, 7.5], "rotation": 90, "texture": "#0"}, + "up": {"uv": [15, 2.5, 15.5, 8], "rotation": 270, "texture": "#0"}, + "down": {"uv": [15.5, 2, 16, 7.5], "rotation": 270, "texture": "#0"} } }, { - "name": "hinge", - "from": [14, 5, 9], - "to": [16, 6, 10], + "from": [13, 13, 6], + "to": [14, 15, 10], "faces": { - "north": {"uv": [9, 0, 11, 1], "texture": "#1"}, - "east": {"uv": [10, 0, 12, 1], "texture": "#1"}, - "south": {"uv": [9, 0, 11, 1], "texture": "#1"}, - "west": {"uv": [11, 0, 13, 1], "texture": "#1"}, - "up": {"uv": [9, 0, 11, 1], "texture": "#1"}, - "down": {"uv": [9, 0, 11, 1], "texture": "#1"} + "north": {"uv": [13, 0, 13.5, 1], "texture": "#0"}, + "east": {"uv": [13, 3.5, 15, 4.5], "texture": "#0"}, + "south": {"uv": [14.5, 0, 15, 1], "texture": "#0"}, + "west": {"uv": [13, 4, 15, 5], "texture": "#0"}, + "up": {"uv": [13, 3.5, 15, 4], "rotation": 90, "texture": "#0"}, + "down": {"uv": [13, 5, 15, 5.5], "rotation": 90, "texture": "#0"} } }, { - "name": "hinge", - "from": [14, 5, 6], - "to": [16, 6, 7], + "from": [2, 13, 6], + "to": [3, 15, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [7.7525, 11.5, 7.25]}, "faces": { - "north": {"uv": [9, 0, 11, 1], "texture": "#1"}, - "east": {"uv": [10, 0, 12, 1], "texture": "#1"}, - "south": {"uv": [9, 0, 11, 1], "texture": "#1"}, - "west": {"uv": [11, 0, 13, 1], "texture": "#1"}, - "up": {"uv": [9, 0, 11, 1], "texture": "#1"}, - "down": {"uv": [9, 0, 11, 1], "texture": "#1"} + "north": {"uv": [13, 0, 13.5, 1], "texture": "#0"}, + "east": {"uv": [13, 3.5, 15, 4.5], "texture": "#0"}, + "south": {"uv": [14.5, 0, 15, 1], "texture": "#0"}, + "west": {"uv": [13, 3.5, 15, 4.5], "texture": "#0"}, + "up": {"uv": [13, 3.5, 15, 4], "rotation": 90, "texture": "#0"}, + "down": {"uv": [13, 5, 15, 5.5], "rotation": 90, "texture": "#0"} } }, { - "name": "hinge", - "from": [0, 5, 9], - "to": [2, 6, 10], + "from": [1.995, 5, 6], + "to": [3.995, 13, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 11.5, 6.5]}, "faces": { - "north": {"uv": [9, 0, 11, 1], "texture": "#1"}, - "east": {"uv": [10, 0, 12, 1], "texture": "#1"}, - "south": {"uv": [9, 0, 11, 1], "texture": "#1"}, - "west": {"uv": [11, 0, 13, 1], "texture": "#1"}, - "up": {"uv": [9, 0, 11, 1], "texture": "#1"}, - "down": {"uv": [9, 0, 11, 1], "texture": "#1"} + "north": {"uv": [14, 0, 15, 4], "texture": "#0"}, + "east": {"uv": [15.5, 1.5, 16, 5.5], "texture": "#0"}, + "south": {"uv": [15, 4, 16, 0], "texture": "#0"}, + "west": {"uv": [15, 0.5, 15.5, 4.5], "texture": "#0"} } }, { - "name": "hinge", - "from": [0, 5, 6], - "to": [2, 6, 7], + "from": [12.005, 5, 6], + "to": [14.005, 13, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 11.5, 6.5]}, + "faces": { + "north": {"uv": [15, 0, 14, 4], "texture": "#0"}, + "east": {"uv": [15.5, 0.5, 15, 4.5], "texture": "#0"}, + "south": {"uv": [16, 4, 15, 0], "texture": "#0"}, + "west": {"uv": [16, 1.5, 15.5, 5.5], "texture": "#0"} + } + }, + { + "from": [12.005, 5, 9], + "to": [14.005, 13, 10], + "faces": { + "north": {"uv": [15, 4, 16, 0], "texture": "#0"}, + "east": {"uv": [15, 0.5, 15.5, 4.5], "texture": "#0"}, + "south": {"uv": [14, 0, 15, 4], "texture": "#0"}, + "west": {"uv": [15.5, 1.5, 16, 5.5], "texture": "#0"} + } + }, + { + "from": [3, 13, 9], + "to": [13, 15, 10], + "faces": { + "north": {"uv": [15, 2, 16, 7.5], "rotation": 90, "texture": "#0"}, + "south": {"uv": [15, 6, 16, 1], "rotation": 90, "texture": "#0"}, + "up": {"uv": [15, 2.5, 15.5, 8], "rotation": 90, "texture": "#0"}, + "down": {"uv": [15.5, 2, 16, 7.5], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [1.995, 5, 9], + "to": [3.995, 13, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 0]}, "faces": { - "north": {"uv": [9, 0, 11, 1], "texture": "#1"}, - "east": {"uv": [10, 0, 12, 1], "texture": "#1"}, - "south": {"uv": [9, 0, 11, 1], "texture": "#1"}, - "west": {"uv": [11, 0, 13, 1], "texture": "#1"}, - "up": {"uv": [9, 0, 11, 1], "texture": "#1"}, - "down": {"uv": [9, 0, 11, 1], "texture": "#1"} + "north": {"uv": [16, 4, 15, 0], "texture": "#0"}, + "east": {"uv": [16, 1.5, 15.5, 5.5], "texture": "#0"}, + "south": {"uv": [15, 0, 14, 4], "texture": "#0"}, + "west": {"uv": [15.5, 0.5, 15, 4.5], "texture": "#0"} } } ], @@ -119,7 +156,7 @@ "scale": [0.4, 0.4, 0.4] }, "ground": { - "translation": [0, 3, 0], + "translation": [0, -1, 0], "scale": [0.25, 0.25, 0.25] }, "gui": { @@ -142,21 +179,7 @@ "name": "base", "origin": [0, 0, 0], "color": 0, - "children": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - { - "name": "stoppers", - "origin": [8, 8, 8], - "color": 0, - "children": [] - } - ] + "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10] } ] } \ No newline at end of file diff --git a/common/src/main/resources/assets/railways/models/block/track_switch_brass/flag.json b/common/src/main/resources/assets/railways/models/block/track_switch_brass/flag.json index a423e21ac..8959ab1a7 100644 --- a/common/src/main/resources/assets/railways/models/block/track_switch_brass/flag.json +++ b/common/src/main/resources/assets/railways/models/block/track_switch_brass/flag.json @@ -1,64 +1,34 @@ { "credit": "Made with Blockbench", + "texture_size": [32, 32], "textures": { - "1": "railways:block/track_switch/brass_casing_xxshort", - "particle": "create:block/brass_casing" + "0": "railways:block/track_switch/brass_switch" }, "elements": [ { - "name": "crossbar", - "from": [5.5, 12, 7], - "to": [10.5, 13, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [0, -4, 0]}, + "from": [4, 20.9, 7.5], + "to": [12, 27.9, 8.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 6, 8]}, "faces": { - "north": {"uv": [0, 0, 6, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 2, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 5, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 2, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 5, 2], "texture": "#1"}, - "down": {"uv": [0, 0, 5, 2], "texture": "#1"} + "north": {"uv": [4, 10.5, 0, 14], "texture": "#0"}, + "east": {"uv": [3.5, 10.5, 4, 14], "texture": "#0"}, + "south": {"uv": [0, 10.5, 4, 14], "texture": "#0"}, + "west": {"uv": [0, 10.5, 0.5, 14], "texture": "#0"}, + "up": {"uv": [0, 10.5, 4, 11], "texture": "#0"}, + "down": {"uv": [0, 13.5, 4, 14], "texture": "#0"} } }, { - "name": "top", - "from": [2.25, 17, 6.8], - "to": [13.75, 18.5, 9.2], - "rotation": {"angle": 0, "axis": "y", "origin": [0, -4, 0]}, + "from": [7, 4, 7], + "to": [9, 28, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 6, 8]}, "faces": { - "north": {"uv": [2, 0, 13.5, 1.5], "texture": "#1"}, - "east": {"uv": [0, 1, 2, 2.5], "texture": "#1"}, - "south": {"uv": [2, 0, 13.5, 1.5], "texture": "#1"}, - "west": {"uv": [0, 1, 2, 2.5], "texture": "#1"}, - "up": {"uv": [2, 0, 13.5, 2], "texture": "#1"}, - "down": {"uv": [2, 0, 13.5, 2], "texture": "#1"} - } - }, - { - "name": "side", - "from": [7, 5.5, 6.9], - "to": [8.5, 18.3, 9.05], - "rotation": {"angle": -22.5, "axis": "z", "origin": [8, 4.5, 8]}, - "faces": { - "north": {"uv": [2, 0, 14.8, 1.5], "rotation": 270, "texture": "#1"}, - "east": {"uv": [2, 0, 14.8, 2], "rotation": 90, "texture": "#1"}, - "south": {"uv": [2, 0, 14.8, 1.5], "rotation": 90, "texture": "#1"}, - "west": {"uv": [2, 0, 14.8, 2], "rotation": 90, "texture": "#1"}, - "up": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 1, 2, 2], "rotation": 90, "texture": "#1"} - } - }, - { - "name": "side", - "from": [7.5, 5.5, 6.9], - "to": [9, 18.3, 9.1], - "rotation": {"angle": 22.5, "axis": "z", "origin": [8, 4.5, 8]}, - "faces": { - "north": {"uv": [1, 0, 13.8, 1.5], "rotation": 270, "texture": "#1"}, - "east": {"uv": [1, 0, 13.8, 2], "rotation": 90, "texture": "#1"}, - "south": {"uv": [1, 0, 13.8, 1.5], "rotation": 90, "texture": "#1"}, - "west": {"uv": [1, 0, 13.8, 2], "rotation": 90, "texture": "#1"}, - "up": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#1"} + "north": {"uv": [14.5, 0, 15.5, 12], "texture": "#0"}, + "east": {"uv": [14.5, 0, 15.5, 12], "texture": "#0"}, + "south": {"uv": [14.5, 0, 15.5, 12], "texture": "#0"}, + "west": {"uv": [14.5, 0, 15.5, 12], "texture": "#0"}, + "up": {"uv": [14.5, 0, 15.5, 1], "texture": "#0"}, + "down": {"uv": [15, 11, 16, 12], "texture": "#0"} } } ], @@ -82,7 +52,7 @@ "scale": [0.4, 0.4, 0.4] }, "ground": { - "translation": [0, 3, 0], + "translation": [0, -1, 0], "scale": [0.25, 0.25, 0.25] }, "gui": { @@ -103,9 +73,9 @@ "groups": [ { "name": "flag", - "origin": [8, 8.5, 8], + "origin": [0, 0, 0], "color": 0, - "children": [0, 1, 2, 3] + "children": [0, 1] } ] } \ No newline at end of file diff --git a/common/src/main/resources/assets/railways/models/block/track_switch_brass/item.json b/common/src/main/resources/assets/railways/models/block/track_switch_brass/item.json index e1fd9018c..589685d8f 100644 --- a/common/src/main/resources/assets/railways/models/block/track_switch_brass/item.json +++ b/common/src/main/resources/assets/railways/models/block/track_switch_brass/item.json @@ -1,157 +1,164 @@ { "credit": "Made with Blockbench", + "texture_size": [32, 32], "textures": { - "1": "railways:block/track_switch/brass_casing_xxshort", - "2": "railways:block/track_switch/brass_switch_top", - "4": "create:block/brass_casing", + "0": "railways:block/track_switch/brass_switch", + "1": "create:block/brass_casing", "particle": "create:block/brass_casing" }, "elements": [ { - "name": "crossbar", - "from": [5.5, 12, 7], - "to": [10.5, 13, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [0, -4, 0]}, + "name": "base", + "from": [0, 0, 0], + "to": [16, 5, 16], "faces": { - "north": {"uv": [0, 0, 6, 1], "texture": "#1"}, - "east": {"uv": [0, 0, 2, 1], "texture": "#1"}, - "south": {"uv": [0, 0, 5, 1], "texture": "#1"}, - "west": {"uv": [0, 0, 2, 1], "texture": "#1"}, - "up": {"uv": [0, 0, 5, 2], "texture": "#1"}, - "down": {"uv": [0, 0, 5, 2], "texture": "#1"} + "north": {"uv": [0, 8, 8, 10.5], "texture": "#0"}, + "east": {"uv": [0, 8, 8, 10.5], "texture": "#0"}, + "south": {"uv": [0, 8, 8, 10.5], "texture": "#0"}, + "west": {"uv": [0, 8, 8, 10.5], "texture": "#0"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#0"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#1"} } }, { - "name": "top", - "from": [2.25, 17, 6.8], - "to": [13.75, 18.5, 9.2], - "rotation": {"angle": 0, "axis": "y", "origin": [0, -4, 0]}, + "name": "hinge", + "from": [7, 5, 9], + "to": [9, 7, 10], "faces": { - "north": {"uv": [2, 0, 13.5, 1.5], "texture": "#1"}, - "east": {"uv": [0, 1, 2, 2.5], "texture": "#1"}, - "south": {"uv": [2, 0, 13.5, 1.5], "texture": "#1"}, - "west": {"uv": [0, 1, 2, 2.5], "texture": "#1"}, - "up": {"uv": [2, 0, 13.5, 2], "texture": "#1"}, - "down": {"uv": [2, 0, 13.5, 2], "texture": "#1"} + "north": {"uv": [3.5, 4.5, 4.5, 5.5], "texture": "#0"}, + "east": {"uv": [3.5, 4.5, 4, 5.5], "texture": "#0"}, + "south": {"uv": [3.5, 4.5, 4.5, 5.5], "texture": "#0"}, + "west": {"uv": [4, 4.5, 4.5, 5.5], "texture": "#0"}, + "up": {"uv": [3.5, 5, 4.5, 5.5], "texture": "#0"}, + "down": {"uv": [3.5, 4.5, 4.5, 5], "texture": "#0"} } }, { - "name": "side", - "from": [7, 5.5, 6.9], - "to": [8.5, 18.3, 9.05], - "rotation": {"angle": -22.5, "axis": "z", "origin": [8, 4.5, 8]}, + "name": "hinge", + "from": [7, 5, 6], + "to": [9, 7, 7], "faces": { - "north": {"uv": [2, 0, 14.8, 1.5], "rotation": 270, "texture": "#1"}, - "east": {"uv": [2, 0, 14.8, 2], "rotation": 90, "texture": "#1"}, - "south": {"uv": [2, 0, 14.8, 1.5], "rotation": 90, "texture": "#1"}, - "west": {"uv": [2, 0, 14.8, 2], "rotation": 90, "texture": "#1"}, - "up": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 1, 2, 2], "rotation": 90, "texture": "#1"} + "north": {"uv": [3.5, 4.5, 4.5, 5.5], "texture": "#0"}, + "east": {"uv": [3.5, 4.5, 4, 5.5], "texture": "#0"}, + "south": {"uv": [3.5, 4.5, 4.5, 5.5], "texture": "#0"}, + "west": {"uv": [4, 4.5, 4.5, 5.5], "texture": "#0"}, + "up": {"uv": [3.5, 5, 4.5, 5.5], "texture": "#0"}, + "down": {"uv": [3.5, 4.5, 4.5, 5], "texture": "#0"} } }, { - "name": "side", - "from": [7.5, 5.5, 6.9], - "to": [9, 18.3, 9.1], - "rotation": {"angle": 22.5, "axis": "z", "origin": [8, 4.5, 8]}, + "from": [3, 13, 6], + "to": [13, 15, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 11.5, 6.5]}, "faces": { - "north": {"uv": [1, 0, 13.8, 1.5], "rotation": 270, "texture": "#1"}, - "east": {"uv": [1, 0, 13.8, 2], "rotation": 90, "texture": "#1"}, - "south": {"uv": [1, 0, 13.8, 1.5], "rotation": 90, "texture": "#1"}, - "west": {"uv": [1, 0, 13.8, 2], "rotation": 90, "texture": "#1"}, - "up": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 0, 2, 1], "rotation": 90, "texture": "#1"} + "north": {"uv": [15, 2, 16, 7], "rotation": 90, "texture": "#0"}, + "south": {"uv": [15, 2, 16, 7.5], "rotation": 90, "texture": "#0"}, + "up": {"uv": [15, 2.5, 15.5, 8], "rotation": 270, "texture": "#0"}, + "down": {"uv": [15.5, 2, 16, 7.5], "rotation": 270, "texture": "#0"} } }, { - "name": "base", - "from": [0, 0, 0], - "to": [16, 5, 16], + "from": [13, 13, 6], + "to": [14, 15, 10], "faces": { - "north": {"uv": [0, 11, 16, 16], "texture": "#1"}, - "east": {"uv": [0, 11, 16, 16], "texture": "#1"}, - "south": {"uv": [0, 11, 16, 16], "texture": "#1"}, - "west": {"uv": [0, 11, 16, 16], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#2"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#4"} + "north": {"uv": [13, 0, 13.5, 1], "texture": "#0"}, + "east": {"uv": [13, 3.5, 15, 4.5], "texture": "#0"}, + "south": {"uv": [14.5, 0, 15, 1], "texture": "#0"}, + "west": {"uv": [13, 4, 15, 5], "texture": "#0"}, + "up": {"uv": [13, 3.5, 15, 4], "rotation": 90, "texture": "#0"}, + "down": {"uv": [13, 5, 15, 5.5], "rotation": 90, "texture": "#0"} } }, { - "name": "hinge", - "from": [7, 5, 6], - "to": [9, 7, 7], + "from": [2, 13, 6], + "to": [3, 15, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [7.7525, 11.5, 7.25]}, "faces": { - "north": {"uv": [7, 1, 9, 3], "texture": "#1"}, - "east": {"uv": [7, 1, 8, 3], "texture": "#1"}, - "south": {"uv": [7, 1, 9, 3], "texture": "#1"}, - "west": {"uv": [7, 1, 8, 3], "texture": "#1"}, - "up": {"uv": [7, 1, 9, 2], "texture": "#1"}, - "down": {"uv": [7, 1, 9, 2], "texture": "#1"} + "north": {"uv": [13, 0, 13.5, 1], "texture": "#0"}, + "east": {"uv": [13, 3.5, 15, 4.5], "texture": "#0"}, + "south": {"uv": [14.5, 0, 15, 1], "texture": "#0"}, + "west": {"uv": [13, 3.5, 15, 4.5], "texture": "#0"}, + "up": {"uv": [13, 3.5, 15, 4], "rotation": 90, "texture": "#0"}, + "down": {"uv": [13, 5, 15, 5.5], "rotation": 90, "texture": "#0"} } }, { - "name": "hinge", - "from": [7, 5, 9], - "to": [9, 7, 10], + "from": [1.995, 5, 6], + "to": [3.995, 13, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 11.5, 6.5]}, "faces": { - "north": {"uv": [7, 1, 9, 3], "texture": "#1"}, - "east": {"uv": [7, 1, 8, 3], "texture": "#1"}, - "south": {"uv": [7, 1, 9, 3], "texture": "#1"}, - "west": {"uv": [7, 1, 8, 3], "texture": "#1"}, - "up": {"uv": [7, 1, 9, 2], "texture": "#1"}, - "down": {"uv": [7, 1, 9, 2], "texture": "#1"} + "north": {"uv": [14, 0, 15, 4], "texture": "#0"}, + "east": {"uv": [15.5, 1.5, 16, 5.5], "texture": "#0"}, + "south": {"uv": [15, 4, 16, 0], "texture": "#0"}, + "west": {"uv": [15, 0.5, 15.5, 4.5], "texture": "#0"} } }, { - "name": "hinge", - "from": [14, 5, 9], - "to": [16, 6, 10], + "from": [12.005, 5, 6], + "to": [14.005, 13, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 11.5, 6.5]}, "faces": { - "north": {"uv": [9, 0, 11, 1], "texture": "#1"}, - "east": {"uv": [10, 0, 12, 1], "texture": "#1"}, - "south": {"uv": [9, 0, 11, 1], "texture": "#1"}, - "west": {"uv": [11, 0, 13, 1], "texture": "#1"}, - "up": {"uv": [9, 0, 11, 1], "texture": "#1"}, - "down": {"uv": [9, 0, 11, 1], "texture": "#1"} + "north": {"uv": [15, 0, 14, 4], "texture": "#0"}, + "east": {"uv": [15.5, 0.5, 15, 4.5], "texture": "#0"}, + "south": {"uv": [16, 4, 15, 0], "texture": "#0"}, + "west": {"uv": [16, 1.5, 15.5, 5.5], "texture": "#0"} } }, { - "name": "hinge", - "from": [14, 5, 6], - "to": [16, 6, 7], + "from": [12.005, 5, 9], + "to": [14.005, 13, 10], "faces": { - "north": {"uv": [9, 0, 11, 1], "texture": "#1"}, - "east": {"uv": [10, 0, 12, 1], "texture": "#1"}, - "south": {"uv": [9, 0, 11, 1], "texture": "#1"}, - "west": {"uv": [11, 0, 13, 1], "texture": "#1"}, - "up": {"uv": [9, 0, 11, 1], "texture": "#1"}, - "down": {"uv": [9, 0, 11, 1], "texture": "#1"} + "north": {"uv": [15, 4, 16, 0], "texture": "#0"}, + "east": {"uv": [15, 0.5, 15.5, 4.5], "texture": "#0"}, + "south": {"uv": [14, 0, 15, 4], "texture": "#0"}, + "west": {"uv": [15.5, 1.5, 16, 5.5], "texture": "#0"} } }, { - "name": "hinge", - "from": [0, 5, 9], - "to": [2, 6, 10], + "from": [3, 13, 9], + "to": [13, 15, 10], "faces": { - "north": {"uv": [9, 0, 11, 1], "texture": "#1"}, - "east": {"uv": [10, 0, 12, 1], "texture": "#1"}, - "south": {"uv": [9, 0, 11, 1], "texture": "#1"}, - "west": {"uv": [11, 0, 13, 1], "texture": "#1"}, - "up": {"uv": [9, 0, 11, 1], "texture": "#1"}, - "down": {"uv": [9, 0, 11, 1], "texture": "#1"} + "north": {"uv": [15, 2, 16, 7.5], "rotation": 90, "texture": "#0"}, + "south": {"uv": [15, 6, 16, 1], "rotation": 90, "texture": "#0"}, + "up": {"uv": [15, 2.5, 15.5, 8], "rotation": 90, "texture": "#0"}, + "down": {"uv": [15.5, 2, 16, 7.5], "rotation": 90, "texture": "#0"} } }, { - "name": "hinge", - "from": [0, 5, 6], - "to": [2, 6, 7], + "from": [1.995, 5, 9], + "to": [3.995, 13, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, 0]}, "faces": { - "north": {"uv": [9, 0, 11, 1], "texture": "#1"}, - "east": {"uv": [10, 0, 12, 1], "texture": "#1"}, - "south": {"uv": [9, 0, 11, 1], "texture": "#1"}, - "west": {"uv": [11, 0, 13, 1], "texture": "#1"}, - "up": {"uv": [9, 0, 11, 1], "texture": "#1"}, - "down": {"uv": [9, 0, 11, 1], "texture": "#1"} + "north": {"uv": [16, 4, 15, 0], "texture": "#0"}, + "east": {"uv": [16, 1.5, 15.5, 5.5], "texture": "#0"}, + "south": {"uv": [15, 0, 14, 4], "texture": "#0"}, + "west": {"uv": [15.5, 0.5, 15, 4.5], "texture": "#0"} + } + }, + { + "from": [4, 20.9, 7.5], + "to": [12, 27.9, 8.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 6, 8]}, + "faces": { + "north": {"uv": [4, 10.5, 0, 14], "texture": "#0"}, + "east": {"uv": [3.5, 10.5, 4, 14], "texture": "#0"}, + "south": {"uv": [0, 10.5, 4, 14], "texture": "#0"}, + "west": {"uv": [0, 10.5, 0.5, 14], "texture": "#0"}, + "up": {"uv": [0, 10.5, 4, 11], "texture": "#0"}, + "down": {"uv": [0, 13.5, 4, 14], "texture": "#0"} + } + }, + { + "from": [7, 4, 7], + "to": [9, 28, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 6, 8]}, + "faces": { + "north": {"uv": [14.5, 0, 15.5, 12], "texture": "#0"}, + "east": {"uv": [14.5, 0, 15.5, 12], "texture": "#0"}, + "south": {"uv": [14.5, 0, 15.5, 12], "texture": "#0"}, + "west": {"uv": [14.5, 0, 15.5, 12], "texture": "#0"}, + "up": {"uv": [14.5, 0, 15.5, 1], "texture": "#0"}, + "down": {"uv": [15, 11, 16, 12], "texture": "#0"} } } ], @@ -179,8 +186,8 @@ "scale": [0.25, 0.25, 0.25] }, "gui": { - "rotation": [30, 45, 0], - "translation": [0.5, -0.5, 0], + "rotation": [30, -45, 0], + "translation": [0.5, -1.5, 0], "scale": [0.5, 0.5, 0.5] }, "head": { @@ -195,30 +202,16 @@ }, "groups": [ { - "name": "flag", - "origin": [8, 8.5, 8], + "name": "base", + "origin": [0, 0, 0], "color": 0, - "children": [0, 1, 2, 3] + "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10] }, { - "name": "base", + "name": "flag", "origin": [0, 0, 0], "color": 0, - "children": [ - 4, - 5, - 6, - 7, - 8, - 9, - 10, - { - "name": "stoppers", - "origin": [8, 8, 8], - "color": 0, - "children": [] - } - ] + "children": [11, 12] } ] } \ No newline at end of file diff --git a/common/src/main/resources/assets/railways/textures/block/track_switch/andesite_casing_xxshort.png b/common/src/main/resources/assets/railways/textures/block/track_switch/andesite_casing_xxshort.png index 12884216ab718c534fba8c98f66ae2021b68af1c..c60d955acf28104adc59d95033e5d1e9512a2364 100644 GIT binary patch delta 319 zcmV-F0l@yG1K9$QBYy!PNkl?m2ca`TWq<4umfz(=F-(CQys_N(i^B=*!aX0%!ySI_R z`+#%GpnpLXBkAw)ES8HSvP4zcXhG?|3EmUDr*s7(J)CodvIJ{MvW$LzfOIPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi z!vFvd!vV){sAK>D0Xa!TK~y+Tos(Tk!$1^;&m`l>*w|VkNI@z7;e&A@ZlT~)(KVI>?UpeUFMDFfyp-G8`Z?3Np zSW_Go@bDO8b)}1!qEB>!IXuM^gn_{%%V4yRX#eob0sS15lSG7ecZqBI{%xO-cNXkC pS8_1@29lLjg`fF}Y7YQD0UO7FwuD^!VE_OC07*qoL%Qn$2wnqr%PY`TLAHx(k{z1uDLNvTmMX zp+4gno8Fw7Zi9v#@du^mf|Gh&RvcWNa)p7d%~62O^i*J_@n7QOs!jt_h@3_ju)GU5KpI@I~=EHMrf7!;ig%)X=tGGQ* x1}x|)d3sNq?HEt--2X95Yf@Sde%?J_k|9(%NziM0ksZ+e44$rjF6*2UngDu|VXpuH diff --git a/common/src/main/resources/assets/railways/textures/block/track_switch/brass_switch.png b/common/src/main/resources/assets/railways/textures/block/track_switch/brass_switch.png new file mode 100644 index 0000000000000000000000000000000000000000..75d5dffb5bfdec93d0799a2528fdae427477f73b GIT binary patch literal 1025 zcmV+c1pfPpP)D)E7{`Bhp09To*Vl6zS7}sgk}$Xl5_A9|ffyJ-LIMUPL0M z)TggM-(6WKa2(uS+u-`0`>Anb*1o>fefH%=f@YISxdA{w7b^<|o_leI(sCZPSR5PB ztyWQsMcitYO1Z)P2V1d8W>rDZY$8mPtl9z?-~ynuoaf@(H{_%fA}xRK1)YKaBL2tk zSGjSs5}N=(tL9MX+gv{vfZVyMXAqfC(Pi`E}IiGo|U4>eGWp&AFdOknlaC4^}r41>V32%1gQVv!PXd-V!#wTduJ zAiP9L(SHP^xJ;l`bD-w1(O73buW|9?A5atp&+||eg&(iILfdUf8Fgduj*L^_++yxf zF0cDW!@;tBvZ}zc{ej?~=V9m>=JOhco}ujqi4};(3d0!5r2>&Tv}z8yIgMMNzeH&{ zPo>;21+O_w>^0Rh5wl~O3M6TAfeQCLWTcIcP+cG?{;-erc=}}w&RLTw3zW)FS4QA%FCXHrm z)1h!i8>;>7QBZH6<^{iPK#6 z;f$6@B}mW>Be#R$OBkW}bWVPY<|ILEH~gp-qHR`U*wbhRhhCyZf9sD35 zBLo+oSsMH3j6-ZUoK-buRl$;xm6Px$ok>JNR5(v#EOIyeucIW!Kn^%{?kNM~yiE812Ij&Hn%Y7P9103}&H3@*0ay)) zzJB!`!;Z+-LJUZ3a%IrcZ($JR zVr5`qWdv*BW@ANh&DUSQ!TdkJ|1-S*_M73{#u$d`nxhB<42|0uBn3Gc*q9*(z`(D+ z|G`X{IEerJ{db1rYojm?;9_G&(Y$wgIM}Z_ExS>~zy12luw`Z-L*ImRm@eRAhZyqb z&p(C@I}5-87L&aRZos#ne{s72-3u`1qesohufG^pP4+`|fwg5P)&PVB9)RynvjP(UUB4vIf}>OUg^zybvyc zWhRh(h6$4|2xz2ws0n~Jl5t=vzp5Oh< Z006PX@HuDO@`C^X002ovPDHLkV1nl@&$j>o diff --git a/common/src/main/resources/railways-common.mixins.json b/common/src/main/resources/railways-common.mixins.json index 5d9dda520..41ebffd71 100644 --- a/common/src/main/resources/railways-common.mixins.json +++ b/common/src/main/resources/railways-common.mixins.json @@ -53,7 +53,7 @@ "MixinSlidingDoorBlock", "MixinSlidingDoorBlockEntity", "MixinSlidingDoorMovementBehaviour", - "MixinStandardBogeyTileEntity", + "MixinStandardBogeyBlockEntity", "MixinStationBlock", "MixinStationBlockEntity", "MixinStationEditPacket", @@ -97,7 +97,7 @@ "client.MixinBezierConnectionClient", "client.MixinBigOutlines", "client.MixinBlockElement_Deserializer", - "client.MixinBogeyTileEntityRenderer", + "client.MixinBogeyBlockEntityRenderer", "client.MixinCarriageContraptionEntity", "client.MixinCarriageContraptionInstance", "client.MixinCarriageSounds",