Update Upstream(Luminol)

Co-authored-by: violetc <58360096+s-yh-china@users.noreply.github.com>

gradle.properties

@@ -4,7 +4,7 @@ mcVersion=1.21.8
 release=2
 # 0 for skip release, 1 for pre-release, 2 for release
 
-luminolRef=a985aa44a90c9d0882c010707c8e0913cd479445
+luminolRef=5d95e9675c4cc0d74d791c09f22c0b990ad55bcf
 
 org.gradle.configuration-cache=true
 org.gradle.caching=true

lophine-server/minecraft-patches/features/0006-Add-config-to-enable-Raytracing-tracker.patch

@@ -18,7 +18,7 @@ index 6868b915bf3deb85783a638d4441a15fea6da2dc..70740381c6501c1a518c52b24381edd1
                      double rangeY = level.paperConfig().entities.trackingRangeY.get(this.entity, -1);
                      if (rangeY != -1) {
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index dc3d29b7d1590ba366755fef51e4254d901d0da8..34b1597c56046f8fc5ab5fe9d8a5d3c96a4bc134 100644
+index 894897a120123cb54f9dba898748724173c01f57..312c385780019bf483e79022bba3fe6e12ca3be7 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -147,7 +147,7 @@ import net.minecraft.world.waypoints.WaypointTransmitter;
@@ -30,7 +30,7 @@ index dc3d29b7d1590ba366755fef51e4254d901d0da8..34b1597c56046f8fc5ab5fe9d8a5d3c9
      // CraftBukkit start
      private static final int CURRENT_LEVEL = 2;
      public boolean preserveMotion = true; // Paper - Fix Entity Teleportation and cancel velocity if teleported; keep initial motion on first snapTo
-@@ -6352,4 +6352,46 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -6365,4 +6365,46 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      // Paper end - Expose entity id counter
  
      public boolean shouldTickHot() { return this.tickCount > 20 * 10 && this.isAlive(); } // KioCG

lophine-server/minecraft-patches/features/0010-Redstone-Shears-Wrench.patch

@@ -0,0 +1,153 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Wed, 23 Jul 2025 20:28:40 +0800
+Subject: [PATCH] Redstone Shears Wrench
+
+Co-authored by: violetc <58360096+s-yh-china@users.noreply.github.com>
+As a part of : Leaves (https://github.com/LeavesMC/Leaves/blob/bfde470a867b74d177fe1b9a2a3ed5c49cd126c7/leaves-server/minecraft-patches/features/0009-Redstone-Shears-Wrench.patch)
+Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
+
+diff --git a/net/minecraft/world/item/ShearsItem.java b/net/minecraft/world/item/ShearsItem.java
+index 8cf3e51e12f9cf98836657e722edb23943f9e866..dc3e33223ac7b11a969ef1a8e3fa73a9b8b44696 100644
+--- a/net/minecraft/world/item/ShearsItem.java
++++ b/net/minecraft/world/item/ShearsItem.java
+@@ -24,6 +24,30 @@ 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.TrapDoorBlock;
++import net.minecraft.world.level.block.FenceGateBlock;
++import net.minecraft.world.level.block.LightningRodBlock;
++import net.minecraft.world.level.block.RailBlock;
++import net.minecraft.world.level.block.BaseRailBlock;
++import net.minecraft.world.level.block.PoweredRailBlock;
++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.RailShape;
++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);
+@@ -80,7 +104,108 @@ public class ShearsItem extends Item {
+ 
+             return InteractionResult.SUCCESS;
+         } else {
++            // Leaves start - shears wrench
++            Block block = blockState.getBlock();
++            if (fun.bm.lophine.config.modules.misc.RedStoneConfig.shears &&
++                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 ||
++                block instanceof BaseRailBlock
++            ) {
++                StateDefinition<Block, BlockState> blockstatelist = block.getStateDefinition();
++                Property<?> iblockstate;
++                if (block instanceof CrafterBlock) iblockstate = blockstatelist.getProperty("orientation");
++                else if (block instanceof BaseRailBlock) iblockstate = blockstatelist.getProperty("shape");
++                else iblockstate = blockstatelist.getProperty("facing");
++                Player player = context.getPlayer();
++
++                if (iblockstate == null || player == null) {
++                    return InteractionResult.FAIL;
++                }
++
++                if (block instanceof BaseRailBlock) {
++                    if (block instanceof RailBlock) {
++                        if (blockState.getValue(RailBlock.SHAPE).isSlope()) {
++                            return InteractionResult.FAIL;
++                        }
++                    } else {
++                        if (getNameHelper(blockState, PoweredRailBlock.POWERED).equals("true")) {
++                            return InteractionResult.FAIL;
++                        }
++                        if (blockState.getValue(PoweredRailBlock.SHAPE).isSlope()) {
++                            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) {
++        List<T> possibleValues = property.getPossibleValues();
++        if (possibleValues.getFirst() instanceof RailShape) {
++            boolean isRailBlock = state.getBlock() instanceof RailBlock;
++            possibleValues = possibleValues.stream().filter(possibleValue -> {
++                RailShape shape = (RailShape) possibleValue;
++                if (isRailBlock) return !shape.isSlope();
++                return !shape.isSlope() && shape != RailShape.NORTH_EAST && shape != RailShape.NORTH_WEST && shape != RailShape.SOUTH_EAST && shape != RailShape.SOUTH_WEST;
++            }).toList();
++        }
++        return state.setValue(property, ShearsItem.getRelative(possibleValues, 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
+ }

lophine-server/minecraft-patches/features/0011-Stackable-ShulkerBoxes.patch

@@ -37,10 +37,10 @@ index 5a1c21b05545a03fbb00cf734605049870d3eecb..2ade5ce23cdab08b1746e2cbe99bfe1d
          if (count > i) {
              source.sendFailure(Component.translatable("commands.give.failed.toomanyitems", i, itemStack.getDisplayName()));
 diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3a78b917cfa2947f26a25e4d77d825e8113a83ef..bec1592ea6ce909bf9b1067e0a32d00c2c4e43f5 100644
+index 68f0023c4234585a8385a830ed410883c8bd1549..1aed2578bb5f4e605fe68d1cfe4dce6a4cf5a1f7 100644
 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3072,7 +3072,7 @@ public class ServerGamePacketListenerImpl
+@@ -3076,7 +3076,7 @@ public class ServerGamePacketListenerImpl
                                              } else if (slot.mayPlace(cursor)) {
                                                  if (ItemStack.isSameItemSameComponents(clickedItem, cursor)) {
                                                      int toPlace = packet.buttonNum() == 0 ? cursor.getCount() : 1;
@@ -49,7 +49,7 @@ index 3a78b917cfa2947f26a25e4d77d825e8113a83ef..bec1592ea6ce909bf9b1067e0a32d00c
                                                      toPlace = Math.min(toPlace, slot.container.getMaxStackSize() - clickedItem.getCount());
                                                      if (toPlace == 1) {
                                                          action = InventoryAction.PLACE_ONE;
-@@ -3108,7 +3108,7 @@ public class ServerGamePacketListenerImpl
+@@ -3112,7 +3112,7 @@ public class ServerGamePacketListenerImpl
                                                  }
                                              } else if (ItemStack.isSameItemSameComponents(cursor, clickedItem)) {
                                                  if (clickedItem.getCount() >= 0) {
@@ -58,7 +58,7 @@ index 3a78b917cfa2947f26a25e4d77d825e8113a83ef..bec1592ea6ce909bf9b1067e0a32d00c
                                                          // As of 1.5, this is result slots only
                                                          action = InventoryAction.PICKUP_ALL;
                                                      }
-@@ -3319,6 +3319,7 @@ public class ServerGamePacketListenerImpl
+@@ -3323,6 +3323,7 @@ public class ServerGamePacketListenerImpl
                          this.player.containerMenu.broadcastFullState();
                      } else {
                          this.player.containerMenu.broadcastChanges();
@@ -66,7 +66,7 @@ index 3a78b917cfa2947f26a25e4d77d825e8113a83ef..bec1592ea6ce909bf9b1067e0a32d00c
                      }
                      if (io.papermc.paper.configuration.GlobalConfiguration.get().unsupportedSettings.updateEquipmentOnPlayerActions) this.player.detectEquipmentUpdates(); // Paper - Force update attributes.
                  }
-@@ -3429,7 +3430,7 @@ public class ServerGamePacketListenerImpl
+@@ -3433,7 +3434,7 @@ public class ServerGamePacketListenerImpl
              }
  
              boolean flag1 = packet.slotNum() >= 1 && packet.slotNum() <= 45;
@@ -75,7 +75,7 @@ index 3a78b917cfa2947f26a25e4d77d825e8113a83ef..bec1592ea6ce909bf9b1067e0a32d00c
              if (flag || (flag1 && !ItemStack.matches(this.player.inventoryMenu.getSlot(packet.slotNum()).getItem(), packet.itemStack()))) { // Insist on valid slot
                  // CraftBukkit start - Call click event
                  org.bukkit.inventory.InventoryView inventory = this.player.inventoryMenu.getBukkitView();
-@@ -3471,6 +3472,7 @@ public class ServerGamePacketListenerImpl
+@@ -3475,6 +3476,7 @@ public class ServerGamePacketListenerImpl
                  this.player.inventoryMenu.getSlot(packet.slotNum()).setByPlayer(itemStack);
                  this.player.inventoryMenu.setRemoteSlot(packet.slotNum(), itemStack);
                  this.player.inventoryMenu.broadcastChanges();

lophine-server/src/main/java/fun/bm/lophine/config/modules/misc/RedStoneConfig.java

@@ -0,0 +1,21 @@
+package fun.bm.lophine.config.modules.misc;
+
+import me.earthme.luminol.config.EnumConfigCategory;
+import me.earthme.luminol.config.IConfigModule;
+import me.earthme.luminol.config.flags.ConfigInfo;
+
+public class RedStoneConfig implements IConfigModule {
+    @ConfigInfo(baseName = "allow_skip_cooldown", comments =
+            """
+                    Allows you to use the Shears to right-click to rotate the block.""")
+    public static boolean shears = false;
+    @Override
+    public EnumConfigCategory getCategory() {
+        return EnumConfigCategory.MISC;
+    }
+
+    @Override
+    public String getBaseName() {
+        return "redstone";
+    }
+}