From 89b3cd83529bff914b7ffc96ad81cc95c11c43eb Mon Sep 17 00:00:00 2001 From: gnembon Date: Wed, 16 Oct 2019 09:42:53 -0300 Subject: [PATCH] removed honeyslime, 1.1.3 --- .../carpet/mixins/PistonBlock_movableTEMixin.java | 13 ------------- src/main/java/carpet/settings/CarpetSettings.java | 4 ++-- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/src/main/java/carpet/mixins/PistonBlock_movableTEMixin.java b/src/main/java/carpet/mixins/PistonBlock_movableTEMixin.java index c21b758b..5140f522 100644 --- a/src/main/java/carpet/mixins/PistonBlock_movableTEMixin.java +++ b/src/main/java/carpet/mixins/PistonBlock_movableTEMixin.java @@ -29,19 +29,6 @@ public abstract class PistonBlock_movableTEMixin extends FacingBlock private ThreadLocal> list1_BlockEntities = new ThreadLocal<>(); //Unneccessary ThreadLocal if client and server use different PistonBlock instances - @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.honeySlime && direction_1 != direction_2) - { - Block block = blockState_1.getBlock(); - if (block != Blocks.HONEY_BLOCK && block != Blocks.SLIME_BLOCK) return; - Block otherBlock = world_1.getBlockState(blockPos_1.method_10079(direction_2.getOpposite(),1)).getBlock(); - if (otherBlock != Blocks.HONEY_BLOCK && otherBlock != Blocks.SLIME_BLOCK) return; - cir.setReturnValue(block == otherBlock); - } - } - @Inject(method = "isMovable", at = @At(value = "RETURN", ordinal = 3, shift = At.Shift.BEFORE)) private static void movableCMD(BlockState blockState_1, World world_1, BlockPos blockPos_1, Direction direction_1, boolean boolean_1, Direction direction_2, CallbackInfoReturnable cir) diff --git a/src/main/java/carpet/settings/CarpetSettings.java b/src/main/java/carpet/settings/CarpetSettings.java index 596d5388..19663a27 100644 --- a/src/main/java/carpet/settings/CarpetSettings.java +++ b/src/main/java/carpet/settings/CarpetSettings.java @@ -150,12 +150,12 @@ public class CarpetSettings @Rule( desc = "Pistons can push block entities, like hoppers, chests etc.", category = {EXPERIMENTAL, FEATURE} ) public static boolean movableBlockEntities = false; - @Rule( + /*@Rule( 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 honeySlime = 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;