feat: add flipping shears support(#29)

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

.github/workflows/build.yml

@@ -1,10 +1,12 @@
-name: Lophine CI - ver/1.21.7
+name: Lophine CI
 
 on:
   push:
-    branches: [ "ver/1.21.7" ]
+    branches:
+      - "**"
   pull_request:
-    branches: [ "ver/1.21.7" ]
+    branches:
+      - "**"
 
 permissions: write-all
 
@@ -20,7 +22,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: zulu
-          java-version: 22
+          java-version: 21
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
@@ -32,15 +34,15 @@ jobs:
         run: git config --global user.email "ci@luminolmc.com" && git config --global user.name "LuminolMC CI"
 
       - name: Apply All Patches
-        run: ./gradlew applyAllPatches
+        run: ./gradlew --refresh-dependencies applyAllPatches
 
       - name: CreateMojmapPaperclipJar
-        run: ./gradlew createMojmapPaperclipJar
+        run: ./gradlew --refresh-dependencies createMojmapPaperclipJar
 
       - name: Publish to repo
         if: github.event_name != 'pull_request' && false # do not push to any repo
         continue-on-error: true
-        run: ./gradlew generateDevelopmentBundle publish -PpublishDevBundle=true
+        run: ./gradlew --refresh-dependencies generateDevelopmentBundle publish -PpublishDevBundle=true
         env:
           PRIVATE_MAVEN_REPO_PASSWORD: ${{ secrets.PRIVATE_MAVEN_REPO_PASSWORD }}
           PRIVATE_MAVEN_REPO_USERNAME: ${{ secrets.PRIVATE_MAVEN_REPO_USERNAME }}

gradle.properties

@@ -1,8 +1,10 @@
 group=fun.bm.lophine
-version=1.21.7-R0.1-SNAPSHOT
-mcVersion=1.21.7
+version=1.21.8-R0.1-SNAPSHOT
+mcVersion=1.21.8
+release=2
+# 0 for skip release, 1 for pre-release, 2 for release
 
-luminolRef=1cb5d158eaa29ff188ae9f09091d7fe6814df3dc
+luminolRef=a985aa44a90c9d0882c010707c8e0913cd479445
 
 org.gradle.configuration-cache=true
 org.gradle.caching=true

lophine-server/build.gradle.kts.patch

@@ -51,7 +51,7 @@
      // Luminol start - Dependenices insert
      implementation("com.electronwill.night-config:toml:3.8.2") // Night config
      implementation("com.github.luben:zstd-jni:1.5.4-1")
-@@ -264,14 +_,14 @@
+@@ -277,14 +_,14 @@
          val gitBranch = git.exec(providers, "rev-parse", "--abbrev-ref", "HEAD").get().trim()
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
@@ -62,7 +62,7 @@
 -            "Specification-Title" to "Luminol",
 +            "Specification-Title" to "Lophine",
              "Specification-Version" to project.version,
-             "Specification-Vendor" to "Luminol Team",
+             "Specification-Vendor" to "LuminolMC org",
 -            "Brand-Id" to "luminolmc:luminol",
 -            "Brand-Name" to "Luminol",
 +            "Brand-Id" to "luminolmc:lophine",
@@ -70,3 +70,12 @@
              "Build-Number" to (build ?: ""),
              "Build-Time" to buildTime.toString(),
              "Git-Branch" to gitBranch,
+@@ -448,7 +_,7 @@
+ }
+ 
+ fill {
+-    project("luminol")
++    project("lophine")
+     versionFamily(paperweight.minecraftVersion.map { it.split(".", "-").takeWhile { part -> part.toIntOrNull() != null }.take(2).joinToString(".") })
+     version(paperweight.minecraftVersion)
+ 

lophine-server/minecraft-patches/features/0008-Add-config-to-enable-unsafe-waypoint-bar.patch

@@ -4,6 +4,23 @@ Date: Mon, 7 Jul 2025 18:19:00 +0800
 Subject: [PATCH] Add config to enable unsafe waypoint bar
 
 
+diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java
+index e2fc15d84fafde6847ecead23c55169449275e1b..b0a06cdfaa49237f372ecd131d47289160476b07 100644
+--- a/net/minecraft/commands/Commands.java
++++ b/net/minecraft/commands/Commands.java
+@@ -253,7 +253,11 @@ public class Commands {
+         TimeCommand.register(this.dispatcher);
+         TitleCommand.register(this.dispatcher, context);
+         //TriggerCommand.register(this.dispatcher); // Folia - region threading - TODO later
+-        //WaypointCommand.register(this.dispatcher, context); // Folia - region threading - TODO later
++        // Lophine start - unsafe waypoint bar
++        if (fun.bm.lophine.config.modules.experiment.WaypointConfig.forceEnableWaypointUnsafe) {
++            WaypointCommand.register(this.dispatcher, context); // Folia - region threading - TODO later
++        }
++        // Lophine end - unsafe waypoint bar
+         WeatherCommand.register(this.dispatcher);
+         WorldBorderCommand.register(this.dispatcher);
+         if (JvmProfiler.INSTANCE.isAvailable()) {
 diff --git a/net/minecraft/server/waypoints/ServerWaypointManager.java b/net/minecraft/server/waypoints/ServerWaypointManager.java
 index 0f8cacbb8fe55a60e2f0c98bf36c005b29f41a4b..36e9b027ce5213f8914728293633e78e9905c1b2 100644
 --- a/net/minecraft/server/waypoints/ServerWaypointManager.java

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/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";
+    }
+}

scripts/SetENV.sh

@@ -8,11 +8,21 @@ project_id_b="Lophine"
 commitid=$(git log --pretty='%h' -1)
 mcversion=$(prop mcVersion)
 grdversion=$(prop version)
-preVersion=$(prop preVersion)
+release=$(prop release)
 release_tag="$mcversion-$commitid"
 jarName="$project_id-$mcversion-paperclip.jar"
 jarName_dir="lophine-server/build/libs/$jarName"
-make_latest=$([ $preVersion = "true" ] && echo "false" || echo "true")
+
+pre=false
+make_latest=false
+
+if [ "$release" = "1" ]; then
+  pre=true
+  make_latest=false
+elif [ "$release" = "2" ]; then
+  pre=false
+  make_latest=true
+fi
 
 mv lophine-server/build/libs/$project_id-paperclip-$grdversion-mojmap.jar $jarName_dir
 
@@ -21,7 +31,7 @@ echo "project_id_b=$project_id_b" >> $GITHUB_ENV
 echo "commit_id=$commitid" >> $GITHUB_ENV
 echo "commit_msg=$(git log --pretty='> [%h] %s' -1)" >> $GITHUB_ENV
 echo "mcversion=$mcversion" >> $GITHUB_ENV
-echo "pre=$preVersion" >> $GITHUB_ENV
+echo "pre=$pre" >> $GITHUB_ENV
 echo "tag=$release_tag" >> $GITHUB_ENV
 echo "jar=$jarName" >> $GITHUB_ENV
 echo "jar_dir=$jarName_dir" >> $GITHUB_ENV