Merge pull request #12 from 404Setup/dev/1.21.3

Upstream to 1.21.3

.github/workflows/build_1.21.1.yml → .github/workflows/build_1.21.3.yml

@@ -1,10 +1,8 @@
-name: LightingLuminol CI - dev/1.20.6
+name: LightingLuminol CI - dev/1.21.3
 
 on:
   push:
-    branches: [ "dev/1.21.1" ]
-  pull_request:
-    branches: [ "dev/1.21.1" ]
+    branches: [ "dev/1.21.3" ]
 
 permissions: write-all
 
@@ -20,7 +18,7 @@ jobs:
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3
         with:
-          gradle-version: 8.7
+          gradle-version: 8.10.2
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
@@ -61,11 +59,4 @@ jobs:
           generateReleaseNotes: true
           prerelease: ${{ env.pre }}
           makeLatest: ${{ env.make_latest }}
-          token: "${{ secrets.GITHUB_TOKEN }}"
-      - name: Push to API
-        if: "!contains(github.event.commits[0].message, '[release skip]')"
-        env:
-          secret_v2: ${{ secrets.API_KEY }}
-          tag: ${{ env.tag }}
-          project_id: ${{ env.project_id }}
-        run: sh scripts/PushToAPI.sh
+          token: "${{ secrets.GITHUB_TOKEN }}"

.gitignore

@@ -20,7 +20,7 @@ nbactions.xml
 
 # Gradle
 !gradle-wrapper.jar
-.gradle/
+.gradle
 build/
 */build/
 
@@ -33,7 +33,6 @@ target/
 dependency-reduced-pom.xml
 
 # various other potential build files
-build/
 bin/
 dist/
 manifest.mf
@@ -52,7 +51,10 @@ manifest.mf
 run/
 
 build-data/
