修复bug

现在和unidict同时使用没有太大问题，也许？

Author: Circulate233

gradle.properties

@@ -15,7 +15,7 @@ show_testing_output = false
 
 # Mod Information
 # HIGHLY RECOMMEND complying with SemVer for mod_version: https://semver.org/
-mod_version = 1.1.9
+mod_version = 1.2.0
 root_package = com.circulation
 mod_id = only_one_item
 mod_name = OnlyOneItem

src/main/java/com/circulation/only_one_item/OnlyOneItem.java

@@ -33,9 +33,6 @@ public class OnlyOneItem {
     @Mod.EventHandler
     public void preInit(FMLPreInitializationEvent event) {
         MinecraftForge.EVENT_BUS.register(new OreDictionaryHandler());
-        if (Loader.isModLoaded("unidict")) {
-            LOGGER.warn("OnlyOneItem and UniDict are incompatible, which may cause some errors to occur!");
-        }
         try {
             OOIConfig.readConfig();
         } catch (IOException ignored) {

src/main/java/com/circulation/only_one_item/mixin/mc/MixinItemStack.java

@@ -7,6 +7,7 @@
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Intrinsic;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Mutable;
 import org.spongepowered.asm.mixin.Shadow;
@@ -40,9 +41,6 @@ public abstract class MixinItemStack implements OOIItemStack {
     @Shadow
     public abstract void setCount(int size);
 
-    @Shadow
-    public abstract void setItemDamage(int meta);
-
     @Inject(method = "forgeInit", at = @At("TAIL"), remap = false)
     private void forgeInit(CallbackInfo ci) {
         if (!this.isEmpty()) {
@@ -63,20 +61,17 @@ private void setMateData(int meta, CallbackInfo ci) {
         return ooi$isBeReplaced;
     }
 
-    @Unique
-    @Override
+    @Intrinsic
     public void ooi$init() {
         ooi$init = true;
     }
 
-    @Unique
-    @Override
+    @Intrinsic
     public ItemStack ooi$getThis() {
         return (ItemStack) (Object) this;
     }
 
-    @Unique
-    @Override
+    @Intrinsic
     public void ooi$ooiInit() {
         ItemConversionTarget target = MatchItemHandler.match(item, itemDamage);
 
@@ -98,4 +93,10 @@ private void setMateData(int meta, CallbackInfo ci) {
             MatchItemHandler.addPreItemStack(this);
         }
     }
+
+    @Intrinsic
+    public void setItem(Item item) {
+        this.item = item;
+        this.delegate = item.delegate;
+    }
 }

src/main/java/com/circulation/only_one_item/mixin/mc/MixinLootEntryItem.java

@@ -0,0 +1,34 @@
+package com.circulation.only_one_item.mixin.mc;
+
+import com.circulation.only_one_item.util.OOIItemStack;
+import com.llamalad7.mixinextras.sugar.Local;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.storage.loot.LootContext;
+import net.minecraft.world.storage.loot.LootEntryItem;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import java.util.Collection;
+import java.util.Random;
+
+@SuppressWarnings("DiscouragedShift")
+@Mixin(LootEntryItem.class)
+public class MixinLootEntryItem {
+
+    @Shadow
+    @Final
+    protected Item item;
+
+    @Inject(method = "addLoot", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/storage/loot/functions/LootFunction;apply(Lnet/minecraft/item/ItemStack;Ljava/util/Random;Lnet/minecraft/world/storage/loot/LootContext;)Lnet/minecraft/item/ItemStack;", shift = At.Shift.BEFORE))
+    public void addLoot(Collection<ItemStack> stacks, Random rand, LootContext context, CallbackInfo ci, @Local(ordinal = 0) ItemStack itemstack) {
+        OOIItemStack i = OOIItemStack.forItem(itemstack);
+        if (i.ooi$isBeReplaced()) {
+            i.setItem(this.item);
+        }
+    }
+}

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

@@ -1,14 +1,21 @@
 package com.circulation.only_one_item.util;
 
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
 public interface OOIItemStack {
 
+    static OOIItemStack forItem(ItemStack itemStack) {
+        return (OOIItemStack) (Object) itemStack;
+    }
+
     void ooi$init();
 
     void ooi$ooiInit();
 
     boolean ooi$isBeReplaced();
 
     ItemStack ooi$getThis();
+
+    void setItem(Item item);
 }

src/main/resources/mixins.only_one_item.json

@@ -8,7 +8,8 @@
   "mixins": [
     "AccessorFurnaceRecipes",
     "MixinFluidStack",
-    "MixinItemStack"
+    "MixinItemStack",
+    "MixinLootEntryItem"
   ],
   "server": [],
   "client": [