diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerBlock.java index f11ff1f93..7c002e81a 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerBlock.java @@ -10,7 +10,6 @@ import com.simibubi.create.AllBlocks; import com.simibubi.create.AllItems; import com.simibubi.create.AllShapes; import com.simibubi.create.content.contraptions.base.DirectionalAxisKineticBlock; -import com.simibubi.create.content.contraptions.base.KineticBlock; import com.simibubi.create.content.contraptions.components.AssemblyOperatorUseContext; import com.simibubi.create.foundation.block.IBE; import com.simibubi.create.foundation.utility.placement.IPlacementHelper; @@ -185,8 +184,10 @@ public class DeployerBlock extends DirectionalAxisKineticBlock implements IBE directions = IPlacementHelper.orderedByDistanceOnlyAxis(pos, ray.getLocation(), - ((KineticBlock) state.getBlock()).getRotationAxis(state), dir -> world.getBlockState(pos.relative(dir)) + List directions = IPlacementHelper.orderedByDistanceExceptAxis(pos, ray.getLocation(), + state.getValue(FACING) + .getAxis(), + dir -> world.getBlockState(pos.relative(dir)) .getMaterial() .isReplaceable()); @@ -198,6 +199,7 @@ public class DeployerBlock extends DirectionalAxisKineticBlock implements IBE getStatePredicate() { - return state -> AllBlocks.MECHANICAL_SAW.has(state) && state.getValue(FACING) - .getAxis() != Axis.Y; + return state -> AllBlocks.MECHANICAL_SAW.has(state); } @Override public PlacementOffset getOffset(Player player, Level world, BlockState state, BlockPos pos, BlockHitResult ray) { - if (state.getValue(FACING) - .getAxis() == Axis.Y) - return PlacementOffset.fail(); - - List directions = IPlacementHelper.orderedByDistanceOnlyAxis(pos, ray.getLocation(), + List directions = IPlacementHelper.orderedByDistanceExceptAxis(pos, ray.getLocation(), state.getValue(FACING) - .getClockWise() .getAxis(), dir -> world.getBlockState(pos.relative(dir)) .getMaterial() @@ -255,10 +249,11 @@ public class SawBlock extends DirectionalAxisKineticBlock implements IBE s.setValue(FACING, state.getValue(FACING)) - .setValue(AXIS_ALONG_FIRST_COORDINATE, state.getValue(AXIS_ALONG_FIRST_COORDINATE)) - .setValue(FLIPPED, state.getValue(FLIPPED))); + .setValue(AXIS_ALONG_FIRST_COORDINATE, state.getValue(AXIS_ALONG_FIRST_COORDINATE)) + .setValue(FLIPPED, state.getValue(FLIPPED))); } } + } } diff --git a/src/main/java/com/simibubi/create/content/logistics/block/redstone/RedstoneLinkFrequencySlot.java b/src/main/java/com/simibubi/create/content/logistics/block/redstone/RedstoneLinkFrequencySlot.java index 902d69c16..82bad3d6f 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/redstone/RedstoneLinkFrequencySlot.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/redstone/RedstoneLinkFrequencySlot.java @@ -23,11 +23,11 @@ public class RedstoneLinkFrequencySlot extends ValueBoxTransform.Dual { @Override protected Vec3 getLocalOffset(BlockState state) { Direction facing = state.getValue(RedstoneLinkBlock.FACING); - Vec3 location = vertical; + Vec3 location = VecHelper.voxelSpace(8f, 3.01f, 5.5f); if (facing.getAxis() .isHorizontal()) { - location = horizontal; + location = VecHelper.voxelSpace(8f, 5.5f, 3.01f); if (isFirst()) location = location.add(0, 5 / 16f, 0); return rotateHorizontally(state, location); @@ -52,7 +52,7 @@ public class RedstoneLinkFrequencySlot extends ValueBoxTransform.Dual { @Override protected float getScale() { - return .5f; + return .4975f; } } diff --git a/src/main/resources/assets/create/models/block/redstone_link/receiver.json b/src/main/resources/assets/create/models/block/redstone_link/receiver.json index 77ca940e3..cb66f463c 100644 --- a/src/main/resources/assets/create/models/block/redstone_link/receiver.json +++ b/src/main/resources/assets/create/models/block/redstone_link/receiver.json @@ -57,8 +57,8 @@ } }, { - "from": [6.1, 2.5, 3.6], - "to": [9.9, 3.5, 7.4], + "from": [6, 2.5, 3.5], + "to": [10, 3.5, 7.5], "faces": { "north": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge"}, "east": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge"}, @@ -68,8 +68,8 @@ } }, { - "from": [6.1, 2.5, 8.6], - "to": [9.9, 3.5, 12.4], + "from": [6, 2.5, 8.5], + "to": [10, 3.5, 12.5], "faces": { "north": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge"}, "east": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge"}, diff --git a/src/main/resources/assets/create/models/block/redstone_link/receiver_vertical.json b/src/main/resources/assets/create/models/block/redstone_link/receiver_vertical.json index d8af8b9b5..d75b88699 100644 --- a/src/main/resources/assets/create/models/block/redstone_link/receiver_vertical.json +++ b/src/main/resources/assets/create/models/block/redstone_link/receiver_vertical.json @@ -57,8 +57,8 @@ } }, { - "from": [6.1, 2.5, 3.6], - "to": [9.9, 3.5, 7.4], + "from": [6, 2.5, 3.5], + "to": [10, 3.5, 7.5], "faces": { "north": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge_side"}, "east": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge_side"}, @@ -68,8 +68,8 @@ } }, { - "from": [6.1, 2.5, 8.6], - "to": [9.9, 3.5, 12.4], + "from": [6, 2.5, 8.5], + "to": [10, 3.5, 12.5], "faces": { "north": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge_side"}, "east": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge_side"}, diff --git a/src/main/resources/assets/create/models/block/redstone_link/transmitter.json b/src/main/resources/assets/create/models/block/redstone_link/transmitter.json index 818591a9e..6603e584c 100644 --- a/src/main/resources/assets/create/models/block/redstone_link/transmitter.json +++ b/src/main/resources/assets/create/models/block/redstone_link/transmitter.json @@ -48,8 +48,8 @@ } }, { - "from": [6.1, 2.5, 3.6], - "to": [9.9, 3.5, 7.4], + "from": [6, 2.5, 3.5], + "to": [10, 3.5, 7.5], "faces": { "north": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge"}, "east": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge"}, @@ -59,8 +59,8 @@ } }, { - "from": [6.1, 2.5, 8.6], - "to": [9.9, 3.5, 12.4], + "from": [6, 2.5, 8.5], + "to": [10, 3.5, 12.5], "faces": { "north": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge"}, "east": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge"}, diff --git a/src/main/resources/assets/create/models/block/redstone_link/transmitter_vertical.json b/src/main/resources/assets/create/models/block/redstone_link/transmitter_vertical.json index f975717bf..6bd62867b 100644 --- a/src/main/resources/assets/create/models/block/redstone_link/transmitter_vertical.json +++ b/src/main/resources/assets/create/models/block/redstone_link/transmitter_vertical.json @@ -48,8 +48,8 @@ } }, { - "from": [6.1, 2.5, 3.6], - "to": [9.9, 3.5, 7.4], + "from": [6, 2.5, 3.5], + "to": [10, 3.5, 7.5], "faces": { "north": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge_side"}, "east": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge_side"}, @@ -59,8 +59,8 @@ } }, { - "from": [6.1, 2.5, 8.6], - "to": [9.9, 3.5, 12.4], + "from": [6, 2.5, 8.5], + "to": [10, 3.5, 12.5], "faces": { "north": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge_side"}, "east": {"uv": [11, 2, 13, 2.5], "texture": "#redstone_bridge_side"},