Skip to content

Compatible with the latest version of CraftEngine #283

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
BlitzOffline merged 1 commit into from
May 24, 2026
+13 −17
Merged

Compatible with the latest version of CraftEngine #283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ spigot = "1.21.5-R0.1-SNAPSHOT"
vault = "1.7.1"
authlib = "1.5.25"
headdb = "1.3.2"
craftengine = "0.0.62"
craftengine = "26.5"
itemsadder = "3.6.3-beta-14"
nexo = "1.1.0"
oraxen = "1.190.0"
Expand Down
28 changes: 12 additions & 16 deletions src/main/java/com/extendedclip/deluxemenus/hooks/CraftEngineHook.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
package com.extendedclip.deluxemenus.hooks;

import com.extendedclip.deluxemenus.cache.SimpleCache;
import net.momirealms.craftengine.bukkit.api.BukkitAdaptors;
import net.momirealms.craftengine.bukkit.api.CraftEngineItems;
import net.momirealms.craftengine.core.item.CustomItem;
import net.momirealms.craftengine.core.util.Key;
import net.momirealms.craftengine.bukkit.item.BukkitItemDefinition;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.jetbrains.annotations.NotNull;

import java.util.Map;
import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;

public class CraftEngineHook implements ItemHook, SimpleCache {
Expand All @@ -20,36 +17,35 @@ public class CraftEngineHook implements ItemHook, SimpleCache {

@Override
public void clearCache() {
cache.clear();
this.cache.clear();
}

@Override
public ItemStack getItem(@NotNull String... arguments) {
if (arguments.length == 0) return EMPTY.clone();
String namespaceId = arguments[0];
ItemStack cached = cache.get(namespaceId);
ItemStack cached = this.cache.get(namespaceId);
if (cached != null) return cached.clone();
CustomItem<ItemStack> customItem = CraftEngineItems.byId(Key.of(namespaceId));
if (customItem == null) return EMPTY.clone();
ItemStack result = customItem.buildItemStack();
cache.put(namespaceId, result);
BukkitItemDefinition definition = CraftEngineItems.byId(namespaceId);
if (definition == null) return EMPTY.clone();
ItemStack result = definition.buildBukkitItem();
this.cache.put(namespaceId, result);
return result.clone();
}

@Override
public ItemStack getItem(@NotNull Player holder, @NotNull String... arguments) {
if (arguments.length == 0) return EMPTY.clone();
Key id = Key.of(arguments[0]);
return Optional.ofNullable(CraftEngineItems.byId(id))
.map(item -> item.buildItemStack(BukkitAdaptors.adapt(holder)))
.orElseGet(EMPTY::clone);
BukkitItemDefinition definition = CraftEngineItems.byId(arguments[0]);
if (definition == null) return EMPTY.clone();
return definition.buildBukkitItem(holder);
}

@Override
public boolean itemMatchesIdentifiers(@NotNull ItemStack item, @NotNull String... arguments) {
if (arguments.length == 0) return false;
CustomItem<ItemStack> customItem = CraftEngineItems.byItemStack(item);
return customItem != null && customItem.id().equals(Key.of(arguments[0]));
BukkitItemDefinition definition = CraftEngineItems.byItemStack(item);
return definition != null && definition.id().asString().equals(arguments[0]);
}

@Override
Expand Down
Loading