Repo-Mirror/craft-engine
9
0
Fork 0
mirror of https://github.com/Xiao-MoMi/craft-engine.git synced 2025-12-20 15:39:22 +00:00
Code Issues Releases Activity

避免被找茬

Browse Source
This commit is contained in:
jhqwqmc
2025-11-19 11:41:00 +08:00
parent 3e53b3c084
commit d6ca20e80a
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
bukkit/compatibility/src/main/java/net/momirealms/craftengine/bukkit/compatibility/papi/CheckItemExpansion.java
View File

@@ -1,7 +1,6 @@
package net.momirealms.craftengine.bukkit.compatibility.papi; package net.momirealms.craftengine.bukkit.compatibility.papi;
import me.clip.placeholderapi.expansion.PlaceholderExpansion; import me.clip.placeholderapi.expansion.PlaceholderExpansion;
import net.momirealms.craftengine.bukkit.item.BukkitItemManager;
import net.momirealms.craftengine.bukkit.nms.FastNMS; import net.momirealms.craftengine.bukkit.nms.FastNMS;
import net.momirealms.craftengine.bukkit.plugin.BukkitCraftEngine; import net.momirealms.craftengine.bukkit.plugin.BukkitCraftEngine;
import net.momirealms.craftengine.bukkit.plugin.user.BukkitServerPlayer; import net.momirealms.craftengine.bukkit.plugin.user.BukkitServerPlayer;
@@ -24,21 +23,18 @@ public class CheckItemExpansion extends PlaceholderExpansion {
this.plugin = plugin; this.plugin = plugin;
} }
@NotNull
@Override @Override
public String getIdentifier() { public @NotNull String getIdentifier() {
return "checkceitem"; return "checkceitem";
} }
@NotNull
@Override @Override
public String getAuthor() { public @NotNull String getAuthor() {
return "jhqwqmc"; return "jhqwqmc";
} }
@NotNull
@Override @Override
public String getVersion() { public @NotNull String getVersion() {
return "1.0"; return "1.0";
} }
@@ -74,7 +70,6 @@ public class CheckItemExpansion extends PlaceholderExpansion {
try { try {
requiredAmount = param.length < 3 ? 1 : Integer.parseInt(param[2]); requiredAmount = param.length < 3 ? 1 : Integer.parseInt(param[2]);
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
this.plugin.logger().warn("Invalid amount: " + param[2], e);
yield null; yield null;
} }
if (requiredAmount < 1) yield "true"; if (requiredAmount < 1) yield "true";
@@ -106,8 +101,7 @@ public class CheckItemExpansion extends PlaceholderExpansion {
try { try {
int slot = Integer.parseInt(param[0]); int slot = Integer.parseInt(param[0]);
yield player.getItemBySlot(Math.max(slot, 0)); yield player.getItemBySlot(Math.max(slot, 0));
} catch (NumberFormatException | ArrayIndexOutOfBoundsException e) { } catch (NumberFormatException e) {
this.plugin.logger().warn("Invalid slot: " + param[0], e);
yield null; yield null;
} }
} }
@@ -116,7 +110,7 @@ public class CheckItemExpansion extends PlaceholderExpansion {
private int getItemCount(BukkitServerPlayer player, String[] param) { private int getItemCount(BukkitServerPlayer player, String[] param) {
Key itemId = Key.of(param[0], param[1]); Key itemId = Key.of(param[0], param[1]);
Predicate<Object> predicate = nmsStack -> BukkitItemManager.instance().wrap(ItemStackUtils.asCraftMirror(nmsStack)).id().equals(itemId); Predicate<Object> predicate = nmsStack -> this.plugin.itemManager().wrap(ItemStackUtils.asCraftMirror(nmsStack)).id().equals(itemId);
Object inventory = FastNMS.INSTANCE.method$Player$getInventory(player.serverPlayer()); Object inventory = FastNMS.INSTANCE.method$Player$getInventory(player.serverPlayer());
Object inventoryMenu = FastNMS.INSTANCE.field$Player$inventoryMenu(player.serverPlayer()); Object inventoryMenu = FastNMS.INSTANCE.field$Player$inventoryMenu(player.serverPlayer());
Object craftSlots = FastNMS.INSTANCE.method$InventoryMenu$getCraftSlots(inventoryMenu); Object craftSlots = FastNMS.INSTANCE.method$InventoryMenu$getCraftSlots(inventoryMenu);