From 0d3eb6ea8455b2f1437c1d2395244d16d53a2859 Mon Sep 17 00:00:00 2001 From: XiaoMoMi Date: Sun, 28 Dec 2025 19:52:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E4=B8=80=E5=B0=8F=E9=83=A8=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../craftengine/core/item/AbstractItemManager.java | 2 +- .../craftengine/core/item/ItemProcessorFactory.java | 4 ++-- .../craftengine/core/item/processor/IdProcessor.java | 12 ++++++------ .../core/item/processor/ItemProcessor.java | 6 +++--- .../core/item/processor/ItemProcessorType.java | 2 +- .../craftengine/core/registry/BuiltInRegistries.java | 3 ++- .../craftengine/core/registry/Registries.java | 3 ++- 7 files changed, 17 insertions(+), 15 deletions(-) diff --git a/core/src/main/java/net/momirealms/craftengine/core/item/AbstractItemManager.java b/core/src/main/java/net/momirealms/craftengine/core/item/AbstractItemManager.java index 3b6b2d0e3..be5385367 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/item/AbstractItemManager.java +++ b/core/src/main/java/net/momirealms/craftengine/core/item/AbstractItemManager.java @@ -603,7 +603,7 @@ public abstract class AbstractItemManager extends AbstractModelGenerator impl // 如果不是原版物品，那么加入ce的标识符 if (!isVanillaItem) - itemBuilder.dataModifier(new IdProcessor<>(id)); + itemBuilder.dataModifier(new IdProcessor(id)); // 事件 Map>> eventTriggerListMap; diff --git a/core/src/main/java/net/momirealms/craftengine/core/item/ItemProcessorFactory.java b/core/src/main/java/net/momirealms/craftengine/core/item/ItemProcessorFactory.java index 8e3aac5ab..52eb62df3 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/item/ItemProcessorFactory.java +++ b/core/src/main/java/net/momirealms/craftengine/core/item/ItemProcessorFactory.java @@ -2,7 +2,7 @@ package net.momirealms.craftengine.core.item; import net.momirealms.craftengine.core.item.processor.ItemProcessor; -public interface ItemProcessorFactory { +public interface ItemProcessorFactory { - ItemProcessor create(Object arg); + T create(Object arg); } diff --git a/core/src/main/java/net/momirealms/craftengine/core/item/processor/IdProcessor.java b/core/src/main/java/net/momirealms/craftengine/core/item/processor/IdProcessor.java index ac42c108b..c5d3806b5 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/item/processor/IdProcessor.java +++ b/core/src/main/java/net/momirealms/craftengine/core/item/processor/IdProcessor.java @@ -5,9 +5,9 @@ import net.momirealms.craftengine.core.item.ItemBuildContext; import net.momirealms.craftengine.core.item.ItemProcessorFactory; import net.momirealms.craftengine.core.util.Key; -public class IdProcessor implements ItemProcessor { +public class IdProcessor implements ItemProcessor { public static final String CRAFT_ENGINE_ID = "craftengine:id"; - public static final ItemProcessorFactory FACTORY = new Factory<>(); + public static final ItemProcessorFactory FACTORY = new Factory(); private final Key argument; public IdProcessor(Key argument) { @@ -19,17 +19,17 @@ public class IdProcessor implements ItemProcessor { } @Override - public Item apply(Item item, ItemBuildContext context) { + public Item apply(Item item, ItemBuildContext context) { item.customId(this.argument); return item; } - private static class Factory implements ItemProcessorFactory { + private static class Factory implements ItemProcessorFactory { @Override - public ItemProcessor create(Object arg) { + public IdProcessor create(Object arg) { String id = arg.toString(); - return new IdProcessor<>(Key.of(id)); + return new IdProcessor(Key.of(id)); } } } diff --git a/core/src/main/java/net/momirealms/craftengine/core/item/processor/ItemProcessor.java b/core/src/main/java/net/momirealms/craftengine/core/item/processor/ItemProcessor.java index 6231646d0..661496897 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/item/processor/ItemProcessor.java +++ b/core/src/main/java/net/momirealms/craftengine/core/item/processor/ItemProcessor.java @@ -4,11 +4,11 @@ import net.momirealms.craftengine.core.item.Item; import net.momirealms.craftengine.core.item.ItemBuildContext; import net.momirealms.sparrow.nbt.CompoundTag; -public interface ItemProcessor { +public interface ItemProcessor { - Item apply(Item item, ItemBuildContext context); + Item apply(Item item, ItemBuildContext context); - default Item prepareNetworkItem(Item item, ItemBuildContext context, CompoundTag networkData) { + default Item prepareNetworkItem(Item item, ItemBuildContext context, CompoundTag networkData) { return item; } } diff --git a/core/src/main/java/net/momirealms/craftengine/core/item/processor/ItemProcessorType.java b/core/src/main/java/net/momirealms/craftengine/core/item/processor/ItemProcessorType.java index b5154e2e8..ef3657306 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/item/processor/ItemProcessorType.java +++ b/core/src/main/java/net/momirealms/craftengine/core/item/processor/ItemProcessorType.java @@ -3,5 +3,5 @@ package net.momirealms.craftengine.core.item.processor; import net.momirealms.craftengine.core.item.ItemProcessorFactory; import net.momirealms.craftengine.core.util.Key; -public record ItemProcessorType(Key id, ItemProcessorFactory factory) { +public record ItemProcessorType(Key id, ItemProcessorFactory factory) { } diff --git a/core/src/main/java/net/momirealms/craftengine/core/registry/BuiltInRegistries.java b/core/src/main/java/net/momirealms/craftengine/core/registry/BuiltInRegistries.java index 1f643f31d..2aff93d1c 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/registry/BuiltInRegistries.java +++ b/core/src/main/java/net/momirealms/craftengine/core/registry/BuiltInRegistries.java @@ -18,6 +18,7 @@ import net.momirealms.craftengine.core.item.behavior.ItemBehavior; import net.momirealms.craftengine.core.item.behavior.ItemBehaviorType; import net.momirealms.craftengine.core.item.equipment.Equipment; import net.momirealms.craftengine.core.item.equipment.EquipmentType; +import net.momirealms.craftengine.core.item.processor.ItemProcessor; import net.momirealms.craftengine.core.item.processor.ItemProcessorType; import net.momirealms.craftengine.core.item.recipe.CustomSmithingTransformRecipe; import net.momirealms.craftengine.core.item.recipe.Recipe; @@ -65,7 +66,7 @@ import net.momirealms.craftengine.core.util.ResourceKey; public final class BuiltInRegistries { public static final Registry BLOCK = createDynamicBoundRegistry(Registries.BLOCK, 512); public static final Registry> BLOCK_BEHAVIOR_TYPE = createConstantBoundRegistry(Registries.BLOCK_BEHAVIOR_TYPE, 64); - public static final Registry> ITEM_PROCESSOR_TYPE = createConstantBoundRegistry(Registries.ITEM_PROCESSOR_TYPE, 64); + public static final Registry> ITEM_PROCESSOR_TYPE = createConstantBoundRegistry(Registries.ITEM_PROCESSOR_TYPE, 64); public static final Registry> ITEM_BEHAVIOR_TYPE = createConstantBoundRegistry(Registries.ITEM_BEHAVIOR_TYPE, 64); public static final Registry>> PROPERTY_TYPE = createConstantBoundRegistry(Registries.PROPERTY_TYPE, 16); public static final Registry> LOOT_FUNCTION_TYPE = createConstantBoundRegistry(Registries.LOOT_FUNCTION_TYPE, 32); diff --git a/core/src/main/java/net/momirealms/craftengine/core/registry/Registries.java b/core/src/main/java/net/momirealms/craftengine/core/registry/Registries.java index 24ce76c49..f13ddf7f4 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/registry/Registries.java +++ b/core/src/main/java/net/momirealms/craftengine/core/registry/Registries.java @@ -18,6 +18,7 @@ import net.momirealms.craftengine.core.item.behavior.ItemBehavior; import net.momirealms.craftengine.core.item.behavior.ItemBehaviorType; import net.momirealms.craftengine.core.item.equipment.Equipment; import net.momirealms.craftengine.core.item.equipment.EquipmentType; +import net.momirealms.craftengine.core.item.processor.ItemProcessor; import net.momirealms.craftengine.core.item.processor.ItemProcessorType; import net.momirealms.craftengine.core.item.recipe.CustomSmithingTransformRecipe; import net.momirealms.craftengine.core.item.recipe.Recipe; @@ -68,7 +69,7 @@ public final class Registries { public static final Key ROOT_REGISTRY = Key.withDefaultNamespace("root"); public static final ResourceKey> BLOCK = ResourceKey.create(ROOT_REGISTRY, Key.withDefaultNamespace("block")); - public static final ResourceKey>> ITEM_PROCESSOR_TYPE = ResourceKey.create(ROOT_REGISTRY, Key.withDefaultNamespace("item_processor_type")); + public static final ResourceKey>> ITEM_PROCESSOR_TYPE = ResourceKey.create(ROOT_REGISTRY, Key.withDefaultNamespace("item_processor_type")); public static final ResourceKey>>> PROPERTY_TYPE = ResourceKey.create(ROOT_REGISTRY, Key.withDefaultNamespace("property_type")); public static final ResourceKey>> BLOCK_BEHAVIOR_TYPE = ResourceKey.create(ROOT_REGISTRY, Key.withDefaultNamespace("block_behavior_type")); public static final ResourceKey>> ITEM_BEHAVIOR_TYPE = ResourceKey.create(ROOT_REGISTRY, Key.withDefaultNamespace("item_behavior_type"));