Skip to content

Commit 46a37b3

Browse files
EuphillyaEuphillya
committed
Update Upstream EssentialsX:
EssentialsX@9dfa8cf Fix similarWarpExist message not being translated correctly EssentialsX@3e29e04 Fix kittycannon on old versions EssentialsX@04518db Use a click component for discord link command EssentialsX@6157668 Bump PlaceholderAPI dependency to version 2.11.6 (EssentialsX#5936)
1 parent 7542137 commit 46a37b3

9 files changed

+81
-53
lines changed

‎Essentials‎

‎patches/plugins/0001-Rebrand.patch‎

Lines changed: 39 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
1-
From 665ec1d1974820e2edc42aace94e9cf1828a9995 Mon Sep 17 00:00:00 2001
1+
From 004681f8e83db8e3a22c4d69d95d6ede42203225 Mon Sep 17 00:00:00 2001
22
From: Euphyllia Bierque <[email protected]>
3-
Date: Wed, 28 Aug 2024 02:54:40 +0200
3+
Date: Wed, 18 Sep 2024 19:04:55 +0200
44
Subject: [PATCH 1/8] Rebrand
55

66
---
7-
Essentials/src/main/resources/plugin.yml | 1 +
8-
.../java/com/earth2me/essentials/EconomyTest.java | 0
9-
.../java/com/earth2me/essentials/MessagingTest.java | 0
10-
.../java/com/earth2me/essentials/StorageTest.java | 0
11-
.../java/com/earth2me/essentials/ToggleTest.java | 0
12-
.../java/com/earth2me/essentials/UserTest.java | 0
13-
.../java/com/earth2me/essentials/UtilTest.java | 0
14-
.../com/earth2me/essentials/utils/FormatUtilTest.java | 0
15-
.../com/earth2me/essentials/utils/StringUtilTest.java | 0
16-
EssentialsDiscord/build.gradle | 4 ++--
17-
build-logic/build.gradle.kts | 2 +-
18-
.../kotlin/essentials.base-conventions.gradle.kts | 4 ++--
19-
.../kotlin/essentials.module-conventions.gradle.kts | 9 +++++++++
20-
.../main/kotlin/essentials.shadow-module.gradle.kts | 11 ++++++++++-
21-
build.gradle | 2 +-
22-
providers/BaseProviders/build.gradle | 10 ++++++++++
23-
.../ess3/provider/providers/BukkitSenderProvider.java | 7 +++++++
24-
providers/PaperProvider/build.gradle | 6 +++---
25-
18 files changed, 46 insertions(+), 10 deletions(-)
7+
Essentials/src/main/resources/plugin.yml | 1 +
8+
.../com/earth2me/essentials/EconomyTest.java | 0
9+
.../earth2me/essentials/MessagingTest.java | 0
10+
.../com/earth2me/essentials/StorageTest.java | 0
11+
.../com/earth2me/essentials/ToggleTest.java | 0
12+
.../com/earth2me/essentials/UserTest.java | 0
13+
.../com/earth2me/essentials/UtilTest.java | 0
14+
.../essentials/utils/FormatUtilTest.java | 0
15+
.../essentials/utils/StringUtilTest.java | 0
16+
EssentialsDiscord/build.gradle | 4 ++--
17+
build-logic/build.gradle.kts | 2 +-
18+
.../essentials.base-conventions.gradle.kts | 4 ++--
19+
.../essentials.module-conventions.gradle.kts | 9 +++++++
20+
.../essentials.shadow-module.gradle.kts | 11 ++++++++-
21+
build.gradle | 2 +-
22+
providers/BaseProviders/build.gradle | 24 +++++++++++++------
23+
.../providers/BukkitSenderProvider.java | 7 ++++++
24+
providers/PaperProvider/build.gradle | 6 ++---
25+
18 files changed, 53 insertions(+), 17 deletions(-)
2626
rename Essentials/src/{test => testaaa}/java/com/earth2me/essentials/EconomyTest.java (100%)
2727
rename Essentials/src/{test => testaaa}/java/com/earth2me/essentials/MessagingTest.java (100%)
2828
rename Essentials/src/{test => testaaa}/java/com/earth2me/essentials/StorageTest.java (100%)
@@ -77,7 +77,7 @@ similarity index 100%
7777
rename from Essentials/src/test/java/com/earth2me/essentials/utils/StringUtilTest.java
7878
rename to Essentials/src/testaaa/java/com/earth2me/essentials/utils/StringUtilTest.java
7979
diff --git a/EssentialsDiscord/build.gradle b/EssentialsDiscord/build.gradle
80-
index 555fec855..e5c417981 100644
80+
index 7ce41fde4..8f3f1a2b1 100644
8181
--- a/EssentialsDiscord/build.gradle
8282
+++ b/EssentialsDiscord/build.gradle
8383
@@ -8,10 +8,10 @@ dependencies {
@@ -90,7 +90,7 @@ index 555fec855..e5c417981 100644
9090
}
9191
- compileOnly 'org.apache.logging.log4j:log4j-core:2.17.1'
9292
+ compileOnly 'org.apache.logging.log4j:log4j-core:2.23.1' // Rebrand - update
93-
compileOnly 'me.clip:placeholderapi:2.10.9'
93+
compileOnly 'me.clip:placeholderapi:2.11.6'
9494
}
9595

