diff --git a/Essentials b/Essentials index b54c8c1774e..6157668a631 160000 --- a/Essentials +++ b/Essentials @@ -1 +1 @@ -Subproject commit b54c8c1774e95c025c521cafcc5be9c49466ca13 +Subproject commit 6157668a631ed9c53468831e6007a3ba49f31edb diff --git a/patches/plugins/0001-Rebrand.patch b/patches/plugins/0001-Rebrand.patch index 78f84f9a4ab..449e67088fb 100644 --- a/patches/plugins/0001-Rebrand.patch +++ b/patches/plugins/0001-Rebrand.patch @@ -1,28 +1,28 @@ -From 665ec1d1974820e2edc42aace94e9cf1828a9995 Mon Sep 17 00:00:00 2001 +From 004681f8e83db8e3a22c4d69d95d6ede42203225 Mon Sep 17 00:00:00 2001 From: Euphyllia Bierque -Date: Wed, 28 Aug 2024 02:54:40 +0200 +Date: Wed, 18 Sep 2024 19:04:55 +0200 Subject: [PATCH 1/8] 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 - .../com/earth2me/essentials/utils/FormatUtilTest.java | 0 - .../com/earth2me/essentials/utils/StringUtilTest.java | 0 - EssentialsDiscord/build.gradle | 4 ++-- - 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, 46 insertions(+), 10 deletions(-) + Essentials/src/main/resources/plugin.yml | 1 + + .../com/earth2me/essentials/EconomyTest.java | 0 + .../earth2me/essentials/MessagingTest.java | 0 + .../com/earth2me/essentials/StorageTest.java | 0 + .../com/earth2me/essentials/ToggleTest.java | 0 + .../com/earth2me/essentials/UserTest.java | 0 + .../com/earth2me/essentials/UtilTest.java | 0 + .../essentials/utils/FormatUtilTest.java | 0 + .../essentials/utils/StringUtilTest.java | 0 + EssentialsDiscord/build.gradle | 4 ++-- + build-logic/build.gradle.kts | 2 +- + .../essentials.base-conventions.gradle.kts | 4 ++-- + .../essentials.module-conventions.gradle.kts | 9 +++++++ + .../essentials.shadow-module.gradle.kts | 11 ++++++++- + build.gradle | 2 +- + providers/BaseProviders/build.gradle | 24 +++++++++++++------ + .../providers/BukkitSenderProvider.java | 7 ++++++ + providers/PaperProvider/build.gradle | 6 ++--- + 18 files changed, 53 insertions(+), 17 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%) @@ -77,7 +77,7 @@ similarity index 100% rename from Essentials/src/test/java/com/earth2me/essentials/utils/StringUtilTest.java rename to Essentials/src/testaaa/java/com/earth2me/essentials/utils/StringUtilTest.java diff --git a/EssentialsDiscord/build.gradle b/EssentialsDiscord/build.gradle -index 555fec855..e5c417981 100644 +index 7ce41fde4..8f3f1a2b1 100644 --- a/EssentialsDiscord/build.gradle +++ b/EssentialsDiscord/build.gradle @@ -8,10 +8,10 @@ dependencies { @@ -90,7 +90,7 @@ index 555fec855..e5c417981 100644 } - compileOnly 'org.apache.logging.log4j:log4j-core:2.17.1' + compileOnly 'org.apache.logging.log4j:log4j-core:2.23.1' // Rebrand - update - compileOnly 'me.clip:placeholderapi:2.10.9' + compileOnly 'me.clip:placeholderapi:2.11.6' } diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts @@ -187,13 +187,24 @@ index 4a859e015..37d054805 100644 project.ext { GIT_COMMIT = !indraGit.isPresent() ? "unknown" : indraGit.commit().abbreviate(7).name() diff --git a/providers/BaseProviders/build.gradle b/providers/BaseProviders/build.gradle -index 99176e222..b255f304b 100644 +index 99176e222..ef6b5616c 100644 --- a/providers/BaseProviders/build.gradle +++ b/providers/BaseProviders/build.gradle -@@ -5,3 +5,13 @@ plugins { - essentials { - injectBstats.set(false) - } +@@ -1,7 +1,17 @@ +-plugins { +- id("essentials.base-conventions") +-} +- +-essentials { +- injectBstats.set(false) +-} ++plugins { ++ id("essentials.base-conventions") ++} ++ ++essentials { ++ injectBstats.set(false) ++} + +// Rebrand +dependencies { diff --git a/patches/plugins/0002-Teleport-to-teleportAsync.patch b/patches/plugins/0002-Teleport-to-teleportAsync.patch index 852d80d17ef..1a979301da5 100644 --- a/patches/plugins/0002-Teleport-to-teleportAsync.patch +++ b/patches/plugins/0002-Teleport-to-teleportAsync.patch @@ -1,6 +1,6 @@ -From 324f53d545c78a7f5411250c0bd8bae5dcd792b8 Mon Sep 17 00:00:00 2001 +From e0057f922d4f0bc719f804f5c691900408332750 Mon Sep 17 00:00:00 2001 From: Euphyllia Bierque -Date: Wed, 28 Aug 2024 02:54:53 +0200 +Date: Wed, 18 Sep 2024 19:04:55 +0200 Subject: [PATCH 2/8] Teleport to teleportAsync --- diff --git a/patches/plugins/0003-Replace-BukkitRunnable-to-FoliaRunnable.patch b/patches/plugins/0003-Replace-BukkitRunnable-to-FoliaRunnable.patch index 083b19f641c..19c7c1776a0 100644 --- a/patches/plugins/0003-Replace-BukkitRunnable-to-FoliaRunnable.patch +++ b/patches/plugins/0003-Replace-BukkitRunnable-to-FoliaRunnable.patch @@ -1,6 +1,6 @@ -From f7f90e0fa858501aedd515b3e0e2400c4caf2190 Mon Sep 17 00:00:00 2001 +From 823b92bc0b0c6c55c3e005f2bcb5a7bab6a13425 Mon Sep 17 00:00:00 2001 From: Euphyllia Bierque -Date: Wed, 28 Aug 2024 02:54:53 +0200 +Date: Wed, 18 Sep 2024 19:04:56 +0200 Subject: [PATCH 3/8] Replace BukkitRunnable to FoliaRunnable --- diff --git a/patches/plugins/0004-Replace-scheduler.patch b/patches/plugins/0004-Replace-scheduler.patch index f5afec4b254..ab4046f49e6 100644 --- a/patches/plugins/0004-Replace-scheduler.patch +++ b/patches/plugins/0004-Replace-scheduler.patch @@ -1,6 +1,6 @@ -From 5e639d26968c0c0da93d4308e2ae43bbad374af5 Mon Sep 17 00:00:00 2001 +From 6b9b57047df6251f719bdb94f35f0cf2d8551e9e Mon Sep 17 00:00:00 2001 From: Euphyllia Bierque -Date: Wed, 28 Aug 2024 02:54:53 +0200 +Date: Wed, 18 Sep 2024 19:04:56 +0200 Subject: [PATCH 4/8] Replace scheduler --- @@ -47,12 +47,12 @@ Subject: [PATCH 4/8] Replace scheduler .../discordlink/rolesync/RoleSyncManager.java | 6 ++-- .../src/main/resources/plugin.yml | 1 + EssentialsGeoIP/src/main/resources/plugin.yml | 1 + - .../src/main/resources/plugin.yml | 1 + + .../src/main/resources/plugin.yml | 21 ++++++------ .../spawn/EssentialsSpawnPlayerListener.java | 12 +++---- EssentialsSpawn/src/main/resources/plugin.yml | 1 + .../earth2me/essentials/xmpp/XMPPManager.java | 2 +- EssentialsXMPP/src/main/resources/plugin.yml | 1 + - 48 files changed, 199 insertions(+), 142 deletions(-) + 48 files changed, 209 insertions(+), 152 deletions(-) diff --git a/Essentials/src/main/java/com/earth2me/essentials/AsyncTeleport.java b/Essentials/src/main/java/com/earth2me/essentials/AsyncTeleport.java index 906fb044c..0d8365bdd 100644 @@ -202,7 +202,7 @@ index 4008b3fe5..aa265ef49 100644 } diff --git a/Essentials/src/main/java/com/earth2me/essentials/Essentials.java b/Essentials/src/main/java/com/earth2me/essentials/Essentials.java -index e2a2ff13e..d32c00769 100644 +index 936f697bb..31c66b698 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/Essentials.java +++ b/Essentials/src/main/java/com/earth2me/essentials/Essentials.java @@ -530,7 +530,7 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials { @@ -729,10 +729,10 @@ index 24a54e272..3129c344f 100644 sender.sendComponent(component); } diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandkittycannon.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandkittycannon.java -index e40234f52..094f6a3f3 100644 +index 18397f82f..c25c5f91c 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandkittycannon.java +++ b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandkittycannon.java -@@ -42,11 +42,11 @@ public class Commandkittycannon extends EssentialsCommand { +@@ -49,11 +49,11 @@ public class Commandkittycannon extends EssentialsCommand { @Override protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception { final Entity ocelot = Mob.CAT.getType() == null ? spawnOcelot(server, user) : spawnCat(server, user); @@ -1326,13 +1326,30 @@ index 2ddee7b12..e3346d465 100644 api-version: 1.13 +folia-supported: true # Euphyllia diff --git a/EssentialsProtect/src/main/resources/plugin.yml b/EssentialsProtect/src/main/resources/plugin.yml -index 65764be4a..4c361b0b2 100644 +index 65764be4a..c681f4683 100644 --- a/EssentialsProtect/src/main/resources/plugin.yml +++ b/EssentialsProtect/src/main/resources/plugin.yml -@@ -8,3 +8,4 @@ description: Provides protection for various parts of the world. - authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology, KHobbits, drtshock] - softdepend: [Essentials] - api-version: 1.13 +@@ -1,10 +1,11 @@ +-# This determines the command prefix when there are conflicts (/name:home, /name:help, etc.) +-name: EssentialsProtect +-main: com.earth2me.essentials.protect.EssentialsProtect +-# Note to developers: This next line cannot change, or the automatic versioning system will break. +-version: ${full.version} +-website: https://essentialsx.net/ +-description: Provides protection for various parts of the world. +-authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology, KHobbits, drtshock] +-softdepend: [Essentials] +-api-version: 1.13 ++# This determines the command prefix when there are conflicts (/name:home, /name:help, etc.) ++name: EssentialsProtect ++main: com.earth2me.essentials.protect.EssentialsProtect ++# Note to developers: This next line cannot change, or the automatic versioning system will break. ++version: ${full.version} ++website: https://essentialsx.net/ ++description: Provides protection for various parts of the world. ++authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology, KHobbits, drtshock] ++softdepend: [Essentials] ++api-version: 1.13 +folia-supported: true # Euphyllia \ No newline at end of file diff --git a/EssentialsSpawn/src/main/java/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java b/EssentialsSpawn/src/main/java/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java diff --git a/patches/plugins/0005-Fix-command-time.patch b/patches/plugins/0005-Fix-command-time.patch index e73cc2a9d98..5bc8be0a723 100644 --- a/patches/plugins/0005-Fix-command-time.patch +++ b/patches/plugins/0005-Fix-command-time.patch @@ -1,6 +1,6 @@ -From 20c72b8e948c67cf4a13379af1a19d9065e5bce6 Mon Sep 17 00:00:00 2001 +From d736760eee2a4246e5b1adb9a0c2cb0de7281840 Mon Sep 17 00:00:00 2001 From: Euphyllia Bierque -Date: Wed, 28 Aug 2024 02:54:54 +0200 +Date: Wed, 18 Sep 2024 19:04:56 +0200 Subject: [PATCH 5/8] Fix command time --- diff --git a/patches/plugins/0006-Fix-dispatch-command.patch b/patches/plugins/0006-Fix-dispatch-command.patch index b89f5985ceb..a40e7755a80 100644 --- a/patches/plugins/0006-Fix-dispatch-command.patch +++ b/patches/plugins/0006-Fix-dispatch-command.patch @@ -1,6 +1,6 @@ -From df65521304224f07b1bf1e56e5703771eaf82b83 Mon Sep 17 00:00:00 2001 +From 6146671041d84408a57c7bbc23d27da0281f385f Mon Sep 17 00:00:00 2001 From: Euphyllia Bierque -Date: Wed, 28 Aug 2024 02:54:54 +0200 +Date: Wed, 18 Sep 2024 19:04:56 +0200 Subject: [PATCH 6/8] Fix dispatch command --- diff --git a/patches/plugins/0007-Fix-command-gc.patch b/patches/plugins/0007-Fix-command-gc.patch index 18ac1c15ef3..c406a40d8a7 100644 --- a/patches/plugins/0007-Fix-command-gc.patch +++ b/patches/plugins/0007-Fix-command-gc.patch @@ -1,6 +1,6 @@ -From 4be19b74d20a2a22ca02bc737fd5af89c269e512 Mon Sep 17 00:00:00 2001 +From fb63dc949f6d06cfe15e6f7900af6a16fd07224e Mon Sep 17 00:00:00 2001 From: Euphyllia Bierque -Date: Wed, 28 Aug 2024 02:54:54 +0200 +Date: Wed, 18 Sep 2024 19:04:57 +0200 Subject: [PATCH 7/8] Fix command gc --- diff --git a/patches/plugins/0008-Fix-Stop-Server-task.patch b/patches/plugins/0008-Fix-Stop-Server-task.patch index 468a44edc6a..f136205ace2 100644 --- a/patches/plugins/0008-Fix-Stop-Server-task.patch +++ b/patches/plugins/0008-Fix-Stop-Server-task.patch @@ -1,6 +1,6 @@ -From 521e2c2d0f4e0fc773ce8767ec57fe00915d443f Mon Sep 17 00:00:00 2001 +From 682ed3022bfc96577f9204318e0fa9333778b133 Mon Sep 17 00:00:00 2001 From: Euphyllia Bierque -Date: Wed, 28 Aug 2024 02:54:54 +0200 +Date: Wed, 18 Sep 2024 19:04:57 +0200 Subject: [PATCH 8/8] Fix Stop Server task ---