-Hearse-API
-Hearse-Server
+LightingLuminol-API
+LightingLuminol-API/*
+LightingLuminol-Server
+LightingLuminol-Server/*
+paper-api-generator
 *.jar
 /patches/todo/

README.md

@@ -22,9 +22,9 @@
 任何版本都可以在 [Release](https://github.com/LuminolMC/LightingLuminol/releases), 中找到，你也可以通过[以下步骤](./README.md#构建)自己构建。
 
 ## 构建
-要构建一个paperclip jar，你需要运行以下命令。你可以在build/libs中找到jar（注意：需要`JDK17`）
+要构建一个paperclip jar，你需要运行以下命令。你可以在build/libs中找到jar（注意：需要`JDK21`）
  ```shell
- ./gradlew applyPatches && ./gradlew createReobfPaperclipJar
+ ./gradlew applyPatches && ./gradlew createMojmapPaperclipJar
 ```
 <!-- ## Using API
 For gradle:

README_EN.md

@@ -25,9 +25,9 @@
 Any versions are available in the [release](https://github.com/LuminolMC/LightingLuminol/releases), also you can build it by yourself through [the following steps](./README_EN.md#Build).
 
 ## Build
-To build a paperclip jar, you need to run the following command. You can find the jar in build/libs(Note: JDK17 is needed)
+To build a paperclip jar, you need to run the following command. You can find the jar in build/libs(Note: JDK21 is needed)
  ```shell
- ./gradlew applyPatches && ./gradlew createReobfPaperclipJar
+ ./gradlew applyPatches && ./gradlew createMojmapPaperclipJar
 ```
 <!-- ## Using API
 For gradle:

build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
     java
     `maven-publish`
-    id("io.papermc.paperweight.patcher") version "1.7.1"
+    id("io.papermc.paperweight.patcher") version "1.7.5"
 }
 
 val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"
@@ -14,7 +14,7 @@ repositories {
 }
 
 dependencies {
-    remapper("net.fabricmc:tiny-remapper:0.10.1:fat")
+    remapper("net.fabricmc:tiny-remapper:0.10.3:fat")
     decompiler("org.vineflower:vineflower:1.10.1")
     paperclip("io.papermc:paperclip:3.0.3")
 }

docs/CONTRIBUTING.md

@@ -21,7 +21,7 @@
 在开始开发之前，您首先需要拥有以下软件作为开发环境：
 
 - `git`
-- `JDK 17 或更高版本`
+- `JDK 21 或更高版本`
 
 <!-- ## 了解补丁（Patches）
 

docs/CONTRIBUTING_EN.md

@@ -23,7 +23,7 @@ See also [This issue](https://github.com/isaacs/github/issues/1681), and then yo
 Before coding, you need these softwares / tools as Dev Environment.
 
 - `git`
-- `JDK 17 or higher`
+- `JDK 21 or higher`
 <!-- 
 ## Understanding "Patches"
 

gradle.properties

@@ -1,13 +1,13 @@
 group = me.earthme.lightingluminol
-version = 1.21.1-R0.1-SNAPSHOT
+version = 1.21.3-R0.1-SNAPSHOT
 
-luminolCommit = 5905dbad6156ad85d9e49cc3a53d989bb4575e0b
+luminolCommit = 6a8df3771b7913646b54c0b7236f298a91e8b6a5
 
 org.gradle.caching = true
 org.gradle.parallel = true
 org.gradle.vfs.watch = false
 org.gradle.jvmargs = -Xmx3G
 
-mcVersion = 1.21.1
+mcVersion = 1.21.3
 GroupMCV = 1.21
 preVersion = true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
+distributionUrl=https\://downloads.gradle.org/distributions/gradle-8.10.2-all.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

patches/server/0001-Fix-build-and-set-serverName-to-LightingLuminol.patch

@@ -5,28 +5,34 @@ Subject: [PATCH] Fix build and set serverName to LightingLuminol
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index ab07c307bea0d3b79a6239bdcca9714e1ddf3b28..82a65f08105a5b7fd4fb0b780259b3a739f43270 100644
+index 0345be6306b2d81987709c3feb31e2d7fb2f254f..9270bafbcd7d96e7362e8211dda6a1322a490ffc 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -13,7 +13,7 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
- val alsoShade: Configuration by configurations.creating
+@@ -25,7 +25,7 @@ abstract class MockitoAgentProvider : CommandLineArgumentProvider {
+ // Paper end - configure mockito agent that is needed in newer java versions
 
  dependencies {
 -    implementation(project(":luminol-api")) // Folia // Luminol
-+    implementation(project(":lightingluminol-api"))//Luminol //LightingLuminol
++    implementation(project(":lightingluminol-api")) // Folia // Luminol // LightingLuminol
      implementation("com.electronwill.night-config:toml:3.6.6") // Luminol - Night config
+     implementation("io.github.classgraph:classgraph:4.8.158") // Kaiiju - Entity throttling & Removal
      // Paper start
-     implementation("org.jline:jline-terminal-jansi:3.21.0")
-diff --git a/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java b/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java
-index 673a81734a0903a0790f3007772642d3d9a044cc..31f3c9039bf7e8191f1a207276f73cb75dd8f57e 100644
---- a/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java
-+++ b/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java
-@@ -31,7 +31,7 @@ public record ServerBuildInfoImpl(
-     private static final String ATTRIBUTE_GIT_COMMIT = "Git-Commit";
-
-     private static final String BRAND_PAPER_NAME = "Paper";
--    private static final String BRAND_LUMINOL_NAME = "Luminol";
-+    private static final String BRAND_LUMINOL_NAME = "LightingLuminol"; //LightingLuminol
-
-     private static final String BUILD_DEV = "DEV";
-
+@@ -109,14 +109,14 @@ tasks.jar {
+         val gitBranch = git("rev-parse", "--abbrev-ref", "HEAD").getText().trim() // Paper
+         attributes(
+             "Main-Class" to "org.bukkit.craftbukkit.Main",
+-            "Implementation-Title" to "Luminol", // Folia // Luminol
++            "Implementation-Title" to "LightingLuminol", // Folia // Luminol // LightingLuminol
+             "Implementation-Version" to implementationVersion,
+             "Implementation-Vendor" to date, // Paper
+-            "Specification-Title" to "Luminol", // Folia // Luminol
++            "Specification-Title" to "LightingLuminol", // Folia // Luminol // LightingLuminol
+             "Specification-Version" to project.version,
+             "Specification-Vendor" to "LuminolMC Team", // Luminol
+-            "Brand-Id" to "luminolmc:luminol", // Folia // Luminol
+-            "Brand-Name" to "Luminol", // Folia // Luminol
++            "Brand-Id" to "luminolmc:lightingluminol", // Folia // Luminol // LightingLuminol
++            "Brand-Name" to "LightingLuminol", // Folia // Luminol // LightingLuminol
+             "Build-Number" to (build ?: ""),
+             "Build-Time" to Instant.now().toString(),
+             "Git-Branch" to gitBranch, // Paper