From 44e1d1a6d2b4b7286deb3119f33cba30e0ca26b8 Mon Sep 17 00:00:00 2001 From: Euphyllia Bierque Date: Wed, 17 Jul 2024 02:28:20 +0200 Subject: [PATCH] Rebuild --- patches/plugins/0001-Rebrand.patch | 60 ++++++++++++++---------------- 1 file changed, 28 insertions(+), 32 deletions(-) diff --git a/patches/plugins/0001-Rebrand.patch b/patches/plugins/0001-Rebrand.patch index 7374af41af3..0ab42087813 100644 --- a/patches/plugins/0001-Rebrand.patch +++ b/patches/plugins/0001-Rebrand.patch @@ -1,28 +1,28 @@ -From b8fb4e3af5ca3dd86dc76a9bf9224a5ffe9c1979 Mon Sep 17 00:00:00 2001 +From 9d842debd6f38dde0c5f1dafb3e597f3b93fee9f Mon Sep 17 00:00:00 2001 From: Euphyllia Bierque -Date: Wed, 17 Jul 2024 02:12:50 +0200 +Date: Wed, 17 Jul 2024 02:25:24 +0200 Subject: [PATCH] Rebrand --- - Essentials/src/main/resources/plugin.yml | 1 + - .../java/com/earth2me/essentials/EconomyTest.java | 0 - .../java/com/earth2me/essentials/MessagingTest.java | 0 - .../java/com/earth2me/essentials/StorageTest.java | 0 - .../java/com/earth2me/essentials/ToggleTest.java | 0 - .../java/com/earth2me/essentials/UserTest.java | 0 - .../java/com/earth2me/essentials/UtilTest.java | 0 - .../earth2me/essentials/utils/FormatUtilTest.java | 0 - .../earth2me/essentials/utils/StringUtilTest.java | 0 - EssentialsDiscord/build.gradle | 6 +++--- - build-logic/build.gradle.kts | 2 +- - .../kotlin/essentials.base-conventions.gradle.kts | 4 ++-- - .../kotlin/essentials.module-conventions.gradle.kts | 10 ++++++++++ - .../main/kotlin/essentials.shadow-module.gradle.kts | 12 +++++++++++- - build.gradle | 2 +- - providers/BaseProviders/build.gradle | 10 ++++++++++ - .../provider/providers/BukkitSenderProvider.java | 7 +++++++ - providers/PaperProvider/build.gradle | 6 +++--- - 18 files changed, 49 insertions(+), 11 deletions(-) + Essentials/src/main/resources/plugin.yml | 1 + + .../java/com/earth2me/essentials/EconomyTest.java | 0 + .../java/com/earth2me/essentials/MessagingTest.java | 0 + .../java/com/earth2me/essentials/StorageTest.java | 0 + .../java/com/earth2me/essentials/ToggleTest.java | 0 + .../java/com/earth2me/essentials/UserTest.java | 0 + .../java/com/earth2me/essentials/UtilTest.java | 0 + .../com/earth2me/essentials/utils/FormatUtilTest.java | 0 + .../com/earth2me/essentials/utils/StringUtilTest.java | 0 + EssentialsDiscord/build.gradle | 6 +++--- + build-logic/build.gradle.kts | 2 +- + .../kotlin/essentials.base-conventions.gradle.kts | 4 ++-- + .../kotlin/essentials.module-conventions.gradle.kts | 9 +++++++++ + .../main/kotlin/essentials.shadow-module.gradle.kts | 11 ++++++++++- + build.gradle | 2 +- + providers/BaseProviders/build.gradle | 10 ++++++++++ + .../ess3/provider/providers/BukkitSenderProvider.java | 7 +++++++ + providers/PaperProvider/build.gradle | 6 +++--- + 18 files changed, 47 insertions(+), 11 deletions(-) rename Essentials/src/{test => testaaa}/java/com/earth2me/essentials/EconomyTest.java (100%) rename Essentials/src/{test => testaaa}/java/com/earth2me/essentials/MessagingTest.java (100%) rename Essentials/src/{test => testaaa}/java/com/earth2me/essentials/StorageTest.java (100%) @@ -133,16 +133,15 @@ index 3d1f04671..041fa8cef 100644 // Don't enforce running tests on Java 8; we only care about the release for compiling, not running tests strictVersions(false) diff --git a/build-logic/src/main/kotlin/essentials.module-conventions.gradle.kts b/build-logic/src/main/kotlin/essentials.module-conventions.gradle.kts -index 9212b2fad..0c47ab915 100644 +index 9212b2fad..83618c84b 100644 --- a/build-logic/src/main/kotlin/essentials.module-conventions.gradle.kts +++ b/build-logic/src/main/kotlin/essentials.module-conventions.gradle.kts -@@ -1,3 +1,5 @@ +@@ -1,3 +1,4 @@ +import gradle.kotlin.dsl.accessors._d61068e8dd7a4c8c489a14bbbc096322.indra // Rebrand -+ plugins { id("essentials.base-conventions") id("xyz.jpenilla.run-paper") -@@ -27,3 +29,11 @@ tasks { +@@ -27,3 +28,11 @@ tasks { dependsOn(copyJar) } } @@ -154,14 +153,12 @@ index 9212b2fad..0c47ab915 100644 + } +} +// Rebrand -\ No newline at end of file diff --git a/build-logic/src/main/kotlin/essentials.shadow-module.gradle.kts b/build-logic/src/main/kotlin/essentials.shadow-module.gradle.kts -index 9ebe51ea4..c2dc2c6e6 100644 +index 9ebe51ea4..31737ab46 100644 --- a/build-logic/src/main/kotlin/essentials.shadow-module.gradle.kts +++ b/build-logic/src/main/kotlin/essentials.shadow-module.gradle.kts -@@ -1,6 +1,8 @@ -+import gradle.kotlin.dsl.accessors._d61068e8dd7a4c8c489a14bbbc096322.indra // Rebrand -+ +@@ -1,6 +1,7 @@ ++import gradle.kotlin.dsl.accessors._d61068e8dd7a4c8c489a14bbbc096322.indra // Rebrand plugins { id("essentials.module-conventions") - id("com.github.johnrengelman.shadow") @@ -169,7 +166,7 @@ index 9ebe51ea4..c2dc2c6e6 100644 } tasks { -@@ -15,3 +17,11 @@ tasks { +@@ -15,3 +16,11 @@ tasks { extensions.configure { archiveFile.set(tasks.shadowJar.flatMap { it.archiveFile }) } @@ -181,7 +178,6 @@ index 9ebe51ea4..c2dc2c6e6 100644 + } +} +// Rebrand -\ No newline at end of file diff --git a/build.gradle b/build.gradle index 4a859e015..37d054805 100644 --- a/build.gradle