Anvilcraft/Create
1
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-11-12 13:01:41 +01:00
Code Issues Projects Releases Packages Wiki Activity

Conditional moving saw operation

Browse source 
- Saws are inactive while moving backwards
- Vertical moving saws can now damage entities
This commit is contained in:
Colman Davenport 2020-09-12 15:47:27 -04:00
parent a28b6bbdc3
commit 5342beacaf
2 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/com/simibubi/create/content/contraptions/components/actors/SawMovementBehaviour.java
View file

@ -27,7 +27,8 @@ public class SawMovementBehaviour extends BlockBreakingMovementBehaviour {
@Override @Override
public boolean isActive(MovementContext context) { public boolean isActive(MovementContext context) {
return SawBlock.isHorizontal(context.state); return !VecHelper.isVecPointingTowards(context.relativeMotion, context.state.get(SawBlock.FACING)
.getOpposite());
} }
@Override @Override
@ -35,6 +36,15 @@ public class SawMovementBehaviour extends BlockBreakingMovementBehaviour {
return new Vec3d(context.state.get(SawBlock.FACING).getDirectionVec()).scale(.65f); return new Vec3d(context.state.get(SawBlock.FACING).getDirectionVec()).scale(.65f);
} }
@Override
public void visitNewPosition(MovementContext context, BlockPos pos) {
super.visitNewPosition(context, pos);
if(!SawBlock.isHorizontal(context.state) && context.data.contains("BreakingPos")) {
context.data.remove("BreakingPos");
context.stall = false;
}
}
@Override @Override
public boolean canBreak(World world, BlockPos breakingPos, BlockState state) { public boolean canBreak(World world, BlockPos breakingPos, BlockState state) {
return super.canBreak(world, breakingPos, state) && SawTileEntity.isSawable(state); return super.canBreak(world, breakingPos, state) && SawTileEntity.isSawable(state);

16
src/main/java/com/simibubi/create/content/contraptions/components/saw/SawRenderer.java
View file

@ -139,10 +139,22 @@ public class SawRenderer extends SafeTileEntityRenderer<SawTileEntity> {
SuperByteBuffer superBuffer; SuperByteBuffer superBuffer;
Direction facing = state.get(SawBlock.FACING); Direction facing = state.get(SawBlock.FACING);
boolean horizontal = SawBlock.isHorizontal(state);
boolean backwards = VecHelper.isVecPointingTowards(context.relativeMotion, facing.getOpposite());
boolean moving = context.getAnimationSpeed() != 0;
boolean shouldAnimate = (context.contraption.stalled && horizontal)
|| (!context.contraption.stalled && !backwards && moving);
if(SawBlock.isHorizontal(state)) { if(SawBlock.isHorizontal(state)) {
superBuffer = AllBlockPartials.SAW_BLADE_HORIZONTAL_ACTIVE.renderOn(state); if(shouldAnimate)
superBuffer = AllBlockPartials.SAW_BLADE_HORIZONTAL_ACTIVE.renderOn(state);
else
superBuffer = AllBlockPartials.SAW_BLADE_HORIZONTAL_INACTIVE.renderOn(state);
} else { } else {
superBuffer = AllBlockPartials.SAW_BLADE_VERTICAL_INACTIVE.renderOn(state); if(shouldAnimate)
superBuffer = AllBlockPartials.SAW_BLADE_VERTICAL_ACTIVE.renderOn(state);
else
superBuffer = AllBlockPartials.SAW_BLADE_VERTICAL_INACTIVE.renderOn(state);
} }
for (MatrixStack m : matrixStacks) { for (MatrixStack m : matrixStacks) {