Skip to content

Fix #216

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

Open
1robie wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Fix #216

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
0ed51c7
fix: enhance variant component initialization with error handling and…
1robie Jan 27, 2026
978b3c3
fix: shutdown register task
1robie Jan 27, 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
8 changes: 8 additions & 0 deletions Common/src/main/java/fr/maxlego08/menu/common/utils/nms/NmsVersion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,14 @@ public boolean isNewNMSVersion() {
return version >= V_1_17.version;
}

public boolean is1_11OrNewer() {
return version >= V_1_11.version;
}

public boolean is1_12OrNewer() {
return version >= V_1_12.version;
}

public boolean isNewItemStackAPI() {
return version >= V_1_21.version;
}
Expand Down
12 changes: 6 additions & 6 deletions .../src/main/java/fr/maxlego08/menu/hooks/packetevents/listener/PacketAnimationListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,9 @@ public void onPacketSend(PacketSendEvent event) {
}
};

if (Bukkit.isPrimaryThread() || this.plugin.isEnabled()) {
if (Bukkit.isPrimaryThread()) {
task.run();
} else {
} else if (this.plugin.isEnabled()) {
this.plugin.getScheduler().runNextTick(w -> task.run());
}
} else if (packetType == PacketType.Play.Server.CLOSE_WINDOW){
Expand All @@ -110,9 +110,9 @@ public void onPacketSend(PacketSendEvent event) {
}
};

if (Bukkit.isPrimaryThread() || this.plugin.isEnabled()) {
if (Bukkit.isPrimaryThread()) {
task.run();
} else {
} else if (this.plugin.isEnabled()) {
this.plugin.getScheduler().runNextTick(w -> task.run());
}
} else if (packetType == PacketType.Play.Server.WINDOW_ITEMS){
Expand Down Expand Up @@ -148,9 +148,9 @@ public void onPacketSend(PacketSendEvent event) {
}
};

if (Bukkit.isPrimaryThread() || !this.plugin.isEnabled()) {
if (Bukkit.isPrimaryThread()) {
task.run();
} else {
} else if (this.plugin.isEnabled()) {
this.plugin.getScheduler().runNextTick(w -> task.run());
}
}
Expand Down
53 changes: 39 additions & 14 deletions src/main/java/fr/maxlego08/menu/ZComponentsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import fr.maxlego08.menu.itemstack.components.spigot.SpigotVariantComponent;
import fr.maxlego08.menu.loader.components.paper.*;
import fr.maxlego08.menu.loader.components.spigot.*;
import fr.maxlego08.menu.zcore.logger.Logger;
import org.jetbrains.annotations.NotNull;

import java.util.HashMap;
Expand All @@ -28,7 +29,14 @@ private boolean isPaperAndMiniMessageEnabled(MenuPlugin plugin){
public void initializeDefaultComponents(MenuPlugin plugin) {
NmsVersion currentVersion = NmsVersion.getCurrentVersion();
if (currentVersion.isAttributItemStack()){ // 1.20.5+
this.initializeVariantComponents(plugin);
try {
this.initializeVariantComponents(plugin);
} catch (Exception e) {
if (Configuration.enableDebug) {
Logger.info("Failed to initialize variant item components:");
e.printStackTrace();
}
}

this.registerComponent(new SpigotBlockStateItemComponentLoader());
this.registerComponent(new SpigotAttributeModifiersItemComponentLoader(plugin));
Expand Down Expand Up @@ -131,32 +139,49 @@ public void initializeDefaultComponents(MenuPlugin plugin) {
}

private void initializeVariantComponents(MenuPlugin plugin) {
NmsVersion currentVersion = NmsVersion.getCurrentVersion();
VariantItemComponentLoaderFactory loaderFactory =
plugin.isPaper() ? new PaperVariantItemComponentLoader(new PaperVariantComponent())
: new SpigotVariantItemComponentLoader(new SpigotVariantComponent());

this.registerComponent(loaderFactory.getLoaderAxolotl());
this.registerComponent(loaderFactory.getLoaderCatCollar());
this.registerComponent(loaderFactory.getLoaderCatVariant());
this.registerComponent(loaderFactory.getLoaderChicken());
this.registerComponent(loaderFactory.getLoaderCow());
this.registerComponent(loaderFactory.getLoaderFox());
this.registerComponent(loaderFactory.getLoaderFrog());
this.registerComponent(loaderFactory.getLoaderHorse());
this.registerComponent(loaderFactory.getLoaderLlama());
this.registerComponent(loaderFactory.getLoaderMushroomCow());
this.registerComponent(loaderFactory.getLoaderPainting());
this.registerComponent(loaderFactory.getLoaderParrot());
this.registerComponent(loaderFactory.getLoaderPig());
this.registerComponent(loaderFactory.getLoaderRabbit());
this.registerComponent(loaderFactory.getLoaderSalmon());
this.registerComponent(loaderFactory.getLoaderSheep());
this.registerComponent(loaderFactory.getLoaderShulkerBox());
this.registerComponent(loaderFactory.getLoaderTropicalFishBaseColor());
this.registerComponent(loaderFactory.getLoaderTropicalFishPatternColor());
this.registerComponent(loaderFactory.getLoaderVillager());
this.registerComponent(loaderFactory.getLoaderWolfCollar());
this.registerComponent(loaderFactory.getLoaderWolfVariant());

if (currentVersion.isNewMaterial()){ // 1.13+
this.registerComponent(loaderFactory.getLoaderFox());
this.registerComponent(loaderFactory.getLoaderMushroomCow());
}
if (currentVersion.isNewNMSVersion()){ // 1.17+
this.registerComponent(loaderFactory.getLoaderAxolotl());
}
if (currentVersion.isAttributItemStack()){ // 1.20.5+
this.registerComponent(loaderFactory.getLoaderWolfCollar());
this.registerComponent(loaderFactory.getLoaderWolfVariant());
this.registerComponent(loaderFactory.getLoaderPainting());
}
if (currentVersion.is1_21_5OrNewer()){ // 1.21.5+
this.registerComponent(loaderFactory.getLoaderChicken());
this.registerComponent(loaderFactory.getLoaderCow());
this.registerComponent(loaderFactory.getLoaderPig());
}
if (currentVersion.isNewNBTVersion()) { // 1.18+
this.registerComponent(loaderFactory.getLoaderFrog());
}
if (currentVersion.is1_11OrNewer()){ // 1.11+
this.registerComponent(loaderFactory.getLoaderLlama());
this.registerComponent(loaderFactory.getLoaderShulkerBox());
}
if (currentVersion.is1_12OrNewer()) { // 1.12+
this.registerComponent(loaderFactory.getLoaderParrot());
}

}


Expand Down