配方添加旋律需求

TBPig · TBPig · commit e07fe3cd400d · 2026-03-06T22:18:08.000+08:00
diff --git a/src/generated/resources/data/anvilcraft_reverberation/recipe/sound_reactor/acoustic_component.json b/src/generated/resources/data/anvilcraft_reverberation/recipe/sound_reactor/acoustic_component.json
@@ -6,6 +6,7 @@
   },
   "minEnergy": 10,
   "priority": 0,
+  "requiredMelody": "anvilcraft_reverberation:equal",
   "requiredTimbres": [
     {
       "block": "minecraft:iron_block"
diff --git a/src/main/java/dev/anvilcraft/reverberation/AnvilCraftReverberation.java b/src/main/java/dev/anvilcraft/reverberation/AnvilCraftReverberation.java
@@ -8,6 +8,7 @@
 import dev.anvilcraft.reverberation.init.AddonItemGroups;
 import dev.anvilcraft.reverberation.init.AddonItems;
 import dev.anvilcraft.lib.config.ConfigManager;
+import dev.anvilcraft.reverberation.init.AddonMelodies;
 import dev.anvilcraft.reverberation.init.AddonRecipeType;
 import net.minecraft.resources.ResourceLocation;
 import net.neoforged.bus.api.IEventBus;
@@ -29,6 +30,7 @@ public AnvilCraftReverberation(IEventBus modEventBus, ModContainer modContainer)
         AddonBlocks.register();
         AddonBlockEntities.register();
         AddonRecipeType.register(modEventBus);
+        AddonMelodies.register();
         AddonDatagen.init();
     }
 
diff --git a/src/main/java/dev/anvilcraft/reverberation/api/Melody.java b/src/main/java/dev/anvilcraft/reverberation/api/Melody.java
@@ -0,0 +1,42 @@
+package dev.anvilcraft.reverberation.api;
+
+import com.google.common.base.Supplier;
+import com.mojang.serialization.Codec;
+import net.minecraft.network.RegistryFriendlyByteBuf;
+import net.minecraft.network.codec.StreamCodec;
+import net.minecraft.resources.ResourceLocation;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+public abstract class Melody {
+    private static final Map<ResourceLocation, Melody> MELODY_REGISTRY = new ConcurrentHashMap<>();
+
+    public static final Codec<Melody> CODEC = ResourceLocation.CODEC.xmap(
+        Melody::getOrThrow,
+        Melody::getId
+    );
+
+    public static final StreamCodec<RegistryFriendlyByteBuf, Melody> STREAM_CODEC = StreamCodec.of(
+        (buf, melody) -> ResourceLocation.STREAM_CODEC.encode(buf, melody.getId()),
+        (buf) -> Melody.getOrThrow(ResourceLocation.STREAM_CODEC.decode(buf))
+    );
+
+    public static Melody register(Supplier<Melody> f) {
+        Melody melody = f.get();
+        MELODY_REGISTRY.put(melody.getId(), melody);
+        return melody;
+    }
+
+    public static Melody getOrThrow(ResourceLocation id) {
+        Melody melody = MELODY_REGISTRY.get(id);
+        if (melody == null) {
+            throw new IllegalArgumentException("Unknown Melody: " + id);
+        }
+        return melody;
+    }
+
+    public abstract boolean satisfy(MergeSoundStore mergeSoundStore);
+
+    public abstract ResourceLocation getId();
+}
diff --git a/src/main/java/dev/anvilcraft/reverberation/api/MergeSoundStore.java b/src/main/java/dev/anvilcraft/reverberation/api/MergeSoundStore.java
@@ -59,6 +59,11 @@ public boolean isValid(SoundReactorRecipe recipe) {
             if (!currentTimbres.contains(requiredTimbre)) return false;
         }
 
+        // 检查旋律条件是否满足
+        if (recipe.getRequiredMelody() != null && !recipe.getRequiredMelody().satisfy(this)) {
+            return false;
+        }
+
         return true;
     }
 }
