[Part2] Industrial Apiary more fix

tier940 · tier940 · commit e4e672f75e13 · 2026-03-19T14:58:04.000+09:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,12 @@
+# v1.4.3
+- Fix external automation inserting non-bee items into bee slots
+- Fix drone not returning to bee slot when Automation Upgrade is inserted while stopped
+- Fix upgrade changes not applied immediately when apiary is stopped
+- Fix bee tooltip not showing flower names for crop flowers
+- Fix BeekeepingLogic state (breeding progress, pending offspring) lost on world reload
+
+* * *
+
 # v1.4.2
 - Add Mixins to skip Forestry fluid registration and redirect to GregTech fluids.
 - Align Industrial Apiary logic with Gendustry spec
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -60,13 +60,11 @@ dependencies {
 
     // Debug Forestry
     implementation rfg.deobf("curse.maven:forestry-59751:5903382") // Forestry 5.8.2.387
-    implementation rfg.deobf("curse.maven:beebetteratbees-244516:2627215") // BeeBetterAtBees 2.0.3
-    implementation rfg.deobf("curse.maven:jei-bees-248370:2490058") // JEIBees 0.9.0.5
+    runtimeOnly rfg.deobf("curse.maven:jei-bees-248370:2490058") // JEIBees 0.9.0.5
 
     // Debug Gendustry
     compileOnly rfg.deobf("curse.maven:bdlib-70496:2518031") // BdLib 1.14.3.12
     compileOnly rfg.deobf("curse.maven:gendustry-70492:2516215") // Gendustry 1.6.5.8
-    compileOnly rfg.deobf("curse.maven:gendustry-jei-addon-301364:2609434") // Gendustry JEI Addon 1.0.2
     if (project.debug_all.toBoolean() || project.debug_gendustry.toBoolean()) {
         runtimeOnly rfg.deobf("curse.maven:bdlib-70496:2518031") // BdLib 1.14.3.12
         runtimeOnly rfg.deobf("curse.maven:gendustry-70492:2516215") // Gendustry 1.6.5.8
diff --git a/src/main/java/com/github/gtexpert/gtbm/integration/forestry/util/BeeProductHelper.java b/src/main/java/com/github/gtexpert/gtbm/integration/forestry/util/BeeProductHelper.java
@@ -8,41 +8,34 @@
 import forestry.api.apiculture.IBeeRoot;
 
 /**
- * Reusable product distribution logic for bee housings.
- * Handles automated bee re-insertion and output slot management.
+ * Product distribution logic for bee housings backed by GT item handlers.
  */
 public class BeeProductHelper {
 
     /**
-     * Add a bee product to the housing's inventory.
-     * If automated, attempts to re-insert bees into queen/drone slots first.
+     * Distributes a bee product into the housing's inventory.
      *
-     * @param product      the product to add
-     * @param beeRoot      the bee root (nullable, skips automation if null)
-     * @param autoBreeding whether auto-breeding is enabled (princess auto-insertion)
-     * @param isAutomated  whether automation upgrade is active (drone auto-insertion)
-     * @param beeInv       the bee housing inventory (queen/drone access)
-     * @param importItems  the import item handler (for drone merging)
-     * @param exportItems  the export item handler (output slots)
-     * @return true if the product was fully inserted
+     * <p>
+     * When the Automation Upgrade is active, bee members are re-inserted
+     * into bee slots (princess → queen, drone → drone / merge).
+     * Everything else goes to the export (output) slots.
      */
     public static boolean addProduct(ItemStack product, IBeeRoot beeRoot,
-                                     boolean autoBreeding, boolean isAutomated,
+                                     boolean isAutomated,
                                      IBeeHousingInventory beeInv,
                                      IItemHandlerModifiable importItems, IItemHandlerModifiable exportItems) {
         if (product.isEmpty()) return true;
 
         ItemStack remaining = product.copy();
 
-        if (beeRoot != null && beeRoot.isMember(remaining)) {
-            if (autoBreeding && (beeRoot.isMember(remaining, EnumBeeType.PRINCESS) ||
-                    beeRoot.isMember(remaining, EnumBeeType.QUEEN))) {
+        if (isAutomated && beeRoot != null && beeRoot.isMember(remaining)) {
+            if (beeRoot.isMember(remaining, EnumBeeType.PRINCESS)) {
                 if (beeInv.getQueen().isEmpty()) {
                     beeInv.setQueen(remaining);
                     return true;
                 }
             }
-            if (isAutomated && beeRoot.isMember(remaining, EnumBeeType.DRONE)) {
+            if (beeRoot.isMember(remaining, EnumBeeType.DRONE)) {
                 if (beeInv.getDrone().isEmpty()) {
                     beeInv.setDrone(remaining);
                     return true;
diff --git a/src/main/java/com/github/gtexpert/gtbm/integration/gendustry/metatileentities/IndustrialApiaryLogic.java b/src/main/java/com/github/gtexpert/gtbm/integration/gendustry/metatileentities/IndustrialApiaryLogic.java
@@ -40,6 +40,7 @@ public class IndustrialApiaryLogic extends RecipeLogicEnergy {
 
     private IBeeRoot beeRoot;
     private IBeekeepingLogic beekeepingLogic;
+    private NBTTagCompound pendingBeeLogicNBT;
     private boolean needsMovePrincess;
     /**
      * Set when {@link #beekeepingLogic} is first created on the server.
@@ -120,6 +121,10 @@ private void initBeekeepingLogic() {
             IBeeRoot root = getBeeRoot();
             if (root != null) {
                 beekeepingLogic = root.createBeekeepingLogic(getApiary());
+                if (pendingBeeLogicNBT != null) {
+                    beekeepingLogic.readFromNBT(pendingBeeLogicNBT);
+                    pendingBeeLogicNBT = null;
+                }
                 if (!metaTileEntity.getWorld().isRemote) {
                     needsInitialSync = true;
                 }
@@ -217,6 +222,8 @@ private void updateClient() {
      * draws energy, and syncs bee state to clients when needed.
      */
     private void updateServer() {
+        updateModifiers();
+
         if (beekeepingLogic == null) {
             if (isActive) setActive(false);
             return;
@@ -225,8 +232,6 @@ private void updateServer() {
         MetaTileEntityIndustrialApiary apiary = getApiary();
         needsMovePrincess = false;
 
-        updateModifiers();
-
         int euPerTick = getEUPerTick();
         boolean hasPower = getEnergyStored() >= euPerTick;
 
@@ -254,6 +259,9 @@ private void updateServer() {
         if (needsMovePrincess && apiary.getQueen().isEmpty()) {
             movePrincessToQueenSlot();
         }
+        if (apiary.getModifiers().isAutomated) {
+            moveBeesFromOutput(apiary);
+        }
 
         // Sync AFTER canWork() so BeekeepingLogic.queenStack has genome data.
         // needsInitialSync covers chunk-reload where isActive == isWorking (both true)
@@ -378,6 +386,27 @@ public void movePrincessToQueenSlot() {
         }
     }
 
+    /**
+     * Scans the output inventory for bee members and moves them into
+     * the appropriate bee slots when the Automation Upgrade is active.
+     */
+    private void moveBeesFromOutput(MetaTileEntityIndustrialApiary apiary) {
+        IBeeRoot root = getBeeRoot();
+        if (root == null) return;
+        var output = getOutputInventory();
+        for (int i = 0; i < output.getSlots(); i++) {
+            ItemStack stack = output.getStackInSlot(i);
+            if (stack.isEmpty() || !root.isMember(stack)) continue;
+            if (root.isMember(stack, EnumBeeType.PRINCESS) && apiary.getQueen().isEmpty()) {
+                apiary.setQueen(stack.copy());
+                output.setStackInSlot(i, ItemStack.EMPTY);
+            } else if (root.isMember(stack, EnumBeeType.DRONE) && apiary.getDrone().isEmpty()) {
+                apiary.setDrone(stack.copy());
+                output.setStackInSlot(i, ItemStack.EMPTY);
+            }
+        }
+    }
+
     // ---- Recipe overrides (unused — bee work replaces GT recipe system) ----
 
     @Override
@@ -416,10 +445,8 @@ public NBTTagCompound serializeNBT() {
     public void deserializeNBT(@NotNull NBTTagCompound compound) {
         super.deserializeNBT(compound);
         if (compound.hasKey("BeekeepingLogic")) {
+            pendingBeeLogicNBT = compound.getCompoundTag("BeekeepingLogic");
             initBeekeepingLogic();
-            if (beekeepingLogic != null) {
-                beekeepingLogic.readFromNBT(compound.getCompoundTag("BeekeepingLogic"));
-            }
         }
     }
 }
diff --git a/src/main/java/com/github/gtexpert/gtbm/integration/gendustry/metatileentities/MetaTileEntityIndustrialApiary.java b/src/main/java/com/github/gtexpert/gtbm/integration/gendustry/metatileentities/MetaTileEntityIndustrialApiary.java
@@ -1,5 +1,6 @@
 package com.github.gtexpert.gtbm.integration.gendustry.metatileentities;
 
+import java.io.IOException;
 import java.util.Collections;
 import java.util.function.Function;
 
@@ -10,6 +11,7 @@
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.network.PacketBuffer;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.NonNullList;
 import net.minecraft.util.ResourceLocation;
@@ -19,6 +21,8 @@
 import net.minecraft.world.biome.Biome;
 import net.minecraftforge.items.IItemHandlerModifiable;
 
+import org.jetbrains.annotations.NotNull;
+
 import com.mojang.authlib.GameProfile;
 
 import gregtech.api.GTValues;
@@ -33,6 +37,7 @@
 import gregtech.client.renderer.ICubeRenderer;
 
 import com.github.gtexpert.gtbm.api.gui.GTBMGuiTextures;
+import com.github.gtexpert.gtbm.api.util.ModLog;
 import com.github.gtexpert.gtbm.common.metatileentities.GTBMSimpleMachineMetaTileEntity;
 import com.github.gtexpert.gtbm.integration.forestry.util.BeeProductHelper;
 import com.github.gtexpert.gtbm.integration.gendustry.util.ApiaryModifierBridge;
@@ -44,6 +49,7 @@
 import forestry.api.genetics.IIndividual;
 import forestry.core.errors.ErrorLogic;
 import forestry.core.owner.OwnerHandler;
+import io.netty.buffer.Unpooled;
 
 public class MetaTileEntityIndustrialApiary extends GTBMSimpleMachineMetaTileEntity
                                             implements IBeeHousing, IBeeHousingInventory {
@@ -84,7 +90,7 @@ public boolean onPollenRetrieved(IIndividual pollen) {
     };
     private final OwnerHandler ownerHandler = new OwnerHandler();
     private IItemHandlerModifiable upgradeInventory;
-    private boolean autoBreeding = false;
+    private boolean autoBreeding;
     private byte[] pendingBeeLogicData;
 
     public MetaTileEntityIndustrialApiary(ResourceLocation metaTileEntityId, RecipeMap<?> recipeMap,
@@ -111,7 +117,7 @@ protected IItemHandlerModifiable createImportItemHandler() {
         return new NotifiableItemStackHandler(this, 2, this, false) {
 
             @Override
-            public boolean isItemValid(int slot, @org.jetbrains.annotations.NotNull ItemStack stack) {
+            public boolean isItemValid(int slot, @NotNull ItemStack stack) {
                 IBeeRoot beeRoot = getLogic().getBeeRoot();
                 if (beeRoot == null) return true;
                 if (slot == 0) {
@@ -122,6 +128,13 @@ public boolean isItemValid(int slot, @org.jetbrains.annotations.NotNull ItemStac
                 }
                 return false;
             }
+
+            @Override
+            @NotNull
+            public ItemStack insertItem(int slot, @NotNull ItemStack stack, boolean simulate) {
+                if (!isItemValid(slot, stack)) return stack;
+                return super.insertItem(slot, stack, simulate);
+            }
         };
     }
 
@@ -140,7 +153,7 @@ protected void initializeInventory() {
         this.upgradeInventory = new NotifiableItemStackHandler(this, getUpgradeSlotCount(), this, false) {
 
             @Override
-            public boolean isItemValid(int slot, @org.jetbrains.annotations.NotNull ItemStack stack) {
+            public boolean isItemValid(int slot, @NotNull ItemStack stack) {
                 if (stack.isEmpty() || !(stack.getItem() instanceof IApiaryUpgrade)) return false;
                 return getMaxAdditionalUpgrades(stack) >= stack.getCount();
             }
@@ -187,9 +200,7 @@ public NBTTagCompound writeToNBT(NBTTagCompound data) {
             }
         }
         data.setTag("UpgradeInventory", upgradeTag);
-
         ownerHandler.writeToNBT(data);
-
         data.setBoolean("AutoBreeding", autoBreeding);
         return data;
     }
@@ -206,7 +217,6 @@ public void readFromNBT(NBTTagCompound data) {
                 }
             }
         }
-        // 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();
@@ -395,10 +405,10 @@ public void setDrone(ItemStack stack) {
     @Override
     public boolean addProduct(ItemStack product, boolean all) {
         return BeeProductHelper.addProduct(product, getLogic().getBeeRoot(),
-                autoBreeding, modifiers.isAutomated, this, importItems, exportItems);
+                modifiers.isAutomated, this, importItems, exportItems);
     }
 
-    // ---- Bee FX sync ----
+    // ---- Bee logic sync ----
 
     public void syncBeeLogicToClient() {
         IBeekeepingLogic logic = getBeekeepingLogic();
@@ -408,7 +418,7 @@ public void syncBeeLogicToClient() {
     }
 
     @Override
-    public void writeInitialSyncData(@org.jetbrains.annotations.NotNull net.minecraft.network.PacketBuffer buf) {
+    public void writeInitialSyncData(@NotNull PacketBuffer buf) {
         super.writeInitialSyncData(buf);
         IBeekeepingLogic logic = getBeekeepingLogic();
         if (logic != null) {
@@ -420,55 +430,48 @@ public void writeInitialSyncData(@org.jetbrains.annotations.NotNull net.minecraf
     }
 
     @Override
-    public void receiveInitialSyncData(@org.jetbrains.annotations.NotNull net.minecraft.network.PacketBuffer buf) {
+    public void receiveInitialSyncData(@NotNull PacketBuffer buf) {
         super.receiveInitialSyncData(buf);
         if (buf.readBoolean()) {
             readBeeLogicData(buf);
         }
     }
 
     @Override
-    public void receiveCustomData(int dataId,
-                                  @org.jetbrains.annotations.NotNull net.minecraft.network.PacketBuffer buf) {
+    public void receiveCustomData(int dataId, @NotNull PacketBuffer buf) {
         super.receiveCustomData(dataId, buf);
         if (dataId == BEE_LOGIC_SYNC_ID) {
             readBeeLogicData(buf);
         }
     }
 
-    private void readBeeLogicData(net.minecraft.network.PacketBuffer buf) {
+    private void readBeeLogicData(PacketBuffer buf) {
         getLogic().initBeekeepingLogicClient();
         IBeekeepingLogic logic = getBeekeepingLogic();
         try {
             if (logic != null) {
                 logic.readData(buf);
                 pendingBeeLogicData = null;
             } else {
-                // Buffer the data for later application when the logic becomes available
                 byte[] data = new byte[buf.readableBytes()];
                 buf.readBytes(data);
                 pendingBeeLogicData = data;
             }
-        } catch (java.io.IOException e) {
-            com.github.gtexpert.gtbm.api.util.ModLog.logger.error("Failed to read bee logic sync data", e);
+        } catch (IOException e) {
+            ModLog.logger.error("Failed to read bee logic sync data", e);
         }
     }
 
-    /** Applies buffered bee logic data that arrived before the logic was initialized on the client. */
     public void applyPendingBeeLogicData() {
-        if (pendingBeeLogicData != null) {
-            IBeekeepingLogic logic = getBeekeepingLogic();
-            if (logic != null) {
-                try {
-                    logic.readData(new net.minecraft.network.PacketBuffer(
-                            io.netty.buffer.Unpooled.wrappedBuffer(pendingBeeLogicData)));
-                } catch (java.io.IOException e) {
-                    com.github.gtexpert.gtbm.api.util.ModLog.logger.error(
-                            "Failed to apply pending bee logic data", e);
-                }
-                pendingBeeLogicData = null;
-            }
+        if (pendingBeeLogicData == null) return;
+        IBeekeepingLogic logic = getBeekeepingLogic();
+        if (logic == null) return;
+        try {
+            logic.readData(new PacketBuffer(Unpooled.wrappedBuffer(pendingBeeLogicData)));
+        } catch (IOException e) {
+            ModLog.logger.error("Failed to apply pending bee logic data", e);
         }
+        pendingBeeLogicData = null;
     }
 
     // ---- Accessors ----
diff --git a/src/main/java/com/github/gtexpert/gtbm/mixins/GTBMMixinLoader.java b/src/main/java/com/github/gtexpert/gtbm/mixins/GTBMMixinLoader.java
@@ -20,6 +20,7 @@ public class GTBMMixinLoader implements ILateMixinLoader {
 
     public static final Map<String, Boolean> modMixinsConfig = new ImmutableMap.Builder<String, Boolean>()
             .put(Mods.Names.FORESTRY, true)
+            .put(Mods.Names.GENDUSTRY, true)
             .put(Mods.Names.GREGICALITY_MULTIBLOCKS, true)
             .build();
 
diff --git a/src/main/java/com/github/gtexpert/gtbm/mixins/forestry/ItemBeeGEMixin.java b/src/main/java/com/github/gtexpert/gtbm/mixins/forestry/ItemBeeGEMixin.java
diff --git a/src/main/java/com/github/gtexpert/gtbm/mixins/gendustry/TileApiaryMixin.java b/src/main/java/com/github/gtexpert/gtbm/mixins/gendustry/TileApiaryMixin.java
diff --git a/src/main/resources/mixins.gtbm.gendustry.json b/src/main/resources/mixins.gtbm.gendustry.json
