Safe access to the offer list (#118 #120)

Signed-off-by: Hendrix-Shen <[email protected]>

Author: Hendrix-Shen

src/main/java/com/plusls/MasaGadget/api/fake/AbstractVillagerAccessor.java

@@ -0,0 +1,7 @@
+package com.plusls.MasaGadget.api.fake;
+
+import net.minecraft.world.item.trading.MerchantOffers;
+
+public interface AbstractVillagerAccessor {
+    MerchantOffers masa_gadget$safeGetOffers();
+}

src/main/java/com/plusls/MasaGadget/impl/feature/entityInfo/VillageTradeEnchantedBookInfo.java

@@ -1,6 +1,7 @@
 package com.plusls.MasaGadget.impl.feature.entityInfo;
 
 import com.google.common.collect.Lists;
+import com.plusls.MasaGadget.api.fake.AbstractVillagerAccessor;
 import com.plusls.MasaGadget.util.PcaSyncProtocol;
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.Minecraft;
@@ -43,7 +44,7 @@ public class VillageTradeEnchantedBookInfo {
 
         List<Component> ret = Lists.newArrayList();
 
-        for (MerchantOffer tradeOffer : villager.getOffers()) {
+        for (MerchantOffer tradeOffer : ((AbstractVillagerAccessor) (villager)).masa_gadget$safeGetOffers()) {
             ItemStack sellItem = tradeOffer.getResult();
             ItemStackCompat sellItemCompat = ItemStackCompat.of(sellItem);
 

src/main/java/com/plusls/MasaGadget/impl/feature/entityInfo/VillagerNextRestockTimeInfo.java

@@ -1,5 +1,6 @@
 package com.plusls.MasaGadget.impl.feature.entityInfo;
 
+import com.plusls.MasaGadget.api.fake.AbstractVillagerAccessor;
 import com.plusls.MasaGadget.mixin.accessor.AccessorVillager;
 import com.plusls.MasaGadget.util.PcaSyncProtocol;
 import net.minecraft.ChatFormatting;
@@ -61,7 +62,7 @@ public class VillagerNextRestockTimeInfo {
     // 因为刁民的需要补货的函数，会检查当前货物是否被消耗，从使用的角度只需要关心当前货物是否用完
     private static boolean needsRestock(@NotNull Villager villagerEntity) {
         if (villagerEntity.getVillagerData().getProfession() != VillagerProfession.NONE) {
-            for (MerchantOffer offer : villagerEntity.getOffers()) {
+            for (MerchantOffer offer : ((AbstractVillagerAccessor) (villagerEntity)).masa_gadget$safeGetOffers()) {
                 if (offer.isOutOfStock()) {
                     return true;
                 }

src/main/java/com/plusls/MasaGadget/mixin/MixinAbstractVillager.java

@@ -0,0 +1,39 @@
+package com.plusls.MasaGadget.mixin;
+
+import com.plusls.MasaGadget.api.fake.AbstractVillagerAccessor;
+import net.minecraft.world.entity.npc.AbstractVillager;
+import net.minecraft.world.item.trading.MerchantOffers;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+//#if MC > 12006
+//$$ import org.jetbrains.annotations.Nullable;
+//#endif
+
+@Mixin(AbstractVillager.class)
+public abstract class MixinAbstractVillager implements AbstractVillagerAccessor {
+    //#if MC > 12006
+    //$$ @Shadow
+    //$$ @Nullable
+    //$$ protected MerchantOffers offers;
+    //$$ @Shadow
+    //$$ protected abstract void updateTrades();
+    //#else
+    @Shadow
+    public abstract MerchantOffers getOffers();
+    //#endif
+
+    @Override
+    public MerchantOffers masa_gadget$safeGetOffers() {
+        //#if MC > 12006
+        //$$ if (this.offers == null) {
+        //$$     this.offers = new MerchantOffers();
+        //$$     this.updateTrades();
+        //$$ }
+        //$$
+        //$$ return this.offers;
+        //#else
+        return this.getOffers();
+        //#endif
+    }
+}

src/main/java/com/plusls/MasaGadget/mixin/mod_tweak/tweakeroo/inventoryPreviewSupportTradeOfferList/MixinAbstractVillager.java

@@ -1,5 +1,6 @@
 package com.plusls.MasaGadget.mixin.mod_tweak.tweakeroo.inventoryPreviewSupportTradeOfferList;
 
+import com.plusls.MasaGadget.api.fake.AbstractVillagerAccessor;
 import com.plusls.MasaGadget.game.Configs;
 import com.plusls.MasaGadget.impl.generic.HitResultHandler;
 import com.plusls.MasaGadget.util.ModId;
@@ -74,12 +75,12 @@ private static Container renderTradeOfferList(Container inv) {
 
         SimpleContainer simpleInventory = new SimpleContainer(MixinRenderUtils.masa_gadget$maxTradeOfferSize);
 
-        for (MerchantOffer tradeOffer : abstractVillager.getOffers()) {
-            for (int i = 0; i < simpleInventory.getContainerSize(); ++i) {
+        for (MerchantOffer tradeOffer : ((AbstractVillagerAccessor) (abstractVillager)).masa_gadget$safeGetOffers()) {
+            for (int i = 0; i < simpleInventory.getContainerSize(); i++) {
                 ItemStack itemStack = simpleInventory.getItem(i);
 
                 if (itemStack.isEmpty()) {
-                    simpleInventory.setItem(i, tradeOffer.getResult().copy());
+                    simpleInventory.setItem(i, tradeOffer.getResult());
                     break;
                 }
             }

src/main/java/com/plusls/MasaGadget/mixin/mod_tweak/tweakeroo/inventoryPreviewSupportTradeOfferList/MixinRenderUtils.java

@@ -5,6 +5,7 @@
   "compatibilityLevel": "JAVA_8",
   "plugin": "top.hendrixshen.magiclib.impl.mixin.MagicMixinPlugin",
   "client": [
+    "MixinAbstractVillager",
     "MixinConnection",
     "accessor.AccessorAbstractMinecartContainer",
     "accessor.AccessorAbstractVillager",
@@ -50,7 +51,6 @@
     "mod_tweak.tweakeroo.inventoryPreviewSupportSelect.MixinInGameHud",
     "mod_tweak.tweakeroo.inventoryPreviewSupportSelect.MixinInventoryOverlay",
     "mod_tweak.tweakeroo.inventoryPreviewSupportShulkerBoxItemEntity.MixinRenderUtils",
-    "mod_tweak.tweakeroo.inventoryPreviewSupportTradeOfferList.MixinAbstractVillager",
     "mod_tweak.tweakeroo.inventoryPreviewSupportTradeOfferList.MixinRenderUtils",
     "mod_tweak.tweakeroo.inventoryPreviewSyncDataClientOnly.MixinClientPacketListener",
     "mod_tweak.tweakeroo.inventoryPreviewUseCache.MixinMixinRenderUtils"