diff --git a/.github/workflows/auto-update.yml.todo b/.github/workflows/auto-update.yml similarity index 92% rename from .github/workflows/auto-update.yml.todo rename to .github/workflows/auto-update.yml index 6a4d01c..00ef613 100644 --- a/.github/workflows/auto-update.yml.todo +++ b/.github/workflows/auto-update.yml @@ -45,14 +45,14 @@ jobs: - name: Grant execute permission for gradlew run: | cd Gale - git config --global user.name "Dreeam" + git config --global user.name "Dreeam-qwq" git config --global user.email 61569423+Dreeam-qwq@users.noreply.github.com chmod +x gradlew - uses: actions/setup-java@main with: distribution: 'zulu' - java-version: 21 + java-version: '21' - name: Running tests before push run: | @@ -60,8 +60,8 @@ jobs: if ! git diff --quiet; then echo "Running tests...." ./gradlew applyAllPatches - ./gradlew createMojmapPaperclipJar - ./gradlew rebuildPatches + ./gradlew build + ./gradlew rebuildAllServerPatches fi - name: Check for changes and write to repository diff --git a/gale-archived-patches/ver/README.md b/gale-archived-patches/ver/README.md index 0e30879..7971921 100644 --- a/gale-archived-patches/ver/README.md +++ b/gale-archived-patches/ver/README.md @@ -1 +1,5 @@ # Note + +If you want to check those patches under api or server folder of a previous MC version. + +You can switch git branch to look into them. diff --git a/gale-server/build.gradle.kts.patch b/gale-server/build.gradle.kts.patch index e044c08..d7bdedf 100644 --- a/gale-server/build.gradle.kts.patch +++ b/gale-server/build.gradle.kts.patch @@ -56,7 +56,7 @@ implementation("ca.spottedleaf:concurrentutil:0.0.2") implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+ implementation("org.jline:jline-terminal-jni:3.27.1") // fall back to jni on java 21 -@@ -180,6 +_,16 @@ +@@ -180,26 +_,36 @@ implementation("me.lucko:spark-paper:1.10.119-SNAPSHOT") } @@ -73,7 +73,13 @@ tasks.jar { manifest { val git = Git(rootProject.layout.projectDirectory.path) -@@ -192,14 +_,14 @@ + val mcVersion = rootProject.providers.gradleProperty("mcVersion").get() + val build = System.getenv("BUILD_NUMBER") ?: null +- val buildTime = if (build != null) Instant.now() else Instant.EPOCH ++ val buildTime = Instant.now() // Gale - branding changes - we don't have ci yet + val gitHash = git.exec(providers, "rev-parse", "--short=7", "HEAD").get().trim() + val implementationVersion = "$mcVersion-${build ?: "DEV"}-$gitHash" + val date = git.exec(providers, "show", "-s", "--format=%ci", gitHash).get().trim() val gitBranch = git.exec(providers, "rev-parse", "--abbrev-ref", "HEAD").get().trim() attributes( "Main-Class" to "org.bukkit.craftbukkit.Main", @@ -109,7 +115,7 @@ + +// Gale start - package license into jar +tasks.register("copyLicense") { -+ from(layout.projectDirectory.file("LICENSE.txt")) ++ from(layout.projectDirectory.file("../paper-server/LICENSE.txt")) + into(layout.buildDirectory.dir("tmp/copiedlicense")) +} + @@ -132,7 +138,7 @@ + val name = rootProject.name + val version = project.version + val licenseFileName = "LICENSE.txt" -+ val licenseFilePath = layout.projectDirectory.dir("../paper-server/src/main/resources/$licenseFileName").asFile ++ val licenseFilePath = layout.projectDirectory.dir("../paper-server/$licenseFileName").asFile + + // Based on io.papermc.paperweight.core.taskcontainers.PaperclipTasks + val jarName = listOfNotNull( diff --git a/gale-server/paper-patches/features/0001-Gale-branding-changes.patch b/gale-server/paper-patches/features/0001-Gale-branding-changes.patch index 81791ce..2218018 100644 --- a/gale-server/paper-patches/features/0001-Gale-branding-changes.patch +++ b/gale-server/paper-patches/features/0001-Gale-branding-changes.patch @@ -181,8 +181,47 @@ index 65c5ca88a67c30becee01c5a8816d964b03862f9..00000000000000000000000000000000 -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. +diff --git a/LICENCE.txt b/LICENSE.txt +similarity index 99% +rename from LICENCE.txt +rename to LICENSE.txt +index 94a9ed024d3859793618152ea559a168bbcbb5e2..e60008693e017bec1b4eb49c84be3898e26fcf2a 100644 +--- a/LICENCE.txt ++++ b/LICENSE.txt +@@ -1,7 +1,7 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + +- Copyright (C) 2007 Free Software Foundation, Inc. ++ Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +@@ -645,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found. + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License +- along with this program. If not, see . ++ along with this program. If not, see . + + Also add information on how to contact you by electronic and paper mail. + +@@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box". + You should also get your employer (if you work as a programmer) or school, + if any, to sign a "copyright disclaimer" for the program, if necessary. + For more information on this, and how to apply and follow the GNU GPL, see +-. ++. + + The GNU General Public License does not permit incorporating your program + into proprietary programs. If your program is a subroutine library, you + may consider it more useful to permit linking proprietary applications with + the library. If this is what you want to do, use the GNU Lesser General + Public License instead of this License. But first, please read +-. ++. diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java -index 532306cacd52579cdf37e4aca25887b1ed3ba6a1..2beea17d87464683faaefa835206f2654df9bde0 100644 +index 532306cacd52579cdf37e4aca25887b1ed3ba6a1..7fab7113821dc5d5f4ba4a2e0ee25968ad5a4439 100644 --- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java +++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java @@ -30,58 +30,35 @@ import org.slf4j.Logger; @@ -207,7 +246,7 @@ index 532306cacd52579cdf37e4aca25887b1ed3ba6a1..2beea17d87464683faaefa835206f265 - return 720000; + public PaperVersionFetcher() { + super( -+ "master", ++ "main", + "https://papermc.io/downloads/paper", + "PaperMC", + "Paper", @@ -457,45 +496,6 @@ index a9339f59f81dff307317ae4afdff0dc296febcc9..64e3c7bd0a1ff93dd87e688f9e49e213 } logger.log(Level.SEVERE, "------------------------------"); -diff --git a/LICENCE.txt b/src/main/resources/LICENSE.txt -similarity index 99% -rename from LICENCE.txt -rename to src/main/resources/LICENSE.txt -index 94a9ed024d3859793618152ea559a168bbcbb5e2..e60008693e017bec1b4eb49c84be3898e26fcf2a 100644 ---- a/LICENCE.txt -+++ b/src/main/resources/LICENSE.txt -@@ -1,7 +1,7 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - -- Copyright (C) 2007 Free Software Foundation, Inc. -+ Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -@@ -645,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found. - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License -- along with this program. If not, see . -+ along with this program. If not, see . - - Also add information on how to contact you by electronic and paper mail. - -@@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box". - You should also get your employer (if you work as a programmer) or school, - if any, to sign a "copyright disclaimer" for the program, if necessary. - For more information on this, and how to apply and follow the GNU GPL, see --. -+. - - The GNU General Public License does not permit incorporating your program - into proprietary programs. If your program is a subroutine library, you - may consider it more useful to permit linking proprietary applications with - the library. If this is what you want to do, use the GNU Lesser General - Public License instead of this License. But first, please read --. -+. diff --git a/src/main/resources/logo.png b/src/main/resources/logo.png index 8b924977b7886df9ab8790b1e4ff9b1c04a2af45..e7e9fd9a6077535b89c6c9d7b0164e8b87c54bed 100644 GIT binary patch diff --git a/gale-server/src/main/java/org/galemc/gale/version/GaleVersionFetcher.java b/gale-server/src/main/java/org/galemc/gale/version/GaleVersionFetcher.java index 9a03014..13de235 100644 --- a/gale-server/src/main/java/org/galemc/gale/version/GaleVersionFetcher.java +++ b/gale-server/src/main/java/org/galemc/gale/version/GaleVersionFetcher.java @@ -6,7 +6,7 @@ public class GaleVersionFetcher extends AbstractPaperVersionFetcher { public GaleVersionFetcher() { super( - "ver/1.21.3", + "ver/1.21.4", "https://github.com/Dreeam-qwq/Gale", "GaleMC", "Gale", diff --git a/gradle.properties b/gradle.properties index fb63566..0057b53 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=org.galemc.gale version=1.21.4-R0.1-SNAPSHOT mcVersion=1.21.4 -paperRef=49d15f6345b59b2085ded0a634336d3406d62fdc +paperRef=b34ae4fb3c01bce93f82f5d2095e1394722262e6 org.gradle.configuration-cache=true org.gradle.caching=true