Skip to content

Commit

Permalink
Update Upstream EssentialsX
Browse files Browse the repository at this point in the history
EssentialsX@5515f9f Rework the provider system (EssentialsX#5087)
EssentialsX@8e53214 Fix paper maven repository URL (EssentialsX#6002)
EssentialsX@667b0f7 Skip upgrading random teleport config when tpr.yml isn't initialized yet (EssentialsX#6003)
EssentialsX@803771e Switch to pastes.dev for /ess dump (EssentialsX#6011)
  • Loading branch information
Euphillya committed Jan 18, 2025
1 parent 8b8eeeb commit b9ce03f
Show file tree
Hide file tree
Showing 10 changed files with 77 additions and 77 deletions.
2 changes: 1 addition & 1 deletion Essentials
Submodule Essentials updated 95 files
+2 −1 Essentials/src/main/java/com/earth2me/essentials/AlternativeCommandsHandler.java
+76 −255 Essentials/src/main/java/com/earth2me/essentials/Essentials.java
+4 −2 Essentials/src/main/java/com/earth2me/essentials/EssentialsBlockListener.java
+12 −7 Essentials/src/main/java/com/earth2me/essentials/EssentialsPlayerListener.java
+19 −17 Essentials/src/main/java/com/earth2me/essentials/EssentialsUpgrade.java
+6 −56 Essentials/src/main/java/com/earth2me/essentials/IEssentials.java
+4 −2 Essentials/src/main/java/com/earth2me/essentials/Kit.java
+6 −3 Essentials/src/main/java/com/earth2me/essentials/MetaItemStack.java
+137 −0 Essentials/src/main/java/com/earth2me/essentials/ProviderFactory.java
+7 −5 Essentials/src/main/java/com/earth2me/essentials/RandomTeleport.java
+15 −7 Essentials/src/main/java/com/earth2me/essentials/Settings.java
+3 −1 Essentials/src/main/java/com/earth2me/essentials/User.java
+5 −2 Essentials/src/main/java/com/earth2me/essentials/commands/Commandanvil.java
+2 −1 Essentials/src/main/java/com/earth2me/essentials/commands/Commandbottom.java
+5 −2 Essentials/src/main/java/com/earth2me/essentials/commands/Commandcartographytable.java
+4 −2 Essentials/src/main/java/com/earth2me/essentials/commands/Commandcreatekit.java
+9 −5 Essentials/src/main/java/com/earth2me/essentials/commands/Commandessentials.java
+5 −2 Essentials/src/main/java/com/earth2me/essentials/commands/Commandgrindstone.java
+2 −1 Essentials/src/main/java/com/earth2me/essentials/commands/Commandhelp.java
+4 −1 Essentials/src/main/java/com/earth2me/essentials/commands/Commandkill.java
+5 −2 Essentials/src/main/java/com/earth2me/essentials/commands/Commandloom.java
+3 −1 Essentials/src/main/java/com/earth2me/essentials/commands/Commandpay.java
+3 −2 Essentials/src/main/java/com/earth2me/essentials/commands/Commandrecipe.java
+5 −2 Essentials/src/main/java/com/earth2me/essentials/commands/Commandsmithingtable.java
+1 −1 Essentials/src/main/java/com/earth2me/essentials/commands/Commandspawner.java
+5 −2 Essentials/src/main/java/com/earth2me/essentials/commands/Commandstonecutter.java
+4 −1 Essentials/src/main/java/com/earth2me/essentials/commands/Commandsuicide.java
+2 −1 Essentials/src/main/java/com/earth2me/essentials/commands/Commandtop.java
+2 −1 Essentials/src/main/java/com/earth2me/essentials/commands/EssentialsCommand.java
+6 −3 Essentials/src/main/java/com/earth2me/essentials/items/AbstractItemDb.java
+7 −5 Essentials/src/main/java/com/earth2me/essentials/items/FlatItemDb.java
+8 −4 Essentials/src/main/java/com/earth2me/essentials/items/LegacyItemDb.java
+9 −6 Essentials/src/main/java/com/earth2me/essentials/signs/EssentialsSign.java
+3 −2 Essentials/src/main/java/com/earth2me/essentials/signs/SignAnvil.java
+3 −2 Essentials/src/main/java/com/earth2me/essentials/signs/SignCartography.java
+2 −2 Essentials/src/main/java/com/earth2me/essentials/signs/SignEnchant.java
+3 −2 Essentials/src/main/java/com/earth2me/essentials/signs/SignGrindstone.java
+3 −2 Essentials/src/main/java/com/earth2me/essentials/signs/SignLoom.java
+3 −2 Essentials/src/main/java/com/earth2me/essentials/signs/SignSmithing.java
+2 −1 Essentials/src/main/java/com/earth2me/essentials/textreader/HelpInput.java
+2 −1 Essentials/src/main/java/com/earth2me/essentials/utils/CommandMapUtil.java
+10 −6 Essentials/src/main/java/com/earth2me/essentials/utils/LocationUtil.java
+8 −9 Essentials/src/main/java/com/earth2me/essentials/utils/PasteUtil.java
+0 −16 Essentials/src/main/java/net/ess3/api/IEssentials.java
+2 −5 providers/1_12Provider/src/main/java/net/ess3/provider/providers/LegacyBannerDataProvider.java
+2 −5 providers/1_12Provider/src/main/java/net/ess3/provider/providers/LegacyInventoryViewProvider.java
+12 −3 providers/1_12Provider/src/main/java/net/ess3/provider/providers/LegacyPotionMetaProvider.java
+2 −5 providers/1_8Provider/src/main/java/net/ess3/provider/providers/LegacyDamageEventProvider.java
+2 −5 providers/1_8Provider/src/main/java/net/ess3/provider/providers/LegacyItemUnbreakableProvider.java
+2 −5 providers/1_8Provider/src/main/java/net/ess3/provider/providers/LegacyPlayerLocaleProvider.java
+2 −5 providers/1_8Provider/src/main/java/net/ess3/provider/providers/PrehistoricPotionMetaProvider.java
+2 −0 providers/BaseProviders/src/main/java/net/ess3/provider/BiomeKeyProvider.java
+2 −0 providers/BaseProviders/src/main/java/net/ess3/provider/ContainerProvider.java
+3 −1 providers/BaseProviders/src/main/java/net/ess3/provider/MaterialTagProvider.java
+5 −0 providers/BaseProviders/src/main/java/net/ess3/provider/OnlineModeProvider.java
+0 −1 providers/BaseProviders/src/main/java/net/ess3/provider/Provider.java
+2 −0 providers/BaseProviders/src/main/java/net/ess3/provider/SerializationProvider.java
+2 −0 providers/BaseProviders/src/main/java/net/ess3/provider/SignDataProvider.java
+12 −3 providers/BaseProviders/src/main/java/net/ess3/provider/providers/BaseBannerDataProvider.java
+6 −3 providers/BaseProviders/src/main/java/net/ess3/provider/providers/BaseInventoryViewProvider.java
+2 −5 providers/BaseProviders/src/main/java/net/ess3/provider/providers/BlockMetaSpawnerItemProvider.java
+0 −5 providers/BaseProviders/src/main/java/net/ess3/provider/providers/BukkitCommandSendListenerProvider.java
+13 −0 providers/BaseProviders/src/main/java/net/ess3/provider/providers/BukkitMaterialTagProvider.java
+11 −3 providers/BaseProviders/src/main/java/net/ess3/provider/providers/BukkitSpawnerBlockProvider.java
+2 −5 providers/BaseProviders/src/main/java/net/ess3/provider/providers/FixedHeightWorldInfoProvider.java
+12 −3 providers/BaseProviders/src/main/java/net/ess3/provider/providers/FlatSpawnEggProvider.java
+2 −5 providers/BaseProviders/src/main/java/net/ess3/provider/providers/LegacySpawnEggProvider.java
+11 −3 providers/BaseProviders/src/main/java/net/ess3/provider/providers/ModernDamageEventProvider.java
+13 −5 providers/BaseProviders/src/main/java/net/ess3/provider/providers/ModernDataWorldInfoProvider.java
+11 −3 providers/BaseProviders/src/main/java/net/ess3/provider/providers/ModernItemUnbreakableProvider.java
+11 −3 providers/BaseProviders/src/main/java/net/ess3/provider/providers/ModernPersistentDataProvider.java
+11 −3 providers/BaseProviders/src/main/java/net/ess3/provider/providers/ModernPlayerLocaleProvider.java
+12 −3 providers/BaseProviders/src/main/java/net/ess3/provider/providers/ModernPotionMetaProvider.java
+11 −3 providers/BaseProviders/src/main/java/net/ess3/provider/providers/ModernSignDataProvider.java
+14 −0 providers/BaseProviders/src/main/java/net/essentialsx/providers/NullableProvider.java
+21 −0 providers/BaseProviders/src/main/java/net/essentialsx/providers/ProviderData.java
+11 −0 providers/BaseProviders/src/main/java/net/essentialsx/providers/ProviderTest.java
+9 −5 providers/NMSReflectionProvider/src/main/java/net/ess3/nms/refl/providers/ReflDataWorldInfoProvider.java
+15 −16 ...ders/NMSReflectionProvider/src/main/java/net/ess3/nms/refl/providers/ReflFormattedCommandAliasProvider.java
+3 −5 providers/NMSReflectionProvider/src/main/java/net/ess3/nms/refl/providers/ReflKnownCommandsProvider.java
+6 −2 providers/NMSReflectionProvider/src/main/java/net/ess3/nms/refl/providers/ReflOnlineModeProvider.java
+2 −5 providers/NMSReflectionProvider/src/main/java/net/ess3/nms/refl/providers/ReflPersistentDataProvider.java
+2 −5 providers/NMSReflectionProvider/src/main/java/net/ess3/nms/refl/providers/ReflServerStateProvider.java
+12 −3 providers/NMSReflectionProvider/src/main/java/net/ess3/nms/refl/providers/ReflSpawnEggProvider.java
+2 −5 providers/NMSReflectionProvider/src/main/java/net/ess3/nms/refl/providers/ReflSpawnerBlockProvider.java
+2 −5 providers/NMSReflectionProvider/src/main/java/net/ess3/nms/refl/providers/ReflSyncCommandsProvider.java
+15 −4 providers/PaperProvider/src/main/java/net/ess3/provider/providers/PaperBiomeKeyProvider.java
+0 −5 providers/PaperProvider/src/main/java/net/ess3/provider/providers/PaperCommandSendListenerProvider.java
+13 −4 providers/PaperProvider/src/main/java/net/ess3/provider/providers/PaperContainerProvider.java
+13 −3 providers/PaperProvider/src/main/java/net/ess3/provider/providers/PaperKnownCommandsProvider.java
+14 −0 providers/PaperProvider/src/main/java/net/ess3/provider/providers/PaperMaterialTagProvider.java
+0 −5 providers/PaperProvider/src/main/java/net/ess3/provider/providers/PaperRecipeBookListener.java
+11 −3 providers/PaperProvider/src/main/java/net/ess3/provider/providers/PaperSerializationProvider.java
+11 −3 providers/PaperProvider/src/main/java/net/ess3/provider/providers/PaperServerStateProvider.java
+1 −1 settings.gradle.kts
6 changes: 3 additions & 3 deletions patches/plugins/0001-Rebrand.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
From b9c822d3fac3bdaef131fd2f13006913fb01b414 Mon Sep 17 00:00:00 2001
From 50e4810a6d14f628710d42e08f0390e0aa60f480 Mon Sep 17 00:00:00 2001
From: Euphyllia Bierque <[email protected]>
Date: Tue, 10 Dec 2024 20:01:47 +0100
Date: Sat, 18 Jan 2025 21:13:38 +0100
Subject: [PATCH 1/9] Rebrand

---
Expand Down Expand Up @@ -229,5 +229,5 @@ index 8a764dff0..68eab95ce 100644

essentials {
--
2.47.1.windows.1
2.47.1.windows.2

6 changes: 3 additions & 3 deletions patches/plugins/0002-Teleport-to-teleportAsync.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
From c59b6ed52fe7fa5c9d9e8ef239a6ed5bde51dea1 Mon Sep 17 00:00:00 2001
From a0254df00814c48b12696ad509c8bfb2f3c8ec9e Mon Sep 17 00:00:00 2001
From: Euphyllia Bierque <[email protected]>
Date: Tue, 10 Dec 2024 20:01:47 +0100
Date: Sat, 18 Jan 2025 21:13:38 +0100
Subject: [PATCH 2/9] Teleport to teleportAsync

---
Expand Down Expand Up @@ -49,5 +49,5 @@ index fc98e97e1..4d0cedd55 100644
if (ess.getSettings().isTeleportToCenterLocation()) {
loc = LocationUtil.getRoundedDestination(loc);
--
2.47.1.windows.1
2.47.1.windows.2

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
From a41f48cbe70dd679b08fe407dd010131f3ca6ff3 Mon Sep 17 00:00:00 2001
From f4da02ac3c867647c763aaa1f3f1b091afabbaaa Mon Sep 17 00:00:00 2001
From: Euphyllia Bierque <[email protected]>
Date: Tue, 10 Dec 2024 20:01:47 +0100
Date: Sat, 18 Jan 2025 21:13:38 +0100
Subject: [PATCH 3/9] Replace BukkitRunnable to FoliaRunnable

---
Expand Down Expand Up @@ -287,10 +287,10 @@ index 000000000..00ae5275f
+ }
+}
diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandessentials.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandessentials.java
index 1d65353ef..d460b8e67 100644
index fa97ff2ff..03989c0de 100644
--- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandessentials.java
+++ b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandessentials.java
@@ -505,7 +505,7 @@ public class Commandessentials extends EssentialsCommand {
@@ -509,7 +509,7 @@ public class Commandessentials extends EssentialsCommand {
}

currentTune = new TuneRunnable(NYAN_TUNE, NOTE_HARP, ess::getOnlinePlayers);
Expand All @@ -299,7 +299,7 @@ index 1d65353ef..d460b8e67 100644
}

// Cow farts.
@@ -900,7 +900,7 @@ public class Commandessentials extends EssentialsCommand {
@@ -904,7 +904,7 @@ public class Commandessentials extends EssentialsCommand {
return Collections.emptyList();
}

Expand All @@ -308,7 +308,7 @@ index 1d65353ef..d460b8e67 100644
private static final Map<String, Float> noteMap = ImmutableMap.<String, Float>builder()
.put("1F#", 0.5f)
.put("1G", 0.53f)
@@ -934,6 +934,7 @@ public class Commandessentials extends EssentialsCommand {
@@ -938,6 +938,7 @@ public class Commandessentials extends EssentialsCommand {
private int i = 0;

TuneRunnable(final String tuneStr, final Sound sound, final Supplier<Collection<Player>> players) {
Expand All @@ -317,5 +317,5 @@ index 1d65353ef..d460b8e67 100644
this.sound = sound;
this.players = players;
--
2.47.1.windows.1
2.47.1.windows.2

92 changes: 46 additions & 46 deletions patches/plugins/0004-Replace-scheduler.patch

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions patches/plugins/0005-Fix-command-time.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
From e05feea1e54efadf8a633e66baa0d0aca8c570f9 Mon Sep 17 00:00:00 2001
From 476a41749cdb2a3f1446c63e9854ce1beda20dae Mon Sep 17 00:00:00 2001
From: Euphyllia Bierque <[email protected]>
Date: Tue, 10 Dec 2024 20:01:49 +0100
Date: Sat, 18 Jan 2025 21:13:39 +0100
Subject: [PATCH 5/9] Fix command time

---
Expand Down Expand Up @@ -59,5 +59,5 @@ index 4e85d7b4c..5d78dc2ce 100644

private void getWorldsTime(final CommandSource sender, final Collection<World> worlds) {
--
2.47.1.windows.1
2.47.1.windows.2

10 changes: 5 additions & 5 deletions patches/plugins/0006-Fix-dispatch-command.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
From 7af440bf80a49fe6c5b310c761ec6cfcee76307b Mon Sep 17 00:00:00 2001
From fde04c758c329af0c29bccae5b8b47df7e57e709 Mon Sep 17 00:00:00 2001
From: Euphyllia Bierque <[email protected]>
Date: Tue, 10 Dec 2024 20:01:49 +0100
Date: Sat, 18 Jan 2025 21:13:40 +0100
Subject: [PATCH 6/9] Fix dispatch command

---
Expand All @@ -22,10 +22,10 @@ index ecda39ad9..4ae2cf229 100644
taskLock.complete(new Object());
return;
diff --git a/Essentials/src/main/java/com/earth2me/essentials/Kit.java b/Essentials/src/main/java/com/earth2me/essentials/Kit.java
index 322fad65f..ec264537d 100644
index 2c9753e04..6b81c4d8a 100644
--- a/Essentials/src/main/java/com/earth2me/essentials/Kit.java
+++ b/Essentials/src/main/java/com/earth2me/essentials/Kit.java
@@ -260,9 +260,13 @@ public class Kit {
@@ -262,9 +262,13 @@ public class Kit {
t.pay(user, OverflowType.DROP);
}

Expand All @@ -43,5 +43,5 @@ index 322fad65f..ec264537d 100644
if (spew) {
user.sendTl("kitInvFull");
--
2.47.1.windows.1
2.47.1.windows.2

6 changes: 3 additions & 3 deletions patches/plugins/0007-Fix-command-gc.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
From 3e74f8fc6f59af8148c3d0db1e04e483ada3c9c5 Mon Sep 17 00:00:00 2001
From 029fe703461420179c633b72885d7da0448c450f Mon Sep 17 00:00:00 2001
From: Euphyllia Bierque <[email protected]>
Date: Tue, 10 Dec 2024 20:01:49 +0100
Date: Sat, 18 Jan 2025 21:13:40 +0100
Subject: [PATCH 7/9] Fix command gc

---
Expand Down Expand Up @@ -61,5 +61,5 @@ index 16082f3c9..495b27b3f 100644
}
}
--
2.47.1.windows.1
2.47.1.windows.2

6 changes: 3 additions & 3 deletions patches/plugins/0008-Fix-Stop-Server-task.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
From 332b25675c9ef88bfb52207695e861f67c3d7953 Mon Sep 17 00:00:00 2001
From 260514b298da8d5f7cd150e8dc984adad49ff111 Mon Sep 17 00:00:00 2001
From: Euphyllia Bierque <[email protected]>
Date: Tue, 10 Dec 2024 20:01:50 +0100
Date: Sat, 18 Jan 2025 21:13:40 +0100
Subject: [PATCH 8/9] Fix Stop Server task

---
Expand Down Expand Up @@ -57,5 +57,5 @@ index 07c050e90..0351649bd 100644
Bukkit.getScheduler().runTask(plugin, () -> Bukkit.getPluginManager().callEvent(event));
}*/ // Euphyllia
--
2.47.1.windows.1
2.47.1.windows.2

6 changes: 3 additions & 3 deletions patches/plugins/0009-Fix-command-killall.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
From 0c394f07a622871b51ee2c581a3faec6d14fd47d Mon Sep 17 00:00:00 2001
From 9289be017ec5f5ab4121c3553f2265f5c282692d Mon Sep 17 00:00:00 2001
From: Euphyllia Bierque <[email protected]>
Date: Tue, 10 Dec 2024 20:01:50 +0100
Date: Sat, 18 Jan 2025 21:13:41 +0100
Subject: [PATCH 9/9] Fix command killall

---
Expand Down Expand Up @@ -275,5 +275,5 @@ index 65e7ad9a6..444010092 100644
sender.sendTl("removed", removed);
}
--
2.47.1.windows.1
2.47.1.windows.2

0 comments on commit b9ce03f

Please sign in to comment.