From 5efbbac663fafbc8b18ed986fd2030a33d9cbd10 Mon Sep 17 00:00:00 2001 From: gnembon Date: Wed, 18 Mar 2020 16:21:10 -0300 Subject: [PATCH] left shears mining sponge. Only pickaxe and glass left --- src/main/java/carpet/CarpetSettings.java | 3 +-- .../carpet/mixins/ShearsItem_missingToolsMixin.java | 10 +--------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/main/java/carpet/CarpetSettings.java b/src/main/java/carpet/CarpetSettings.java index bfd87c62..7137c37b 100644 --- a/src/main/java/carpet/CarpetSettings.java +++ b/src/main/java/carpet/CarpetSettings.java @@ -349,8 +349,7 @@ public class CarpetSettings public static boolean carpets = false; @Rule( - desc = "Glass and Sponge can be broken faster with their appropriate tools", - extra = "Glass is pickaxes, sponge is shears", + desc = "Glass can be broken faster with pickaxes", category = SURVIVAL ) public static boolean missingTools = false; diff --git a/src/main/java/carpet/mixins/ShearsItem_missingToolsMixin.java b/src/main/java/carpet/mixins/ShearsItem_missingToolsMixin.java index 7ce7b958..4809d638 100644 --- a/src/main/java/carpet/mixins/ShearsItem_missingToolsMixin.java +++ b/src/main/java/carpet/mixins/ShearsItem_missingToolsMixin.java @@ -13,13 +13,5 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(ShearsItem.class) public class ShearsItem_missingToolsMixin { - @Inject(method = "getMiningSpeedMultiplier", at = @At("HEAD"), cancellable = true) - private void getCustomMaterial(ItemStack itemStack_1, BlockState blockState_1, CallbackInfoReturnable cir) - { - if (CarpetSettings.missingTools && (blockState_1.getMaterial() == Material.SPONGE)) - { - cir.setReturnValue(15.0F); - cir.cancel(); - } - } + // left intentionally blank until this becomes in master branch }