mirror of
https://github.com/LeavesMC/Leaves.git
synced 2025-12-19 14:59:32 +00:00
d5c9306a7f
* init 1.21.4, and boom! * build change, but weight not work * just work * Build changes, and delete timings * Fix API patches (#406) * Fix API patches * merge --------- Co-authored-by: violetc <58360096+s-yh-china@users.noreply.github.com> * 0006/0129 * 0009/0129 * 0011/0129 * 0018/0129 * 0030/0129 * 0035/0129 * 0043/0129 * 0048/0129 * 0049/0129 * 0057/0129 * 0065/0129 * 0086/0129 (#408) * 0072/0129 * 0080/0129 * Readd patch infos * 0086/0129 * Delete applied patches * 0087/0129 * 0091/0129 * 0097/0129 * 0101/0129 * 102/129 * 0107/0129 * 0112/0129 * 0118/0129 * 0129/0129, 100% patched * fix some * server work * Protocol... (#409) * Jade v7 * Fix changed part for Jade * Formatting imports, add Lms Paster protocol * REI payloads 5/8 * Add REI support, remove unnecessary content in Jade * Rename * Make jade better * Make action work * fix action jar * Fix some protocol * Fix bot action, and entity tickCount * Fix Warden GameEventListener register on load * Fix extra Raider drop * Fix grindstone overstacking * Update Paper, and some doc * Merge * [ci skip] Update Action --------- Co-authored-by: Lumine1909 <133463833+Lumine1909@users.noreply.github.com>
103 lines
5.1 KiB
Diff
103 lines
5.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: violetc <58360096+s-yh-china@users.noreply.github.com>
|
|
Date: Sun, 27 Mar 2022 12:48:40 +0800
|
|
Subject: [PATCH] Redstone Shears Wrench
|
|
|
|
|
|
diff --git a/net/minecraft/world/item/ShearsItem.java b/net/minecraft/world/item/ShearsItem.java
|
|
index 9140b41f2ffef897b74792c916e8320a9a7afb7c..0f4f970071a289209eb8131d289e23426d53e818 100644
|
|
--- a/net/minecraft/world/item/ShearsItem.java
|
|
+++ b/net/minecraft/world/item/ShearsItem.java
|
|
@@ -23,6 +23,22 @@ import net.minecraft.world.level.block.GrowingPlantHeadBlock;
|
|
import net.minecraft.world.level.block.state.BlockState;
|
|
import net.minecraft.world.level.gameevent.GameEvent;
|
|
|
|
+// Leaves start - shears wrench
|
|
+import net.minecraft.Util;
|
|
+import net.minecraft.network.chat.Component;
|
|
+import net.minecraft.world.level.block.ComparatorBlock;
|
|
+import net.minecraft.world.level.block.DispenserBlock;
|
|
+import net.minecraft.world.level.block.HopperBlock;
|
|
+import net.minecraft.world.level.block.ObserverBlock;
|
|
+import net.minecraft.world.level.block.RepeaterBlock;
|
|
+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.piston.PistonBaseBlock;
|
|
+import net.minecraft.world.level.block.state.StateDefinition;
|
|
+import net.minecraft.world.level.block.state.properties.Property;
|
|
+// Leaves end - shears wrench
|
|
+
|
|
public class ShearsItem extends Item {
|
|
public ShearsItem(Item.Properties properties) {
|
|
super(properties);
|
|
@@ -81,7 +97,68 @@ 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) {
|
|
+ StateDefinition<Block, BlockState> blockstatelist = block.getStateDefinition();
|
|
+ Property<?> iblockstate = block instanceof CrafterBlock ? blockstatelist.getProperty("orientation") : blockstatelist.getProperty("facing");
|
|
+ Player player = context.getPlayer();
|
|
+
|
|
+ if (iblockstate == null || player == null) {
|
|
+ return InteractionResult.FAIL;
|
|
+ }
|
|
+
|
|
+ if (block instanceof PistonBaseBlock) {
|
|
+ if (getNameHelper(blockState, PistonBaseBlock.EXTENDED).equals("true")) {
|
|
+ return InteractionResult.FAIL;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ if (block instanceof RepeaterBlock || block instanceof ComparatorBlock) {
|
|
+ if (getNameHelper(blockState, ComparatorBlock.POWERED).equals("true")) {
|
|
+ return InteractionResult.FAIL;
|
|
+ }
|
|
+ if (block instanceof RepeaterBlock) {
|
|
+ if (getNameHelper(blockState, RepeaterBlock.LOCKED).equals("true")) {
|
|
+ return InteractionResult.FAIL;
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+
|
|
+ if (block instanceof CrafterBlock) {
|
|
+ if (getNameHelper(blockState, CrafterBlock.CRAFTING).equals("true")) {
|
|
+ return InteractionResult.FAIL;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ BlockState iblockdata1 = ShearsItem.cycleState(blockState, iblockstate, player.isSecondaryUseActive());
|
|
+ level.setBlock(clickedPos, iblockdata1, 18);
|
|
+ ShearsItem.message(player, Component.translatable("item.minecraft.debug_stick.update", iblockstate.getName(), ShearsItem.getNameHelper(iblockdata1, iblockstate)));
|
|
+ return InteractionResult.CONSUME;
|
|
+ }
|
|
+ // Leaves end - shears wrench
|
|
+
|
|
return super.useOn(context);
|
|
}
|
|
}
|
|
+
|
|
+ // Leaves start - shears wrench
|
|
+ private static <T extends Comparable<T>> BlockState cycleState(BlockState state, Property<T> property, boolean inverse) {
|
|
+ return state.setValue(property, ShearsItem.getRelative(property.getPossibleValues(), state.getValue(property), inverse)); // CraftBukkit - decompile error
|
|
+ }
|
|
+
|
|
+ private static <T> T getRelative(Iterable<T> elements, T current, boolean inverse) {
|
|
+ return inverse ? Util.findPreviousInIterable(elements, current) : Util.findNextInIterable(elements, current);
|
|
+ }
|
|
+
|
|
+ private static void message(Player player, Component message) {
|
|
+ ((ServerPlayer) player).sendSystemMessage(message, true);
|
|
+ }
|
|
+
|
|
+ private static <T extends Comparable<T>> String getNameHelper(BlockState state, Property<T> property) {
|
|
+ return property.getName(state.getValue(property));
|
|
+ }
|
|
+ // Leaves end - shears wrench
|
|
}
|