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

修改空判断

Browse Source
This commit is contained in:
XiaoMoMi
2025-08-13 21:56:08 +08:00
parent 0ebbd5068e
commit 70b8cab056
5 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/BukkitItemManager.java
View File

@@ -368,7 +368,7 @@ public class BukkitItemManager extends AbstractItemManager<ItemStack> {
@Nullable
private ItemStack createVanillaItemStack(Key id) {
Object item = FastNMS.INSTANCE.method$Registry$getValue(MBuiltInRegistries.ITEM, KeyUtils.toResourceLocation(id));
if (item == MItems.AIR) {
if (item == MItems.AIR && !id.equals(ItemKeys.AIR)) {
return null;
}
return FastNMS.INSTANCE.method$CraftItemStack$asCraftMirror(FastNMS.INSTANCE.constructor$ItemStack(item, 1));

5
core/src/main/java/net/momirealms/craftengine/core/item/AbstractCustomItem.java
View File

@@ -101,4 +101,9 @@ public abstract class AbstractCustomItem<I> implements CustomItem<I> {
public @NotNull List<ItemBehavior> behaviors() {
return this.behaviors;
}
@Override
public boolean isEmpty() {
return false;
}
}

2
core/src/main/java/net/momirealms/craftengine/core/item/BuildableItem.java
View File

@@ -10,6 +10,8 @@ public interface BuildableItem<I> {
Item<I> buildItem(ItemBuildContext context, int count);
boolean isEmpty();
default Item<I> buildItem(Player player) {
return buildItem(ItemBuildContext.of(player));
}

5
core/src/main/java/net/momirealms/craftengine/core/item/CloneableConstantItem.java
View File

@@ -27,4 +27,9 @@ public class CloneableConstantItem<I> implements BuildableItem<I> {
public I buildItemStack(ItemBuildContext context, int count) {
return this.item.copyWithCount(count).getItem();
}
@Override
public boolean isEmpty() {
return this.item.isEmpty();
}
}

13
core/src/main/java/net/momirealms/craftengine/core/item/recipe/AbstractRecipeSerializer.java
View File

@@ -1,9 +1,6 @@
package net.momirealms.craftengine.core.item.recipe;
import net.momirealms.craftengine.core.item.CloneableConstantItem;
import net.momirealms.craftengine.core.item.CustomItem;
import net.momirealms.craftengine.core.item.Item;
import net.momirealms.craftengine.core.item.ItemManager;
import net.momirealms.craftengine.core.item.*;
import net.momirealms.craftengine.core.item.recipe.reader.VanillaRecipeReader;
import net.momirealms.craftengine.core.item.recipe.reader.VanillaRecipeReader1_20;
import net.momirealms.craftengine.core.item.recipe.reader.VanillaRecipeReader1_20_5;
@@ -72,9 +69,13 @@ public abstract class AbstractRecipeSerializer<T, R extends Recipe<T>> implement
}
String id = ResourceConfigUtils.requireNonEmptyStringOrThrow(resultMap.get("id"), "warning.config.recipe.result.missing_id");
int count = ResourceConfigUtils.getAsInt(resultMap.getOrDefault("count", 1), "count");
BuildableItem<T> resultItem = (BuildableItem<T>) CraftEngine.instance().itemManager().getBuildableItem(Key.of(id)).orElseThrow(() -> new LocalizedResourceConfigException("warning.config.recipe.invalid_result", id));
if (resultItem.isEmpty()) {
throw new LocalizedResourceConfigException("warning.config.recipe.invalid_result", id);
}
List<PostProcessor<T>> processors = ResourceConfigUtils.parseConfigAsList(resultMap.get("post-processors"), PostProcessors::fromMap);
return (CustomRecipeResult<T>) new CustomRecipeResult<>(
CraftEngine.instance().itemManager().getBuildableItem(Key.of(id)).orElseThrow(() -> new LocalizedResourceConfigException("warning.config.recipe.invalid_result", id)),
return new CustomRecipeResult<>(
resultItem,
count,
processors.isEmpty() ? null : processors.toArray(new PostProcessor[0])
);