diff --git a/src/main/java/dev/anvilcraft/reverberation/api/melody/Melody.java b/src/main/java/dev/anvilcraft/reverberation/api/melody/Melody.java
diff --git a/src/main/java/dev/anvilcraft/reverberation/data/recipe/SoundReactorRecipeLoader.java b/src/main/java/dev/anvilcraft/reverberation/data/recipe/SoundReactorRecipeLoader.java
@@ -2,18 +2,21 @@
 
 import com.tterrag.registrate.providers.RegistrateRecipeProvider;
 import dev.anvilcraft.reverberation.init.AddonItems;
+import dev.anvilcraft.reverberation.init.AddonMelodies;
 import dev.anvilcraft.reverberation.recipe.SoundReactorRecipe;
 import dev.dubhe.anvilcraft.init.block.ModBlocks;
 import dev.dubhe.anvilcraft.init.item.ModItemTags;
 import net.minecraft.world.level.block.Blocks;
 
 public class SoundReactorRecipeLoader {
     public static void init(RegistrateRecipeProvider provider) {
+        // 基础配方 - 不需要旋律
         SoundReactorRecipe.builder()
             .requires(ModItemTags.BRONZE_PLATES, 2)
             .result(AddonItems.ACOUSTIC_COMPONENT.get())
             .requiresTimbre(Blocks.IRON_BLOCK)
             .requiresTimbre(ModBlocks.BRONZE_BLOCK.get())
+            .requiresMelody(AddonMelodies.EQUAL_MELODY)
             .minEnergy(10)
             .save(provider);
     }
diff --git a/src/main/java/dev/anvilcraft/reverberation/init/AddonMelodies.java b/src/main/java/dev/anvilcraft/reverberation/init/AddonMelodies.java
@@ -0,0 +1,18 @@
+package dev.anvilcraft.reverberation.init;
+
+import dev.anvilcraft.reverberation.melody.AblationMelody;
+import dev.anvilcraft.reverberation.melody.EqualMelody;
+import dev.anvilcraft.reverberation.melody.HigherMelody;
+import dev.anvilcraft.reverberation.melody.LowerMelody;
+import dev.anvilcraft.reverberation.api.Melody;
+
+@SuppressWarnings("unused")
+public class AddonMelodies {
+    public static final Melody LOWER_MELODY = Melody.register(LowerMelody::new);
+    public static final Melody HIGHER_MELODY = Melody.register(HigherMelody::new);
+    public static final Melody ABLATION_MELODY = Melody.register(AblationMelody::new);
+    public static final Melody EQUAL_MELODY = Melody.register(EqualMelody::new);
+
+    public static void register() {
+    }
+}
diff --git a/src/main/java/dev/anvilcraft/reverberation/melody/AblationMelody.java b/src/main/java/dev/anvilcraft/reverberation/melody/AblationMelody.java
@@ -1,8 +1,12 @@
-package dev.anvilcraft.reverberation.api.melody;
+package dev.anvilcraft.reverberation.melody;
 
+import dev.anvilcraft.reverberation.AnvilCraftReverberation;
+import dev.anvilcraft.reverberation.api.Melody;
 import dev.anvilcraft.reverberation.api.MergeSound;
 import dev.anvilcraft.reverberation.api.MergeSoundStore;
 import dev.anvilcraft.reverberation.api.SoundWave;
+import dev.dubhe.anvilcraft.init.block.ModBlocks;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.block.Block;
 
 import java.util.List;
@@ -19,13 +23,17 @@ public boolean satisfy(MergeSoundStore mergeSoundStore) {
         int emberEnergy = 0;
         for (SoundWave soundWave : soundWaves) {
             Block block = soundWave.timbre().block();
-            // TODO: 根据需要定义霜冻和余烬对应的方块
-            // if (block == ModBlocks.FROST_ANVIL) {
-            //     frostEnergy += soundWave.loudness();
-            // } else if (block == ModBlocks.EMBER_ANVIL) {
-            //     emberEnergy += soundWave.loudness();
-            // }
+             if (block.equals(ModBlocks.FROST_ANVIL.get())) {
+                 frostEnergy += soundWave.loudness();
+             } else if (block.equals(ModBlocks.EMBER_ANVIL.get())) {
+                 emberEnergy += soundWave.loudness();
+             }
         }
         return frostEnergy == emberEnergy;
     }
+    
+    @Override
+    public ResourceLocation getId() {
+        return AnvilCraftReverberation.of("ablation");
+    }
 }