9696
diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts
@@ -187,13 +187,24 @@ index 4a859e015..37d054805 100644
187187
project.ext {
188188
GIT_COMMIT = !indraGit.isPresent() ? "unknown" : indraGit.commit().abbreviate(7).name()
189189
diff --git a/providers/BaseProviders/build.gradle b/providers/BaseProviders/build.gradle
190-
index 99176e222..b255f304b 100644
190+
index 99176e222..ef6b5616c 100644
191191
--- a/providers/BaseProviders/build.gradle
192192
+++ b/providers/BaseProviders/build.gradle
193-
@@ -5,3 +5,13 @@ plugins {
194-
essentials {
195-
injectBstats.set(false)
196-
}
193+
@@ -1,7 +1,17 @@
194+
-plugins {
195+
- id("essentials.base-conventions")
196+
-}
197+
-
198+
-essentials {
199+
- injectBstats.set(false)
200+
-}
201+
+plugins {
202+
+ id("essentials.base-conventions")
203+
+}
204+
+
205+
+essentials {
206+
+ injectBstats.set(false)
207+
+}
197208
+
198209
+// Rebrand
199210
+dependencies {

‎patches/plugins/0002-Teleport-to-teleportAsync.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
From 324f53d545c78a7f5411250c0bd8bae5dcd792b8 Mon Sep 17 00:00:00 2001
1+
From e0057f922d4f0bc719f804f5c691900408332750 Mon Sep 17 00:00:00 2001
22
From: Euphyllia Bierque <[email protected]>
3-
Date: Wed, 28 Aug 2024 02:54:53 +0200
3+
Date: Wed, 18 Sep 2024 19:04:55 +0200
44
Subject: [PATCH 2/8] Teleport to teleportAsync
55

66
---

‎patches/plugins/0003-Replace-BukkitRunnable-to-FoliaRunnable.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
From f7f90e0fa858501aedd515b3e0e2400c4caf2190 Mon Sep 17 00:00:00 2001
1+
From 823b92bc0b0c6c55c3e005f2bcb5a7bab6a13425 Mon Sep 17 00:00:00 2001
22
From: Euphyllia Bierque <[email protected]>
3-
Date: Wed, 28 Aug 2024 02:54:53 +0200
3+
Date: Wed, 18 Sep 2024 19:04:56 +0200
44
Subject: [PATCH 3/8] Replace BukkitRunnable to FoliaRunnable
55

66
---

‎patches/plugins/0004-Replace-scheduler.patch‎

Lines changed: 29 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
From 5e639d26968c0c0da93d4308e2ae43bbad374af5 Mon Sep 17 00:00:00 2001
1+
From 6b9b57047df6251f719bdb94f35f0cf2d8551e9e Mon Sep 17 00:00:00 2001
22
From: Euphyllia Bierque <[email protected]>
3-
Date: Wed, 28 Aug 2024 02:54:53 +0200
3+
Date: Wed, 18 Sep 2024 19:04:56 +0200
44
Subject: [PATCH 4/8] Replace scheduler
55

66
---
@@ -47,12 +47,12 @@ Subject: [PATCH 4/8] Replace scheduler
4747
.../discordlink/rolesync/RoleSyncManager.java | 6 ++--
4848
.../src/main/resources/plugin.yml | 1 +
4949
EssentialsGeoIP/src/main/resources/plugin.yml | 1 +
50-
.../src/main/resources/plugin.yml | 1 +
50+
.../src/main/resources/plugin.yml | 21 ++++++------
5151
.../spawn/EssentialsSpawnPlayerListener.java | 12 +++----
5252
EssentialsSpawn/src/main/resources/plugin.yml | 1 +
5353
.../earth2me/essentials/xmpp/XMPPManager.java | 2 +-
5454
EssentialsXMPP/src/main/resources/plugin.yml | 1 +
55-
48 files changed, 199 insertions(+), 142 deletions(-)
55+
48 files changed, 209 insertions(+), 152 deletions(-)
5656

5757
diff --git a/Essentials/src/main/java/com/earth2me/essentials/AsyncTeleport.java b/Essentials/src/main/java/com/earth2me/essentials/AsyncTeleport.java
5858
index 906fb044c..0d8365bdd 100644
@@ -202,7 +202,7 @@ index 4008b3fe5..aa265ef49 100644
202202
}
203203

204204
diff --git a/Essentials/src/main/java/com/earth2me/essentials/Essentials.java b/Essentials/src/main/java/com/earth2me/essentials/Essentials.java
205-
index e2a2ff13e..d32c00769 100644
205+
index 936f697bb..31c66b698 100644
206206
--- a/Essentials/src/main/java/com/earth2me/essentials/Essentials.java
207207
+++ b/Essentials/src/main/java/com/earth2me/essentials/Essentials.java
208208
@@ -530,7 +530,7 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials {
@@ -729,10 +729,10 @@ index 24a54e272..3129c344f 100644
729729
sender.sendComponent(component);
730730
}
731731
diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandkittycannon.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandkittycannon.java
732-
index e40234f52..094f6a3f3 100644
732+
index 18397f82f..c25c5f91c 100644
733733
--- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandkittycannon.java
734734
+++ b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandkittycannon.java
735-
@@ -42,11 +42,11 @@ public class Commandkittycannon extends EssentialsCommand {
735+
@@ -49,11 +49,11 @@ public class Commandkittycannon extends EssentialsCommand {
736736
@Override
737737
protected void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception {
738738
final Entity ocelot = Mob.CAT.getType() == null ? spawnOcelot(server, user) : spawnCat(server, user);
@@ -1326,13 +1326,30 @@ index 2ddee7b12..e3346d465 100644
13261326
api-version: 1.13
13271327
+folia-supported: true # Euphyllia
13281328
diff --git a/EssentialsProtect/src/main/resources/plugin.yml b/EssentialsProtect/src/main/resources/plugin.yml
1329-
index 65764be4a..4c361b0b2 100644
1329+
index 65764be4a..c681f4683 100644
13301330
--- a/EssentialsProtect/src/main/resources/plugin.yml
13311331
+++ b/EssentialsProtect/src/main/resources/plugin.yml
1332-
@@ -8,3 +8,4 @@ description: Provides protection for various parts of the world.
1333-
authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology, KHobbits, drtshock]
1334-
softdepend: [Essentials]
1335-
api-version: 1.13
1332+
@@ -1,10 +1,11 @@
1333+
-# This determines the command prefix when there are conflicts (/name:home, /name:help, etc.)
1334+
-name: EssentialsProtect
1335+
-main: com.earth2me.essentials.protect.EssentialsProtect
1336+
-# Note to developers: This next line cannot change, or the automatic versioning system will break.
1337+
-version: ${full.version}
1338+
-website: https://essentialsx.net/
1339+
-description: Provides protection for various parts of the world.
1340+
-authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology, KHobbits, drtshock]
1341+
-softdepend: [Essentials]
1342+
-api-version: 1.13
1343+
+# This determines the command prefix when there are conflicts (/name:home, /name:help, etc.)
1344+
+name: EssentialsProtect
1345+
+main: com.earth2me.essentials.protect.EssentialsProtect
1346+
+# Note to developers: This next line cannot change, or the automatic versioning system will break.
1347+
+version: ${full.version}
1348+
+website: https://essentialsx.net/
1349+
+description: Provides protection for various parts of the world.
1350+
+authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology, KHobbits, drtshock]
1351+
+softdepend: [Essentials]
1352+
+api-version: 1.13
13361353
+folia-supported: true # Euphyllia
13371354
\ No newline at end of file
13381355
diff --git a/EssentialsSpawn/src/main/java/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java b/EssentialsSpawn/src/main/java/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java

‎patches/plugins/0005-Fix-command-time.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
From 20c72b8e948c67cf4a13379af1a19d9065e5bce6 Mon Sep 17 00:00:00 2001
1+
From d736760eee2a4246e5b1adb9a0c2cb0de7281840 Mon Sep 17 00:00:00 2001
22
From: Euphyllia Bierque <[email protected]>
3-
Date: Wed, 28 Aug 2024 02:54:54 +0200
3+
Date: Wed, 18 Sep 2024 19:04:56 +0200
44
Subject: [PATCH 5/8] Fix command time
55

66
---

‎patches/plugins/0006-Fix-dispatch-command.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
From df65521304224f07b1bf1e56e5703771eaf82b83 Mon Sep 17 00:00:00 2001
1+
From 6146671041d84408a57c7bbc23d27da0281f385f Mon Sep 17 00:00:00 2001
22
From: Euphyllia Bierque <[email protected]>
3-
Date: Wed, 28 Aug 2024 02:54:54 +0200
3+
Date: Wed, 18 Sep 2024 19:04:56 +0200
44
Subject: [PATCH 6/8] Fix dispatch command
55

66
---

‎patches/plugins/0007-Fix-command-gc.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
From 4be19b74d20a2a22ca02bc737fd5af89c269e512 Mon Sep 17 00:00:00 2001
1+
From fb63dc949f6d06cfe15e6f7900af6a16fd07224e Mon Sep 17 00:00:00 2001
22
From: Euphyllia Bierque <[email protected]>
3-
Date: Wed, 28 Aug 2024 02:54:54 +0200
3+
Date: Wed, 18 Sep 2024 19:04:57 +0200
44
Subject: [PATCH 7/8] Fix command gc
55

66
---

‎patches/plugins/0008-Fix-Stop-Server-task.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
From 521e2c2d0f4e0fc773ce8767ec57fe00915d443f Mon Sep 17 00:00:00 2001
1+
From 682ed3022bfc96577f9204318e0fa9333778b133 Mon Sep 17 00:00:00 2001
22
From: Euphyllia Bierque <[email protected]>
3-
Date: Wed, 28 Aug 2024 02:54:54 +0200
3+
Date: Wed, 18 Sep 2024 19:04:57 +0200
44
Subject: [PATCH 8/8] Fix Stop Server task
55

66
---

0 commit comments

Comments
 (0)