Industrial Apiary Changes (#1197)

* Start with lower energy without acceleration upgrades

* Pollen collection is an upgrade... I didnt know.

* Implement Queen Pollination

* Fix battery slot not working

* Dont try to pollinate when there is no chance to success

2 files changed, 2 insertions, 16 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 45d455ff03..5160b6b0f0 100644
--- a/src/main/java/gregtech/common/gui/GT_Container_IndustrialApiary.java
+++ b/src/main/java/gregtech/common/gui/GT_Container_IndustrialApiary.java
@@ -37,7 +37,6 @@ public class GT_Container_IndustrialApiary extends GT_ContainerMetaTile_Machine
 
     int mSpeed = 0; // scale 0 - 8
     boolean mLockedSpeed = true;
-    boolean retrievePollen;
 
     ArrayList<String> mErrorStates = new ArrayList<>(50);
 
@@ -49,7 +48,6 @@ public class GT_Container_IndustrialApiary extends GT_ContainerMetaTile_Machine
     public void addSlots(InventoryPlayer aInventoryPlayer) {
         addSlotToContainer(slotItemTransferToggle = new GT_Slot_Holo(mTileEntity, 0, 8, 63, false, true, 1));
         addSlotToContainer(slotSpeedToggle = new GT_Slot_Holo(mTileEntity, 0, 26, 63, false, true, 1));
-        addSlotToContainer(slotPollenToggle = new GT_Slot_Holo(mTileEntity, 0, 8, 45, false, true, 1));
         addSlotToContainer(slotCancelProcess = new GT_Slot_Holo(mTileEntity, 0, 8, 27, false, true, 1));
         int tStartIndex = 5;
 
@@ -101,9 +99,6 @@ public class GT_Container_IndustrialApiary extends GT_ContainerMetaTile_Machine
                 }
                 return null;
             case 2:
-                machine.retreviePollen = !machine.retreviePollen;
-                return null;
-            case 3:
                 machine.cancelProcess();
                 detectAndSendChanges();
                 return null;
@@ -150,7 +145,7 @@ public class GT_Container_IndustrialApiary extends GT_ContainerMetaTile_Machine
 
     @Override
     public int getSlotStartIndex() {
-        return 4;
+        return 3;
     }
 
     @Override
@@ -173,7 +168,6 @@ public class GT_Container_IndustrialApiary extends GT_ContainerMetaTile_Machine
         this.mSpeed = getMachine().mSpeed;
         this.mItemTransfer = getMachine().mItemTransfer;
         this.mStuttering = getMachine().mStuttering;
-        this.retrievePollen = getMachine().retreviePollen;
         this.mLockedSpeed = getMachine().mLockedSpeed;
 
         for (Object crafter : this.crafters) {
@@ -184,8 +178,7 @@ public class GT_Container_IndustrialApiary extends GT_ContainerMetaTile_Machine
             for(IErrorState s : getMachine().mErrorStates)
                 var1.sendProgressBarUpdate(this, 103, s.getID());
             var1.sendProgressBarUpdate(this, 104, this.mStuttering ? 1 : 0);
-            var1.sendProgressBarUpdate(this, 105, this.retrievePollen ? 1 : 0);
-            var1.sendProgressBarUpdate(this, 106, this.mLockedSpeed ? 1 : 0);
+            var1.sendProgressBarUpdate(this, 105, this.mLockedSpeed ? 1 : 0);
         }
     }
 
@@ -210,9 +203,6 @@ public class GT_Container_IndustrialApiary extends GT_ContainerMetaTile_Machine
                 this.mStuttering = par2 == 1;
                 break;
             case 105:
-                this.retrievePollen = par2 == 1;
-                break;
-            case 106:
                 this.mLockedSpeed = par2 == 1;
                 break;
         }
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 f901a78599..c810704403 100644
--- a/src/main/java/gregtech/common/gui/GT_GUIContainer_IndustrialApiary.java
+++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_IndustrialApiary.java
@@ -25,7 +25,6 @@ public class GT_GUIContainer_IndustrialApiary extends GT_GUIContainerMetaTile_Ma
         STALLED_STUTTERING_TOOLTIP = "GT5U.machines.stalled_stuttering.tooltip",
         ITEM_TRANSFER_TOOLTIP = "GT5U.machines.item_transfer.tooltip",
         POWER_SOURCE_POWER = "GT5U.machines.powersource.power",
-        RETRIEVE_POLLEN_TOOLTIP = "GT5U.machines.industrialapiary.pollen.tooltip",
         CANCEL_PROCESS_TOOLTIP = "GT5U.machines.industrialapiary.cancel.tooltip",
         SPEED_TOOLTIP = "GT5U.machines.industrialapiary.speed.tooltip",
         SPEED_LOCKED_TOOLTIP = "GT5U.machines.industrialapiary.speedlocked.tooltip",
@@ -57,7 +56,6 @@ public class GT_GUIContainer_IndustrialApiary extends GT_GUIContainerMetaTile_Ma
         mErrorStatesTooltip.enabled = false;
         addToolTip(mInfoTooltip = new GT_GuiTooltip(new Rectangle(this.guiLeft + 163, guiTop + 5, 6, 17)));
 
-        addToolTip(new GT_GuiSlotTooltip(getContainer().slotPollenToggle, mTooltipCache.getData(RETRIEVE_POLLEN_TOOLTIP)));
         addToolTip(new GT_GuiSlotTooltip(getContainer().slotCancelProcess, mTooltipCache.getData(CANCEL_PROCESS_TOOLTIP)));
 
 
@@ -129,8 +127,6 @@ public class GT_GUIContainer_IndustrialApiary extends GT_GUIContainerMetaTile_Ma
         if (this.mContainer != null) {
             if (getContainer().mItemTransfer)
                 drawTexturedModalRect(x + 7, y + 62, 176, 18, 18, 18);
-            if(getContainer().retrievePollen)
-                drawTexturedModalRect(x + 7, y + 44, 194, 18, 18, 18);
             if(getContainer().mMaxProgressTime > 0) {
                 double p = (double) getContainer().mProgressTime / getContainer().mMaxProgressTime;
                 drawTexturedModalRect(x+70, y+3, 176, 0, (int)(p*20), 18);