Update Upstream(Luminol)

Update Upstream(Luminol)

.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/src/main/java/fun/bm/lophine/config/modules/experiment/WaypointConfig.java

@@ -3,9 +3,11 @@ package fun.bm.lophine.config.modules.experiment;
 import me.earthme.luminol.config.EnumConfigCategory;
 import me.earthme.luminol.config.IConfigModule;
 import me.earthme.luminol.config.flags.ConfigInfo;
+import me.earthme.luminol.config.flags.TransformedConfig;
 
 public class WaypointConfig implements IConfigModule {
-    @ConfigInfo(baseName = "enable-waypoint", comments =
+    @TransformedConfig(name = "enable-waypoint", category = {"experiment", "waypoint bar"})
+    @ConfigInfo(baseName = "enabled", comments =
             """
                     Enable waypoint bar unsafe""")
     public static boolean forceEnableWaypointUnsafe = false;
@@ -17,6 +19,6 @@ public class WaypointConfig implements IConfigModule {
 
     @Override
     public String getBaseName() {
-        return "waypoint bar";
+        return "waypoint_bar";
     }
 }

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