Industrial Apiary Fixes (#1225)

* Upgrade slot tooltip

* Fix Hellish biomes temperature

* Princess -> Queen process is always automated

4 files changed, 19 insertions, 8 deletions

diff --git a/src/main/java/gregtech/common/gui/GT_Container_IndustrialApiary.java b/src/main/java/gregtech/common/gui/GT_Container_IndustrialApiary.java
index 5160b6b0f0..26170a9478 100644
--- a/src/main/java/gregtech/common/gui/GT_Container_IndustrialApiary.java
+++ b/src/main/java/gregtech/common/gui/GT_Container_IndustrialApiary.java
@@ -27,10 +27,10 @@ public class GT_Container_IndustrialApiary extends GT_ContainerMetaTile_Machine
 
     GT_Slot_Holo slotItemTransferToggle;
     GT_Slot_Holo slotSpeedToggle;
-    GT_Slot_Holo slotPollenToggle;
     GT_Slot_Holo slotCancelProcess;
     Slot slotBattery;
     Slot slotSpecial;
+    ArrayList<Slot> slotUpgrade;
 
     boolean mItemTransfer;
     boolean mStuttering;
@@ -54,10 +54,11 @@ public class GT_Container_IndustrialApiary extends GT_ContainerMetaTile_Machine
         addSlotToContainer(new ApiarySlot(this.mTileEntity, tStartIndex++, 37, 22));
         addSlotToContainer(new ApiarySlot(this.mTileEntity, tStartIndex++, 37, 42));
 
-        addSlotToContainer(new ApiarySlot(this.mTileEntity, tStartIndex++, 62, 24));
-        addSlotToContainer(new ApiarySlot(this.mTileEntity, tStartIndex++, 80, 24));
-        addSlotToContainer(new ApiarySlot(this.mTileEntity, tStartIndex++, 62, 42));
-        addSlotToContainer(new ApiarySlot(this.mTileEntity, tStartIndex++, 80, 42));
+        slotUpgrade = new ArrayList<>(4);
+        slotUpgrade.add(addSlotToContainer(new ApiarySlot(this.mTileEntity, tStartIndex++, 62, 24)));
+        slotUpgrade.add(addSlotToContainer(new ApiarySlot(this.mTileEntity, tStartIndex++, 80, 24)));
+        slotUpgrade.add(addSlotToContainer(new ApiarySlot(this.mTileEntity, tStartIndex++, 62, 42)));
+        slotUpgrade.add(addSlotToContainer(new ApiarySlot(this.mTileEntity, tStartIndex++, 80, 42)));
 
         for(int i = 107; i <= 143; i += 18)
             for(int j = 6; j <= 42; j += 18)
diff --git a/src/main/java/gregtech/common/gui/GT_GUIContainer_IndustrialApiary.java b/src/main/java/gregtech/common/gui/GT_GUIContainer_IndustrialApiary.java
index c810704403..3737632dd4 100644
--- a/src/main/java/gregtech/common/gui/GT_GUIContainer_IndustrialApiary.java
+++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_IndustrialApiary.java
@@ -29,7 +29,8 @@ public class GT_GUIContainer_IndustrialApiary extends GT_GUIContainerMetaTile_Ma
         SPEED_TOOLTIP = "GT5U.machines.industrialapiary.speed.tooltip",
         SPEED_LOCKED_TOOLTIP = "GT5U.machines.industrialapiary.speedlocked.tooltip",
         INFO_TOOLTIP = "GT5U.machines.industrialapiary.info.tooltip",
-        INFO_WITH_BEE_TOOLTIP = "GT5U.machines.industrialapiary.infoextended.tooltip"
+        INFO_WITH_BEE_TOOLTIP = "GT5U.machines.industrialapiary.infoextended.tooltip",
+        UPGRADE_TOOLTIP = "GT5U.machines.industrialapiary.upgradeslot.tooltip"
             ;
 
 
@@ -57,6 +58,7 @@ public class GT_GUIContainer_IndustrialApiary extends GT_GUIContainerMetaTile_Ma
         addToolTip(mInfoTooltip = new GT_GuiTooltip(new Rectangle(this.guiLeft + 163, guiTop + 5, 6, 17)));
 
         addToolTip(new GT_GuiSlotTooltip(getContainer().slotCancelProcess, mTooltipCache.getData(CANCEL_PROCESS_TOOLTIP)));
+        getContainer().slotUpgrade.forEach(s->addToolTip(new GT_GuiSlotTooltip(s, mTooltipCache.getData(UPGRADE_TOOLTIP))));
 
 
         addToolTip(new GT_GuiSlotTooltip(getContainer().slotItemTransferToggle, mTooltipCache.getData(ITEM_TRANSFER_TOOLTIP)));
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_IndustrialApiary.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_IndustrialApiary.java
index de41e5bc17..faa1df8ebe 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_IndustrialApiary.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_IndustrialApiary.java
@@ -439,7 +439,7 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM
                     for (int i = 0; i < mOutputItems.length; i++)
                         if(mOutputItems[i] != null)
                             for (int j = 0; j < mOutputItems.length; j++) {
-                                if(isAutomated)
+                                if(j == 0 && isAutomated)
                                 {
                                     if(beeRoot.isMember(mOutputItems[i], EnumBeeType.QUEEN.ordinal()) || beeRoot.isMember(mOutputItems[i], EnumBeeType.PRINCESS.ordinal())) {
                                         if(aBaseMetaTileEntity.addStackToSlot(queen, mOutputItems[i]))
@@ -449,6 +449,9 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM
                                         if(aBaseMetaTileEntity.addStackToSlot(drone, mOutputItems[i]))
                                             break;
                                 }
+                                else if(i == 0 && j == 0 && beeRoot.isMember(mOutputItems[0], EnumBeeType.QUEEN.ordinal()))
+                                    if(aBaseMetaTileEntity.addStackToSlot(queen, mOutputItems[0]))
+                                        break;
                                 if (aBaseMetaTileEntity.addStackToSlot(getOutputSlot() + ((j + i) % mOutputItems.length), mOutputItems[i]))
                                     break;
                             }
@@ -604,7 +607,10 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM
 
     @Override
     public EnumTemperature getTemperature() {
-        return EnumTemperature.getFromValue(getBiome().temperature + temperatureMod);
+        if(BiomeHelper.isBiomeHellish(getBiome()))
+            return EnumTemperature.HELLISH;
+        return
+            EnumTemperature.getFromValue(getBiome().temperature + temperatureMod);
     }
 
     @Override
diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang
index 31660da2b3..146f2ddbb0 100644
--- a/src/main/resources/assets/gregtech/lang/en_US.lang
+++ b/src/main/resources/assets/gregtech/lang/en_US.lang
@@ -158,6 +158,8 @@ GT5U.machines.industrialapiary.infoextended.tooltip.3=Production Modifier: %4$d
 GT5U.machines.industrialapiary.infoextended.tooltip.4=Flowering Chance: %5$d %%
 GT5U.machines.industrialapiary.infoextended.tooltip.5=Lifespan Modifier: %6$d %%
 GT5U.machines.industrialapiary.infoextended.tooltip.6=Terrority: %7$d x %8$d x %9$d
+GT5U.machines.industrialapiary.upgradeslot.tooltip=Upgrade slot
+GT5U.machines.industrialapiary.upgradeslot.tooltip.1=§7Also accepts gendustry upgrades
 
 GT5U.recipe_filter.representation_slot.tooltip=Click with a machine to set filter