icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

restrict honey rule to 1.14 only

Browse Source
This commit is contained in:
gnembon committed 2019-10-16 09:38:47 -03:00
1 parent e625734910
commit 79e7bba04b
3 files changed
+7 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/mixins/PistonHandler_movableTEMixin.java
+3 -3
View File
@@ -41,7 +41,7 @@ public abstract class PistonHandler_movableTEMixin
* @author 2No2Name
*/
private void stickToStickySide(BlockPos blockPos_1, Direction direction_1, CallbackInfoReturnable<Boolean> cir, BlockState blockState_1, Block block_1, int int_1, int int_2, int int_4, BlockPos blockPos_3, int int_5, int int_6){
if (CarpetSettings.honeyGlidingSlime && this.world.getBlockState(blockPos_1).getBlock() == Blocks.ORANGE_STAINED_GLASS && !method_11538(blockPos_1)) {
if (CarpetSettings.honeySlime && this.world.getBlockState(blockPos_1).getBlock() == Blocks.ORANGE_STAINED_GLASS && !method_11538(blockPos_1)) {
cir.setReturnValue(false);
return;
}
@@ -58,7 +58,7 @@ public abstract class PistonHandler_movableTEMixin
*/
private void stickToStickySide(CallbackInfoReturnable<Boolean> cir, int int_1){
BlockPos pos = this.movedBlocks.get(int_1);
if (CarpetSettings.honeyGlidingSlime && world.getBlockState(pos).getBlock() == Blocks.ORANGE_STAINED_GLASS && !method_11538(pos))
if (CarpetSettings.honeySlime && world.getBlockState(pos).getBlock() == Blocks.ORANGE_STAINED_GLASS && !method_11538(pos))
{
cir.setReturnValue(false);
return;
@@ -120,7 +120,7 @@ public abstract class PistonHandler_movableTEMixin
* @author 2No2Nameb
*/
private Block redirectSlimeBlock() {
if (CarpetSettings.honeyGlidingSlime && blockState_1.getBlock() == Blocks.ORANGE_STAINED_GLASS)
if (CarpetSettings.honeySlime && blockState_1.getBlock() == Blocks.ORANGE_STAINED_GLASS)
return Blocks.ORANGE_STAINED_GLASS;
if (CarpetSettings.movableBlockEntities && isStickyOnSide(blockState_1, this.direction.getOpposite()))
return blockState_1.getBlock(); //this makes the comparison in the while condition "while(blockState_1.getBlock() == redirectSlimeBlock())" evaluate to true, so the block is treated as sticky