diff --git a/src/main/java/dev/anvilcraft/reverberation/melody/EqualMelody.java b/src/main/java/dev/anvilcraft/reverberation/melody/EqualMelody.java
@@ -0,0 +1,27 @@
+package dev.anvilcraft.reverberation.melody;
+
+import dev.anvilcraft.reverberation.AnvilCraftReverberation;
+import dev.anvilcraft.reverberation.api.Melody;
+import dev.anvilcraft.reverberation.api.MergeSound;
+import dev.anvilcraft.reverberation.api.MergeSoundStore;
+import net.minecraft.resources.ResourceLocation;
+
+import java.util.List;
+
+public class EqualMelody extends Melody {
+
+    @Override
+    public boolean satisfy(MergeSoundStore mergeSoundStore) {
+        List<MergeSound> soundHistory = mergeSoundStore.getSoundHistory();
+        if (soundHistory.size() < 2) return false;
+
+        MergeSound sound1 = soundHistory.getLast();
+        MergeSound sound2 = soundHistory.get(soundHistory.size() - 2);
+        return sound1.getEnergy() == sound2.getEnergy();
+    }
+
+    @Override
+    public ResourceLocation getId() {
+        return AnvilCraftReverberation.of("equal");
+    }
+}
diff --git a/src/main/java/dev/anvilcraft/reverberation/melody/HigherMelody.java b/src/main/java/dev/anvilcraft/reverberation/melody/HigherMelody.java
@@ -1,7 +1,10 @@
-package dev.anvilcraft.reverberation.api.melody;
+package dev.anvilcraft.reverberation.melody;
 
+import dev.anvilcraft.reverberation.AnvilCraftReverberation;
+import dev.anvilcraft.reverberation.api.Melody;
 import dev.anvilcraft.reverberation.api.MergeSound;
 import dev.anvilcraft.reverberation.api.MergeSoundStore;
+import net.minecraft.resources.ResourceLocation;
 
 import java.util.List;
 
@@ -15,4 +18,9 @@ public boolean satisfy(MergeSoundStore mergeSoundStore) {
         MergeSound sound2 = soundHistory.get(soundHistory.size() - 2);
         return sound1.getEnergy() >= sound2.getEnergy() * 2;
     }
+    
+    @Override
+    public ResourceLocation getId() {
+        return AnvilCraftReverberation.of("higher");
+    }
 }
diff --git a/src/main/java/dev/anvilcraft/reverberation/melody/LowerMelody.java b/src/main/java/dev/anvilcraft/reverberation/melody/LowerMelody.java
@@ -1,11 +1,15 @@
-package dev.anvilcraft.reverberation.api.melody;
+package dev.anvilcraft.reverberation.melody;
 
+import dev.anvilcraft.reverberation.AnvilCraftReverberation;
+import dev.anvilcraft.reverberation.api.Melody;
 import dev.anvilcraft.reverberation.api.MergeSound;
 import dev.anvilcraft.reverberation.api.MergeSoundStore;
+import net.minecraft.resources.ResourceLocation;
 
 import java.util.List;
 
