diff --git a/leaves-server/minecraft-patches/features/0009-Redstone-Shears-Wrench.patch b/leaves-server/minecraft-patches/features/0009-Redstone-Shears-Wrench.patch index 0a3aaf74..5e716256 100644 --- a/leaves-server/minecraft-patches/features/0009-Redstone-Shears-Wrench.patch +++ b/leaves-server/minecraft-patches/features/0009-Redstone-Shears-Wrench.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Redstone Shears Wrench diff --git a/net/minecraft/world/item/ShearsItem.java b/net/minecraft/world/item/ShearsItem.java -index 8cf3e51e12f9cf98836657e722edb23943f9e866..813a6d2bfe99ad8ddf81d7dfca51a7544b5fef0d 100644 +index 8cf3e51e12f9cf98836657e722edb23943f9e866..fd93daeec48e1c0c1352366b21fbc7e0a7e7f07b 100644 --- a/net/minecraft/world/item/ShearsItem.java +++ b/net/minecraft/world/item/ShearsItem.java -@@ -24,6 +24,22 @@ import net.minecraft.world.level.block.GrowingPlantHeadBlock; +@@ -24,6 +24,26 @@ import net.minecraft.world.level.block.GrowingPlantHeadBlock; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.gameevent.GameEvent; @@ -23,6 +23,10 @@ index 8cf3e51e12f9cf98836657e722edb23943f9e866..813a6d2bfe99ad8ddf81d7dfca51a754 +import net.minecraft.world.level.block.CrafterBlock; +import net.minecraft.world.level.block.LeverBlock; +import net.minecraft.world.level.block.CocoaBlock; ++import net.minecraft.world.level.block.TrapDoorBlock; ++import net.minecraft.world.level.block.FenceGateBlock; ++import net.minecraft.world.level.block.LightningRodBlock; ++import net.minecraft.world.level.block.CalibratedSculkSensorBlock; +import net.minecraft.world.level.block.piston.PistonBaseBlock; +import net.minecraft.world.level.block.state.StateDefinition; +import net.minecraft.world.level.block.state.properties.Property; @@ -31,15 +35,27 @@ index 8cf3e51e12f9cf98836657e722edb23943f9e866..813a6d2bfe99ad8ddf81d7dfca51a754 public class ShearsItem extends Item { public ShearsItem(Item.Properties properties) { super(properties); -@@ -80,7 +96,68 @@ public class ShearsItem extends Item { +@@ -80,7 +100,80 @@ public class ShearsItem extends Item { return InteractionResult.SUCCESS; } else { + // Leaves start - shears wrench + Block block = blockState.getBlock(); -+ if (org.leavesmc.leaves.LeavesConfig.modify.redstoneShearsWrench && block instanceof ObserverBlock || block instanceof DispenserBlock || -+ block instanceof PistonBaseBlock || block instanceof HopperBlock || block instanceof RepeaterBlock || block instanceof ComparatorBlock || -+ block instanceof CrafterBlock || block instanceof LeverBlock || block instanceof CocoaBlock) { ++ if (org.leavesmc.leaves.LeavesConfig.modify.redstoneShearsWrench && ++ block instanceof ObserverBlock || ++ block instanceof DispenserBlock || ++ block instanceof PistonBaseBlock || ++ block instanceof HopperBlock || ++ block instanceof RepeaterBlock || ++ block instanceof ComparatorBlock || ++ block instanceof CrafterBlock || ++ block instanceof LeverBlock || ++ block instanceof CocoaBlock || ++ block instanceof TrapDoorBlock || ++ block instanceof FenceGateBlock || ++ block instanceof LightningRodBlock || ++ block instanceof CalibratedSculkSensorBlock ++ ) { + StateDefinition blockstatelist = block.getStateDefinition(); + Property iblockstate = block instanceof CrafterBlock ? blockstatelist.getProperty("orientation") : blockstatelist.getProperty("facing"); + Player player = context.getPlayer();