Merge branch '2.x' into l10n_2.x

JRoy · web-flow · commit fb7766641895 · 2025-03-13T10:18:49.000-04:00
diff --git a/Essentials/build.gradle b/Essentials/build.gradle
@@ -10,12 +10,12 @@ dependencies {
 
     api 'io.papermc:paperlib:1.0.6'
 
-    implementation 'org.spongepowered:configurate-yaml:4.1.2'
-    implementation 'org.checkerframework:checker-qual:3.21.0'
+    implementation 'org.spongepowered:configurate-yaml:4.2.0'
+    implementation 'org.checkerframework:checker-qual:3.49.0'
     implementation 'nu.studer:java-ordered-properties:1.0.4'
 
-    implementation 'net.kyori:adventure-api:4.18.0'
-    implementation 'net.kyori:adventure-text-minimessage:4.18.0'
+    implementation 'net.kyori:adventure-api:4.19.0'
+    implementation 'net.kyori:adventure-text-minimessage:4.19.0'
     implementation 'net.kyori:adventure-platform-bukkit:4.3.4'
 
     // Providers
diff --git a/Essentials/src/main/java/com/earth2me/essentials/Essentials.java b/Essentials/src/main/java/com/earth2me/essentials/Essentials.java
@@ -86,6 +86,7 @@
 import net.ess3.provider.providers.ModernPlayerLocaleProvider;
 import net.ess3.provider.providers.ModernPotionMetaProvider;
 import net.ess3.provider.providers.ModernSignDataProvider;
+import net.ess3.provider.providers.ModernSyncCommandsProvider;
 import net.ess3.provider.providers.PaperBiomeKeyProvider;
 import net.ess3.provider.providers.PaperContainerProvider;
 import net.ess3.provider.providers.PaperKnownCommandsProvider;
@@ -393,7 +394,7 @@ public void onEnable() {
             providerFactory.registerProvider(BukkitMaterialTagProvider.class, PaperMaterialTagProvider.class);
 
             // Sync Commands Provider
-            providerFactory.registerProvider(ReflSyncCommandsProvider.class);
+            providerFactory.registerProvider(ReflSyncCommandsProvider.class, ModernSyncCommandsProvider.class);
 
             // Persistent Data Provider
             providerFactory.registerProvider(ReflPersistentDataProvider.class, ModernPersistentDataProvider.class);
diff --git a/Essentials/src/main/java/com/earth2me/essentials/EssentialsPlayerListener.java b/Essentials/src/main/java/com/earth2me/essentials/EssentialsPlayerListener.java
@@ -595,8 +595,12 @@ public void onPlayerTeleport(final PlayerTeleportEvent event) {
         if (tickCountProvider != null && ess.getSettings().isWorldChangePreserveFlying() && VersionUtil.getServerBukkitVersion().isHigherThanOrEqualTo(VersionUtil.v1_17_R01)) {
             if (user.isAuthorized("essentials.fly")) {
                 //noinspection DataFlowIssue - not real
-                if (event.getFrom().getWorld() != event.getTo().getWorld() && player.isFlying()) {
-                    user.setFlightTick(tickCountProvider.getTickCount());
+                if (event.getFrom().getWorld() != event.getTo().getWorld() && player.getAllowFlight()) {
+                    // If the player is not flying but has the ability to fly, we set the sign of the tick count to -1
+                    // Later on in the PlayerChangedWorldEvent, we will set the player's flying state to true if the tick count is positive.
+                    // If the tick count is negative, we simply just set the player's flight ability to true.
+                    final int tick = player.isFlying() ? tickCountProvider.getTickCount() : -tickCountProvider.getTickCount();
+                    user.setFlightTick(tick);
                 }
             }
         }
@@ -778,9 +782,12 @@ public void onPlayerChangedWorldFlyReset(final PlayerChangedWorldEvent event) {
         }
 
         final TickCountProvider tickCountProvider = ess.provider(TickCountProvider.class);
-        if (tickCountProvider != null && user.getFlightTick() == tickCountProvider.getTickCount() && user.isAuthorized("essentials.fly")) {
+        final int flightTick = user.getFlightTick();
+        if (tickCountProvider != null && Math.abs(flightTick) == tickCountProvider.getTickCount() && user.isAuthorized("essentials.fly")) {
             user.getBase().setAllowFlight(true);
-            user.getBase().setFlying(true);
+            if (flightTick > 0) {
+                user.getBase().setFlying(true);
+            }
         }
         user.setFlightTick(-1);
     }
diff --git a/Essentials/src/main/java/com/earth2me/essentials/Kit.java b/Essentials/src/main/java/com/earth2me/essentials/Kit.java
@@ -242,10 +242,10 @@ public boolean expandItems(final User user, final List<String> items) throws Exc
 
             for (final ItemStack itemStack : leftover.values()) {
                 int spillAmount = itemStack.getAmount();
-                if (maxStackSize != 0) {
-                    itemStack.setAmount(Math.min(spillAmount, itemStack.getMaxStackSize()));
-                }
                 while (spillAmount > 0) {
+                    if (maxStackSize != 0) {
+                        itemStack.setAmount(Math.min(spillAmount, itemStack.getMaxStackSize()));
+                    }
                     user.getWorld().dropItemNaturally(user.getLocation(), itemStack);
                     spillAmount -= itemStack.getAmount();
                 }
diff --git a/Essentials/src/main/java/com/earth2me/essentials/Trade.java b/Essentials/src/main/java/com/earth2me/essentials/Trade.java
@@ -242,8 +242,8 @@ public Map<Integer, ItemStack> pay(final IUser user, final OverflowType type) th
                 } else {
                     for (final ItemStack itemStack : leftover.values()) {
                         int spillAmount = itemStack.getAmount();
-                        itemStack.setAmount(Math.min(spillAmount, itemStack.getMaxStackSize()));
                         while (spillAmount > 0) {
+                            itemStack.setAmount(Math.min(spillAmount, itemStack.getMaxStackSize()));
                             user.getBase().getWorld().dropItemNaturally(user.getBase().getLocation(), itemStack);
                             spillAmount -= itemStack.getAmount();
                         }
diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandbalancetop.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandbalancetop.java
@@ -128,12 +128,12 @@ public void run() {
                             playtime = user.getBase().getStatistic(PLAY_ONE_TICK);
                         }
                         // Play time in seconds
-                        final long playTimeSecs = playtime / 20;
+                        final long playTimeSecs = Math.max(playtime / 20, 0);
 
                         // Checking if player meets the requirements of minimum balance and minimum playtime to be listed in baltop list
                         if ((ess.getSettings().showZeroBaltop() || balance.compareTo(BigDecimal.ZERO) > 0)
                                 && balance.compareTo(ess.getSettings().getBaltopMinBalance()) >= 0 &&
-                                playTimeSecs > ess.getSettings().getBaltopMinPlaytime()) {
+                                playTimeSecs >= ess.getSettings().getBaltopMinPlaytime()) {
                             newCache.getLines().add(AdventureUtil.miniToLegacy(tlLiteral("balanceTopLine", pos, entry.getValue().getDisplayName(), AdventureUtil.parsed(NumberUtil.displayCurrency(balance, ess)))));
                         }
                         pos++;
diff --git a/Essentials/src/main/java/com/earth2me/essentials/signs/EssentialsSign.java b/Essentials/src/main/java/com/earth2me/essentials/signs/EssentialsSign.java
@@ -12,6 +12,7 @@
 import com.earth2me.essentials.utils.VersionUtil;
 import net.ess3.api.IEssentials;
 import net.ess3.api.MaxMoneyException;
+import net.ess3.api.TranslatableException;
 import net.ess3.api.events.SignBreakEvent;
 import net.ess3.api.events.SignCreateEvent;
 import net.ess3.api.events.SignInteractEvent;
@@ -411,6 +412,10 @@ protected final ItemStack getItemStack(final String itemName, final int quantity
             item.setAmount(quantity);
             return item;
         } catch (final Exception ex) {
+            if (ex instanceof TranslatableException) {
+                final TranslatableException te = (TranslatableException) ex;
+                throw new SignException(ex, te.getTlKey(), te.getArgs());
+            }
             throw new SignException(ex, "errorWithMessage", ex.getMessage());
         }
     }
diff --git a/EssentialsDiscord/build.gradle b/EssentialsDiscord/build.gradle
@@ -4,7 +4,7 @@ plugins {
 
 dependencies {
     compileOnly project(':EssentialsX')
-    implementation('net.dv8tion:JDA:5.1.2') {
+    implementation('net.dv8tion:JDA:5.3.0') {
         exclude(module: 'opus-java')
     }
     implementation 'com.github.MinnDevelopment:emoji-java:v6.1.0'
diff --git a/EssentialsDiscord/src/main/java/net/essentialsx/discord/listeners/PaperChatListener.java b/EssentialsDiscord/src/main/java/net/essentialsx/discord/listeners/PaperChatListener.java
@@ -12,6 +12,7 @@ public class PaperChatListener extends PaperChatListenerProvider {
     private final JDADiscordService jda;
 
     public PaperChatListener(JDADiscordService jda) {
+        super(false);
         this.jda = jda;
     }
 
diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts
@@ -8,6 +8,6 @@ repositories {
 
 dependencies {
     implementation("net.kyori", "indra-common", "3.1.3")
-    implementation("com.gradleup.shadow", "shadow-gradle-plugin", "8.3.3")
+    implementation("com.gradleup.shadow", "shadow-gradle-plugin", "8.3.6")
     implementation("xyz.jpenilla", "run-task", "2.3.1")
 }
diff --git a/providers/BaseProviders/src/main/java/net/ess3/provider/providers/BukkitSpawnerBlockProvider.java b/providers/BaseProviders/src/main/java/net/ess3/provider/providers/BukkitSpawnerBlockProvider.java
@@ -20,7 +20,7 @@ public void setMinSpawnDelay(final CreatureSpawner spawner, final int delay) {
     @ProviderTest
     public static boolean test() {
         try {
-            CreatureSpawner.class.getDeclaredMethod("setMaxSpawnDelay", int.class);
+            CreatureSpawner.class.getMethod("setMaxSpawnDelay", int.class);
             return true;
         } catch (final NoSuchMethodException ignored) {
             return false;
diff --git a/providers/BaseProviders/src/main/java/net/ess3/provider/providers/ModernSyncCommandsProvider.java b/providers/BaseProviders/src/main/java/net/ess3/provider/providers/ModernSyncCommandsProvider.java
@@ -0,0 +1,28 @@
+package net.ess3.provider.providers;
+
+import net.ess3.provider.SyncCommandsProvider;
+import net.essentialsx.providers.ProviderData;
+import net.essentialsx.providers.ProviderTest;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+
+@ProviderData(description = "1.21.4+ Sync Commands Provider", weight = 1)
+public class ModernSyncCommandsProvider implements SyncCommandsProvider {
+    @Override
+    public void syncCommands() {
+        for (final Player player : Bukkit.getOnlinePlayers()) {
+            player.updateCommands();
+        }
+    }
+
+    @ProviderTest
+    public static boolean test() {
+        try {
+            // There isn't a real good way to test this, but we can check if the Creaking class exists.
+            Class.forName("org.bukkit.entity.Creaking");
+            return true;
+        } catch (final Throwable ignored) {
+            return false;
+        }
+    }
+}
diff --git a/providers/PaperProvider/src/main/java/net/ess3/provider/providers/PaperChatListenerProvider.java b/providers/PaperProvider/src/main/java/net/ess3/provider/providers/PaperChatListenerProvider.java
@@ -14,10 +14,16 @@
 import java.util.Map;
 
 public abstract class PaperChatListenerProvider implements Listener {
+    private final boolean formatParsing;
     private final LegacyComponentSerializer serializer;
     private final Map<AsyncChatEvent, PaperChatEvent> eventMap = new IdentityHashMap<>();
 
     public PaperChatListenerProvider() {
+        this(true);
+    }
+
+    public PaperChatListenerProvider(final boolean formatParsing) {
+        this.formatParsing = formatParsing;
         this.serializer = LegacyComponentSerializer.builder()
                 .flattener(ComponentFlattener.basic())
                 .extractUrls(AbstractChatEvent.URL_PATTERN)
@@ -59,6 +65,10 @@ public final void onHighest(final AsyncChatEvent event) {
             return;
         }
 
+        if (!formatParsing) {
+            return;
+        }
+
         final TextComponent format = serializer.deserialize(paperChatEvent.getFormat());
         final TextComponent eventMessage = serializer.deserialize(paperChatEvent.getMessage());
 

Original file line number	Diff line number	Diff line change
`@@ -595,8 +595,12 @@ public void onPlayerTeleport(final PlayerTeleportEvent event) {`
`595`	`595`	`if (tickCountProvider != null && ess.getSettings().isWorldChangePreserveFlying() && VersionUtil.getServerBukkitVersion().isHigherThanOrEqualTo(VersionUtil.v1_17_R01)) {`
`596`	`596`	`if (user.isAuthorized("essentials.fly")) {`
`597`	`597`	`//noinspection DataFlowIssue - not real`
`598`		`- if (event.getFrom().getWorld() != event.getTo().getWorld() && player.isFlying()) {`
`599`		`- user.setFlightTick(tickCountProvider.getTickCount());`
	`598`	`+ if (event.getFrom().getWorld() != event.getTo().getWorld() && player.getAllowFlight()) {`
	`599`	`+ // If the player is not flying but has the ability to fly, we set the sign of the tick count to -1`
	`600`	`+ // Later on in the PlayerChangedWorldEvent, we will set the player's flying state to true if the tick count is positive.`
	`601`	`+ // If the tick count is negative, we simply just set the player's flight ability to true.`
	`602`	`+ final int tick = player.isFlying() ? tickCountProvider.getTickCount() : -tickCountProvider.getTickCount();`
	`603`	`+ user.setFlightTick(tick);`
`600`	`604`	`}`
`601`	`605`	`}`
`602`	`606`	`}`
`@@ -778,9 +782,12 @@ public void onPlayerChangedWorldFlyReset(final PlayerChangedWorldEvent event) {`
`778`	`782`	`}`
`779`	`783`
`780`	`784`	`final TickCountProvider tickCountProvider = ess.provider(TickCountProvider.class);`
`781`		`- if (tickCountProvider != null && user.getFlightTick() == tickCountProvider.getTickCount() && user.isAuthorized("essentials.fly")) {`
	`785`	`+ final int flightTick = user.getFlightTick();`
	`786`	`+ if (tickCountProvider != null && Math.abs(flightTick) == tickCountProvider.getTickCount() && user.isAuthorized("essentials.fly")) {`
`782`	`787`	`user.getBase().setAllowFlight(true);`
`783`		`- user.getBase().setFlying(true);`
	`788`	`+ if (flightTick > 0) {`
	`789`	`+ user.getBase().setFlying(true);`
	`790`	`+ }`
`784`	`791`	`}`
`785`	`792`	`user.setFlightTick(-1);`
`786`	`793`	`}`
Original file line number	Diff line number	Diff line change
`@@ -128,12 +128,12 @@ public void run() {`
`128`	`128`	`playtime = user.getBase().getStatistic(PLAY_ONE_TICK);`
`129`	`129`	`}`
`130`	`130`	`// Play time in seconds`
`131`		`- final long playTimeSecs = playtime / 20;`
	`131`	`+ final long playTimeSecs = Math.max(playtime / 20, 0);`
`132`	`132`
`133`	`133`	`// Checking if player meets the requirements of minimum balance and minimum playtime to be listed in baltop list`
`134`	`134`	`if ((ess.getSettings().showZeroBaltop() \|\| balance.compareTo(BigDecimal.ZERO) > 0)`
`135`	`135`	`&& balance.compareTo(ess.getSettings().getBaltopMinBalance()) >= 0 &&`
`136`		`- playTimeSecs > ess.getSettings().getBaltopMinPlaytime()) {`
	`136`	`+ playTimeSecs >= ess.getSettings().getBaltopMinPlaytime()) {`
`137`	`137`	`newCache.getLines().add(AdventureUtil.miniToLegacy(tlLiteral("balanceTopLine", pos, entry.getValue().getDisplayName(), AdventureUtil.parsed(NumberUtil.displayCurrency(balance, ess)))));`
`138`	`138`	`}`
`139`	`139`	`pos++;`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ plugins {`
`4`	`4`
`5`	`5`	`dependencies {`
`6`	`6`	`compileOnly project(':EssentialsX')`
`7`		`- implementation('net.dv8tion:JDA:5.1.2') {`
	`7`	`+ implementation('net.dv8tion:JDA:5.3.0') {`
`8`	`8`	`exclude(module: 'opus-java')`
`9`	`9`	`}`
`10`	`10`	`implementation 'com.github.MinnDevelopment:emoji-java:v6.1.0'`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ public class PaperChatListener extends PaperChatListenerProvider {`
`12`	`12`	`private final JDADiscordService jda;`
`13`	`13`
`14`	`14`	`public PaperChatListener(JDADiscordService jda) {`
	`15`	`+ super(false);`
`15`	`16`	`this.jda = jda;`
`16`	`17`	`}`
`17`	`18`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,6 @@ repositories {`
`8`	`8`
`9`	`9`	`dependencies {`
`10`	`10`	`implementation("net.kyori", "indra-common", "3.1.3")`
`11`		`- implementation("com.gradleup.shadow", "shadow-gradle-plugin", "8.3.3")`
	`11`	`+ implementation("com.gradleup.shadow", "shadow-gradle-plugin", "8.3.6")`
`12`	`12`	`implementation("xyz.jpenilla", "run-task", "2.3.1")`
`13`	`13`	`}`