-public class LowerMelody extends Melody  {
+public class LowerMelody extends Melody {
+    
     @Override
     public boolean satisfy(MergeSoundStore mergeSoundStore) {
         List<MergeSound> soundHistory = mergeSoundStore.getSoundHistory();
@@ -15,4 +19,9 @@ public boolean satisfy(MergeSoundStore mergeSoundStore) {
         MergeSound sound2 = soundHistory.get(soundHistory.size() - 2);
         return sound1.getEnergy() * 2 <= sound2.getEnergy();
     }
+    
+    @Override
+    public ResourceLocation getId() {
+        return AnvilCraftReverberation.of("lower");
+    }
 }
diff --git a/src/main/java/dev/anvilcraft/reverberation/melody/package-info.java b/src/main/java/dev/anvilcraft/reverberation/melody/package-info.java
@@ -1,6 +1,6 @@
 @MethodsReturnNonnullByDefault
 @ParametersAreNonnullByDefault
-package dev.anvilcraft.reverberation.api.melody;
+package dev.anvilcraft.reverberation.melody;
 
 import net.minecraft.MethodsReturnNonnullByDefault;
 
diff --git a/src/main/java/dev/anvilcraft/reverberation/recipe/SoundReactorRecipe.java b/src/main/java/dev/anvilcraft/reverberation/recipe/SoundReactorRecipe.java
@@ -6,6 +6,7 @@
 import dev.anvilcraft.lib.recipe.component.ItemIngredientPredicate;
 import dev.anvilcraft.reverberation.AnvilCraftReverberation;
 import dev.anvilcraft.reverberation.api.Timbre;
+import dev.anvilcraft.reverberation.api.Melody;
 import dev.anvilcraft.reverberation.init.AddonRecipeType;
 import lombok.Getter;
 import net.minecraft.advancements.Advancement;
@@ -52,6 +53,8 @@ public class SoundReactorRecipe implements Recipe<RecipeInput> {
     @Nullable
     private final Integer maxSourceNum;
     private final List<Timbre> requiredTimbres;
+    @Nullable
+    private final Melody requiredMelody;
     private final int priority;
 
     public SoundReactorRecipe(
@@ -62,6 +65,7 @@ public SoundReactorRecipe(
         @Nullable Integer minSourceNum,
         @Nullable Integer maxSourceNum,
         List<Timbre> requiredTimbres,
+        @Nullable Melody requiredMelody,
         int priority
     ) {
         this.input = input;
@@ -71,6 +75,7 @@ public SoundReactorRecipe(
         this.minSourceNum = minSourceNum;
         this.maxSourceNum = maxSourceNum;
         this.requiredTimbres = requiredTimbres;
+        this.requiredMelody = requiredMelody;
         this.priority = priority;
     }
 
@@ -132,17 +137,19 @@ private static void writeOptionalInteger(RegistryFriendlyByteBuf buf, @Nullable
             Codec.INT.optionalFieldOf("minSourceNum").forGetter(recipe -> Optional.ofNullable(recipe.minSourceNum)),
             Codec.INT.optionalFieldOf("maxSourceNum").forGetter(recipe -> Optional.ofNullable(recipe.maxSourceNum)),
             Timbre.CODEC.listOf().optionalFieldOf("requiredTimbres").forGetter(recipe -> Optional.ofNullable(recipe.requiredTimbres)),
+            Melody.CODEC.optionalFieldOf("requiredMelody").forGetter(recipe -> Optional.ofNullable(recipe.requiredMelody)),
             Codec.INT.fieldOf("priority").orElse(0).forGetter(SoundReactorRecipe::getPriority)
         ).apply(
-            instance, (input, result, minEnergyOpt, maxEnergyOpt, minSourceNumOpt, maxSourceNumOpt, requiredBlocksOpt, priority) ->
+            instance, (input, result, minEnergyOpt, maxEnergyOpt, minSourceNumOpt, maxSourceNumOpt, requiredTimbresOpt, requiredMelodyOpt, priority) ->
                 new SoundReactorRecipe(
                     input,
                     result,
                     minEnergyOpt.orElse(null),
                     maxEnergyOpt.orElse(null),
                     minSourceNumOpt.orElse(null),
                     maxSourceNumOpt.orElse(null),
-                    requiredBlocksOpt.orElse(new ArrayList<>()),
+                    requiredTimbresOpt.orElse(new ArrayList<>()),
+                    requiredMelodyOpt.orElse(null),
                     priority
                 )
         ));
@@ -156,6 +163,7 @@ private static void writeOptionalInteger(RegistryFriendlyByteBuf buf, @Nullable
                 writeOptionalInteger(buf, recipe.getMinSourceNum());
                 writeOptionalInteger(buf, recipe.getMaxSourceNum());
                 writeTimbres(buf, recipe);
+                writeMelody(buf, recipe);
                 buf.writeInt(recipe.getPriority());
             },
             (buf) -> new SoundReactorRecipe(
@@ -166,9 +174,22 @@ private static void writeOptionalInteger(RegistryFriendlyByteBuf buf, @Nullable
                 readOptionalInteger(buf),
                 readOptionalInteger(buf),
                 readTimbres(buf),
+                readMelody(buf),
                 buf.readInt()
             )
         );
+        
+        private static void writeMelody(RegistryFriendlyByteBuf buf, SoundReactorRecipe recipe) {
+            buf.writeBoolean(recipe.getRequiredMelody() != null);
+            if (recipe.getRequiredMelody() != null) {
+                Melody.STREAM_CODEC.encode(buf, recipe.getRequiredMelody());
+            }
+        }
+        
+        public static @Nullable Melody readMelody(RegistryFriendlyByteBuf buf) {
+            boolean present = buf.readBoolean();
+            return present ? Melody.STREAM_CODEC.decode(buf) : null;
+        }
 
         private static void writeTimbres(RegistryFriendlyByteBuf buf, SoundReactorRecipe recipe) {
             buf.writeVarInt(recipe.getRequiredTimbres().size());
@@ -210,6 +231,8 @@ public static class Builder implements RecipeBuilder {
         @Nullable
         private Integer maxSourceNum;
         private final List<Timbre> requiredTimbres = new ArrayList<>();
+        @Nullable
+        private Melody requiredMelody;
         private int priority = 0;
         protected final Map<String, Criterion<?>> criteria = new LinkedHashMap<>();
 
@@ -287,6 +310,11 @@ public Builder requiresTimbre(Block block) {
             return this;
         }
 
+        public Builder requiresMelody(Melody melody) {
+            this.requiredMelody = melody;
+            return this;
+        }
+
         @Override
         public Item getResult() {
             return result == null ? Items.AIR : result.getItem();
@@ -315,6 +343,7 @@ public void save(RecipeOutput recipeOutput, ResourceLocation id) {
                 minSourceNum,
                 maxSourceNum,
                 requiredTimbres,
+                requiredMelody,
                 priority
             );
             recipeOutput.accept(id, recipe, advancement.build(id.withPrefix("recipes/")));

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`},`
`7`	`7`	`"minEnergy": 10,`
`8`	`8`	`"priority": 0,`
	`9`	`+ "requiredMelody": "anvilcraft_reverberation:equal",`
`9`	`10`	`"requiredTimbres": [`
`10`	`11`	`{`
`11`	`12`	`"block": "minecraft:iron_block"`
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,11 @@ public boolean isValid(SoundReactorRecipe recipe) {`
`59`	`59`	`if (!currentTimbres.contains(requiredTimbre)) return false;`
`60`	`60`	`}`
`61`	`61`
	`62`	`+ // 检查旋律条件是否满足`
	`63`	`+ if (recipe.getRequiredMelody() != null && !recipe.getRequiredMelody().satisfy(this)) {`
	`64`	`+ return false;`
	`65`	`+ }`
	`66`	`+`
`62`	`67`	`return true;`
`63`	`68`	`}`
`64`	`69`	`}`