Skip to content

Correctif de l'erreur lors d'un click en inventaire #1309

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PuppyTransGirl merged 2 commits into from
May 24, 2026
Merged

Correctif de l'erreur lors d'un click en inventaire #1309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ad60b4
rename PacketListener in MainMenuListener
iambibi May 24, 2026
5e92e3f
rename PacketListener in PacketMenuListener + fix Field index 0 out o…
iambibi May 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/fr/openmc/api/packetmenulib/PacketMenuLib.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ public final class PacketMenuLib {
@Getter
private static final Map<UUID, Integer> 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);
}

/**
Expand Down
9 changes: 5 additions & 4 deletions ...nmc/api/packetmenulib/PacketListener.java → ...api/packetmenulib/PacketMenuListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/fr/openmc/core/features/mainmenu/MainMenu.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -20,7 +20,7 @@
public class MainMenu extends Feature implements NotInUnitTest, LoadAfterItemsAdder, LoadIfEnable<ProtocolLibHook>, HasCommands {
@Override
public void init() {
new PacketListener(OMCPlugin.getInstance());
new MainMenuListener(OMCPlugin.getInstance());
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions ...es/mainmenu/listeners/PacketListener.java → .../mainmenu/listeners/MainMenuListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@

import java.util.*;

public class PacketListener implements Listener {
public class MainMenuListener implements Listener {

private final ClientboundUpdateAdvancementsPacket advancementPacket;
@Getter
private static final Map<UUID, ClientboundUpdateAdvancementsPacket> advancementPackets = new HashMap<>();
@Getter
private static final List<UUID> enabledAdvancements = new ArrayList<>();

public PacketListener(OMCPlugin plugin) {
public MainMenuListener(OMCPlugin plugin) {
Bukkit.getPluginManager().registerEvents(this, plugin);
advancementPacket = createEmptyAdvancementPacket();
}
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/fr/openmc/core/features/mainmenu/menus/Page1.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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));
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/fr/openmc/core/features/mainmenu/menus/Page2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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));
Expand Down
Loading