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

Merge branch 'Creators-of-Create:mc1.18/dev' into mc1.18/dev

Browse source
This commit is contained in:
techno-sam 2023-04-06 17:10:26 -07:00 committed by GitHub
commit d52065808c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/com/simibubi/create/content/contraptions/components/crank/HandCrankBlock.java
View file

@ -2,6 +2,7 @@ package com.simibubi.create.content.contraptions.components.crank;
import com.jozufozu.flywheel.core.PartialModel;
import com.simibubi.create.AllBlockPartials;
import com.simibubi.create.AllItems;
import com.simibubi.create.AllShapes;
import com.simibubi.create.AllTileEntities;
import com.simibubi.create.content.contraptions.base.DirectionalKineticBlock;
@ -74,7 +75,8 @@ public class HandCrankBlock extends DirectionalKineticBlock
return InteractionResult.PASS;
withTileEntityDo(worldIn, pos, te -> te.turn(player.isShiftKeyDown()));
player.causeFoodExhaustion(getRotationSpeed() * AllConfigs.SERVER.kinetics.crankHungerMultiplier.getF());
if(!player.getItemInHand(handIn).is(AllItems.EXTENDO_GRIP.get()))
player.causeFoodExhaustion(getRotationSpeed() * AllConfigs.SERVER.kinetics.crankHungerMultiplier.getF());
if (player.getFoodData()
.getFoodLevel() == 0)
@ -117,14 +119,14 @@ public class HandCrankBlock extends DirectionalKineticBlock
}
}
}
@Override
public BlockState updateShape(BlockState pState, Direction pDirection, BlockState pNeighborState,
LevelAccessor pLevel, BlockPos pCurrentPos, BlockPos pNeighborPos) {
updateWater(pLevel, pState, pCurrentPos);
return pState;
}
@Override
public FluidState getFluidState(BlockState pState) {
return fluidState(pState);

4
src/main/java/com/simibubi/create/content/curiosities/girder/GirderEncasedShaftBlock.java
View file

@ -44,6 +44,10 @@ public class GirderEncasedShaftBlock extends HorizontalAxisKineticBlock
public GirderEncasedShaftBlock(Properties properties) {
super(properties);
registerDefaultState(super.defaultBlockState()
.setValue(WATERLOGGED, false)
.setValue(TOP, false)
.setValue(BOTTOM, false));
}
@Override