Industrial Apiary more fix

Author: tier940

CHANGELOG.md

@@ -1,3 +1,10 @@
+# v1.4.2
+- Add Mixins to skip Forestry fluid registration and redirect to GregTech fluids.
+- Align Industrial Apiary logic with Gendustry spec
+- Delegate owner persistence to Forestry's OwnerHandler with legacy NBT migration
+
+* * *
+
 # v1.4.1
 - Update TOP Integration [#17](https://github.com/GTModpackTeam/GTBeesMatrix/pull/17) 
 - Fix farming NPE [#18](https://github.com/GTModpackTeam/GTBeesMatrix/pull/18)

src/main/java/com/github/gtexpert/gtbm/integration/forestry/util/BeeProductHelper.java

@@ -42,7 +42,7 @@ public static boolean addProduct(ItemStack product, IBeeRoot beeRoot,
                     return true;
                 }
             }
-            if ((autoBreeding || isAutomated) && beeRoot.isMember(remaining, EnumBeeType.DRONE)) {
+            if (isAutomated && beeRoot.isMember(remaining, EnumBeeType.DRONE)) {
                 if (beeInv.getDrone().isEmpty()) {
                     beeInv.setDrone(remaining);
                     return true;

src/main/java/com/github/gtexpert/gtbm/integration/gendustry/metatileentities/IndustrialApiaryLogic.java

@@ -371,7 +371,7 @@ public void movePrincessToQueenSlot() {
         for (int i = 0; i < output.getSlots(); i++) {
             ItemStack stack = output.getStackInSlot(i);
             if (!stack.isEmpty() && root.isMember(stack, EnumBeeType.PRINCESS)) {
-                apiary.setQueen(stack);
+                apiary.setQueen(stack.copy());
                 output.setStackInSlot(i, ItemStack.EMPTY);
                 return;
             }

src/main/java/com/github/gtexpert/gtbm/integration/gendustry/metatileentities/MetaTileEntityIndustrialApiary.java

@@ -11,6 +11,7 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumFacing;
+import net.minecraft.util.NonNullList;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
@@ -42,6 +43,7 @@
 import forestry.api.core.*;
 import forestry.api.genetics.IIndividual;
 import forestry.core.errors.ErrorLogic;
+import forestry.core.owner.OwnerHandler;
 
 public class MetaTileEntityIndustrialApiary extends GTBMSimpleMachineMetaTileEntity
                                             implements IBeeHousing, IBeeHousingInventory {
@@ -76,11 +78,12 @@ public boolean onPollenRetrieved(IIndividual pollen) {
             if (!modifiers.isCollectingPollen) return false;
             ItemStack stack = pollen.getGenome().getSpeciesRoot()
                     .getMemberStack(pollen, forestry.api.arboriculture.EnumGermlingType.POLLEN);
-            return addProduct(stack, true);
+            addProduct(stack, true);
+            return true;
         }
     };
+    private final OwnerHandler ownerHandler = new OwnerHandler();
     private IItemHandlerModifiable upgradeInventory;
-    private GameProfile owner;
     private boolean autoBreeding = false;
     private byte[] pendingBeeLogicData;
 
@@ -165,6 +168,12 @@ public int getMaxAdditionalUpgrades(ItemStack stack) {
         return upgrade.getMaxNumber(stack) - existing;
     }
 
+    @Override
+    public void clearMachineInventory(NonNullList<ItemStack> itemBuffer) {
+        super.clearMachineInventory(itemBuffer);
+        clearInventory(itemBuffer, upgradeInventory);
+    }
+
     // ---- NBT ----
 
     @Override
@@ -179,12 +188,7 @@ public NBTTagCompound writeToNBT(NBTTagCompound data) {
         }
         data.setTag("UpgradeInventory", upgradeTag);
 
-        if (owner != null) {
-            NBTTagCompound ownerTag = new NBTTagCompound();
-            ownerTag.setString("Name", owner.getName());
-            ownerTag.setString("UUID", owner.getId().toString());
-            data.setTag("Owner", ownerTag);
-        }
+        ownerHandler.writeToNBT(data);
 
         data.setBoolean("AutoBreeding", autoBreeding);
         return data;
@@ -202,12 +206,16 @@ public void readFromNBT(NBTTagCompound data) {
                 }
             }
         }
-        if (data.hasKey("Owner")) {
-            NBTTagCompound ownerTag = data.getCompoundTag("Owner");
-            owner = new GameProfile(
-                    java.util.UUID.fromString(ownerTag.getString("UUID")),
-                    ownerTag.getString("Name"));
+        // Migrate legacy "Owner" tag to Forestry's "owner" format
+        if (data.hasKey("Owner") && !data.hasKey("owner")) {
+            NBTTagCompound legacyTag = data.getCompoundTag("Owner");
+            NBTTagCompound converted = new NBTTagCompound();
+            converted.setString("Name", legacyTag.getString("Name"));
+            converted.setString("Id", legacyTag.getString("UUID"));
+            data.setTag("owner", converted);
+            data.removeTag("Owner");
         }
+        ownerHandler.readFromNBT(data);
         if (data.hasKey("AutoBreeding")) {
             autoBreeding = data.getBoolean("AutoBreeding");
         }
@@ -217,8 +225,8 @@ public void readFromNBT(NBTTagCompound data) {
 
     @Override
     protected ModularUI createUI(EntityPlayer player) {
-        if (owner == null) {
-            owner = player.getGameProfile();
+        if (ownerHandler.getOwner() == null) {
+            ownerHandler.setOwner(player.getGameProfile());
         }
         IBeekeepingLogic logic = getBeekeepingLogic();
         if (logic != null && !getWorld().isRemote) {
@@ -322,7 +330,7 @@ public boolean isRaining() {
     @Override
     @Nullable
     public GameProfile getOwner() {
-        return owner;
+        return ownerHandler.getOwner();
     }
 
     @Override

src/main/java/com/github/gtexpert/gtbm/integration/top/provider/IndustrialApiaryProvider.java

@@ -53,12 +53,7 @@ public void addProbeInfo(ProbeMode probeMode, IProbeInfo probeInfo, EntityPlayer
                 if (bee != null) {
                     EnumBeeType type = beeRoot.getType(queenStack);
                     if (type == EnumBeeType.QUEEN || type == EnumBeeType.PRINCESS) {
-                        String speciesName;
-                        if (bee.isAnalyzed()) {
-                            speciesName = bee.getGenome().getPrimary().getAlleleName();
-                        } else {
-                            speciesName = "{*gtbm.top.industrial_apiary.species.unknown*}";
-                        }
+                        String speciesName = bee.getGenome().getPrimary().getAlleleName();
                         probeInfo.text(
                                 TextStyleClass.INFO + "{*gtbm.top.industrial_apiary.species*} " + speciesName);
                     }

src/main/resources/assets/gtbm/lang/en_us.lang

@@ -66,6 +66,5 @@ gtbm.multiblock.mega_apiary.outputs=%s: §6x%s
 # TOP
 gtbm.top.mega_apiary.queen=Queen:
 gtbm.top.industrial_apiary.species=Species:
-gtbm.top.industrial_apiary.species.unknown=Unknown Species
 gtbm.top.industrial_apiary.production=Production:
 gtbm.top.industrial_apiary.lifespan=Lifespan:

src/main/resources/assets/gtbm/lang/ja_jp.lang

@@ -37,8 +37,8 @@ gtbm.farm.ceu=ゴムの木農園
 gtbm.farm.gtfo=果樹農園
 
 # GUI
-gtbm.gui.auto_breeding.tooltip.enabled=自動交配を有効化 (現在は無効)/nクイーン死亡後にプリンセスを自動的に入力スロットに戻します
-gtbm.gui.auto_breeding.tooltip.disabled=自動交配を無効化 (現在は有効)/nプリンセスはアウトプットに残ります
+gtbm.gui.auto_breeding.tooltip.enabled=自動交配を無効化 (現在は有効)/nクイーン死亡後にプリンセスを自動的に入力スロットに戻します
+gtbm.gui.auto_breeding.tooltip.disabled=自動交配を有効化 (現在は無効)/nプリンセスはアウトプットに残ります
 
 # Multiblock Display
 gtbm.multiblock.progress=進捗: %s / %s (%s%%)
@@ -66,6 +66,5 @@ gtbm.multiblock.mega_apiary.outputs=%s: §6x%s
 # TOP
 gtbm.top.mega_apiary.queen=女王:
 gtbm.top.industrial_apiary.species=種:
-gtbm.top.industrial_apiary.species.unknown=不明な種
 gtbm.top.industrial_apiary.production=生産速度:
 gtbm.top.industrial_apiary.lifespan=寿命: