mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-12-29 16:36:37 +01:00
Code Issues Projects Releases Packages Wiki Activity

Clean up gantry fix

Browse source
This commit is contained in:
reidbhuntley 2021-05-21 13:18:15 -04:00
parent d0040260d7
commit c7d3166fd1
2 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/main/java/com/simibubi/create/content/contraptions/relays/advanced/GantryShaftBlock.java
View file

@ -125,13 +125,6 @@ public class GantryShaftBlock extends DirectionalKineticBlock {
} }
} }
if (!world.isRemote() && part == Part.MIDDLE && prevPart != Part.MIDDLE) {
TileEntity te = world.getTileEntity(pos);
if (te instanceof GantryShaftTileEntity) {
((GantryShaftTileEntity)te).checkAttachedCarriageBlocks(true);
}
}
return state.with(PART, part); return state.with(PART, part);
} }
@ -176,6 +169,20 @@ public class GantryShaftBlock extends DirectionalKineticBlock {
return onWrenched; return onWrenched;
} }
@Override
public void onBlockAdded(BlockState state, World worldIn, BlockPos pos, BlockState oldState, boolean isMoving) {
super.onBlockAdded(state, worldIn, pos, oldState, isMoving);
if (!worldIn.isRemote() && oldState.getBlock().is(AllBlocks.GANTRY_SHAFT.get())) {
Part oldPart = oldState.get(PART), part = state.get(PART);
if ((oldPart != Part.MIDDLE && part == Part.MIDDLE) || (oldPart == Part.SINGLE && part != Part.SINGLE)) {
TileEntity te = worldIn.getTileEntity(pos);
if (te instanceof GantryShaftTileEntity)
((GantryShaftTileEntity) te).checkAttachedCarriageBlocks();
}
}
}
@Override @Override
public void neighborChanged(BlockState state, World worldIn, BlockPos pos, Block p_220069_4_, BlockPos p_220069_5_, public void neighborChanged(BlockState state, World worldIn, BlockPos pos, Block p_220069_4_, BlockPos p_220069_5_,
boolean p_220069_6_) { boolean p_220069_6_) {

13
src/main/java/com/simibubi/create/content/contraptions/relays/advanced/GantryShaftTileEntity.java
View file

@ -19,8 +19,8 @@ public class GantryShaftTileEntity extends KineticTileEntity {
super(typeIn); super(typeIn);
} }
public void checkAttachedCarriageBlocks(boolean willBeMiddle) { public void checkAttachedCarriageBlocks() {
if (!canAssembleOn(willBeMiddle)) if (!canAssembleOn())
return; return;
for (Direction d : Iterate.directions) { for (Direction d : Iterate.directions) {
if (d.getAxis() == getBlockState().get(GantryShaftBlock.FACING) if (d.getAxis() == getBlockState().get(GantryShaftBlock.FACING)
@ -41,7 +41,7 @@ public class GantryShaftTileEntity extends KineticTileEntity {
@Override @Override
public void onSpeedChanged(float previousSpeed) { public void onSpeedChanged(float previousSpeed) {
super.onSpeedChanged(previousSpeed); super.onSpeedChanged(previousSpeed);
checkAttachedCarriageBlocks(false); checkAttachedCarriageBlocks();
} }
@Override @Override
@ -75,10 +75,6 @@ public class GantryShaftTileEntity extends KineticTileEntity {
} }
public boolean canAssembleOn() { public boolean canAssembleOn() {
return canAssembleOn(false);
}
public boolean canAssembleOn(boolean willBeMiddle) {
BlockState blockState = getBlockState(); BlockState blockState = getBlockState();
if (!AllBlocks.GANTRY_SHAFT.has(blockState)) if (!AllBlocks.GANTRY_SHAFT.has(blockState))
return false; return false;
@ -86,9 +82,6 @@ public class GantryShaftTileEntity extends KineticTileEntity {
return false; return false;
float speed = getPinionMovementSpeed(); float speed = getPinionMovementSpeed();
if (willBeMiddle)
return speed != 0;
switch (blockState.get(GantryShaftBlock.PART)) { switch (blockState.get(GantryShaftBlock.PART)) {
case END: case END:
return speed < 0; return speed < 0;