From d03460bd7b5817d2b63a1a404094f65b97ad628a Mon Sep 17 00:00:00 2001 From: C-H716 <1536152356@qq.com> Date: Sat, 15 Nov 2025 01:18:54 +0800 Subject: [PATCH] =?UTF-8?q?NBT=E5=90=88=E6=88=90=E9=85=8D=E6=96=B9?= =?UTF-8?q?=E7=94=9F=E6=88=90=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- .../ae/items/InfinityBigIntegerCellItem.java | 2 +- .../datagen/NBTShapedRecipeBuilder.java | 246 ++++++++++++++++++ .../com/extendedae_plus/init/ModItems.java | 2 +- 4 files changed, 249 insertions(+), 3 deletions(-) create mode 100644 src/main/java/com/extendedae_plus/datagen/NBTShapedRecipeBuilder.java diff --git a/build.gradle b/build.gradle index 59d2264..8d13863 100644 --- a/build.gradle +++ b/build.gradle @@ -97,7 +97,7 @@ dependencies { //aea modCompileOnly "curse.maven:advancedae-1084104:6939473" -// modRuntimeOnly "curse.maven:advancedae-1084104:6939473" + modRuntimeOnly "curse.maven:advancedae-1084104:6939473" modImplementation "mezz.jei:jei-${minecraft_version}-forge:${jei_version}" modImplementation "curse.maven:jade-324717:${jade_version}" diff --git a/src/main/java/com/extendedae_plus/ae/items/InfinityBigIntegerCellItem.java b/src/main/java/com/extendedae_plus/ae/items/InfinityBigIntegerCellItem.java index 3e5120d..627024d 100644 --- a/src/main/java/com/extendedae_plus/ae/items/InfinityBigIntegerCellItem.java +++ b/src/main/java/com/extendedae_plus/ae/items/InfinityBigIntegerCellItem.java @@ -24,7 +24,7 @@ import java.util.UUID; public class InfinityBigIntegerCellItem extends Item implements ICellWorkbenchItem { - public InfinityBigIntegerCellItem() { + public InfinityBigIntegerCellItem(Properties props) { super(new Properties().stacksTo(1).fireResistant()); } diff --git a/src/main/java/com/extendedae_plus/datagen/NBTShapedRecipeBuilder.java b/src/main/java/com/extendedae_plus/datagen/NBTShapedRecipeBuilder.java new file mode 100644 index 0000000..d06192d --- /dev/null +++ b/src/main/java/com/extendedae_plus/datagen/NBTShapedRecipeBuilder.java @@ -0,0 +1,246 @@ +package com.extendedae_plus.datagen; + +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; +import com.google.gson.JsonArray; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonPrimitive; +import net.minecraft.advancements.Advancement; +import net.minecraft.advancements.AdvancementRewards; +import net.minecraft.advancements.CriterionTriggerInstance; +import net.minecraft.advancements.RequirementsStrategy; +import net.minecraft.advancements.critereon.RecipeUnlockedTrigger; +import net.minecraft.data.recipes.CraftingRecipeBuilder; +import net.minecraft.data.recipes.FinishedRecipe; +import net.minecraft.data.recipes.RecipeBuilder; +import net.minecraft.data.recipes.RecipeCategory; +import net.minecraft.nbt.*; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.TagKey; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.crafting.CraftingBookCategory; +import net.minecraft.world.item.crafting.RecipeSerializer; +import net.minecraft.world.level.ItemLike; +import net.minecraftforge.registries.ForgeRegistries; +import org.jetbrains.annotations.NotNull; + +import javax.annotation.Nullable; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.function.Consumer; + +public class NBTShapedRecipeBuilder extends CraftingRecipeBuilder implements RecipeBuilder { + + private final RecipeCategory category; + private final ItemStack result; + private final List rows = Lists.newArrayList(); + private final Map key = Maps.newLinkedHashMap(); // 改用 JsonObject！ + private final Advancement.Builder advancement = Advancement.Builder.recipeAdvancement(); + @Nullable private String group; + private boolean showNotification = true; + + private NBTShapedRecipeBuilder(RecipeCategory category, ItemStack result) { + this.category = category; + this.result = result; + } + + public static NBTShapedRecipeBuilder shaped(RecipeCategory category, ItemStack result) { + return new NBTShapedRecipeBuilder(category, result); + } + + public static NBTShapedRecipeBuilder shaped(RecipeCategory category, ItemLike result) { + return shaped(category, new ItemStack(result)); + } + + public static NBTShapedRecipeBuilder shaped(RecipeCategory category, ItemLike result, int count) { + return shaped(category, new ItemStack(result, count)); + } + + /** 普通物品 */ + public NBTShapedRecipeBuilder define(Character symbol, ItemLike item) { + JsonObject json = new JsonObject(); + json.addProperty("item", Objects.requireNonNull(ForgeRegistries.ITEMS.getKey(item.asItem())).toString()); + this.key.put(symbol, json); + return this; + } + + public NBTShapedRecipeBuilder define(Character symbol, TagKey tag) { + JsonObject json = new JsonObject(); + json.addProperty("tag", tag.location().toString()); + this.key.put(symbol, json); + return this; + } + + /** forge:nbt 输入（无 count，结构化 NBT） */ + public NBTShapedRecipeBuilder defineNbt(Character symbol, ItemStack stackWithNbt) { + JsonObject json = new JsonObject(); + json.addProperty("type", "forge:nbt"); + json.addProperty("item", Objects.requireNonNull(ForgeRegistries.ITEMS.getKey(stackWithNbt.getItem())).toString()); + if (stackWithNbt.hasTag() && stackWithNbt.getTag() != null) { + json.add("nbt", nbtToJson(stackWithNbt.getTag())); + } + this.key.put(symbol, json); + return this; + } + + public NBTShapedRecipeBuilder pattern(String pattern) { + if (!this.rows.isEmpty() && pattern.length() != this.rows.get(0).length()) { + throw new IllegalArgumentException("Pattern must be the same width"); + } + this.rows.add(pattern); + return this; + } + + public @NotNull NBTShapedRecipeBuilder unlockedBy(@NotNull String name, @NotNull CriterionTriggerInstance criterion) { + this.advancement.addCriterion(name, criterion); + return this; + } + + public @NotNull NBTShapedRecipeBuilder group(@Nullable String group) { + this.group = group; + return this; + } + + public NBTShapedRecipeBuilder showNotification(boolean show) { + this.showNotification = show; + return this; + } + + public @NotNull Item getResult() { + return this.result.getItem(); + } + + public void save(Consumer consumer, @NotNull ResourceLocation id) { + this.ensureValid(id); + this.advancement + .parent(RecipeBuilder.ROOT_RECIPE_ADVANCEMENT) + .addCriterion("has_the_recipe", RecipeUnlockedTrigger.unlocked(id)) + .rewards(AdvancementRewards.Builder.recipe(id)) + .requirements(RequirementsStrategy.OR); + + consumer.accept(new NBTResult( + id, this.result, this.group == null ? "" : this.group, + determineBookCategory(this.category), this.rows, this.key, + this.advancement, id.withPrefix("recipes/" + this.category.getFolderName() + "/"), + this.showNotification + )); + } + + private void ensureValid(ResourceLocation id) { + if (this.rows.isEmpty()) throw new IllegalStateException("No pattern for " + id); + Set defined = Sets.newHashSet(this.key.keySet()); + defined.remove(' '); + for (String row : this.rows) { + for (int i = 0; i < row.length(); i++) { + char c = row.charAt(i); + if (!this.key.containsKey(c) && c != ' ') throw new IllegalStateException("Undefined symbol '" + c + "'"); + defined.remove(c); + } + } + if (!defined.isEmpty()) throw new IllegalStateException("Unused ingredients"); + if (this.rows.size() == 1 && this.rows.get(0).length() == 1) throw new IllegalStateException("Use shapeless"); + if (this.advancement.getCriteria().isEmpty()) throw new IllegalStateException("No unlock criterion"); + } + + /** NBT → JsonElement（结构化） */ + private static JsonElement nbtToJson(CompoundTag tag) { + JsonObject obj = new JsonObject(); + tag.getAllKeys().forEach(key -> { + Tag value = tag.get(key); + if (value instanceof CompoundTag c) { + obj.add(key, nbtToJson(c)); + } else if (value instanceof ListTag list) { + JsonArray arr = new JsonArray(); + for (Tag item : list) { + arr.add(nbtToJson(item)); + } + obj.add(key, arr); + } else if (value instanceof StringTag s) { + obj.addProperty(key, s.getAsString()); + } else if (value instanceof NumericTag n) { + if (value instanceof ByteTag) obj.addProperty(key, n.getAsByte()); + else if (value instanceof ShortTag) obj.addProperty(key, n.getAsShort()); + else if (value instanceof IntTag) obj.addProperty(key, n.getAsInt()); + else if (value instanceof LongTag) obj.addProperty(key, n.getAsLong()); + else if (value instanceof FloatTag) obj.addProperty(key, n.getAsFloat()); + else if (value instanceof DoubleTag) obj.addProperty(key, n.getAsDouble()); + } + }); + return obj; + } + + private static JsonElement nbtToJson(Tag tag) { + if (tag instanceof CompoundTag c) return nbtToJson(c); + if (tag instanceof StringTag s) return new JsonPrimitive(s.getAsString()); + if (tag instanceof NumericTag n) { + if (tag instanceof ByteTag) return new JsonPrimitive(n.getAsByte()); + if (tag instanceof ShortTag) return new JsonPrimitive(n.getAsShort()); + if (tag instanceof IntTag) return new JsonPrimitive(n.getAsInt()); + if (tag instanceof LongTag) return new JsonPrimitive(n.getAsLong()); + if (tag instanceof FloatTag) return new JsonPrimitive(n.getAsFloat()); + if (tag instanceof DoubleTag) return new JsonPrimitive(n.getAsDouble()); + } + return new JsonPrimitive(tag.getAsString()); + } + + /** 完美 Result */ + public static class NBTResult extends CraftingRecipeBuilder.CraftingResult { + private final ResourceLocation id; + private final ItemStack result; + private final String group; + private final List pattern; + private final Map key; // 直接存 JSON + private final Advancement.Builder advancement; + private final ResourceLocation advancementId; + private final boolean showNotification; + + public NBTResult(ResourceLocation id, ItemStack result, String group, + CraftingBookCategory category, List pattern, + Map key, Advancement.Builder advancement, + ResourceLocation advancementId, boolean showNotification) { + super(category); + this.id = id; + this.result = result; + this.group = group; + this.pattern = pattern; + this.key = key; + this.advancement = advancement; + this.advancementId = advancementId; + this.showNotification = showNotification; + } + + @Override + public void serializeRecipeData(@NotNull JsonObject json) { + if (!this.group.isEmpty()) json.addProperty("group", this.group); + + JsonArray patternArray = new JsonArray(); + this.pattern.forEach(patternArray::add); + json.add("pattern", patternArray); + + JsonObject keyObj = new JsonObject(); + this.key.forEach((c, jsonObj) -> keyObj.add(String.valueOf(c), jsonObj)); + json.add("key", keyObj); + + JsonObject resultObj = new JsonObject(); + resultObj.addProperty("type", "forge:partial_nbt"); + resultObj.addProperty("item", Objects.requireNonNull(ForgeRegistries.ITEMS.getKey(this.result.getItem())).toString()); + if (this.result.getCount() > 1) resultObj.addProperty("count", this.result.getCount()); + if (this.result.hasTag() && this.result.getTag() != null) { + resultObj.add("nbt", nbtToJson(this.result.getTag())); + } + json.add("result", resultObj); + + json.addProperty("show_notification", this.showNotification); + } + + @Override public @NotNull RecipeSerializer getType() { return RecipeSerializer.SHAPED_RECIPE; } + @Override public @NotNull ResourceLocation getId() { return this.id; } + @Nullable @Override public JsonObject serializeAdvancement() { return this.advancement.serializeToJson(); } + @Nullable @Override public ResourceLocation getAdvancementId() { return this.advancementId; } + } +} \ No newline at end of file diff --git a/src/main/java/com/extendedae_plus/init/ModItems.java b/src/main/java/com/extendedae_plus/init/ModItems.java index f1fc5c5..c6adf46 100644 --- a/src/main/java/com/extendedae_plus/init/ModItems.java +++ b/src/main/java/com/extendedae_plus/init/ModItems.java @@ -75,7 +75,7 @@ public final class ModItems { ); public static final RegistryObject INFINITY_BIGINTEGER_CELL_ITEM = ITEMS.register( - "infinity_biginteger_cell", InfinityBigIntegerCellItem::new + "infinity_biginteger_cell", () -> new InfinityBigIntegerCellItem(new Item.Properties()) ); // 频道卡（作为 AE 升级卡使用）