From 72b4d49997da86c8da6138deb8db73c8e034e8f1 Mon Sep 17 00:00:00 2001 From: l3st4tDevelopment Date: Sat, 3 Sep 2022 03:00:48 -0400 Subject: [PATCH 01/22] Added 1.19.2 spigot --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 8692e5b7..6d6ccbe7 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -27,7 +27,7 @@ jobs: # Build remapped Spigot versions - uses: SpraxDev/Action-SpigotMC@v4 with: - versions: 1.18.2, 1.19 + versions: 1.18.2, 1.19, 1.19.2 remapped: true # Build project From 65f606ee83f690866ae46b871ff697ec18c89fa7 Mon Sep 17 00:00:00 2001 From: Christian Koop Date: Wed, 29 Mar 2023 19:21:54 +0200 Subject: [PATCH 02/22] Refactor `/songoda diag` command and change output formatting a bit This should make reading the version information displayed easier. No more confusing the plugin version vs. the core version. Additionally fixed `Mb` to `MiB`. --- .../core/core/SongodaCoreDiagCommand.java | 101 ++++++++++-------- 1 file changed, 55 insertions(+), 46 deletions(-) diff --git a/Core/src/main/java/com/songoda/core/core/SongodaCoreDiagCommand.java b/Core/src/main/java/com/songoda/core/core/SongodaCoreDiagCommand.java index 04c2a94b..cf30d502 100644 --- a/Core/src/main/java/com/songoda/core/core/SongodaCoreDiagCommand.java +++ b/Core/src/main/java/com/songoda/core/core/SongodaCoreDiagCommand.java @@ -9,66 +9,26 @@ import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; import java.text.DecimalFormat; import java.util.List; public class SongodaCoreDiagCommand extends AbstractCommand { - private final DecimalFormat format = new DecimalFormat("##.##"); + private final DecimalFormat decimalFormat = new DecimalFormat("##.##"); - private Object serverInstance; - private Field tpsField; + private Object nmsServerInstance; + private Field recentTpsOnNmsServer; public SongodaCoreDiagCommand() { super(CommandType.CONSOLE_OK, "diag"); try { - serverInstance = ClassMapping.MINECRAFT_SERVER.getClazz().getMethod("getServer").invoke(null); - tpsField = serverInstance.getClass().getField("recentTps"); - } catch (NoSuchFieldException | SecurityException | IllegalAccessException | IllegalArgumentException - | InvocationTargetException | NoSuchMethodException ex) { + this.nmsServerInstance = ClassMapping.MINECRAFT_SERVER.getClazz().getMethod("getServer").invoke(null); + this.recentTpsOnNmsServer = this.nmsServerInstance.getClass().getField("recentTps"); + } catch (ReflectiveOperationException | SecurityException | IllegalArgumentException ex) { ex.printStackTrace(); } } - @Override - protected ReturnType runCommand(CommandSender sender, String... args) { - sender.sendMessage(""); - sender.sendMessage("Songoda Diagnostics Information"); - sender.sendMessage(""); - sender.sendMessage("Plugins:"); - - for (PluginInfo plugin : SongodaCore.getPlugins()) { - sender.sendMessage(plugin.getJavaPlugin().getName() - + " (" + plugin.getJavaPlugin().getDescription().getVersion() + " Core " + plugin.getCoreLibraryVersion() + ")"); - } - - sender.sendMessage(""); - sender.sendMessage("Server Version: " + Bukkit.getVersion()); - sender.sendMessage("NMS: " + ServerProject.getServerVersion() + " " + ServerVersion.getServerVersionString()); - sender.sendMessage("Operating System: " + System.getProperty("os.name")); - sender.sendMessage("Allocated Memory: " + format.format(Runtime.getRuntime().maxMemory() / (1024 * 1024)) + "Mb"); - sender.sendMessage("Online Players: " + Bukkit.getOnlinePlayers().size()); - - if (tpsField != null) { - try { - double[] tps = ((double[]) tpsField.get(serverInstance)); - - sender.sendMessage("TPS from last 1m, 5m, 15m: " + format.format(tps[0]) + ", " - + format.format(tps[1]) + ", " + format.format(tps[2])); - } catch (IllegalAccessException ex) { - ex.printStackTrace(); - } - } - - return ReturnType.SUCCESS; - } - - @Override - protected List onTab(CommandSender sender, String... args) { - return null; - } - @Override public String getPermissionNode() { return "songoda.admin"; @@ -83,4 +43,53 @@ public class SongodaCoreDiagCommand extends AbstractCommand { public String getDescription() { return "Display diagnostics information."; } + + @Override + protected ReturnType runCommand(CommandSender sender, String... args) { + sender.sendMessage(""); + sender.sendMessage("Songoda Diagnostics Information"); + sender.sendMessage(""); + sender.sendMessage("Plugins:"); + + for (PluginInfo plugin : SongodaCore.getPlugins()) { + sender.sendMessage(String.format("%s v%s (Core v%s)", + plugin.getJavaPlugin().getName(), + plugin.getJavaPlugin().getDescription().getVersion(), + plugin.getCoreLibraryVersion())); + } + + sender.sendMessage(""); + sender.sendMessage("Server Version: " + Bukkit.getVersion()); + sender.sendMessage("NMS: " + ServerProject.getServerVersion() + " " + ServerVersion.getServerVersionString()); + sender.sendMessage("Operating System: " + System.getProperty("os.name")); + sender.sendMessage("Allocated Memory: " + getRuntimeMaxMemory()); + sender.sendMessage("Online Players: " + Bukkit.getOnlinePlayers().size()); + sendCurrentTps(sender); + sender.sendMessage(""); + + return ReturnType.SUCCESS; + } + + @Override + protected List onTab(CommandSender sender, String... args) { + return null; + } + + private String getRuntimeMaxMemory() { + return this.decimalFormat.format(Runtime.getRuntime().maxMemory() / (1024 * 1024)) + " MiB"; + } + + private void sendCurrentTps(CommandSender receiver) { + if (this.recentTpsOnNmsServer == null) { + return; + } + + try { + double[] tps = ((double[]) this.recentTpsOnNmsServer.get(this.nmsServerInstance)); + + receiver.sendMessage(String.format("TPS from last 1m, 5m, 15m: %s, %s, %s", this.decimalFormat.format(tps[0]), this.decimalFormat.format(tps[1]), this.decimalFormat.format(tps[2]))); + } catch (IllegalAccessException ex) { + ex.printStackTrace(); + } + } } From 32c2c7484184b10b8812e5266b2c7ca1a6283718 Mon Sep 17 00:00:00 2001 From: Christian Koop Date: Wed, 29 Mar 2023 19:58:41 +0200 Subject: [PATCH 03/22] Fixes AnvilView/-GUI in v1_19_R3 --- .../java/com/songoda/core/nms/v1_19_R3/anvil/AnvilView.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NMS/NMS-v1_19_R3/src/main/java/com/songoda/core/nms/v1_19_R3/anvil/AnvilView.java b/NMS/NMS-v1_19_R3/src/main/java/com/songoda/core/nms/v1_19_R3/anvil/AnvilView.java index ad944620..b9b1ea5a 100644 --- a/NMS/NMS-v1_19_R3/src/main/java/com/songoda/core/nms/v1_19_R3/anvil/AnvilView.java +++ b/NMS/NMS-v1_19_R3/src/main/java/com/songoda/core/nms/v1_19_R3/anvil/AnvilView.java @@ -40,10 +40,10 @@ public class AnvilView extends AnvilMenu implements CustomAnvil { static { try { - mc_ContainerAnvil_repairInventory = ItemCombinerMenu.class.getDeclaredField("p"); + mc_ContainerAnvil_repairInventory = ItemCombinerMenu.class.getDeclaredField("q"); mc_ContainerAnvil_repairInventory.setAccessible(true); - mc_ContainerAnvil_resultInventory = ItemCombinerMenu.class.getDeclaredField("o"); + mc_ContainerAnvil_resultInventory = ItemCombinerMenu.class.getDeclaredField("r"); mc_ContainerAnvil_resultInventory.setAccessible(true); mc_ContainerAnvil_bukkitEntity = AnvilMenu.class.getDeclaredField("bukkitEntity"); From e33848adc5796a67affd9e4a6335b709657abe7b Mon Sep 17 00:00:00 2001 From: Christian Koop Date: Wed, 29 Mar 2023 21:16:28 +0200 Subject: [PATCH 04/22] Release v2.6.19-DEV --- Compatibility/pom.xml | 2 +- Core/pom.xml | 2 +- Core/src/main/java/com/songoda/core/SongodaCore.java | 2 +- NMS/NMS-API/pom.xml | 2 +- NMS/NMS-v1_10_R1/pom.xml | 2 +- NMS/NMS-v1_11_R1/pom.xml | 2 +- NMS/NMS-v1_12_R1/pom.xml | 2 +- NMS/NMS-v1_13_R1/pom.xml | 2 +- NMS/NMS-v1_13_R2/pom.xml | 2 +- NMS/NMS-v1_14_R1/pom.xml | 2 +- NMS/NMS-v1_15_R1/pom.xml | 2 +- NMS/NMS-v1_16_R1/pom.xml | 2 +- NMS/NMS-v1_16_R2/pom.xml | 2 +- NMS/NMS-v1_16_R3/pom.xml | 2 +- NMS/NMS-v1_17_R1/pom.xml | 2 +- NMS/NMS-v1_18_R1/pom.xml | 2 +- NMS/NMS-v1_18_R2/pom.xml | 2 +- NMS/NMS-v1_19_R1/pom.xml | 2 +- NMS/NMS-v1_19_R1v2/pom.xml | 2 +- NMS/NMS-v1_19_R2/pom.xml | 2 +- NMS/NMS-v1_19_R3/pom.xml | 2 +- NMS/NMS-v1_8_R1/pom.xml | 2 +- NMS/NMS-v1_8_R2/pom.xml | 2 +- NMS/NMS-v1_8_R3/pom.xml | 2 +- NMS/NMS-v1_9_R1/pom.xml | 2 +- NMS/NMS-v1_9_R2/pom.xml | 2 +- pom.xml | 2 +- 27 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Compatibility/pom.xml b/Compatibility/pom.xml index 9dbba0e2..b9bee145 100644 --- a/Compatibility/pom.xml +++ b/Compatibility/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.18 + 2.6.19-DEV ../pom.xml diff --git a/Core/pom.xml b/Core/pom.xml index 094fa067..5e9fb195 100644 --- a/Core/pom.xml +++ b/Core/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.18 + 2.6.19-DEV ../pom.xml diff --git a/Core/src/main/java/com/songoda/core/SongodaCore.java b/Core/src/main/java/com/songoda/core/SongodaCore.java index 5d76a5f9..8f8fa62a 100644 --- a/Core/src/main/java/com/songoda/core/SongodaCore.java +++ b/Core/src/main/java/com/songoda/core/SongodaCore.java @@ -55,7 +55,7 @@ public class SongodaCore { /** * @since coreRevision 6 */ - private final static String coreVersion = "2.6.18"; + private final static String coreVersion = "2.6.19-DEV"; /** * This is specific to the website api diff --git a/NMS/NMS-API/pom.xml b/NMS/NMS-API/pom.xml index 9f837d2a..09f07575 100644 --- a/NMS/NMS-API/pom.xml +++ b/NMS/NMS-API/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.18 + 2.6.19-DEV ../../pom.xml diff --git a/NMS/NMS-v1_10_R1/pom.xml b/NMS/NMS-v1_10_R1/pom.xml index 236fb363..5e4c0c85 100644 --- a/NMS/NMS-v1_10_R1/pom.xml +++ b/NMS/NMS-v1_10_R1/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.18 + 2.6.19-DEV ../../pom.xml diff --git a/NMS/NMS-v1_11_R1/pom.xml b/NMS/NMS-v1_11_R1/pom.xml index f59cc539..b8f5a055 100644 --- a/NMS/NMS-v1_11_R1/pom.xml +++ b/NMS/NMS-v1_11_R1/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.18 + 2.6.19-DEV ../../pom.xml diff --git a/NMS/NMS-v1_12_R1/pom.xml b/NMS/NMS-v1_12_R1/pom.xml index fcc3fa2c..e90da53a 100644 --- a/NMS/NMS-v1_12_R1/pom.xml +++ b/NMS/NMS-v1_12_R1/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.18 + 2.6.19-DEV ../../pom.xml diff --git a/NMS/NMS-v1_13_R1/pom.xml b/NMS/NMS-v1_13_R1/pom.xml index c933b9e4..d6739e60 100644 --- a/NMS/NMS-v1_13_R1/pom.xml +++ b/NMS/NMS-v1_13_R1/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.18 + 2.6.19-DEV ../../pom.xml diff --git a/NMS/NMS-v1_13_R2/pom.xml b/NMS/NMS-v1_13_R2/pom.xml index 52d6a1f0..8060da29 100644 --- a/NMS/NMS-v1_13_R2/pom.xml +++ b/NMS/NMS-v1_13_R2/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.18 + 2.6.19-DEV ../../pom.xml diff --git a/NMS/NMS-v1_14_R1/pom.xml b/NMS/NMS-v1_14_R1/pom.xml index 2263f18a..ef8027cb 100644 --- a/NMS/NMS-v1_14_R1/pom.xml +++ b/NMS/NMS-v1_14_R1/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.18 + 2.6.19-DEV ../../pom.xml diff --git a/NMS/NMS-v1_15_R1/pom.xml b/NMS/NMS-v1_15_R1/pom.xml index 5a7e4774..141662af 100644 --- a/NMS/NMS-v1_15_R1/pom.xml +++ b/NMS/NMS-v1_15_R1/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.18 + 2.6.19-DEV ../../pom.xml diff --git a/NMS/NMS-v1_16_R1/pom.xml b/NMS/NMS-v1_16_R1/pom.xml index a94664ea..469a14d5 100644 --- a/NMS/NMS-v1_16_R1/pom.xml +++ b/NMS/NMS-v1_16_R1/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.18 + 2.6.19-DEV ../../pom.xml diff --git a/NMS/NMS-v1_16_R2/pom.xml b/NMS/NMS-v1_16_R2/pom.xml index 99b7080b..70c3fe46 100644 --- a/NMS/NMS-v1_16_R2/pom.xml +++ b/NMS/NMS-v1_16_R2/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.18 + 2.6.19-DEV ../../pom.xml diff --git a/NMS/NMS-v1_16_R3/pom.xml b/NMS/NMS-v1_16_R3/pom.xml index 3108af55..d942e7eb 100644 --- a/NMS/NMS-v1_16_R3/pom.xml +++ b/NMS/NMS-v1_16_R3/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.18 + 2.6.19-DEV ../../pom.xml diff --git a/NMS/NMS-v1_17_R1/pom.xml b/NMS/NMS-v1_17_R1/pom.xml index 74182a43..2ef63c0b 100644 --- a/NMS/NMS-v1_17_R1/pom.xml +++ b/NMS/NMS-v1_17_R1/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.18 + 2.6.19-DEV ../../pom.xml diff --git a/NMS/NMS-v1_18_R1/pom.xml b/NMS/NMS-v1_18_R1/pom.xml index c2523f17..61f469d3 100644 --- a/NMS/NMS-v1_18_R1/pom.xml +++ b/NMS/NMS-v1_18_R1/pom.xml @@ -19,7 +19,7 @@ com.songoda SongodaCore-Modules - 2.6.18 + 2.6.19-DEV ../../pom.xml diff --git a/NMS/NMS-v1_18_R2/pom.xml b/NMS/NMS-v1_18_R2/pom.xml index 521397c0..801a1f33 100644 --- a/NMS/NMS-v1_18_R2/pom.xml +++ b/NMS/NMS-v1_18_R2/pom.xml @@ -60,7 +60,7 @@ com.songoda SongodaCore-Modules - 2.6.18 + 2.6.19-DEV ../../pom.xml diff --git a/NMS/NMS-v1_19_R1/pom.xml b/NMS/NMS-v1_19_R1/pom.xml index f67d44b6..08ad48a3 100644 --- a/NMS/NMS-v1_19_R1/pom.xml +++ b/NMS/NMS-v1_19_R1/pom.xml @@ -60,7 +60,7 @@ com.songoda SongodaCore-Modules - 2.6.18 + 2.6.19-DEV ../../pom.xml diff --git a/NMS/NMS-v1_19_R1v2/pom.xml b/NMS/NMS-v1_19_R1v2/pom.xml index f86f796c..bed10ed9 100644 --- a/NMS/NMS-v1_19_R1v2/pom.xml +++ b/NMS/NMS-v1_19_R1v2/pom.xml @@ -60,7 +60,7 @@ com.songoda SongodaCore-Modules - 2.6.18 + 2.6.19-DEV ../../pom.xml diff --git a/NMS/NMS-v1_19_R2/pom.xml b/NMS/NMS-v1_19_R2/pom.xml index 5f72ec24..0ebd3c1e 100644 --- a/NMS/NMS-v1_19_R2/pom.xml +++ b/NMS/NMS-v1_19_R2/pom.xml @@ -60,7 +60,7 @@ com.songoda SongodaCore-Modules - 2.6.18 + 2.6.19-DEV ../../pom.xml diff --git a/NMS/NMS-v1_19_R3/pom.xml b/NMS/NMS-v1_19_R3/pom.xml index 85a007c2..84d27777 100644 --- a/NMS/NMS-v1_19_R3/pom.xml +++ b/NMS/NMS-v1_19_R3/pom.xml @@ -60,7 +60,7 @@ com.songoda SongodaCore-Modules - 2.6.18 + 2.6.19-DEV ../../pom.xml diff --git a/NMS/NMS-v1_8_R1/pom.xml b/NMS/NMS-v1_8_R1/pom.xml index 923e9bde..ecd09f8b 100644 --- a/NMS/NMS-v1_8_R1/pom.xml +++ b/NMS/NMS-v1_8_R1/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.18 + 2.6.19-DEV ../../pom.xml diff --git a/NMS/NMS-v1_8_R2/pom.xml b/NMS/NMS-v1_8_R2/pom.xml index 4e4778c0..66bb2736 100644 --- a/NMS/NMS-v1_8_R2/pom.xml +++ b/NMS/NMS-v1_8_R2/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.18 + 2.6.19-DEV ../../pom.xml diff --git a/NMS/NMS-v1_8_R3/pom.xml b/NMS/NMS-v1_8_R3/pom.xml index e3783b2d..98200a5f 100644 --- a/NMS/NMS-v1_8_R3/pom.xml +++ b/NMS/NMS-v1_8_R3/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.18 + 2.6.19-DEV ../../pom.xml diff --git a/NMS/NMS-v1_9_R1/pom.xml b/NMS/NMS-v1_9_R1/pom.xml index b79c0b28..061f4605 100644 --- a/NMS/NMS-v1_9_R1/pom.xml +++ b/NMS/NMS-v1_9_R1/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.18 + 2.6.19-DEV ../../pom.xml diff --git a/NMS/NMS-v1_9_R2/pom.xml b/NMS/NMS-v1_9_R2/pom.xml index eb1e3117..abb35e49 100644 --- a/NMS/NMS-v1_9_R2/pom.xml +++ b/NMS/NMS-v1_9_R2/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.18 + 2.6.19-DEV ../../pom.xml diff --git a/pom.xml b/pom.xml index 3097a971..0e95cf9f 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.songoda SongodaCore-Modules - 2.6.18 + 2.6.19-DEV pom From 824f674dcdae29266d3871ac0f1f920ae2a994a9 Mon Sep 17 00:00:00 2001 From: Christian Koop Date: Thu, 6 Apr 2023 10:06:58 +0200 Subject: [PATCH 05/22] Change order of IP and UUID in 'license not found' message to match GUI The marketplace first asks for the UUID - I changed the order in the message to match that order. --- Core/src/main/java/com/songoda/core/SongodaPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/src/main/java/com/songoda/core/SongodaPlugin.java b/Core/src/main/java/com/songoda/core/SongodaPlugin.java index bd542f34..ff1062b7 100644 --- a/Core/src/main/java/com/songoda/core/SongodaPlugin.java +++ b/Core/src/main/java/com/songoda/core/SongodaPlugin.java @@ -107,8 +107,8 @@ public abstract class SongodaPlugin extends JavaPlugin { ChatColor.YELLOW + "License setup steps:\n" + ChatColor.YELLOW + "Visit the link mentioned above and click the 'Create License' button.\n" + ChatColor.YELLOW + "Copy the following IP address and UUID and click create.\n" + - ChatColor.YELLOW + "IP: " + externalIP + "\n" + ChatColor.YELLOW + "UUID: " + serverUuid + "\n" + + ChatColor.YELLOW + "IP: " + externalIP + "\n" + ChatColor.RED + "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; this.console.sendMessage(message); }).start(); From 3dd3a31f258f080469b77772534a8046138d4564 Mon Sep 17 00:00:00 2001 From: ceze88 Date: Fri, 7 Apr 2023 20:46:14 +0200 Subject: [PATCH 06/22] Add coordinate placeholders to loot commands --- .../main/java/com/songoda/core/lootables/loot/DropUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/src/main/java/com/songoda/core/lootables/loot/DropUtils.java b/Core/src/main/java/com/songoda/core/lootables/loot/DropUtils.java index 40f00351..c4abb7e6 100644 --- a/Core/src/main/java/com/songoda/core/lootables/loot/DropUtils.java +++ b/Core/src/main/java/com/songoda/core/lootables/loot/DropUtils.java @@ -101,7 +101,7 @@ public class DropUtils { Bukkit.getScheduler().runTask(SongodaCore.getHijackedPlugin(), () -> { for (String command : commands) { if (entity.getKiller() != null) { - command = command.replace("%player%", entity.getKiller().getName()); + command = command.replace("%player%", entity.getKiller().getName().replace("%x%", String.valueOf((int)entity.getLocation().getX())).replace("%y%", String.valueOf((int)entity.getLocation().getY())).replace("%z%", String.valueOf((int)entity.getLocation().getZ()))); } if (!command.contains("%player%")) { From 1455cf2d1c4c47037b40145e9a89ad786f927035 Mon Sep 17 00:00:00 2001 From: ceze88 Date: Tue, 11 Apr 2023 19:23:05 +0200 Subject: [PATCH 07/22] Fix enchant book loot --- .../com/songoda/core/lootables/loot/Loot.java | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/Core/src/main/java/com/songoda/core/lootables/loot/Loot.java b/Core/src/main/java/com/songoda/core/lootables/loot/Loot.java index cb13e30e..d8d900a9 100644 --- a/Core/src/main/java/com/songoda/core/lootables/loot/Loot.java +++ b/Core/src/main/java/com/songoda/core/lootables/loot/Loot.java @@ -4,9 +4,11 @@ import com.google.gson.annotations.SerializedName; import com.songoda.core.compatibility.CompatibleMaterial; import com.songoda.core.utils.ItemUtils; import com.songoda.core.utils.TextUtils; +import org.bukkit.Material; import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.EntityType; import org.bukkit.inventory.ItemStack; +import org.bukkit.inventory.meta.EnchantmentStorageMeta; import java.util.ArrayList; import java.util.Arrays; @@ -149,6 +151,25 @@ public class Loot { return null; } + //Create enchantment book + if (item.getType().equals(Material.ENCHANTED_BOOK)) { + EnchantmentStorageMeta meta = (EnchantmentStorageMeta) item.getItemMeta(); + for (Map.Entry entry : this.enchants.entrySet()) { + if (entry.getValue() == null) continue; + + //TODO add random enchants +// if (entry.getKey().equalsIgnoreCase("RANDOM")) { +// item = ItemUtils.applyRandomEnchants(item, entry.getValue()); +// +// continue; +// } + + meta.addStoredEnchant(Enchantment.getByName(entry.getKey()), entry.getValue(), true); + } + item.setItemMeta(meta); + return item; + } + Map enchants = new HashMap<>(); for (Map.Entry entry : this.enchants.entrySet()) { if (entry.getValue() == null) continue; From a3e73be1aad453f932a14950ae499e5161504c4b Mon Sep 17 00:00:00 2001 From: Christian Koop Date: Thu, 13 Apr 2023 10:57:22 +0200 Subject: [PATCH 08/22] Fixes a Spigot 1.19.4 NMS method singature changing EpicAnchor is affected by that --- .../com/songoda/core/nms/v1_19_R3/world/WorldCoreImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/NMS/NMS-v1_19_R3/src/main/java/com/songoda/core/nms/v1_19_R3/world/WorldCoreImpl.java b/NMS/NMS-v1_19_R3/src/main/java/com/songoda/core/nms/v1_19_R3/world/WorldCoreImpl.java index f47905a9..5a84efc4 100644 --- a/NMS/NMS-v1_19_R3/src/main/java/com/songoda/core/nms/v1_19_R3/world/WorldCoreImpl.java +++ b/NMS/NMS-v1_19_R3/src/main/java/com/songoda/core/nms/v1_19_R3/world/WorldCoreImpl.java @@ -13,6 +13,7 @@ import net.minecraft.util.profiling.ProfilerFiller; import net.minecraft.world.level.BaseSpawner; import net.minecraft.world.level.ChunkPos; import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.chunk.ChunkStatus; import net.minecraft.world.level.chunk.LevelChunk; import net.minecraft.world.level.chunk.LevelChunkSection; import net.minecraft.world.level.material.FluidState; @@ -55,7 +56,7 @@ public class WorldCoreImpl implements WorldCore { */ @Override public void randomTickChunk(org.bukkit.Chunk bukkitChunk, int tickAmount) { - LevelChunk chunk = ((CraftChunk) bukkitChunk).getHandle(); + LevelChunk chunk = (LevelChunk) ((CraftChunk) bukkitChunk).getHandle(ChunkStatus.FULL); ServerLevel world = chunk.q; ProfilerFiller gameProfilerFiller = world.getProfiler(); From 7c4e967dd8068f22f5b83b749f015177633247e3 Mon Sep 17 00:00:00 2001 From: Christian Koop Date: Thu, 13 Apr 2023 11:18:12 +0200 Subject: [PATCH 09/22] Changes *some* Songoda wording to Craftaro I don't want to introduce too much confusion or breaking changes --- Core/src/main/java/com/songoda/core/SongodaPlugin.java | 6 +++--- .../java/com/songoda/core/core/SongodaCoreDiagCommand.java | 2 +- .../java/com/songoda/core/core/SongodaCoreOverviewGUI.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Core/src/main/java/com/songoda/core/SongodaPlugin.java b/Core/src/main/java/com/songoda/core/SongodaPlugin.java index ff1062b7..29e5066a 100644 --- a/Core/src/main/java/com/songoda/core/SongodaPlugin.java +++ b/Core/src/main/java/com/songoda/core/SongodaPlugin.java @@ -119,7 +119,7 @@ public abstract class SongodaPlugin extends JavaPlugin { console.sendMessage(" "); // blank line to separate chatter console.sendMessage(ChatColor.GREEN + "============================="); - console.sendMessage(String.format("%s%s %s by %sSongoda <3!", ChatColor.GRAY, + console.sendMessage(String.format("%s%s %s by %sCraftaro <3!", ChatColor.GRAY, getDescription().getName(), getDescription().getVersion(), ChatColor.DARK_PURPLE)); console.sendMessage(String.format("%sAction: %s%s%s...", ChatColor.GRAY, ChatColor.GREEN, "Enabling", ChatColor.GRAY)); @@ -162,7 +162,7 @@ public abstract class SongodaPlugin extends JavaPlugin { console.sendMessage(" "); // blank line to separate chatter console.sendMessage(ChatColor.GREEN + "============================="); - console.sendMessage(String.format("%s%s %s by %sSongoda <3!", ChatColor.GRAY, + console.sendMessage(String.format("%s%s %s by %sCraftaro <3!", ChatColor.GRAY, getDescription().getName(), getDescription().getVersion(), ChatColor.DARK_PURPLE)); console.sendMessage(String.format("%sAction: %s%s%s...", ChatColor.GRAY, ChatColor.RED, "Disabling", ChatColor.GRAY)); @@ -236,7 +236,7 @@ public abstract class SongodaPlugin extends JavaPlugin { if (unfinishedTasks > 0) { getLogger().log(Level.WARNING, String.format("A DataManager has been forcefully terminated with %d unfinished tasks - " + - "This can be a serious problem, please report it to us (Songoda)!", unfinishedTasks)); + "This can be a serious problem, please report it to us (Craftaro / Songoda)!", unfinishedTasks)); } } } diff --git a/Core/src/main/java/com/songoda/core/core/SongodaCoreDiagCommand.java b/Core/src/main/java/com/songoda/core/core/SongodaCoreDiagCommand.java index cf30d502..4500c902 100644 --- a/Core/src/main/java/com/songoda/core/core/SongodaCoreDiagCommand.java +++ b/Core/src/main/java/com/songoda/core/core/SongodaCoreDiagCommand.java @@ -47,7 +47,7 @@ public class SongodaCoreDiagCommand extends AbstractCommand { @Override protected ReturnType runCommand(CommandSender sender, String... args) { sender.sendMessage(""); - sender.sendMessage("Songoda Diagnostics Information"); + sender.sendMessage("Craftaro Diagnostics Information"); sender.sendMessage(""); sender.sendMessage("Plugins:"); diff --git a/Core/src/main/java/com/songoda/core/core/SongodaCoreOverviewGUI.java b/Core/src/main/java/com/songoda/core/core/SongodaCoreOverviewGUI.java index c5b743f3..60aa5b3d 100644 --- a/Core/src/main/java/com/songoda/core/core/SongodaCoreOverviewGUI.java +++ b/Core/src/main/java/com/songoda/core/core/SongodaCoreOverviewGUI.java @@ -16,7 +16,7 @@ final class SongodaCoreOverviewGUI extends Gui { // could do pages, too, but don't think we'll have that many at a time for a while int max = (int) Math.ceil(plugins.size() / 9.); setRows(max); - setTitle("Songoda Plugins"); + setTitle("Craftaro Plugins"); // TODO: this could use some decorating From 2730b9159896ea76d51ab976ff06ae7000a63a9e Mon Sep 17 00:00:00 2001 From: Christian Koop Date: Thu, 13 Apr 2023 11:22:04 +0200 Subject: [PATCH 10/22] Have songoda-Command have 'craftaro' as alias and change wording to that Not having the actuall command change allows of other plugins *finding* that command in that way means not introducing a breaking change by accident ^^ + It's very hacky the way I did it but tbh... Core v3 is somewhat around the corner anyways --- .../main/java/com/songoda/core/commands/CommandManager.java | 4 ++++ .../main/java/com/songoda/core/commands/MainCommand.java | 2 +- .../main/java/com/songoda/core/core/SongodaCoreCommand.java | 6 +++--- .../java/com/songoda/core/core/SongodaCoreDiagCommand.java | 2 +- .../java/com/songoda/core/core/SongodaCoreIPCommand.java | 2 +- .../java/com/songoda/core/core/SongodaCoreUUIDCommand.java | 2 +- 6 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Core/src/main/java/com/songoda/core/commands/CommandManager.java b/Core/src/main/java/com/songoda/core/commands/CommandManager.java index 7ddc6e98..2a97e2e1 100644 --- a/Core/src/main/java/com/songoda/core/commands/CommandManager.java +++ b/Core/src/main/java/com/songoda/core/commands/CommandManager.java @@ -372,6 +372,10 @@ public class CommandManager implements CommandExecutor, TabCompleter { // Set tab complete commandObject.setTabCompleter(tabManager); + if (command.equalsIgnoreCase("songoda")) { + commandObject.setAliases(Collections.singletonList("craftaro")); + } + // Register the command Field fieldKnownCommands = SimpleCommandMap.class.getDeclaredField("knownCommands"); fieldKnownCommands.setAccessible(true); diff --git a/Core/src/main/java/com/songoda/core/commands/MainCommand.java b/Core/src/main/java/com/songoda/core/commands/MainCommand.java index 3675a5a3..190fd543 100644 --- a/Core/src/main/java/com/songoda/core/commands/MainCommand.java +++ b/Core/src/main/java/com/songoda/core/commands/MainCommand.java @@ -65,7 +65,7 @@ public class MainCommand extends AbstractCommand { .sendTo(sender); } - sender.sendMessage(ChatColor.DARK_GRAY + "- " + ChatColor.YELLOW + "/songoda" + ChatColor.GRAY + " - Opens the Songoda plugin GUI"); + sender.sendMessage(ChatColor.DARK_GRAY + "- " + ChatColor.YELLOW + "/craftaro" + ChatColor.GRAY + " - Opens the Craftaro plugin GUI"); sender.sendMessage(""); if (nestedCommands != null) { diff --git a/Core/src/main/java/com/songoda/core/core/SongodaCoreCommand.java b/Core/src/main/java/com/songoda/core/core/SongodaCoreCommand.java index 945c594f..d2fb1e76 100644 --- a/Core/src/main/java/com/songoda/core/core/SongodaCoreCommand.java +++ b/Core/src/main/java/com/songoda/core/core/SongodaCoreCommand.java @@ -12,7 +12,7 @@ public class SongodaCoreCommand extends AbstractCommand { protected GuiManager guiManager; public SongodaCoreCommand() { - super(false, "songoda"); + super(CommandType.CONSOLE_OK, "craftaro", "songoda"); } @Override @@ -24,7 +24,7 @@ public class SongodaCoreCommand extends AbstractCommand { guiManager.showGUI((Player) sender, new SongodaCoreOverviewGUI()); } else { - sender.sendMessage("/songoda diag"); + sender.sendMessage("/craftaro diag"); } return ReturnType.SUCCESS; @@ -37,7 +37,7 @@ public class SongodaCoreCommand extends AbstractCommand { @Override public String getSyntax() { - return "/songoda"; + return "/craftaro"; } @Override diff --git a/Core/src/main/java/com/songoda/core/core/SongodaCoreDiagCommand.java b/Core/src/main/java/com/songoda/core/core/SongodaCoreDiagCommand.java index 4500c902..42e4103f 100644 --- a/Core/src/main/java/com/songoda/core/core/SongodaCoreDiagCommand.java +++ b/Core/src/main/java/com/songoda/core/core/SongodaCoreDiagCommand.java @@ -36,7 +36,7 @@ public class SongodaCoreDiagCommand extends AbstractCommand { @Override public String getSyntax() { - return "/songoda diag"; + return "/craftaro diag"; } @Override diff --git a/Core/src/main/java/com/songoda/core/core/SongodaCoreIPCommand.java b/Core/src/main/java/com/songoda/core/core/SongodaCoreIPCommand.java index 6f0e8a8c..62745c64 100644 --- a/Core/src/main/java/com/songoda/core/core/SongodaCoreIPCommand.java +++ b/Core/src/main/java/com/songoda/core/core/SongodaCoreIPCommand.java @@ -63,7 +63,7 @@ public class SongodaCoreIPCommand extends AbstractCommand { @Override public String getSyntax() { - return "/songoda myip"; + return "/craftaro myip"; } @Override diff --git a/Core/src/main/java/com/songoda/core/core/SongodaCoreUUIDCommand.java b/Core/src/main/java/com/songoda/core/core/SongodaCoreUUIDCommand.java index 0bcb10c6..bc6a9dbf 100644 --- a/Core/src/main/java/com/songoda/core/core/SongodaCoreUUIDCommand.java +++ b/Core/src/main/java/com/songoda/core/core/SongodaCoreUUIDCommand.java @@ -45,7 +45,7 @@ public class SongodaCoreUUIDCommand extends AbstractCommand { @Override public String getSyntax() { - return "/songodacore uuid"; + return "/craftaro uuid"; } @Override From b9293079e0fc87b87032d00d7aeb77616c5592b3 Mon Sep 17 00:00:00 2001 From: Christian Koop Date: Thu, 13 Apr 2023 11:22:43 +0200 Subject: [PATCH 11/22] Fix broken Wiki-URL in CustomizableGui The Wiki has moved/changed and is not redirecting properly sadly --- Core/src/main/java/com/songoda/core/gui/CustomizableGui.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/src/main/java/com/songoda/core/gui/CustomizableGui.java b/Core/src/main/java/com/songoda/core/gui/CustomizableGui.java index cc2fb1ac..f41c4d5b 100644 --- a/Core/src/main/java/com/songoda/core/gui/CustomizableGui.java +++ b/Core/src/main/java/com/songoda/core/gui/CustomizableGui.java @@ -60,7 +60,7 @@ public class CustomizableGui extends Gui { "in this GUI.") .setDefaultComment("overrides", "For information on how to apply overrides please visit", - "https://wiki.songoda.com/Gui"); + "https://wiki.craftaro.com/index.php/Gui"); config.saveChanges(); } From c34c8faa9ca5e4e2a30a888842a3f450ab0c4fc0 Mon Sep 17 00:00:00 2001 From: Christian Koop Date: Thu, 13 Apr 2023 11:23:05 +0200 Subject: [PATCH 12/22] Fix wrong permission configured for SongodaCoreUUIDCommand --- .../main/java/com/songoda/core/core/SongodaCoreUUIDCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/src/main/java/com/songoda/core/core/SongodaCoreUUIDCommand.java b/Core/src/main/java/com/songoda/core/core/SongodaCoreUUIDCommand.java index bc6a9dbf..72f42ccd 100644 --- a/Core/src/main/java/com/songoda/core/core/SongodaCoreUUIDCommand.java +++ b/Core/src/main/java/com/songoda/core/core/SongodaCoreUUIDCommand.java @@ -40,7 +40,7 @@ public class SongodaCoreUUIDCommand extends AbstractCommand { @Override public String getPermissionNode() { - return "songodacore.admin"; + return "songoda.admin"; } @Override From 37a9ee88685347964ad02ae9308a984cc2de3a61 Mon Sep 17 00:00:00 2001 From: Christian Koop Date: Thu, 13 Apr 2023 11:35:19 +0200 Subject: [PATCH 13/22] Adds missing commands to list when console is running songoda command --- .../src/main/java/com/songoda/core/core/SongodaCoreCommand.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Core/src/main/java/com/songoda/core/core/SongodaCoreCommand.java b/Core/src/main/java/com/songoda/core/core/SongodaCoreCommand.java index d2fb1e76..4a4769cf 100644 --- a/Core/src/main/java/com/songoda/core/core/SongodaCoreCommand.java +++ b/Core/src/main/java/com/songoda/core/core/SongodaCoreCommand.java @@ -25,6 +25,8 @@ public class SongodaCoreCommand extends AbstractCommand { guiManager.showGUI((Player) sender, new SongodaCoreOverviewGUI()); } else { sender.sendMessage("/craftaro diag"); + sender.sendMessage("/craftaro myip"); + sender.sendMessage("/craftaro uuid"); } return ReturnType.SUCCESS; From 177ecb36e500c4d4e5f30cbe9b10f96744a02bc4 Mon Sep 17 00:00:00 2001 From: Christian Koop Date: Thu, 13 Apr 2023 11:48:55 +0200 Subject: [PATCH 14/22] Release v2.6.19 --- Compatibility/pom.xml | 2 +- Core/pom.xml | 2 +- NMS/NMS-API/pom.xml | 2 +- NMS/NMS-v1_10_R1/pom.xml | 2 +- NMS/NMS-v1_11_R1/pom.xml | 2 +- NMS/NMS-v1_12_R1/pom.xml | 2 +- NMS/NMS-v1_13_R1/pom.xml | 2 +- NMS/NMS-v1_13_R2/pom.xml | 2 +- NMS/NMS-v1_14_R1/pom.xml | 2 +- NMS/NMS-v1_15_R1/pom.xml | 2 +- NMS/NMS-v1_16_R1/pom.xml | 2 +- NMS/NMS-v1_16_R2/pom.xml | 2 +- NMS/NMS-v1_16_R3/pom.xml | 2 +- NMS/NMS-v1_17_R1/pom.xml | 2 +- NMS/NMS-v1_18_R1/pom.xml | 2 +- NMS/NMS-v1_18_R2/pom.xml | 2 +- NMS/NMS-v1_19_R1/pom.xml | 2 +- NMS/NMS-v1_19_R1v2/pom.xml | 2 +- NMS/NMS-v1_19_R2/pom.xml | 2 +- NMS/NMS-v1_19_R3/pom.xml | 2 +- NMS/NMS-v1_8_R1/pom.xml | 2 +- NMS/NMS-v1_8_R2/pom.xml | 2 +- NMS/NMS-v1_8_R3/pom.xml | 2 +- NMS/NMS-v1_9_R1/pom.xml | 2 +- NMS/NMS-v1_9_R2/pom.xml | 2 +- pom.xml | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Compatibility/pom.xml b/Compatibility/pom.xml index b9bee145..3c34e61d 100644 --- a/Compatibility/pom.xml +++ b/Compatibility/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.19-DEV + 2.6.19 ../pom.xml diff --git a/Core/pom.xml b/Core/pom.xml index 5e9fb195..d62fab4c 100644 --- a/Core/pom.xml +++ b/Core/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.19-DEV + 2.6.19 ../pom.xml diff --git a/NMS/NMS-API/pom.xml b/NMS/NMS-API/pom.xml index 09f07575..54653ced 100644 --- a/NMS/NMS-API/pom.xml +++ b/NMS/NMS-API/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.19-DEV + 2.6.19 ../../pom.xml diff --git a/NMS/NMS-v1_10_R1/pom.xml b/NMS/NMS-v1_10_R1/pom.xml index 5e4c0c85..3eedb030 100644 --- a/NMS/NMS-v1_10_R1/pom.xml +++ b/NMS/NMS-v1_10_R1/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.19-DEV + 2.6.19 ../../pom.xml diff --git a/NMS/NMS-v1_11_R1/pom.xml b/NMS/NMS-v1_11_R1/pom.xml index b8f5a055..0c9f6cf1 100644 --- a/NMS/NMS-v1_11_R1/pom.xml +++ b/NMS/NMS-v1_11_R1/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.19-DEV + 2.6.19 ../../pom.xml diff --git a/NMS/NMS-v1_12_R1/pom.xml b/NMS/NMS-v1_12_R1/pom.xml index e90da53a..55f19bb1 100644 --- a/NMS/NMS-v1_12_R1/pom.xml +++ b/NMS/NMS-v1_12_R1/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.19-DEV + 2.6.19 ../../pom.xml diff --git a/NMS/NMS-v1_13_R1/pom.xml b/NMS/NMS-v1_13_R1/pom.xml index d6739e60..b8275b07 100644 --- a/NMS/NMS-v1_13_R1/pom.xml +++ b/NMS/NMS-v1_13_R1/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.19-DEV + 2.6.19 ../../pom.xml diff --git a/NMS/NMS-v1_13_R2/pom.xml b/NMS/NMS-v1_13_R2/pom.xml index 8060da29..adf4ea90 100644 --- a/NMS/NMS-v1_13_R2/pom.xml +++ b/NMS/NMS-v1_13_R2/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.19-DEV + 2.6.19 ../../pom.xml diff --git a/NMS/NMS-v1_14_R1/pom.xml b/NMS/NMS-v1_14_R1/pom.xml index ef8027cb..e3516501 100644 --- a/NMS/NMS-v1_14_R1/pom.xml +++ b/NMS/NMS-v1_14_R1/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.19-DEV + 2.6.19 ../../pom.xml diff --git a/NMS/NMS-v1_15_R1/pom.xml b/NMS/NMS-v1_15_R1/pom.xml index 141662af..5b2d8e47 100644 --- a/NMS/NMS-v1_15_R1/pom.xml +++ b/NMS/NMS-v1_15_R1/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.19-DEV + 2.6.19 ../../pom.xml diff --git a/NMS/NMS-v1_16_R1/pom.xml b/NMS/NMS-v1_16_R1/pom.xml index 469a14d5..5f4ba56d 100644 --- a/NMS/NMS-v1_16_R1/pom.xml +++ b/NMS/NMS-v1_16_R1/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.19-DEV + 2.6.19 ../../pom.xml diff --git a/NMS/NMS-v1_16_R2/pom.xml b/NMS/NMS-v1_16_R2/pom.xml index 70c3fe46..1cf5ed06 100644 --- a/NMS/NMS-v1_16_R2/pom.xml +++ b/NMS/NMS-v1_16_R2/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.19-DEV + 2.6.19 ../../pom.xml diff --git a/NMS/NMS-v1_16_R3/pom.xml b/NMS/NMS-v1_16_R3/pom.xml index d942e7eb..680b913f 100644 --- a/NMS/NMS-v1_16_R3/pom.xml +++ b/NMS/NMS-v1_16_R3/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.19-DEV + 2.6.19 ../../pom.xml diff --git a/NMS/NMS-v1_17_R1/pom.xml b/NMS/NMS-v1_17_R1/pom.xml index 2ef63c0b..21e00633 100644 --- a/NMS/NMS-v1_17_R1/pom.xml +++ b/NMS/NMS-v1_17_R1/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.19-DEV + 2.6.19 ../../pom.xml diff --git a/NMS/NMS-v1_18_R1/pom.xml b/NMS/NMS-v1_18_R1/pom.xml index 61f469d3..5e1dbb91 100644 --- a/NMS/NMS-v1_18_R1/pom.xml +++ b/NMS/NMS-v1_18_R1/pom.xml @@ -19,7 +19,7 @@ com.songoda SongodaCore-Modules - 2.6.19-DEV + 2.6.19 ../../pom.xml diff --git a/NMS/NMS-v1_18_R2/pom.xml b/NMS/NMS-v1_18_R2/pom.xml index 801a1f33..65ce83a2 100644 --- a/NMS/NMS-v1_18_R2/pom.xml +++ b/NMS/NMS-v1_18_R2/pom.xml @@ -60,7 +60,7 @@ com.songoda SongodaCore-Modules - 2.6.19-DEV + 2.6.19 ../../pom.xml diff --git a/NMS/NMS-v1_19_R1/pom.xml b/NMS/NMS-v1_19_R1/pom.xml index 08ad48a3..078319cc 100644 --- a/NMS/NMS-v1_19_R1/pom.xml +++ b/NMS/NMS-v1_19_R1/pom.xml @@ -60,7 +60,7 @@ com.songoda SongodaCore-Modules - 2.6.19-DEV + 2.6.19 ../../pom.xml diff --git a/NMS/NMS-v1_19_R1v2/pom.xml b/NMS/NMS-v1_19_R1v2/pom.xml index bed10ed9..69bab071 100644 --- a/NMS/NMS-v1_19_R1v2/pom.xml +++ b/NMS/NMS-v1_19_R1v2/pom.xml @@ -60,7 +60,7 @@ com.songoda SongodaCore-Modules - 2.6.19-DEV + 2.6.19 ../../pom.xml diff --git a/NMS/NMS-v1_19_R2/pom.xml b/NMS/NMS-v1_19_R2/pom.xml index 0ebd3c1e..0773ce86 100644 --- a/NMS/NMS-v1_19_R2/pom.xml +++ b/NMS/NMS-v1_19_R2/pom.xml @@ -60,7 +60,7 @@ com.songoda SongodaCore-Modules - 2.6.19-DEV + 2.6.19 ../../pom.xml diff --git a/NMS/NMS-v1_19_R3/pom.xml b/NMS/NMS-v1_19_R3/pom.xml index 84d27777..1b638b7b 100644 --- a/NMS/NMS-v1_19_R3/pom.xml +++ b/NMS/NMS-v1_19_R3/pom.xml @@ -60,7 +60,7 @@ com.songoda SongodaCore-Modules - 2.6.19-DEV + 2.6.19 ../../pom.xml diff --git a/NMS/NMS-v1_8_R1/pom.xml b/NMS/NMS-v1_8_R1/pom.xml index ecd09f8b..5f774ddd 100644 --- a/NMS/NMS-v1_8_R1/pom.xml +++ b/NMS/NMS-v1_8_R1/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.19-DEV + 2.6.19 ../../pom.xml diff --git a/NMS/NMS-v1_8_R2/pom.xml b/NMS/NMS-v1_8_R2/pom.xml index 66bb2736..281344d2 100644 --- a/NMS/NMS-v1_8_R2/pom.xml +++ b/NMS/NMS-v1_8_R2/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.19-DEV + 2.6.19 ../../pom.xml diff --git a/NMS/NMS-v1_8_R3/pom.xml b/NMS/NMS-v1_8_R3/pom.xml index 98200a5f..2af8c463 100644 --- a/NMS/NMS-v1_8_R3/pom.xml +++ b/NMS/NMS-v1_8_R3/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.19-DEV + 2.6.19 ../../pom.xml diff --git a/NMS/NMS-v1_9_R1/pom.xml b/NMS/NMS-v1_9_R1/pom.xml index 061f4605..214d23c7 100644 --- a/NMS/NMS-v1_9_R1/pom.xml +++ b/NMS/NMS-v1_9_R1/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.19-DEV + 2.6.19 ../../pom.xml diff --git a/NMS/NMS-v1_9_R2/pom.xml b/NMS/NMS-v1_9_R2/pom.xml index abb35e49..7a564fc7 100644 --- a/NMS/NMS-v1_9_R2/pom.xml +++ b/NMS/NMS-v1_9_R2/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.19-DEV + 2.6.19 ../../pom.xml diff --git a/pom.xml b/pom.xml index 0e95cf9f..2ba3e4f0 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.songoda SongodaCore-Modules - 2.6.19-DEV + 2.6.19 pom From 57f9f1f9111d85b37480a3639e66b80b26c3de23 Mon Sep 17 00:00:00 2001 From: Christian Koop Date: Thu, 13 Apr 2023 11:51:14 +0200 Subject: [PATCH 15/22] Fix coreVersion in SongodaCore class not being the correct release --- Core/src/main/java/com/songoda/core/SongodaCore.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/src/main/java/com/songoda/core/SongodaCore.java b/Core/src/main/java/com/songoda/core/SongodaCore.java index 8f8fa62a..9ef03580 100644 --- a/Core/src/main/java/com/songoda/core/SongodaCore.java +++ b/Core/src/main/java/com/songoda/core/SongodaCore.java @@ -55,7 +55,7 @@ public class SongodaCore { /** * @since coreRevision 6 */ - private final static String coreVersion = "2.6.19-DEV"; + private final static String coreVersion = "2.6.19"; /** * This is specific to the website api From e21db58a6738fbccec2d153dca01a7f416dcbfb8 Mon Sep 17 00:00:00 2001 From: Christian Koop Date: Wed, 19 Apr 2023 21:50:30 +0200 Subject: [PATCH 16/22] Reimplement BlockUtils#updateAdjacentComparators in WorldCore The implementation broke in 1.19.4 mid-version. Fixes `java.lang.NoSuchMethodException: org.bukkit.craftbukkit.v1_19_R3.CraftChunk.getHandle()` Related commit: a3e73be1aad453f932a14950ae499e5161504c4b --- .../main/java/com/songoda/core/utils/BlockUtils.java | 4 ++++ .../java/com/songoda/core/nms/world/WorldCore.java | 5 +++-- .../core/nms/v1_10_R1/world/WorldCoreImpl.java | 12 ++++++++++++ .../core/nms/v1_11_R1/world/WorldCoreImpl.java | 12 ++++++++++++ .../core/nms/v1_12_R1/world/WorldCoreImpl.java | 12 ++++++++++++ .../core/nms/v1_13_R1/world/WorldCoreImpl.java | 11 +++++++++++ .../core/nms/v1_13_R2/world/WorldCoreImpl.java | 11 +++++++++++ .../core/nms/v1_14_R1/world/WorldCoreImpl.java | 11 +++++++++++ .../core/nms/v1_15_R1/world/WorldCoreImpl.java | 11 +++++++++++ .../core/nms/v1_16_R1/world/WorldCoreImpl.java | 11 +++++++++++ .../core/nms/v1_16_R2/world/WorldCoreImpl.java | 11 +++++++++++ .../core/nms/v1_16_R3/world/WorldCoreImpl.java | 11 +++++++++++ .../core/nms/v1_17_R1/world/WorldCoreImpl.java | 11 +++++++++++ .../core/nms/v1_18_R1/world/WorldCoreImpl.java | 11 +++++++++++ .../core/nms/v1_18_R2/world/WorldCoreImpl.java | 11 +++++++++++ .../core/nms/v1_19_R1/world/WorldCoreImpl.java | 11 +++++++++++ .../core/nms/v1_19_R1v2/world/WorldCoreImpl.java | 11 +++++++++++ .../core/nms/v1_19_R2/world/WorldCoreImpl.java | 11 +++++++++++ .../core/nms/v1_19_R3/world/WorldCoreImpl.java | 11 +++++++++++ .../core/nms/v1_8_R1/world/WorldCoreImpl.java | 12 ++++++++++++ .../core/nms/v1_8_R2/world/WorldCoreImpl.java | 12 ++++++++++++ .../core/nms/v1_8_R3/world/WorldCoreImpl.java | 12 ++++++++++++ .../core/nms/v1_9_R1/world/WorldCoreImpl.java | 12 ++++++++++++ .../core/nms/v1_9_R2/world/WorldCoreImpl.java | 12 ++++++++++++ 24 files changed, 257 insertions(+), 2 deletions(-) diff --git a/Core/src/main/java/com/songoda/core/utils/BlockUtils.java b/Core/src/main/java/com/songoda/core/utils/BlockUtils.java index 3329cff4..314feee9 100644 --- a/Core/src/main/java/com/songoda/core/utils/BlockUtils.java +++ b/Core/src/main/java/com/songoda/core/utils/BlockUtils.java @@ -4,6 +4,7 @@ import com.songoda.core.compatibility.ClassMapping; import com.songoda.core.compatibility.CompatibleMaterial; import com.songoda.core.compatibility.MethodMapping; import com.songoda.core.compatibility.ServerVersion; +import com.songoda.core.nms.NmsManager; import org.bukkit.Effect; import org.bukkit.Location; import org.bukkit.Material; @@ -337,7 +338,10 @@ public class BlockUtils { * Manually trigger the updateAdjacentComparators method for containers * * @param loc The Location of the container + * + * @deprecated Broken in/since Spigot 1.19.4! Use {@link com.songoda.core.nms.world.WorldCore#updateAdjacentComparators(Block)} on {@link NmsManager#getWorld()} instead */ + @Deprecated public static void updateAdjacentComparators(Location loc) { if (loc == null || loc.getWorld() == null) { return; diff --git a/NMS/NMS-API/src/main/java/com/songoda/core/nms/world/WorldCore.java b/NMS/NMS-API/src/main/java/com/songoda/core/nms/world/WorldCore.java index bf5256ff..302569c9 100644 --- a/NMS/NMS-API/src/main/java/com/songoda/core/nms/world/WorldCore.java +++ b/NMS/NMS-API/src/main/java/com/songoda/core/nms/world/WorldCore.java @@ -3,12 +3,11 @@ package com.songoda.core.nms.world; import org.bukkit.Chunk; import org.bukkit.Location; import org.bukkit.World; +import org.bukkit.block.Block; import org.bukkit.block.BlockState; import org.bukkit.block.CreatureSpawner; import org.bukkit.inventory.ItemStack; -import java.lang.reflect.InvocationTargetException; - public interface WorldCore { SSpawner getSpawner(CreatureSpawner spawner); @@ -30,6 +29,8 @@ public interface WorldCore { */ void randomTickChunk(Chunk bukkitChunk, int tickAmount) throws ReflectiveOperationException; + void updateAdjacentComparators(Block bukkitBlock); + /** * Ticks all inactive spawners in a specific chunk ignoring the minimum required players within a specific range.
* A spawner is deemed inactive if no player is within its activation range. diff --git a/NMS/NMS-v1_10_R1/src/main/java/com/songoda/core/nms/v1_10_R1/world/WorldCoreImpl.java b/NMS/NMS-v1_10_R1/src/main/java/com/songoda/core/nms/v1_10_R1/world/WorldCoreImpl.java index 25d93b42..37fc32f0 100644 --- a/NMS/NMS-v1_10_R1/src/main/java/com/songoda/core/nms/v1_10_R1/world/WorldCoreImpl.java +++ b/NMS/NMS-v1_10_R1/src/main/java/com/songoda/core/nms/v1_10_R1/world/WorldCoreImpl.java @@ -18,6 +18,8 @@ import org.bukkit.Location; import org.bukkit.World; import org.bukkit.block.CreatureSpawner; import org.bukkit.craftbukkit.v1_10_R1.CraftChunk; +import org.bukkit.craftbukkit.v1_10_R1.block.CraftBlock; +import org.bukkit.craftbukkit.v1_10_R1.util.CraftMagicNumbers; import org.bukkit.inventory.ItemStack; public class WorldCoreImpl implements WorldCore { @@ -85,4 +87,14 @@ public class WorldCoreImpl implements WorldCore { } } } + + @Override + public void updateAdjacentComparators(org.bukkit.block.Block bukkitBlock) { + CraftBlock craftBlock = (CraftBlock) bukkitBlock; + CraftChunk craftChunk = (CraftChunk) bukkitBlock.getChunk(); + net.minecraft.server.v1_10_R1.World nmsWorld = craftChunk.getHandle().getWorld(); + + BlockPosition blockPosition = new BlockPosition(craftBlock.getX(), craftBlock.getY(), craftBlock.getZ()); + nmsWorld.updateAdjacentComparators(blockPosition, CraftMagicNumbers.getBlock(craftBlock)); + } } diff --git a/NMS/NMS-v1_11_R1/src/main/java/com/songoda/core/nms/v1_11_R1/world/WorldCoreImpl.java b/NMS/NMS-v1_11_R1/src/main/java/com/songoda/core/nms/v1_11_R1/world/WorldCoreImpl.java index 966be49c..15e5f026 100644 --- a/NMS/NMS-v1_11_R1/src/main/java/com/songoda/core/nms/v1_11_R1/world/WorldCoreImpl.java +++ b/NMS/NMS-v1_11_R1/src/main/java/com/songoda/core/nms/v1_11_R1/world/WorldCoreImpl.java @@ -18,6 +18,8 @@ import org.bukkit.Location; import org.bukkit.World; import org.bukkit.block.CreatureSpawner; import org.bukkit.craftbukkit.v1_11_R1.CraftChunk; +import org.bukkit.craftbukkit.v1_11_R1.block.CraftBlock; +import org.bukkit.craftbukkit.v1_11_R1.util.CraftMagicNumbers; import org.bukkit.inventory.ItemStack; public class WorldCoreImpl implements WorldCore { @@ -85,4 +87,14 @@ public class WorldCoreImpl implements WorldCore { } } } + + @Override + public void updateAdjacentComparators(org.bukkit.block.Block bukkitBlock) { + CraftBlock craftBlock = (CraftBlock) bukkitBlock; + CraftChunk craftChunk = (CraftChunk) bukkitBlock.getChunk(); + net.minecraft.server.v1_11_R1.World nmsWorld = craftChunk.getHandle().getWorld(); + + BlockPosition blockPosition = new BlockPosition(craftBlock.getX(), craftBlock.getY(), craftBlock.getZ()); + nmsWorld.updateAdjacentComparators(blockPosition, CraftMagicNumbers.getBlock(craftBlock)); + } } diff --git a/NMS/NMS-v1_12_R1/src/main/java/com/songoda/core/nms/v1_12_R1/world/WorldCoreImpl.java b/NMS/NMS-v1_12_R1/src/main/java/com/songoda/core/nms/v1_12_R1/world/WorldCoreImpl.java index 447c2624..eef44159 100644 --- a/NMS/NMS-v1_12_R1/src/main/java/com/songoda/core/nms/v1_12_R1/world/WorldCoreImpl.java +++ b/NMS/NMS-v1_12_R1/src/main/java/com/songoda/core/nms/v1_12_R1/world/WorldCoreImpl.java @@ -18,6 +18,8 @@ import org.bukkit.Location; import org.bukkit.World; import org.bukkit.block.CreatureSpawner; import org.bukkit.craftbukkit.v1_12_R1.CraftChunk; +import org.bukkit.craftbukkit.v1_12_R1.block.CraftBlock; +import org.bukkit.craftbukkit.v1_12_R1.util.CraftMagicNumbers; import org.bukkit.inventory.ItemStack; public class WorldCoreImpl implements WorldCore { @@ -85,4 +87,14 @@ public class WorldCoreImpl implements WorldCore { } } } + + @Override + public void updateAdjacentComparators(org.bukkit.block.Block bukkitBlock) { + CraftBlock craftBlock = (CraftBlock) bukkitBlock; + CraftChunk craftChunk = (CraftChunk) bukkitBlock.getChunk(); + net.minecraft.server.v1_12_R1.World nmsWorld = craftChunk.getHandle().getWorld(); + + BlockPosition blockPosition = new BlockPosition(craftBlock.getX(), craftBlock.getY(), craftBlock.getZ()); + nmsWorld.updateAdjacentComparators(blockPosition, CraftMagicNumbers.getBlock(craftBlock)); + } } diff --git a/NMS/NMS-v1_13_R1/src/main/java/com/songoda/core/nms/v1_13_R1/world/WorldCoreImpl.java b/NMS/NMS-v1_13_R1/src/main/java/com/songoda/core/nms/v1_13_R1/world/WorldCoreImpl.java index 3e34e414..a00cf41d 100644 --- a/NMS/NMS-v1_13_R1/src/main/java/com/songoda/core/nms/v1_13_R1/world/WorldCoreImpl.java +++ b/NMS/NMS-v1_13_R1/src/main/java/com/songoda/core/nms/v1_13_R1/world/WorldCoreImpl.java @@ -16,8 +16,10 @@ import net.minecraft.server.v1_13_R1.MobSpawnerAbstract; import net.minecraft.server.v1_13_R1.WorldServer; import org.bukkit.Location; import org.bukkit.World; +import org.bukkit.block.Block; import org.bukkit.block.CreatureSpawner; import org.bukkit.craftbukkit.v1_13_R1.CraftChunk; +import org.bukkit.craftbukkit.v1_13_R1.block.CraftBlock; import org.bukkit.inventory.ItemStack; public class WorldCoreImpl implements WorldCore { @@ -89,4 +91,13 @@ public class WorldCoreImpl implements WorldCore { } } } + + @Override + public void updateAdjacentComparators(Block bukkitBlock) { + CraftBlock craftBlock = (CraftBlock) bukkitBlock; + CraftChunk craftChunk = (CraftChunk) bukkitBlock.getChunk(); + + net.minecraft.server.v1_13_R1.World nmsWorld = craftChunk.getHandle().getWorld(); + nmsWorld.updateAdjacentComparators(craftBlock.getPosition(), craftBlock.getNMS().getBlock()); + } } diff --git a/NMS/NMS-v1_13_R2/src/main/java/com/songoda/core/nms/v1_13_R2/world/WorldCoreImpl.java b/NMS/NMS-v1_13_R2/src/main/java/com/songoda/core/nms/v1_13_R2/world/WorldCoreImpl.java index 28b29315..43283261 100644 --- a/NMS/NMS-v1_13_R2/src/main/java/com/songoda/core/nms/v1_13_R2/world/WorldCoreImpl.java +++ b/NMS/NMS-v1_13_R2/src/main/java/com/songoda/core/nms/v1_13_R2/world/WorldCoreImpl.java @@ -16,8 +16,10 @@ import net.minecraft.server.v1_13_R2.MobSpawnerAbstract; import net.minecraft.server.v1_13_R2.WorldServer; import org.bukkit.Location; import org.bukkit.World; +import org.bukkit.block.Block; import org.bukkit.block.CreatureSpawner; import org.bukkit.craftbukkit.v1_13_R2.CraftChunk; +import org.bukkit.craftbukkit.v1_13_R2.block.CraftBlock; import org.bukkit.inventory.ItemStack; public class WorldCoreImpl implements WorldCore { @@ -96,4 +98,13 @@ public class WorldCoreImpl implements WorldCore { chunk.world.methodProfiler.exit(); } + + @Override + public void updateAdjacentComparators(Block bukkitBlock) { + CraftBlock craftBlock = (CraftBlock) bukkitBlock; + CraftChunk craftChunk = (CraftChunk) bukkitBlock.getChunk(); + + net.minecraft.server.v1_13_R2.World nmsWorld = craftChunk.getHandle().getWorld(); + nmsWorld.updateAdjacentComparators(craftBlock.getPosition(), craftBlock.getNMS().getBlock()); + } } diff --git a/NMS/NMS-v1_14_R1/src/main/java/com/songoda/core/nms/v1_14_R1/world/WorldCoreImpl.java b/NMS/NMS-v1_14_R1/src/main/java/com/songoda/core/nms/v1_14_R1/world/WorldCoreImpl.java index 3dbffc9f..9a15ed48 100644 --- a/NMS/NMS-v1_14_R1/src/main/java/com/songoda/core/nms/v1_14_R1/world/WorldCoreImpl.java +++ b/NMS/NMS-v1_14_R1/src/main/java/com/songoda/core/nms/v1_14_R1/world/WorldCoreImpl.java @@ -18,8 +18,10 @@ import net.minecraft.server.v1_14_R1.MobSpawnerAbstract; import net.minecraft.server.v1_14_R1.WorldServer; import org.bukkit.Location; import org.bukkit.World; +import org.bukkit.block.Block; import org.bukkit.block.CreatureSpawner; import org.bukkit.craftbukkit.v1_14_R1.CraftChunk; +import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlock; import org.bukkit.inventory.ItemStack; public class WorldCoreImpl implements WorldCore { @@ -93,4 +95,13 @@ public class WorldCoreImpl implements WorldCore { profiler.exit(); } + + @Override + public void updateAdjacentComparators(Block bukkitBlock) { + CraftBlock craftBlock = (CraftBlock) bukkitBlock; + CraftChunk craftChunk = (CraftChunk) bukkitBlock.getChunk(); + + net.minecraft.server.v1_14_R1.World nmsWorld = craftChunk.getHandle().getWorld(); + nmsWorld.updateAdjacentComparators(craftBlock.getPosition(), craftBlock.getNMS().getBlock()); + } } diff --git a/NMS/NMS-v1_15_R1/src/main/java/com/songoda/core/nms/v1_15_R1/world/WorldCoreImpl.java b/NMS/NMS-v1_15_R1/src/main/java/com/songoda/core/nms/v1_15_R1/world/WorldCoreImpl.java index b32e1e7a..8810cf6a 100644 --- a/NMS/NMS-v1_15_R1/src/main/java/com/songoda/core/nms/v1_15_R1/world/WorldCoreImpl.java +++ b/NMS/NMS-v1_15_R1/src/main/java/com/songoda/core/nms/v1_15_R1/world/WorldCoreImpl.java @@ -18,8 +18,10 @@ import net.minecraft.server.v1_15_R1.MobSpawnerAbstract; import net.minecraft.server.v1_15_R1.WorldServer; import org.bukkit.Location; import org.bukkit.World; +import org.bukkit.block.Block; import org.bukkit.block.CreatureSpawner; import org.bukkit.craftbukkit.v1_15_R1.CraftChunk; +import org.bukkit.craftbukkit.v1_15_R1.block.CraftBlock; import org.bukkit.inventory.ItemStack; public class WorldCoreImpl implements WorldCore { @@ -96,4 +98,13 @@ public class WorldCoreImpl implements WorldCore { profiler.exit(); } + + @Override + public void updateAdjacentComparators(Block bukkitBlock) { + CraftBlock craftBlock = (CraftBlock) bukkitBlock; + CraftChunk craftChunk = (CraftChunk) bukkitBlock.getChunk(); + + net.minecraft.server.v1_15_R1.World nmsWorld = craftChunk.getHandle().getWorld(); + nmsWorld.updateAdjacentComparators(craftBlock.getPosition(), craftBlock.getNMS().getBlock()); + } } diff --git a/NMS/NMS-v1_16_R1/src/main/java/com/songoda/core/nms/v1_16_R1/world/WorldCoreImpl.java b/NMS/NMS-v1_16_R1/src/main/java/com/songoda/core/nms/v1_16_R1/world/WorldCoreImpl.java index b86c9568..cbe8ef07 100644 --- a/NMS/NMS-v1_16_R1/src/main/java/com/songoda/core/nms/v1_16_R1/world/WorldCoreImpl.java +++ b/NMS/NMS-v1_16_R1/src/main/java/com/songoda/core/nms/v1_16_R1/world/WorldCoreImpl.java @@ -18,8 +18,10 @@ import net.minecraft.server.v1_16_R1.MobSpawnerAbstract; import net.minecraft.server.v1_16_R1.WorldServer; import org.bukkit.Location; import org.bukkit.World; +import org.bukkit.block.Block; import org.bukkit.block.CreatureSpawner; import org.bukkit.craftbukkit.v1_16_R1.CraftChunk; +import org.bukkit.craftbukkit.v1_16_R1.block.CraftBlock; import org.bukkit.inventory.ItemStack; public class WorldCoreImpl implements WorldCore { @@ -97,4 +99,13 @@ public class WorldCoreImpl implements WorldCore { profiler.exit(); } + + @Override + public void updateAdjacentComparators(Block bukkitBlock) { + CraftBlock craftBlock = (CraftBlock) bukkitBlock; + CraftChunk craftChunk = (CraftChunk) bukkitBlock.getChunk(); + + net.minecraft.server.v1_16_R1.World nmsWorld = craftChunk.getHandle().getWorld(); + nmsWorld.updateAdjacentComparators(craftBlock.getPosition(), craftBlock.getNMS().getBlock()); + } } diff --git a/NMS/NMS-v1_16_R2/src/main/java/com/songoda/core/nms/v1_16_R2/world/WorldCoreImpl.java b/NMS/NMS-v1_16_R2/src/main/java/com/songoda/core/nms/v1_16_R2/world/WorldCoreImpl.java index bdf815df..842cf36e 100644 --- a/NMS/NMS-v1_16_R2/src/main/java/com/songoda/core/nms/v1_16_R2/world/WorldCoreImpl.java +++ b/NMS/NMS-v1_16_R2/src/main/java/com/songoda/core/nms/v1_16_R2/world/WorldCoreImpl.java @@ -18,8 +18,10 @@ import net.minecraft.server.v1_16_R2.MobSpawnerAbstract; import net.minecraft.server.v1_16_R2.WorldServer; import org.bukkit.Location; import org.bukkit.World; +import org.bukkit.block.Block; import org.bukkit.block.CreatureSpawner; import org.bukkit.craftbukkit.v1_16_R2.CraftChunk; +import org.bukkit.craftbukkit.v1_16_R2.block.CraftBlock; import org.bukkit.inventory.ItemStack; public class WorldCoreImpl implements WorldCore { @@ -97,4 +99,13 @@ public class WorldCoreImpl implements WorldCore { profiler.exit(); } + + @Override + public void updateAdjacentComparators(Block bukkitBlock) { + CraftBlock craftBlock = (CraftBlock) bukkitBlock; + CraftChunk craftChunk = (CraftChunk) bukkitBlock.getChunk(); + + net.minecraft.server.v1_16_R2.World nmsWorld = craftChunk.getHandle().getWorld(); + nmsWorld.updateAdjacentComparators(craftBlock.getPosition(), craftBlock.getNMS().getBlock()); + } } diff --git a/NMS/NMS-v1_16_R3/src/main/java/com/songoda/core/nms/v1_16_R3/world/WorldCoreImpl.java b/NMS/NMS-v1_16_R3/src/main/java/com/songoda/core/nms/v1_16_R3/world/WorldCoreImpl.java index c4b0f5c3..b1ad6147 100644 --- a/NMS/NMS-v1_16_R3/src/main/java/com/songoda/core/nms/v1_16_R3/world/WorldCoreImpl.java +++ b/NMS/NMS-v1_16_R3/src/main/java/com/songoda/core/nms/v1_16_R3/world/WorldCoreImpl.java @@ -18,8 +18,10 @@ import net.minecraft.server.v1_16_R3.MobSpawnerAbstract; import net.minecraft.server.v1_16_R3.WorldServer; import org.bukkit.Location; import org.bukkit.World; +import org.bukkit.block.Block; import org.bukkit.block.CreatureSpawner; import org.bukkit.craftbukkit.v1_16_R3.CraftChunk; +import org.bukkit.craftbukkit.v1_16_R3.block.CraftBlock; import org.bukkit.inventory.ItemStack; public class WorldCoreImpl implements WorldCore { @@ -98,4 +100,13 @@ public class WorldCoreImpl implements WorldCore { profiler.exit(); } + + @Override + public void updateAdjacentComparators(Block bukkitBlock) { + CraftBlock craftBlock = (CraftBlock) bukkitBlock; + CraftChunk craftChunk = (CraftChunk) bukkitBlock.getChunk(); + + net.minecraft.server.v1_16_R3.World nmsWorld = craftChunk.getHandle().getWorld(); + nmsWorld.updateAdjacentComparators(craftBlock.getPosition(), craftBlock.getNMS().getBlock()); + } } diff --git a/NMS/NMS-v1_17_R1/src/main/java/com/songoda/core/nms/v1_17_R1/world/WorldCoreImpl.java b/NMS/NMS-v1_17_R1/src/main/java/com/songoda/core/nms/v1_17_R1/world/WorldCoreImpl.java index 7f800f18..c1ba86ab 100644 --- a/NMS/NMS-v1_17_R1/src/main/java/com/songoda/core/nms/v1_17_R1/world/WorldCoreImpl.java +++ b/NMS/NMS-v1_17_R1/src/main/java/com/songoda/core/nms/v1_17_R1/world/WorldCoreImpl.java @@ -18,8 +18,10 @@ import net.minecraft.world.level.chunk.ChunkSection; import net.minecraft.world.level.material.Fluid; import org.bukkit.Location; import org.bukkit.World; +import org.bukkit.block.Block; import org.bukkit.block.CreatureSpawner; import org.bukkit.craftbukkit.v1_17_R1.CraftChunk; +import org.bukkit.craftbukkit.v1_17_R1.block.CraftBlock; import org.bukkit.inventory.ItemStack; public class WorldCoreImpl implements WorldCore { @@ -96,4 +98,13 @@ public class WorldCoreImpl implements WorldCore { profiler.exit(); } + + @Override + public void updateAdjacentComparators(Block bukkitBlock) { + CraftBlock craftBlock = (CraftBlock) bukkitBlock; + CraftChunk craftChunk = (CraftChunk) bukkitBlock.getChunk(); + + net.minecraft.world.level.World nmsWorld = craftChunk.getHandle().getWorld(); + nmsWorld.updateAdjacentComparators(craftBlock.getPosition(), craftBlock.getNMS().getBlock()); + } } diff --git a/NMS/NMS-v1_18_R1/src/main/java/com/songoda/core/nms/v1_18_R1/world/WorldCoreImpl.java b/NMS/NMS-v1_18_R1/src/main/java/com/songoda/core/nms/v1_18_R1/world/WorldCoreImpl.java index 88bec313..cefdd224 100644 --- a/NMS/NMS-v1_18_R1/src/main/java/com/songoda/core/nms/v1_18_R1/world/WorldCoreImpl.java +++ b/NMS/NMS-v1_18_R1/src/main/java/com/songoda/core/nms/v1_18_R1/world/WorldCoreImpl.java @@ -18,8 +18,10 @@ import net.minecraft.world.level.chunk.ChunkSection; import net.minecraft.world.level.material.Fluid; import org.bukkit.Location; import org.bukkit.World; +import org.bukkit.block.Block; import org.bukkit.block.CreatureSpawner; import org.bukkit.craftbukkit.v1_18_R1.CraftChunk; +import org.bukkit.craftbukkit.v1_18_R1.block.CraftBlock; import org.bukkit.inventory.ItemStack; public class WorldCoreImpl implements WorldCore { @@ -93,4 +95,13 @@ public class WorldCoreImpl implements WorldCore { gameprofilerfiller.c(); } + + @Override + public void updateAdjacentComparators(Block bukkitBlock) { + CraftBlock craftBlock = (CraftBlock) bukkitBlock; + CraftChunk craftChunk = (CraftChunk) bukkitBlock.getChunk(); + + WorldServer nmsWorld = craftChunk.getHandle().q; + nmsWorld.c(craftBlock.getPosition(), craftBlock.getNMS().b()); + } } diff --git a/NMS/NMS-v1_18_R2/src/main/java/com/songoda/core/nms/v1_18_R2/world/WorldCoreImpl.java b/NMS/NMS-v1_18_R2/src/main/java/com/songoda/core/nms/v1_18_R2/world/WorldCoreImpl.java index fc0198eb..bbfc8474 100644 --- a/NMS/NMS-v1_18_R2/src/main/java/com/songoda/core/nms/v1_18_R2/world/WorldCoreImpl.java +++ b/NMS/NMS-v1_18_R2/src/main/java/com/songoda/core/nms/v1_18_R2/world/WorldCoreImpl.java @@ -18,8 +18,10 @@ import net.minecraft.world.level.chunk.LevelChunkSection; import net.minecraft.world.level.material.FluidState; import org.bukkit.Location; import org.bukkit.World; +import org.bukkit.block.Block; import org.bukkit.block.CreatureSpawner; import org.bukkit.craftbukkit.v1_18_R2.CraftChunk; +import org.bukkit.craftbukkit.v1_18_R2.block.CraftBlock; import org.bukkit.inventory.ItemStack; public class WorldCoreImpl implements WorldCore { @@ -92,4 +94,13 @@ public class WorldCoreImpl implements WorldCore { gameProfilerFiller.pop(); } + + @Override + public void updateAdjacentComparators(Block bukkitBlock) { + CraftBlock craftBlock = (CraftBlock) bukkitBlock; + CraftChunk craftChunk = (CraftChunk) bukkitBlock.getChunk(); + + ServerLevel nmsWorld = craftChunk.getHandle().q; + nmsWorld.updateNeighbourForOutputSignal(craftBlock.getPosition(), craftBlock.getNMS().getBlock()); + } } diff --git a/NMS/NMS-v1_19_R1/src/main/java/com/songoda/core/nms/v1_19_R1/world/WorldCoreImpl.java b/NMS/NMS-v1_19_R1/src/main/java/com/songoda/core/nms/v1_19_R1/world/WorldCoreImpl.java index 02b63a43..ef9b1958 100644 --- a/NMS/NMS-v1_19_R1/src/main/java/com/songoda/core/nms/v1_19_R1/world/WorldCoreImpl.java +++ b/NMS/NMS-v1_19_R1/src/main/java/com/songoda/core/nms/v1_19_R1/world/WorldCoreImpl.java @@ -18,8 +18,10 @@ import net.minecraft.world.level.chunk.LevelChunkSection; import net.minecraft.world.level.material.FluidState; import org.bukkit.Location; import org.bukkit.World; +import org.bukkit.block.Block; import org.bukkit.block.CreatureSpawner; import org.bukkit.craftbukkit.v1_19_R1.CraftChunk; +import org.bukkit.craftbukkit.v1_19_R1.block.CraftBlock; import org.bukkit.inventory.ItemStack; public class WorldCoreImpl implements WorldCore { @@ -90,4 +92,13 @@ public class WorldCoreImpl implements WorldCore { } } } + + @Override + public void updateAdjacentComparators(Block bukkitBlock) { + CraftBlock craftBlock = (CraftBlock) bukkitBlock; + CraftChunk craftChunk = (CraftChunk) bukkitBlock.getChunk(); + + ServerLevel nmsWorld = craftChunk.getHandle().q; + nmsWorld.updateNeighbourForOutputSignal(craftBlock.getPosition(), craftBlock.getNMS().getBlock()); + } } diff --git a/NMS/NMS-v1_19_R1v2/src/main/java/com/songoda/core/nms/v1_19_R1v2/world/WorldCoreImpl.java b/NMS/NMS-v1_19_R1v2/src/main/java/com/songoda/core/nms/v1_19_R1v2/world/WorldCoreImpl.java index 496fa18e..b0015e23 100644 --- a/NMS/NMS-v1_19_R1v2/src/main/java/com/songoda/core/nms/v1_19_R1v2/world/WorldCoreImpl.java +++ b/NMS/NMS-v1_19_R1v2/src/main/java/com/songoda/core/nms/v1_19_R1v2/world/WorldCoreImpl.java @@ -18,8 +18,10 @@ import net.minecraft.world.level.chunk.LevelChunkSection; import net.minecraft.world.level.material.FluidState; import org.bukkit.Location; import org.bukkit.World; +import org.bukkit.block.Block; import org.bukkit.block.CreatureSpawner; import org.bukkit.craftbukkit.v1_19_R1.CraftChunk; +import org.bukkit.craftbukkit.v1_19_R1.block.CraftBlock; import org.bukkit.inventory.ItemStack; public class WorldCoreImpl implements WorldCore { @@ -90,4 +92,13 @@ public class WorldCoreImpl implements WorldCore { } } } + + @Override + public void updateAdjacentComparators(Block bukkitBlock) { + CraftBlock craftBlock = (CraftBlock) bukkitBlock; + CraftChunk craftChunk = (CraftChunk) bukkitBlock.getChunk(); + + ServerLevel nmsWorld = craftChunk.getHandle().q; + nmsWorld.updateNeighbourForOutputSignal(craftBlock.getPosition(), craftBlock.getNMS().getBlock()); + } } diff --git a/NMS/NMS-v1_19_R2/src/main/java/com/songoda/core/nms/v1_19_R2/world/WorldCoreImpl.java b/NMS/NMS-v1_19_R2/src/main/java/com/songoda/core/nms/v1_19_R2/world/WorldCoreImpl.java index c616f9ff..cd919101 100644 --- a/NMS/NMS-v1_19_R2/src/main/java/com/songoda/core/nms/v1_19_R2/world/WorldCoreImpl.java +++ b/NMS/NMS-v1_19_R2/src/main/java/com/songoda/core/nms/v1_19_R2/world/WorldCoreImpl.java @@ -18,8 +18,10 @@ import net.minecraft.world.level.chunk.LevelChunkSection; import net.minecraft.world.level.material.FluidState; import org.bukkit.Location; import org.bukkit.World; +import org.bukkit.block.Block; import org.bukkit.block.CreatureSpawner; import org.bukkit.craftbukkit.v1_19_R2.CraftChunk; +import org.bukkit.craftbukkit.v1_19_R2.block.CraftBlock; import org.bukkit.inventory.ItemStack; public class WorldCoreImpl implements WorldCore { @@ -90,4 +92,13 @@ public class WorldCoreImpl implements WorldCore { } } } + + @Override + public void updateAdjacentComparators(Block bukkitBlock) { + CraftBlock craftBlock = (CraftBlock) bukkitBlock; + CraftChunk craftChunk = (CraftChunk) bukkitBlock.getChunk(); + + ServerLevel nmsWorld = craftChunk.getHandle().q; + nmsWorld.updateNeighbourForOutputSignal(craftBlock.getPosition(), craftBlock.getNMS().getBlock()); + } } diff --git a/NMS/NMS-v1_19_R3/src/main/java/com/songoda/core/nms/v1_19_R3/world/WorldCoreImpl.java b/NMS/NMS-v1_19_R3/src/main/java/com/songoda/core/nms/v1_19_R3/world/WorldCoreImpl.java index 5a84efc4..1a3b56ca 100644 --- a/NMS/NMS-v1_19_R3/src/main/java/com/songoda/core/nms/v1_19_R3/world/WorldCoreImpl.java +++ b/NMS/NMS-v1_19_R3/src/main/java/com/songoda/core/nms/v1_19_R3/world/WorldCoreImpl.java @@ -19,8 +19,10 @@ import net.minecraft.world.level.chunk.LevelChunkSection; import net.minecraft.world.level.material.FluidState; import org.bukkit.Location; import org.bukkit.World; +import org.bukkit.block.Block; import org.bukkit.block.CreatureSpawner; import org.bukkit.craftbukkit.v1_19_R3.CraftChunk; +import org.bukkit.craftbukkit.v1_19_R3.block.CraftBlock; import org.bukkit.inventory.ItemStack; public class WorldCoreImpl implements WorldCore { @@ -91,4 +93,13 @@ public class WorldCoreImpl implements WorldCore { } } } + + @Override + public void updateAdjacentComparators(Block bukkitBlock) { + CraftBlock craftBlock = (CraftBlock) bukkitBlock; + CraftChunk craftChunk = (CraftChunk) bukkitBlock.getChunk(); + LevelChunk nmsChunk = (LevelChunk) craftChunk.getHandle(ChunkStatus.FULL); + + nmsChunk.q.updateNeighbourForOutputSignal(craftBlock.getPosition(), craftBlock.getNMS().getBlock()); + } } diff --git a/NMS/NMS-v1_8_R1/src/main/java/com/songoda/core/nms/v1_8_R1/world/WorldCoreImpl.java b/NMS/NMS-v1_8_R1/src/main/java/com/songoda/core/nms/v1_8_R1/world/WorldCoreImpl.java index 2c024638..abd021ad 100644 --- a/NMS/NMS-v1_8_R1/src/main/java/com/songoda/core/nms/v1_8_R1/world/WorldCoreImpl.java +++ b/NMS/NMS-v1_8_R1/src/main/java/com/songoda/core/nms/v1_8_R1/world/WorldCoreImpl.java @@ -18,6 +18,8 @@ import org.bukkit.Location; import org.bukkit.World; import org.bukkit.block.CreatureSpawner; import org.bukkit.craftbukkit.v1_8_R1.CraftChunk; +import org.bukkit.craftbukkit.v1_8_R1.block.CraftBlock; +import org.bukkit.craftbukkit.v1_8_R1.util.CraftMagicNumbers; import org.bukkit.inventory.ItemStack; public class WorldCoreImpl implements WorldCore { @@ -87,4 +89,14 @@ public class WorldCoreImpl implements WorldCore { } } } + + @Override + public void updateAdjacentComparators(org.bukkit.block.Block bukkitBlock) { + CraftBlock craftBlock = (CraftBlock) bukkitBlock; + CraftChunk craftChunk = (CraftChunk) bukkitBlock.getChunk(); + net.minecraft.server.v1_8_R1.World nmsWorld = craftChunk.getHandle().getWorld(); + + BlockPosition blockPosition = new BlockPosition(craftBlock.getX(), craftBlock.getY(), craftBlock.getZ()); + nmsWorld.updateAdjacentComparators(blockPosition, CraftMagicNumbers.getBlock(craftBlock)); + } } diff --git a/NMS/NMS-v1_8_R2/src/main/java/com/songoda/core/nms/v1_8_R2/world/WorldCoreImpl.java b/NMS/NMS-v1_8_R2/src/main/java/com/songoda/core/nms/v1_8_R2/world/WorldCoreImpl.java index bd0d76bc..158e7a2a 100644 --- a/NMS/NMS-v1_8_R2/src/main/java/com/songoda/core/nms/v1_8_R2/world/WorldCoreImpl.java +++ b/NMS/NMS-v1_8_R2/src/main/java/com/songoda/core/nms/v1_8_R2/world/WorldCoreImpl.java @@ -18,6 +18,8 @@ import org.bukkit.Location; import org.bukkit.World; import org.bukkit.block.CreatureSpawner; import org.bukkit.craftbukkit.v1_8_R2.CraftChunk; +import org.bukkit.craftbukkit.v1_8_R2.block.CraftBlock; +import org.bukkit.craftbukkit.v1_8_R2.util.CraftMagicNumbers; import org.bukkit.inventory.ItemStack; public class WorldCoreImpl implements WorldCore { @@ -87,4 +89,14 @@ public class WorldCoreImpl implements WorldCore { } } } + + @Override + public void updateAdjacentComparators(org.bukkit.block.Block bukkitBlock) { + CraftBlock craftBlock = (CraftBlock) bukkitBlock; + CraftChunk craftChunk = (CraftChunk) bukkitBlock.getChunk(); + net.minecraft.server.v1_8_R2.World nmsWorld = craftChunk.getHandle().getWorld(); + + BlockPosition blockPosition = new BlockPosition(craftBlock.getX(), craftBlock.getY(), craftBlock.getZ()); + nmsWorld.updateAdjacentComparators(blockPosition, CraftMagicNumbers.getBlock(craftBlock)); + } } diff --git a/NMS/NMS-v1_8_R3/src/main/java/com/songoda/core/nms/v1_8_R3/world/WorldCoreImpl.java b/NMS/NMS-v1_8_R3/src/main/java/com/songoda/core/nms/v1_8_R3/world/WorldCoreImpl.java index 45fcb655..bba6b4f7 100644 --- a/NMS/NMS-v1_8_R3/src/main/java/com/songoda/core/nms/v1_8_R3/world/WorldCoreImpl.java +++ b/NMS/NMS-v1_8_R3/src/main/java/com/songoda/core/nms/v1_8_R3/world/WorldCoreImpl.java @@ -18,6 +18,8 @@ import org.bukkit.Location; import org.bukkit.World; import org.bukkit.block.CreatureSpawner; import org.bukkit.craftbukkit.v1_8_R3.CraftChunk; +import org.bukkit.craftbukkit.v1_8_R3.block.CraftBlock; +import org.bukkit.craftbukkit.v1_8_R3.util.CraftMagicNumbers; import org.bukkit.inventory.ItemStack; public class WorldCoreImpl implements WorldCore { @@ -86,4 +88,14 @@ public class WorldCoreImpl implements WorldCore { } } } + + @Override + public void updateAdjacentComparators(org.bukkit.block.Block bukkitBlock) { + CraftBlock craftBlock = (CraftBlock) bukkitBlock; + CraftChunk craftChunk = (CraftChunk) bukkitBlock.getChunk(); + net.minecraft.server.v1_8_R3.World nmsWorld = craftChunk.getHandle().getWorld(); + + BlockPosition blockPosition = new BlockPosition(craftBlock.getX(), craftBlock.getY(), craftBlock.getZ()); + nmsWorld.updateAdjacentComparators(blockPosition, CraftMagicNumbers.getBlock(craftBlock)); + } } diff --git a/NMS/NMS-v1_9_R1/src/main/java/com/songoda/core/nms/v1_9_R1/world/WorldCoreImpl.java b/NMS/NMS-v1_9_R1/src/main/java/com/songoda/core/nms/v1_9_R1/world/WorldCoreImpl.java index 66c3e421..1cf86d79 100644 --- a/NMS/NMS-v1_9_R1/src/main/java/com/songoda/core/nms/v1_9_R1/world/WorldCoreImpl.java +++ b/NMS/NMS-v1_9_R1/src/main/java/com/songoda/core/nms/v1_9_R1/world/WorldCoreImpl.java @@ -18,6 +18,8 @@ import org.bukkit.Location; import org.bukkit.World; import org.bukkit.block.CreatureSpawner; import org.bukkit.craftbukkit.v1_9_R1.CraftChunk; +import org.bukkit.craftbukkit.v1_9_R1.block.CraftBlock; +import org.bukkit.craftbukkit.v1_9_R1.util.CraftMagicNumbers; import org.bukkit.inventory.ItemStack; public class WorldCoreImpl implements WorldCore { @@ -86,4 +88,14 @@ public class WorldCoreImpl implements WorldCore { } } } + + @Override + public void updateAdjacentComparators(org.bukkit.block.Block bukkitBlock) { + CraftBlock craftBlock = (CraftBlock) bukkitBlock; + CraftChunk craftChunk = (CraftChunk) bukkitBlock.getChunk(); + net.minecraft.server.v1_9_R1.World nmsWorld = craftChunk.getHandle().getWorld(); + + BlockPosition blockPosition = new BlockPosition(craftBlock.getX(), craftBlock.getY(), craftBlock.getZ()); + nmsWorld.updateAdjacentComparators(blockPosition, CraftMagicNumbers.getBlock(craftBlock)); + } } diff --git a/NMS/NMS-v1_9_R2/src/main/java/com/songoda/core/nms/v1_9_R2/world/WorldCoreImpl.java b/NMS/NMS-v1_9_R2/src/main/java/com/songoda/core/nms/v1_9_R2/world/WorldCoreImpl.java index 5dfeba18..41091719 100644 --- a/NMS/NMS-v1_9_R2/src/main/java/com/songoda/core/nms/v1_9_R2/world/WorldCoreImpl.java +++ b/NMS/NMS-v1_9_R2/src/main/java/com/songoda/core/nms/v1_9_R2/world/WorldCoreImpl.java @@ -18,6 +18,8 @@ import org.bukkit.Location; import org.bukkit.World; import org.bukkit.block.CreatureSpawner; import org.bukkit.craftbukkit.v1_9_R2.CraftChunk; +import org.bukkit.craftbukkit.v1_9_R2.block.CraftBlock; +import org.bukkit.craftbukkit.v1_9_R2.util.CraftMagicNumbers; import org.bukkit.inventory.ItemStack; public class WorldCoreImpl implements WorldCore { @@ -85,4 +87,14 @@ public class WorldCoreImpl implements WorldCore { } } } + + @Override + public void updateAdjacentComparators(org.bukkit.block.Block bukkitBlock) { + CraftBlock craftBlock = (CraftBlock) bukkitBlock; + CraftChunk craftChunk = (CraftChunk) bukkitBlock.getChunk(); + net.minecraft.server.v1_9_R2.World nmsWorld = craftChunk.getHandle().getWorld(); + + BlockPosition blockPosition = new BlockPosition(craftBlock.getX(), craftBlock.getY(), craftBlock.getZ()); + nmsWorld.updateAdjacentComparators(blockPosition, CraftMagicNumbers.getBlock(craftBlock)); + } } From eb76ba47ee4120ce75ccf53e998d4bf95be8fe2e Mon Sep 17 00:00:00 2001 From: Christian Koop Date: Wed, 19 Apr 2023 21:51:42 +0200 Subject: [PATCH 17/22] Deprecate the ClassMapping and MethodMapping classes They are a huge pain to maintain... I should have put a stronger word against this when it got added... --- .../java/com/songoda/core/compatibility/ClassMapping.java | 4 ++++ .../java/com/songoda/core/compatibility/MethodMapping.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/Compatibility/src/main/java/com/songoda/core/compatibility/ClassMapping.java b/Compatibility/src/main/java/com/songoda/core/compatibility/ClassMapping.java index 4fe950f7..4087cc18 100644 --- a/Compatibility/src/main/java/com/songoda/core/compatibility/ClassMapping.java +++ b/Compatibility/src/main/java/com/songoda/core/compatibility/ClassMapping.java @@ -1,5 +1,9 @@ package com.songoda.core.compatibility; +/** + * @deprecated Usage is highly discouraged – use NMSManager instead + */ +@Deprecated public enum ClassMapping { BIOME_BASE("world.level.biome", "BiomeBase"), BIOME_STORAGE("world.level.chunk", "BiomeStorage"), diff --git a/Compatibility/src/main/java/com/songoda/core/compatibility/MethodMapping.java b/Compatibility/src/main/java/com/songoda/core/compatibility/MethodMapping.java index 640a1c1b..39d6c394 100644 --- a/Compatibility/src/main/java/com/songoda/core/compatibility/MethodMapping.java +++ b/Compatibility/src/main/java/com/songoda/core/compatibility/MethodMapping.java @@ -5,6 +5,10 @@ import org.bukkit.inventory.ItemStack; import java.lang.reflect.Method; +/** + * @deprecated Usage is highly discouraged – use NMSManager instead + */ +@Deprecated public enum MethodMapping { MC_ITEM_STACK__GET_TAG("getTag", "getTag", "s", "t", "u"), MC_ITEM_STACK__SET_TAG("setTag", "setTag", "c", "c", "c", ClassMapping.NBT_TAG_COMPOUND.getClazz()), From 9361fad0bf1372dd95319af06f1887292006a23f Mon Sep 17 00:00:00 2001 From: Christian Koop Date: Sat, 22 Apr 2023 15:18:29 +0200 Subject: [PATCH 18/22] Deprecate BlockUtils and BlockUtilsModern classes --- Core/src/main/java/com/songoda/core/utils/BlockUtils.java | 4 ++++ .../main/java/com/songoda/core/utils/BlockUtilsModern.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/Core/src/main/java/com/songoda/core/utils/BlockUtils.java b/Core/src/main/java/com/songoda/core/utils/BlockUtils.java index 314feee9..d6d97d77 100644 --- a/Core/src/main/java/com/songoda/core/utils/BlockUtils.java +++ b/Core/src/main/java/com/songoda/core/utils/BlockUtils.java @@ -20,6 +20,10 @@ import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; +/** + * @deprecated This class will be removed in the future and replaced with a more maintainable system. + */ +@Deprecated public class BlockUtils { protected static final Set DOORS; protected static final Set PRESSURE_PLATES; diff --git a/Core/src/main/java/com/songoda/core/utils/BlockUtilsModern.java b/Core/src/main/java/com/songoda/core/utils/BlockUtilsModern.java index 9eff9b46..08e1a7ee 100644 --- a/Core/src/main/java/com/songoda/core/utils/BlockUtilsModern.java +++ b/Core/src/main/java/com/songoda/core/utils/BlockUtilsModern.java @@ -22,6 +22,10 @@ import java.lang.reflect.Method; import java.util.logging.Level; import java.util.logging.Logger; +/** + * @deprecated This class will be removed in the future and replaced with a more maintainable system. + */ +@Deprecated public class BlockUtilsModern { protected static void _updatePressurePlateModern(Block plate, int power) { BlockData blockData = plate.getBlockData(); From 8d9508413710e7dd2d6e3e0f3e1dc265635906c6 Mon Sep 17 00:00:00 2001 From: Christian Koop Date: Sat, 22 Apr 2023 16:13:01 +0200 Subject: [PATCH 19/22] Adds missing Spawn Eggs to CompatibleMaterial, added in Minecraft 1.19.3 fixes #46 --- .../com/songoda/core/compatibility/CompatibleMaterial.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Compatibility/src/main/java/com/songoda/core/compatibility/CompatibleMaterial.java b/Compatibility/src/main/java/com/songoda/core/compatibility/CompatibleMaterial.java index f56914ba..0558dce3 100644 --- a/Compatibility/src/main/java/com/songoda/core/compatibility/CompatibleMaterial.java +++ b/Compatibility/src/main/java/com/songoda/core/compatibility/CompatibleMaterial.java @@ -32,6 +32,12 @@ public enum CompatibleMaterial { DARK_OAK_DOOR_ITEM(431), */ + /* 1.19.3 */ + ENDER_DRAGON_SPAWN_EGG(), + IRON_GOLEM_SPAWN_EGG(), + SNOW_GOLEM_SPAWN_EGG(), + WITHER_SPAWN_EGG(), + /* 1.19 */ ACACIA_CHEST_BOAT(), ALLAY_SPAWN_EGG(), From 7a7d2e8b9757305a5a6d917ab4df50608d38a7ef Mon Sep 17 00:00:00 2001 From: Christian Koop Date: Wed, 19 Apr 2023 21:52:21 +0200 Subject: [PATCH 20/22] Release v2.6.20 --- Compatibility/pom.xml | 2 +- Core/pom.xml | 2 +- Core/src/main/java/com/songoda/core/SongodaCore.java | 2 +- NMS/NMS-API/pom.xml | 2 +- NMS/NMS-v1_10_R1/pom.xml | 2 +- NMS/NMS-v1_11_R1/pom.xml | 2 +- NMS/NMS-v1_12_R1/pom.xml | 2 +- NMS/NMS-v1_13_R1/pom.xml | 2 +- NMS/NMS-v1_13_R2/pom.xml | 2 +- NMS/NMS-v1_14_R1/pom.xml | 2 +- NMS/NMS-v1_15_R1/pom.xml | 2 +- NMS/NMS-v1_16_R1/pom.xml | 2 +- NMS/NMS-v1_16_R2/pom.xml | 2 +- NMS/NMS-v1_16_R3/pom.xml | 2 +- NMS/NMS-v1_17_R1/pom.xml | 2 +- NMS/NMS-v1_18_R1/pom.xml | 2 +- NMS/NMS-v1_18_R2/pom.xml | 2 +- NMS/NMS-v1_19_R1/pom.xml | 2 +- NMS/NMS-v1_19_R1v2/pom.xml | 2 +- NMS/NMS-v1_19_R2/pom.xml | 2 +- NMS/NMS-v1_19_R3/pom.xml | 2 +- NMS/NMS-v1_8_R1/pom.xml | 2 +- NMS/NMS-v1_8_R2/pom.xml | 2 +- NMS/NMS-v1_8_R3/pom.xml | 2 +- NMS/NMS-v1_9_R1/pom.xml | 2 +- NMS/NMS-v1_9_R2/pom.xml | 2 +- pom.xml | 2 +- 27 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Compatibility/pom.xml b/Compatibility/pom.xml index 3c34e61d..9d94b4da 100644 --- a/Compatibility/pom.xml +++ b/Compatibility/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.19 + 2.6.20 ../pom.xml diff --git a/Core/pom.xml b/Core/pom.xml index d62fab4c..6efa329c 100644 --- a/Core/pom.xml +++ b/Core/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.19 + 2.6.20 ../pom.xml diff --git a/Core/src/main/java/com/songoda/core/SongodaCore.java b/Core/src/main/java/com/songoda/core/SongodaCore.java index 9ef03580..c6023751 100644 --- a/Core/src/main/java/com/songoda/core/SongodaCore.java +++ b/Core/src/main/java/com/songoda/core/SongodaCore.java @@ -55,7 +55,7 @@ public class SongodaCore { /** * @since coreRevision 6 */ - private final static String coreVersion = "2.6.19"; + private final static String coreVersion = "2.6.20"; /** * This is specific to the website api diff --git a/NMS/NMS-API/pom.xml b/NMS/NMS-API/pom.xml index 54653ced..05888076 100644 --- a/NMS/NMS-API/pom.xml +++ b/NMS/NMS-API/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.19 + 2.6.20 ../../pom.xml diff --git a/NMS/NMS-v1_10_R1/pom.xml b/NMS/NMS-v1_10_R1/pom.xml index 3eedb030..db30de3d 100644 --- a/NMS/NMS-v1_10_R1/pom.xml +++ b/NMS/NMS-v1_10_R1/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.19 + 2.6.20 ../../pom.xml diff --git a/NMS/NMS-v1_11_R1/pom.xml b/NMS/NMS-v1_11_R1/pom.xml index 0c9f6cf1..fb523499 100644 --- a/NMS/NMS-v1_11_R1/pom.xml +++ b/NMS/NMS-v1_11_R1/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.19 + 2.6.20 ../../pom.xml diff --git a/NMS/NMS-v1_12_R1/pom.xml b/NMS/NMS-v1_12_R1/pom.xml index 55f19bb1..dc37b0c7 100644 --- a/NMS/NMS-v1_12_R1/pom.xml +++ b/NMS/NMS-v1_12_R1/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.19 + 2.6.20 ../../pom.xml diff --git a/NMS/NMS-v1_13_R1/pom.xml b/NMS/NMS-v1_13_R1/pom.xml index b8275b07..a4179b3c 100644 --- a/NMS/NMS-v1_13_R1/pom.xml +++ b/NMS/NMS-v1_13_R1/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.19 + 2.6.20 ../../pom.xml diff --git a/NMS/NMS-v1_13_R2/pom.xml b/NMS/NMS-v1_13_R2/pom.xml index adf4ea90..8a9404e4 100644 --- a/NMS/NMS-v1_13_R2/pom.xml +++ b/NMS/NMS-v1_13_R2/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.19 + 2.6.20 ../../pom.xml diff --git a/NMS/NMS-v1_14_R1/pom.xml b/NMS/NMS-v1_14_R1/pom.xml index e3516501..452fdc9b 100644 --- a/NMS/NMS-v1_14_R1/pom.xml +++ b/NMS/NMS-v1_14_R1/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.19 + 2.6.20 ../../pom.xml diff --git a/NMS/NMS-v1_15_R1/pom.xml b/NMS/NMS-v1_15_R1/pom.xml index 5b2d8e47..8ff64932 100644 --- a/NMS/NMS-v1_15_R1/pom.xml +++ b/NMS/NMS-v1_15_R1/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.19 + 2.6.20 ../../pom.xml diff --git a/NMS/NMS-v1_16_R1/pom.xml b/NMS/NMS-v1_16_R1/pom.xml index 5f4ba56d..d1564071 100644 --- a/NMS/NMS-v1_16_R1/pom.xml +++ b/NMS/NMS-v1_16_R1/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.19 + 2.6.20 ../../pom.xml diff --git a/NMS/NMS-v1_16_R2/pom.xml b/NMS/NMS-v1_16_R2/pom.xml index 1cf5ed06..089771bd 100644 --- a/NMS/NMS-v1_16_R2/pom.xml +++ b/NMS/NMS-v1_16_R2/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.19 + 2.6.20 ../../pom.xml diff --git a/NMS/NMS-v1_16_R3/pom.xml b/NMS/NMS-v1_16_R3/pom.xml index 680b913f..f5635c9c 100644 --- a/NMS/NMS-v1_16_R3/pom.xml +++ b/NMS/NMS-v1_16_R3/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.19 + 2.6.20 ../../pom.xml diff --git a/NMS/NMS-v1_17_R1/pom.xml b/NMS/NMS-v1_17_R1/pom.xml index 21e00633..748d2638 100644 --- a/NMS/NMS-v1_17_R1/pom.xml +++ b/NMS/NMS-v1_17_R1/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.19 + 2.6.20 ../../pom.xml diff --git a/NMS/NMS-v1_18_R1/pom.xml b/NMS/NMS-v1_18_R1/pom.xml index 5e1dbb91..6f99c559 100644 --- a/NMS/NMS-v1_18_R1/pom.xml +++ b/NMS/NMS-v1_18_R1/pom.xml @@ -19,7 +19,7 @@ com.songoda SongodaCore-Modules - 2.6.19 + 2.6.20 ../../pom.xml diff --git a/NMS/NMS-v1_18_R2/pom.xml b/NMS/NMS-v1_18_R2/pom.xml index 65ce83a2..d7f5c630 100644 --- a/NMS/NMS-v1_18_R2/pom.xml +++ b/NMS/NMS-v1_18_R2/pom.xml @@ -60,7 +60,7 @@ com.songoda SongodaCore-Modules - 2.6.19 + 2.6.20 ../../pom.xml diff --git a/NMS/NMS-v1_19_R1/pom.xml b/NMS/NMS-v1_19_R1/pom.xml index 078319cc..52adb7d8 100644 --- a/NMS/NMS-v1_19_R1/pom.xml +++ b/NMS/NMS-v1_19_R1/pom.xml @@ -60,7 +60,7 @@ com.songoda SongodaCore-Modules - 2.6.19 + 2.6.20 ../../pom.xml diff --git a/NMS/NMS-v1_19_R1v2/pom.xml b/NMS/NMS-v1_19_R1v2/pom.xml index 69bab071..e0e3e858 100644 --- a/NMS/NMS-v1_19_R1v2/pom.xml +++ b/NMS/NMS-v1_19_R1v2/pom.xml @@ -60,7 +60,7 @@ com.songoda SongodaCore-Modules - 2.6.19 + 2.6.20 ../../pom.xml diff --git a/NMS/NMS-v1_19_R2/pom.xml b/NMS/NMS-v1_19_R2/pom.xml index 0773ce86..b0a69d5f 100644 --- a/NMS/NMS-v1_19_R2/pom.xml +++ b/NMS/NMS-v1_19_R2/pom.xml @@ -60,7 +60,7 @@ com.songoda SongodaCore-Modules - 2.6.19 + 2.6.20 ../../pom.xml diff --git a/NMS/NMS-v1_19_R3/pom.xml b/NMS/NMS-v1_19_R3/pom.xml index 1b638b7b..a85a5de6 100644 --- a/NMS/NMS-v1_19_R3/pom.xml +++ b/NMS/NMS-v1_19_R3/pom.xml @@ -60,7 +60,7 @@ com.songoda SongodaCore-Modules - 2.6.19 + 2.6.20 ../../pom.xml diff --git a/NMS/NMS-v1_8_R1/pom.xml b/NMS/NMS-v1_8_R1/pom.xml index 5f774ddd..035cb273 100644 --- a/NMS/NMS-v1_8_R1/pom.xml +++ b/NMS/NMS-v1_8_R1/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.19 + 2.6.20 ../../pom.xml diff --git a/NMS/NMS-v1_8_R2/pom.xml b/NMS/NMS-v1_8_R2/pom.xml index 281344d2..2f28a5a9 100644 --- a/NMS/NMS-v1_8_R2/pom.xml +++ b/NMS/NMS-v1_8_R2/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.19 + 2.6.20 ../../pom.xml diff --git a/NMS/NMS-v1_8_R3/pom.xml b/NMS/NMS-v1_8_R3/pom.xml index 2af8c463..078f178b 100644 --- a/NMS/NMS-v1_8_R3/pom.xml +++ b/NMS/NMS-v1_8_R3/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.19 + 2.6.20 ../../pom.xml diff --git a/NMS/NMS-v1_9_R1/pom.xml b/NMS/NMS-v1_9_R1/pom.xml index 214d23c7..98cdbaeb 100644 --- a/NMS/NMS-v1_9_R1/pom.xml +++ b/NMS/NMS-v1_9_R1/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.19 + 2.6.20 ../../pom.xml diff --git a/NMS/NMS-v1_9_R2/pom.xml b/NMS/NMS-v1_9_R2/pom.xml index 7a564fc7..fc03e492 100644 --- a/NMS/NMS-v1_9_R2/pom.xml +++ b/NMS/NMS-v1_9_R2/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.19 + 2.6.20 ../../pom.xml diff --git a/pom.xml b/pom.xml index 2ba3e4f0..47277582 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.songoda SongodaCore-Modules - 2.6.19 + 2.6.20 pom From 06761c001c0fb9c2b5ceec1d703238ccdbc14014 Mon Sep 17 00:00:00 2001 From: Christian Koop Date: Sat, 29 Apr 2023 11:56:04 +0200 Subject: [PATCH 21/22] Fix plugin cmd list displayed in Action Bar instead of the chat 1.19.3+ The boolean flag determines 'whether the message is an actionbar or chat message'. We want to have it set to `false` here. Reference: https://wiki.vg/index.php?title=Protocol&oldid=18120#System_Chat_Message --- Core/src/main/java/com/songoda/core/chat/ChatMessage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/src/main/java/com/songoda/core/chat/ChatMessage.java b/Core/src/main/java/com/songoda/core/chat/ChatMessage.java index 07fab7f8..2094d233 100644 --- a/Core/src/main/java/com/songoda/core/chat/ChatMessage.java +++ b/Core/src/main/java/com/songoda/core/chat/ChatMessage.java @@ -227,7 +227,7 @@ public class ChatMessage { Object packet; if (ServerVersion.isServerVersionAtLeast(ServerVersion.V1_19)) { - packet = mc_PacketPlayOutChat_new.newInstance(mc_IChatBaseComponent_ChatSerializer_a.invoke(null, gson.toJson(textList)), mc_PacketPlayOutChat_new_1_19_0 ? 1 : true); + packet = mc_PacketPlayOutChat_new.newInstance(mc_IChatBaseComponent_ChatSerializer_a.invoke(null, gson.toJson(textList)), mc_PacketPlayOutChat_new_1_19_0 ? 1 : false); }else if (ServerVersion.isServerVersionAtLeast(ServerVersion.V1_16)) { packet = mc_PacketPlayOutChat_new.newInstance( mc_IChatBaseComponent_ChatSerializer_a.invoke(null, gson.toJson(textList)), From 0a0848c8570687e5ff3f5f30aae7c98cd63be9ac Mon Sep 17 00:00:00 2001 From: Christian Koop Date: Sat, 29 Apr 2023 12:37:40 +0200 Subject: [PATCH 22/22] Release v2.6.21 --- Compatibility/pom.xml | 2 +- Core/pom.xml | 2 +- Core/src/main/java/com/songoda/core/SongodaCore.java | 2 +- NMS/NMS-API/pom.xml | 2 +- NMS/NMS-v1_10_R1/pom.xml | 2 +- NMS/NMS-v1_11_R1/pom.xml | 2 +- NMS/NMS-v1_12_R1/pom.xml | 2 +- NMS/NMS-v1_13_R1/pom.xml | 2 +- NMS/NMS-v1_13_R2/pom.xml | 2 +- NMS/NMS-v1_14_R1/pom.xml | 2 +- NMS/NMS-v1_15_R1/pom.xml | 2 +- NMS/NMS-v1_16_R1/pom.xml | 2 +- NMS/NMS-v1_16_R2/pom.xml | 2 +- NMS/NMS-v1_16_R3/pom.xml | 2 +- NMS/NMS-v1_17_R1/pom.xml | 2 +- NMS/NMS-v1_18_R1/pom.xml | 2 +- NMS/NMS-v1_18_R2/pom.xml | 2 +- NMS/NMS-v1_19_R1/pom.xml | 2 +- NMS/NMS-v1_19_R1v2/pom.xml | 2 +- NMS/NMS-v1_19_R2/pom.xml | 2 +- NMS/NMS-v1_19_R3/pom.xml | 2 +- NMS/NMS-v1_8_R1/pom.xml | 2 +- NMS/NMS-v1_8_R2/pom.xml | 2 +- NMS/NMS-v1_8_R3/pom.xml | 2 +- NMS/NMS-v1_9_R1/pom.xml | 2 +- NMS/NMS-v1_9_R2/pom.xml | 2 +- pom.xml | 2 +- 27 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Compatibility/pom.xml b/Compatibility/pom.xml index 9d94b4da..dc0f42e9 100644 --- a/Compatibility/pom.xml +++ b/Compatibility/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.20 + 2.6.21 ../pom.xml diff --git a/Core/pom.xml b/Core/pom.xml index 6efa329c..3ec36712 100644 --- a/Core/pom.xml +++ b/Core/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.20 + 2.6.21 ../pom.xml diff --git a/Core/src/main/java/com/songoda/core/SongodaCore.java b/Core/src/main/java/com/songoda/core/SongodaCore.java index c6023751..0d3e0653 100644 --- a/Core/src/main/java/com/songoda/core/SongodaCore.java +++ b/Core/src/main/java/com/songoda/core/SongodaCore.java @@ -55,7 +55,7 @@ public class SongodaCore { /** * @since coreRevision 6 */ - private final static String coreVersion = "2.6.20"; + private final static String coreVersion = "2.6.21"; /** * This is specific to the website api diff --git a/NMS/NMS-API/pom.xml b/NMS/NMS-API/pom.xml index 05888076..87a4b50b 100644 --- a/NMS/NMS-API/pom.xml +++ b/NMS/NMS-API/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.20 + 2.6.21 ../../pom.xml diff --git a/NMS/NMS-v1_10_R1/pom.xml b/NMS/NMS-v1_10_R1/pom.xml index db30de3d..d92e5390 100644 --- a/NMS/NMS-v1_10_R1/pom.xml +++ b/NMS/NMS-v1_10_R1/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.20 + 2.6.21 ../../pom.xml diff --git a/NMS/NMS-v1_11_R1/pom.xml b/NMS/NMS-v1_11_R1/pom.xml index fb523499..553f3ed9 100644 --- a/NMS/NMS-v1_11_R1/pom.xml +++ b/NMS/NMS-v1_11_R1/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.20 + 2.6.21 ../../pom.xml diff --git a/NMS/NMS-v1_12_R1/pom.xml b/NMS/NMS-v1_12_R1/pom.xml index dc37b0c7..579dd688 100644 --- a/NMS/NMS-v1_12_R1/pom.xml +++ b/NMS/NMS-v1_12_R1/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.20 + 2.6.21 ../../pom.xml diff --git a/NMS/NMS-v1_13_R1/pom.xml b/NMS/NMS-v1_13_R1/pom.xml index a4179b3c..5fc70233 100644 --- a/NMS/NMS-v1_13_R1/pom.xml +++ b/NMS/NMS-v1_13_R1/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.20 + 2.6.21 ../../pom.xml diff --git a/NMS/NMS-v1_13_R2/pom.xml b/NMS/NMS-v1_13_R2/pom.xml index 8a9404e4..09bf4cbc 100644 --- a/NMS/NMS-v1_13_R2/pom.xml +++ b/NMS/NMS-v1_13_R2/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.20 + 2.6.21 ../../pom.xml diff --git a/NMS/NMS-v1_14_R1/pom.xml b/NMS/NMS-v1_14_R1/pom.xml index 452fdc9b..41bb3d30 100644 --- a/NMS/NMS-v1_14_R1/pom.xml +++ b/NMS/NMS-v1_14_R1/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.20 + 2.6.21 ../../pom.xml diff --git a/NMS/NMS-v1_15_R1/pom.xml b/NMS/NMS-v1_15_R1/pom.xml index 8ff64932..ebcde45c 100644 --- a/NMS/NMS-v1_15_R1/pom.xml +++ b/NMS/NMS-v1_15_R1/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.20 + 2.6.21 ../../pom.xml diff --git a/NMS/NMS-v1_16_R1/pom.xml b/NMS/NMS-v1_16_R1/pom.xml index d1564071..800e99f6 100644 --- a/NMS/NMS-v1_16_R1/pom.xml +++ b/NMS/NMS-v1_16_R1/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.20 + 2.6.21 ../../pom.xml diff --git a/NMS/NMS-v1_16_R2/pom.xml b/NMS/NMS-v1_16_R2/pom.xml index 089771bd..d3eeb8d2 100644 --- a/NMS/NMS-v1_16_R2/pom.xml +++ b/NMS/NMS-v1_16_R2/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.20 + 2.6.21 ../../pom.xml diff --git a/NMS/NMS-v1_16_R3/pom.xml b/NMS/NMS-v1_16_R3/pom.xml index f5635c9c..203a99f3 100644 --- a/NMS/NMS-v1_16_R3/pom.xml +++ b/NMS/NMS-v1_16_R3/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.20 + 2.6.21 ../../pom.xml diff --git a/NMS/NMS-v1_17_R1/pom.xml b/NMS/NMS-v1_17_R1/pom.xml index 748d2638..101edd00 100644 --- a/NMS/NMS-v1_17_R1/pom.xml +++ b/NMS/NMS-v1_17_R1/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.20 + 2.6.21 ../../pom.xml diff --git a/NMS/NMS-v1_18_R1/pom.xml b/NMS/NMS-v1_18_R1/pom.xml index 6f99c559..ad448eed 100644 --- a/NMS/NMS-v1_18_R1/pom.xml +++ b/NMS/NMS-v1_18_R1/pom.xml @@ -19,7 +19,7 @@ com.songoda SongodaCore-Modules - 2.6.20 + 2.6.21 ../../pom.xml diff --git a/NMS/NMS-v1_18_R2/pom.xml b/NMS/NMS-v1_18_R2/pom.xml index d7f5c630..fec27385 100644 --- a/NMS/NMS-v1_18_R2/pom.xml +++ b/NMS/NMS-v1_18_R2/pom.xml @@ -60,7 +60,7 @@ com.songoda SongodaCore-Modules - 2.6.20 + 2.6.21 ../../pom.xml diff --git a/NMS/NMS-v1_19_R1/pom.xml b/NMS/NMS-v1_19_R1/pom.xml index 52adb7d8..703f3c39 100644 --- a/NMS/NMS-v1_19_R1/pom.xml +++ b/NMS/NMS-v1_19_R1/pom.xml @@ -60,7 +60,7 @@ com.songoda SongodaCore-Modules - 2.6.20 + 2.6.21 ../../pom.xml diff --git a/NMS/NMS-v1_19_R1v2/pom.xml b/NMS/NMS-v1_19_R1v2/pom.xml index e0e3e858..8dd02dd0 100644 --- a/NMS/NMS-v1_19_R1v2/pom.xml +++ b/NMS/NMS-v1_19_R1v2/pom.xml @@ -60,7 +60,7 @@ com.songoda SongodaCore-Modules - 2.6.20 + 2.6.21 ../../pom.xml diff --git a/NMS/NMS-v1_19_R2/pom.xml b/NMS/NMS-v1_19_R2/pom.xml index b0a69d5f..66321cb1 100644 --- a/NMS/NMS-v1_19_R2/pom.xml +++ b/NMS/NMS-v1_19_R2/pom.xml @@ -60,7 +60,7 @@ com.songoda SongodaCore-Modules - 2.6.20 + 2.6.21 ../../pom.xml diff --git a/NMS/NMS-v1_19_R3/pom.xml b/NMS/NMS-v1_19_R3/pom.xml index a85a5de6..b067de76 100644 --- a/NMS/NMS-v1_19_R3/pom.xml +++ b/NMS/NMS-v1_19_R3/pom.xml @@ -60,7 +60,7 @@ com.songoda SongodaCore-Modules - 2.6.20 + 2.6.21 ../../pom.xml diff --git a/NMS/NMS-v1_8_R1/pom.xml b/NMS/NMS-v1_8_R1/pom.xml index 035cb273..d175279d 100644 --- a/NMS/NMS-v1_8_R1/pom.xml +++ b/NMS/NMS-v1_8_R1/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.20 + 2.6.21 ../../pom.xml diff --git a/NMS/NMS-v1_8_R2/pom.xml b/NMS/NMS-v1_8_R2/pom.xml index 2f28a5a9..7705dfe3 100644 --- a/NMS/NMS-v1_8_R2/pom.xml +++ b/NMS/NMS-v1_8_R2/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.20 + 2.6.21 ../../pom.xml diff --git a/NMS/NMS-v1_8_R3/pom.xml b/NMS/NMS-v1_8_R3/pom.xml index 078f178b..5e034f78 100644 --- a/NMS/NMS-v1_8_R3/pom.xml +++ b/NMS/NMS-v1_8_R3/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.20 + 2.6.21 ../../pom.xml diff --git a/NMS/NMS-v1_9_R1/pom.xml b/NMS/NMS-v1_9_R1/pom.xml index 98cdbaeb..fe3acd62 100644 --- a/NMS/NMS-v1_9_R1/pom.xml +++ b/NMS/NMS-v1_9_R1/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.20 + 2.6.21 ../../pom.xml diff --git a/NMS/NMS-v1_9_R2/pom.xml b/NMS/NMS-v1_9_R2/pom.xml index fc03e492..25899bc2 100644 --- a/NMS/NMS-v1_9_R2/pom.xml +++ b/NMS/NMS-v1_9_R2/pom.xml @@ -7,7 +7,7 @@ com.songoda SongodaCore-Modules - 2.6.20 + 2.6.21 ../../pom.xml diff --git a/pom.xml b/pom.xml index 47277582..fda2bfe2 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.songoda SongodaCore-Modules - 2.6.20 + 2.6.21 pom