From 6ad60b442f476ca224bd3452e47ca461262aa342 Mon Sep 17 00:00:00 2001 From: iambibi_ <89582596+iambibi@users.noreply.github.com> Date: Sun, 24 May 2026 15:22:41 +0200 Subject: [PATCH 1/2] rename PacketListener in MainMenuListener --- .../java/fr/openmc/core/features/mainmenu/MainMenu.java | 4 ++-- .../{PacketListener.java => MainMenuListener.java} | 4 ++-- .../java/fr/openmc/core/features/mainmenu/menus/Page1.java | 6 +++--- .../java/fr/openmc/core/features/mainmenu/menus/Page2.java | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) rename src/main/java/fr/openmc/core/features/mainmenu/listeners/{PacketListener.java => MainMenuListener.java} (98%) diff --git a/src/main/java/fr/openmc/core/features/mainmenu/MainMenu.java b/src/main/java/fr/openmc/core/features/mainmenu/MainMenu.java index 8306523e6..a5983c947 100644 --- a/src/main/java/fr/openmc/core/features/mainmenu/MainMenu.java +++ b/src/main/java/fr/openmc/core/features/mainmenu/MainMenu.java @@ -9,7 +9,7 @@ import fr.openmc.core.bootstrap.features.types.LoadIfEnable; import fr.openmc.core.bootstrap.features.types.NotInUnitTest; import fr.openmc.core.features.mainmenu.commands.MainMenuCommand; -import fr.openmc.core.features.mainmenu.listeners.PacketListener; +import fr.openmc.core.features.mainmenu.listeners.MainMenuListener; import fr.openmc.core.features.mainmenu.menus.Page1; import fr.openmc.core.hooks.ProtocolLibHook; import org.bukkit.entity.Player; @@ -20,7 +20,7 @@ public class MainMenu extends Feature implements NotInUnitTest, LoadAfterItemsAdder, LoadIfEnable, HasCommands { @Override public void init() { - new PacketListener(OMCPlugin.getInstance()); + new MainMenuListener(OMCPlugin.getInstance()); } @Override diff --git a/src/main/java/fr/openmc/core/features/mainmenu/listeners/PacketListener.java b/src/main/java/fr/openmc/core/features/mainmenu/listeners/MainMenuListener.java similarity index 98% rename from src/main/java/fr/openmc/core/features/mainmenu/listeners/PacketListener.java rename to src/main/java/fr/openmc/core/features/mainmenu/listeners/MainMenuListener.java index 1ab6dd1fe..557c7a622 100644 --- a/src/main/java/fr/openmc/core/features/mainmenu/listeners/PacketListener.java +++ b/src/main/java/fr/openmc/core/features/mainmenu/listeners/MainMenuListener.java @@ -29,7 +29,7 @@ import java.util.*; -public class PacketListener implements Listener { +public class MainMenuListener implements Listener { private final ClientboundUpdateAdvancementsPacket advancementPacket; @Getter @@ -37,7 +37,7 @@ public class PacketListener implements Listener { @Getter private static final List enabledAdvancements = new ArrayList<>(); - public PacketListener(OMCPlugin plugin) { + public MainMenuListener(OMCPlugin plugin) { Bukkit.getPluginManager().registerEvents(this, plugin); advancementPacket = createEmptyAdvancementPacket(); } diff --git a/src/main/java/fr/openmc/core/features/mainmenu/menus/Page1.java b/src/main/java/fr/openmc/core/features/mainmenu/menus/Page1.java index 0c0a09696..11bb0be1d 100644 --- a/src/main/java/fr/openmc/core/features/mainmenu/menus/Page1.java +++ b/src/main/java/fr/openmc/core/features/mainmenu/menus/Page1.java @@ -22,7 +22,7 @@ import fr.openmc.core.features.events.contents.weeklyevents.contents.contest.models.ContestData; import fr.openmc.core.features.homes.command.TpHomeCommand; import fr.openmc.core.features.mailboxes.commands.MailboxCommand; -import fr.openmc.core.features.mainmenu.listeners.PacketListener; +import fr.openmc.core.features.mainmenu.listeners.MainMenuListener; import fr.openmc.core.features.milestones.menus.MainMilestonesMenu; import fr.openmc.core.features.quests.command.QuestCommand; import fr.openmc.core.features.settings.command.SettingsCommand; @@ -251,12 +251,12 @@ public void onInventoryClick(InventoryClickEvent event) { PacketMenuLib.closeMenu(player); Bukkit.getScheduler().runTask(OMCPlugin.getInstance(), () -> { ServerPlayer nmsPlayer = ((CraftPlayer) player).getHandle(); - ClientboundUpdateAdvancementsPacket packet = PacketListener.getAdvancementPackets().get(nmsPlayer.getUUID()); + ClientboundUpdateAdvancementsPacket packet = MainMenuListener.getAdvancementPackets().get(nmsPlayer.getUUID()); if (packet == null) return; nmsPlayer.connection.send(packet); - PacketListener.getEnabledAdvancements().add(nmsPlayer.getUUID()); + MainMenuListener.getEnabledAdvancements().add(nmsPlayer.getUUID()); Component message = Component.text("Appuyez sur la touche '").color(NamedTextColor.GREEN) .append(Component.keybind("key.advancements").color(NamedTextColor.YELLOW)) .append(Component.text("' pour ouvrir le menu des Avancements.", NamedTextColor.GREEN)); diff --git a/src/main/java/fr/openmc/core/features/mainmenu/menus/Page2.java b/src/main/java/fr/openmc/core/features/mainmenu/menus/Page2.java index 77ccf82fa..1adacc4b3 100644 --- a/src/main/java/fr/openmc/core/features/mainmenu/menus/Page2.java +++ b/src/main/java/fr/openmc/core/features/mainmenu/menus/Page2.java @@ -11,7 +11,7 @@ import fr.openmc.core.features.dream.DreamUtils; import fr.openmc.core.features.economy.commands.BankCommands; import fr.openmc.core.features.mailboxes.commands.MailboxCommand; -import fr.openmc.core.features.mainmenu.listeners.PacketListener; +import fr.openmc.core.features.mainmenu.listeners.MainMenuListener; import fr.openmc.core.features.settings.command.SettingsCommand; import fr.openmc.core.utils.text.messages.MessageType; import fr.openmc.core.utils.text.messages.MessagesManager; @@ -171,12 +171,12 @@ public void onInventoryClick(InventoryClickEvent event) { PacketMenuLib.closeMenu(player); Bukkit.getScheduler().runTask(OMCPlugin.getInstance(), () -> { ServerPlayer nmsPlayer = ((CraftPlayer) player).getHandle(); - ClientboundUpdateAdvancementsPacket packet = PacketListener.getAdvancementPackets().get(nmsPlayer.getUUID()); + ClientboundUpdateAdvancementsPacket packet = MainMenuListener.getAdvancementPackets().get(nmsPlayer.getUUID()); if (packet == null) return; nmsPlayer.connection.send(packet); - PacketListener.getEnabledAdvancements().add(nmsPlayer.getUUID()); + MainMenuListener.getEnabledAdvancements().add(nmsPlayer.getUUID()); Component message = Component.text("Appuyez sur la touche '").color(NamedTextColor.GREEN) .append(Component.keybind("key.advancements").color(NamedTextColor.YELLOW)) .append(Component.text("' pour ouvrir le menu des avancements.", NamedTextColor.GREEN)); From 5e92e3fd1e00c496db9d04ca12442890cbf7a308 Mon Sep 17 00:00:00 2001 From: iambibi_ <89582596+iambibi@users.noreply.github.com> Date: Sun, 24 May 2026 15:24:22 +0200 Subject: [PATCH 2/2] rename PacketListener in PacketMenuListener + fix Field index 0 out of bound for 0 --- .../java/fr/openmc/api/packetmenulib/PacketMenuLib.java | 4 ++-- .../{PacketListener.java => PacketMenuListener.java} | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) rename src/main/java/fr/openmc/api/packetmenulib/{PacketListener.java => PacketMenuListener.java} (93%) diff --git a/src/main/java/fr/openmc/api/packetmenulib/PacketMenuLib.java b/src/main/java/fr/openmc/api/packetmenulib/PacketMenuLib.java index 95c1599a7..383d6d65e 100644 --- a/src/main/java/fr/openmc/api/packetmenulib/PacketMenuLib.java +++ b/src/main/java/fr/openmc/api/packetmenulib/PacketMenuLib.java @@ -20,10 +20,10 @@ public final class PacketMenuLib { @Getter private static final Map windowIds = new HashMap<>(); @Getter - private static PacketListener packetListener; + private static PacketMenuListener packetListener; public static void init(JavaPlugin plugin) { - packetListener = new PacketListener(plugin); + packetListener = new PacketMenuListener(plugin); } /** diff --git a/src/main/java/fr/openmc/api/packetmenulib/PacketListener.java b/src/main/java/fr/openmc/api/packetmenulib/PacketMenuListener.java similarity index 93% rename from src/main/java/fr/openmc/api/packetmenulib/PacketListener.java rename to src/main/java/fr/openmc/api/packetmenulib/PacketMenuListener.java index 2a686a9a9..41a23fd0c 100644 --- a/src/main/java/fr/openmc/api/packetmenulib/PacketListener.java +++ b/src/main/java/fr/openmc/api/packetmenulib/PacketMenuListener.java @@ -10,17 +10,18 @@ import fr.openmc.api.packetmenulib.menu.ClickType; import fr.openmc.api.packetmenulib.menu.Menu; import lombok.Getter; +import net.minecraft.world.inventory.ContainerInput; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; import java.util.Objects; import java.util.UUID; -public class PacketListener extends PacketAdapter { +public class PacketMenuListener extends PacketAdapter { @Getter - private static PacketListener instance; + private static PacketMenuListener instance; - public PacketListener(Plugin plugin) { + public PacketMenuListener(Plugin plugin) { super(plugin, PacketType.Play.Client.WINDOW_CLICK, PacketType.Play.Client.CLOSE_WINDOW, PacketType.Play.Server.OPEN_WINDOW, PacketType.Play.Server.SET_SLOT); ProtocolLibrary.getProtocolManager().addPacketListener(this); instance = this; @@ -51,7 +52,7 @@ public void onPacketReceiving(PacketEvent event) { int stateId = packet.getIntegers().read(1); short slot = packet.getShorts().read(0); byte button = packet.getBytes().read(0); - int mode = ( (net.minecraft.world.inventory.ClickAction) packet.getStructures().withType(net.minecraft.world.inventory.ClickAction.class).read(0)).ordinal(); + int mode = ((ContainerInput) packet.getStructures().withType(ContainerInput.class).read(0)).ordinal(); if (PacketMenuLib.getWindowIds().containsKey(event.getPlayer().getUniqueId()) && windowId == PacketMenuLib.getWindowIds().get(event.getPlayer().getUniqueId())) { Player player = event.getPlayer();