From f800eaa9c06d29843bfc036bf7b28d2a0c8c8908 Mon Sep 17 00:00:00 2001 From: NONPLAYT Date: Tue, 14 Mar 2023 21:16:49 +0300 Subject: [PATCH] add new patches to api and publish api --- .github/workflows/build.yml | 7 ++++ patches/api/0003-Add-packages.patch | 35 +++++++++++++++++++ .../api/0004-Update-Bungeecord-Chat-API.patch | 17 +++++++++ patches/server/0001-Divine-Branding.patch | 8 ++--- 4 files changed, 63 insertions(+), 4 deletions(-) create mode 100644 patches/api/0003-Add-packages.patch create mode 100644 patches/api/0004-Update-Bungeecord-Chat-API.patch diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 09d9249..74ec110 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,6 +38,13 @@ jobs: - name: Create Mojmap Jar run: ./gradlew createMojmapPaperclipJar --stacktrace + - name: Publish Packages + if: github.ref_name == env.branch + run: | + export GITHUB_USERNAME=${{ env.GH_USERNAME }} + export GITHUB_TOKEN=${{ secrets.GH_TOKEN }} + ./gradlew publish --stacktrace + - name: Upload Artifacts if: env.debug == 'true' || github.ref_name != env.branch uses: actions/upload-artifact@main diff --git a/patches/api/0003-Add-packages.patch b/patches/api/0003-Add-packages.patch new file mode 100644 index 0000000..fce36bd --- /dev/null +++ b/patches/api/0003-Add-packages.patch @@ -0,0 +1,35 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com> +Date: Tue, 14 Mar 2023 21:03:19 +0300 +Subject: [PATCH] Add packages + + +diff --git a/build.gradle.kts b/build.gradle.kts +index 181e9cd8623995f40e696ccfe49754dc340405d8..919aaa4821e65cd2d6ee39b4740d9bfadfb7c058 100644 +--- a/build.gradle.kts ++++ b/build.gradle.kts +@@ -152,3 +152,23 @@ tasks.check { + dependsOn(scanJar) + } + // Paper end ++ ++// DivineMC start ++publishing { ++ repositories { ++ maven { ++ name = "githubPackage" ++ url = uri("https://maven.pkg.github.com/DivineMC/DivineMC") ++ ++ credentials.username = System.getenv("GITHUB_USERNAME") ++ credentials.password = System.getenv("GITHUB_TOKEN") ++ } ++ ++ publications { ++ register("gpr") { ++ from(components["java"]) ++ } ++ } ++ } ++} ++// DivineMC end +\ No newline at end of file diff --git a/patches/api/0004-Update-Bungeecord-Chat-API.patch b/patches/api/0004-Update-Bungeecord-Chat-API.patch new file mode 100644 index 0000000..34248d1 --- /dev/null +++ b/patches/api/0004-Update-Bungeecord-Chat-API.patch @@ -0,0 +1,17 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com> +Date: Tue, 14 Mar 2023 21:03:19 +0300 +Subject: [PATCH] Update Bungeecord chat api + +diff --git a/build.gradle.kts b/build.gradle.kts +--- a/build.gradle.kts (revision d4a930ba2525c0ab90b5a4943973a98cebfb7181) ++++ b/build.gradle.kts (date 1678817156402) +@@ -25,7 +25,7 @@ + // api dependencies are listed transitively to API consumers + api("com.google.guava:guava:31.1-jre") + api("com.google.code.gson:gson:2.10") +- api("net.md-5:bungeecord-chat:1.16-R0.4-deprecated+build.6") // Paper ++ api("net.md-5:bungeecord-chat:1.19-R0.1-SNAPSHOT") // Paper // DivineMC + api("org.yaml:snakeyaml:1.33") + // Paper start + api("com.googlecode.json-simple:json-simple:1.1.1") { diff --git a/patches/server/0001-Divine-Branding.patch b/patches/server/0001-Divine-Branding.patch index 024b6d0..a02b426 100644 --- a/patches/server/0001-Divine-Branding.patch +++ b/patches/server/0001-Divine-Branding.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Divine Branding diff --git a/build.gradle.kts b/build.gradle.kts -index 77d057333f2e7755a230eec1cfddac11e98f8c2f..c6085109028e8e458e800055fdc0a8fbfa7ed221 100644 +index 530159ef6307e092279824488652bbc94d3ad387..df5c8abe5fe5428f99fab668583c0af986adbd27 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,7 +7,7 @@ plugins { @@ -222,7 +222,7 @@ index 7ddf52de4b095f63c75b696008fcdde6345fc3c8..cfb665cf895cd96d1b6f78267abfd2c1 private final String bukkitVersion = Versioning.getBukkitVersion(); private final Logger logger = Logger.getLogger("Minecraft"); diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 190e17eb28d166aedee06e9578561ba402d1b6d2..8f3577c35a1610772d2050534e5c201dcf002f23 100644 +index f30621be24c6c3a4f173436fce1ad1c13507c84f..07c2991774323e051844aa83a80b9fdaa0cbeb63 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -278,7 +278,7 @@ public class Main { @@ -235,10 +235,10 @@ index 190e17eb28d166aedee06e9578561ba402d1b6d2..8f3577c35a1610772d2050534e5c201d //Thread.sleep(TimeUnit.SECONDS.toMillis(20)); // Paper End diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 6aa2121e286dd6d43201a38722ea0cdd205baaa7..98794b2413111b7e6cb7900c1f91b494b60ddaed 100644 +index 0ccde7fe2a852f7da72f0b3f5a53cb48d28d1840..29c26e1ffa1d5212df6cdc954a286aba41fb50c3 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -@@ -468,7 +468,7 @@ public final class CraftMagicNumbers implements UnsafeValues { +@@ -464,7 +464,7 @@ public final class CraftMagicNumbers implements UnsafeValues { @Override public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {