diff --git a/src/main/java/carpet/mixins/PistonBlock_movableTEMixin.java b/src/main/java/carpet/mixins/PistonBlock_movableTEMixin.java index c53c6441..f2878acf 100644 --- a/src/main/java/carpet/mixins/PistonBlock_movableTEMixin.java +++ b/src/main/java/carpet/mixins/PistonBlock_movableTEMixin.java @@ -32,7 +32,7 @@ public abstract class PistonBlock_movableTEMixin extends FacingBlock @Inject(method = "isMovable", at = @At("HEAD"), cancellable = true) private static void slimeHoney(BlockState blockState_1, World world_1, BlockPos blockPos_1, Direction direction_1, boolean boolean_1, Direction direction_2, CallbackInfoReturnable cir) { - if (CarpetSettings.honeyGlidingSlime && direction_1 != direction_2) + if (CarpetSettings.honeySlime && direction_1 != direction_2) { Block block = blockState_1.getBlock(); if (block != Blocks.ORANGE_STAINED_GLASS && block != Blocks.SLIME_BLOCK) return; diff --git a/src/main/java/carpet/mixins/PistonHandler_movableTEMixin.java b/src/main/java/carpet/mixins/PistonHandler_movableTEMixin.java index 1a1fea52..7e7f7d84 100644 --- a/src/main/java/carpet/mixins/PistonHandler_movableTEMixin.java +++ b/src/main/java/carpet/mixins/PistonHandler_movableTEMixin.java @@ -41,7 +41,7 @@ public abstract class PistonHandler_movableTEMixin * @author 2No2Name */ private void stickToStickySide(BlockPos blockPos_1, Direction direction_1, CallbackInfoReturnable 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 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 diff --git a/src/main/java/carpet/settings/CarpetSettings.java b/src/main/java/carpet/settings/CarpetSettings.java index 28e8d736..f80f81a2 100644 --- a/src/main/java/carpet/settings/CarpetSettings.java +++ b/src/main/java/carpet/settings/CarpetSettings.java @@ -151,11 +151,11 @@ public class CarpetSettings public static boolean movableBlockEntities = false; @Rule( - desc = "Honey doesn't stick to Slime and vice versa", - extra = "In 1.14 that behaviour is applied to orange stained glass instead", + desc = "Orange stained glass behaves like slime, but doesn't stick to it", + extra = "Only available for 1.14. in 1.15 use honey instead", category = {EXPERIMENTAL, FEATURE} ) - public static boolean honeyGlidingSlime = false; + public static boolean honeySlime = false; @Rule( desc = "Saplings turn into dead shrubs in hot climates and no water access", category = FEATURE ) public static boolean desertShrubs = false;