修复bug

Author: Circulate233

src/main/java/com/circulation/only_one_item/conversion/ItemConversionTarget.java

@@ -3,13 +3,15 @@
 import com.circulation.only_one_item.util.MatchItem;
 import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
 import lombok.Getter;
+import lombok.ToString;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
 import java.util.Collections;
 import java.util.Set;
 
 @Getter
+@ToString
 public final class ItemConversionTarget {
     private final String targetID;
     private final int targetMeta;

src/main/java/com/circulation/only_one_item/handler/MatchItemHandler.java

@@ -58,12 +58,11 @@ public static void preItemStackInit() {
                 int meta = stack.getMetadata();
                 if (rl == null) continue;
                 if ((finalItemBlackMap.containsKey(rl) && finalItemBlackMap.get(rl).contains(meta))
-                    || finalMODIDBlackSet.contains(rl.getNamespace())) {
-                    ods.add(stack);
-                }
-                if (allTarget.contains(SimpleItem.getInstance(stack))) {
-                    ods.add(stack);
+                    || finalMODIDBlackSet.contains(rl.getNamespace())
+                    || allTarget.contains(SimpleItem.getInstance(stack))) {
+                    continue;
                 }
+                ods.add(stack);
             }
         });
 
@@ -183,13 +182,12 @@ public static void addPreItemStack(OOIItemStack i) {
         list.add(new WeakReference<>(i));
     }
 
-    public static void addTargetItem(ResourceLocation rl, int meta, ItemConversionTarget target) {
+    public static void addTargetItem(ResourceLocation rl, int meta, ItemConversionTarget t) {
+        if (allTarget.contains(SimpleItem.getInstance(rl, meta))) return;
         itemIdToTargetMap
             .computeIfAbsent(rl, k -> new Int2ObjectOpenHashMap<>())
-            .put(meta, target);
-        finalItemBlackMap
-            .computeIfAbsent(rl, k -> new IntOpenHashSet())
-            .add(meta);
+            .put(meta, t);
+        allTarget.add(SimpleItem.getInstance(t.getTargetID(), t.getTargetMeta()));
     }
 
     public static void onOreRegister(OreDictionary.OreRegisterEvent event) {
@@ -267,7 +265,6 @@ public static ItemConversionTarget match(Item item, int meta) {
 
     private static void Init(List<ItemConversionTarget> items) {
         for (ItemConversionTarget t : items) {
-            allTarget.add(SimpleItem.getInstance(t.getTargetID(), t.getTargetMeta()));
             for (MatchItem matchItem : t.getMatchItems()) {
                 if (matchItem.oreName() != null) {
                     var list = OreDictionary.getOres(matchItem.oreName(), false);

src/main/java/com/circulation/only_one_item/util/RecipeSignature.java

@@ -187,14 +187,19 @@ public void rebuildRecipe() {
                         Ingredient.EMPTY
                         : new OreIngredient(od));
                 } else if (input instanceof Multiset<?> items) {
-                    inputs.add(Ingredient.fromStacks(items.stream()
-                                                          .map(ii -> {
-                                                              if (ii instanceof SimpleItem s) {
-                                                                  return s.getItemStack(1);
-                                                              }
-                                                              return ItemStack.EMPTY;
-                                                          })
-                                                          .toArray(ItemStack[]::new)));
+                    inputs.add(
+                        Ingredient
+                            .fromStacks(
+                                items.stream()
+                                     .map(ii -> {
+                                         if (ii instanceof SimpleItem s) {
+                                             return s.getItemStack(1);
+                                         }
+                                         return ItemStack.EMPTY;
+                                     })
+                                     .toArray(ItemStack[]::new)
+                            )
+                    );
                 }
             }
             if (isEmpty(inputs)) {
@@ -249,4 +254,4 @@ public String toString() {
         return outputSignature.toString() + inputSignatures + shaped;
     }
 
-}
+}