mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2025-01-12 15:26:39 +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
Failed to generate hash of commit
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
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.jozufozu.flywheel.core.PartialModel;
import com.simibubi.create.AllBlockPartials; import com.simibubi.create.AllBlockPartials;
import com.simibubi.create.AllItems;
import com.simibubi.create.AllShapes; import com.simibubi.create.AllShapes;
import com.simibubi.create.AllTileEntities; import com.simibubi.create.AllTileEntities;
import com.simibubi.create.content.contraptions.base.DirectionalKineticBlock; import com.simibubi.create.content.contraptions.base.DirectionalKineticBlock;
@ -74,6 +75,7 @@ public class HandCrankBlock extends DirectionalKineticBlock
return InteractionResult.PASS; return InteractionResult.PASS;
withTileEntityDo(worldIn, pos, te -> te.turn(player.isShiftKeyDown())); withTileEntityDo(worldIn, pos, te -> te.turn(player.isShiftKeyDown()));
if(!player.getItemInHand(handIn).is(AllItems.EXTENDO_GRIP.get()))
player.causeFoodExhaustion(getRotationSpeed() * AllConfigs.SERVER.kinetics.crankHungerMultiplier.getF()); player.causeFoodExhaustion(getRotationSpeed() * AllConfigs.SERVER.kinetics.crankHungerMultiplier.getF());
if (player.getFoodData() if (player.getFoodData()

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) { public GirderEncasedShaftBlock(Properties properties) {
super(properties); super(properties);
registerDefaultState(super.defaultBlockState()
.setValue(WATERLOGGED, false)
.setValue(TOP, false)
.setValue(BOTTOM, false));
} }
@Override @Override