Move Industrial Apiary to gregtech (#1107)

* Industrial Apiary

* Make Forestry not required.

* Add support for gendustry upgrades and lower energy demand

* Add item validation to input slots and fix battery + special slots

* Automation upgrade support and bug fixes

* Better canWork check and flower detection

* GUI work

* Better detection of modifier update

* Add button to cancel process

* Add textures

* Tooltip changes

* Add convert crafting

* Make top and sides glow

* Bug fix

* New textures

* Add bee effects

* Make all tooltips translatable

* Implement GT Apiary Upgrades

* Prevent inserting too many upgrades

* Just require gendustry instead of checking it everywhere

* Add blacklist (bug fix) and use hashsets instead of arrays

* Cache beemember to do effects

* Make blacklist automatic

* Add acceleration upgrades for all tiers (LV -> UV)

* Lock the machine to maxspeed by default

* Correct required energy in info tooltip

* Use isUpgrade method instead of manually checking

* Lower amperage to 4

* Save locked speed to nbt

3 files changed, 35 insertions, 9 deletions

diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java
index b5898618f3..285d1fd542 100644
--- a/src/main/java/gregtech/api/enums/ItemList.java
+++ b/src/main/java/gregtech/api/enums/ItemList.java
@@ -1403,6 +1403,16 @@ public enum ItemList implements IItemContainer {
     Machine_MV_Miner,
     Machine_HV_Miner,
 
+    Machine_IndustrialApiary,
+    IndustrialApiary_Upgrade_Acceleration_1,
+    IndustrialApiary_Upgrade_Acceleration_2,
+    IndustrialApiary_Upgrade_Acceleration_3,
+    IndustrialApiary_Upgrade_Acceleration_4,
+    IndustrialApiary_Upgrade_Acceleration_5,
+    IndustrialApiary_Upgrade_Acceleration_6,
+    IndustrialApiary_Upgrade_Acceleration_7,
+    IndustrialApiary_Upgrade_Acceleration_8,
+
     Neutron_Reflector,
 
     Reactor_Coolant_He_1,
diff --git a/src/main/java/gregtech/api/enums/OrePrefixes.java b/src/main/java/gregtech/api/enums/OrePrefixes.java
index fa8bb0b2cb..7b480ea995 100644
--- a/src/main/java/gregtech/api/enums/OrePrefixes.java
+++ b/src/main/java/gregtech/api/enums/OrePrefixes.java
@@ -331,7 +331,9 @@ public enum OrePrefixes {
     cellSteamCracked2("Cells", "Moderately Steam-Cracked ", " Cell", true, true, true, true, false, false, false, true, false, false, 0, M * 1, 64, 30),
     cellSteamCracked3("Cells", "Severely Steam-Cracked ", " Cell", true, true, true, true, false, false, false, true, false, false, 0, M * 1, 64, 30),
 
-    componentCircuit("Circuit Parts", "", "", true, true, false, false, false, false, false, false, false, false, 0, -1, 64, -1);
+    componentCircuit("Circuit Parts", "", "", true, true, false, false, false, false, false, false, false, false, 0, -1, 64, -1),
+
+    apiaryUpgrade("Industrial Apiary Upgrade", "", "", false, false, true, false, false, false, false, false, true, false, 0, -1, 64, -1);
 
     public static final ImmutableList<OrePrefixes> CELL_TYPES =
             ImmutableList.of(
diff --git a/src/main/java/gregtech/api/enums/Textures.java b/src/main/java/gregtech/api/enums/Textures.java
index eee5425809..fb1ff424fc 100644
--- a/src/main/java/gregtech/api/enums/Textures.java
+++ b/src/main/java/gregtech/api/enums/Textures.java
@@ -593,6 +593,8 @@ public class Textures {
         OVERLAY_TOP_ROCK_BREAKER_GLOW,
         OVERLAY_TOP_SCANNER,
         OVERLAY_TOP_SCANNER_GLOW,
+        OVERLAY_TOP_INDUSTRIAL_APIARY,
+        OVERLAY_TOP_INDUSTRIAL_APIARY_GLOW,
 
         OVERLAY_FRONT_POTIONBREWER,
         OVERLAY_FRONT_POTIONBREWER_GLOW,
@@ -625,9 +627,11 @@ public class Textures {
         OVERLAY_FRONT_BOXINATOR_GLOW,
         OVERLAY_FRONT_ROCK_BREAKER,
         OVERLAY_FRONT_ROCK_BREAKER_GLOW,
-
         OVERLAY_FRONT_SCANNER,
         OVERLAY_FRONT_SCANNER_GLOW,
+        OVERLAY_FRONT_INDUSTRIAL_APIARY,
+        OVERLAY_FRONT_INDUSTRIAL_APIARY_GLOW,
+
         OVERLAY_BOTTOM_POTIONBREWER,
         OVERLAY_BOTTOM_POTIONBREWER_GLOW,
         OVERLAY_BOTTOM_REPLICATOR,
@@ -649,13 +653,15 @@ public class Textures {
         OVERLAY_BOTTOM_STEAM_EXTRACTOR_GLOW,
         OVERLAY_BOTTOM_DISASSEMBLER,
         OVERLAY_BOTTOM_DISASSEMBLER_GLOW,
-
         OVERLAY_BOTTOM_BOXINATOR,
         OVERLAY_BOTTOM_BOXINATOR_GLOW,
         OVERLAY_BOTTOM_ROCK_BREAKER,
         OVERLAY_BOTTOM_ROCK_BREAKER_GLOW,
         OVERLAY_BOTTOM_SCANNER,
         OVERLAY_BOTTOM_SCANNER_GLOW,
+        OVERLAY_BOTTOM_INDUSTRIAL_APIARY,
+        OVERLAY_BOTTOM_INDUSTRIAL_APIARY_GLOW,
+
         OVERLAY_SIDE_POTIONBREWER,
         OVERLAY_SIDE_POTIONBREWER_GLOW,
         OVERLAY_SIDE_REPLICATOR,
@@ -664,7 +670,6 @@ public class Textures {
         OVERLAY_SIDE_MASSFAB_GLOW,
         OVERLAY_SIDE_STEAM_HAMMER,
         OVERLAY_SIDE_STEAM_HAMMER_GLOW,
-
         OVERLAY_SIDE_STEAM_FURNACE,
         OVERLAY_SIDE_STEAM_FURNACE_GLOW,
         OVERLAY_SIDE_STEAM_ALLOY_SMELTER,
@@ -677,13 +682,15 @@ public class Textures {
         OVERLAY_SIDE_STEAM_EXTRACTOR_GLOW,
         OVERLAY_SIDE_DISASSEMBLER,
         OVERLAY_SIDE_DISASSEMBLER_GLOW,
-
         OVERLAY_SIDE_BOXINATOR,
         OVERLAY_SIDE_BOXINATOR_GLOW,
         OVERLAY_SIDE_ROCK_BREAKER,
         OVERLAY_SIDE_ROCK_BREAKER_GLOW,
         OVERLAY_SIDE_SCANNER,
         OVERLAY_SIDE_SCANNER_GLOW,
+        OVERLAY_SIDE_INDUSTRIAL_APIARY,
+        OVERLAY_SIDE_INDUSTRIAL_APIARY_GLOW,
+
         OVERLAY_TOP_POTIONBREWER_ACTIVE,
         OVERLAY_TOP_POTIONBREWER_ACTIVE_GLOW,
         OVERLAY_TOP_REPLICATOR_ACTIVE,
@@ -712,9 +719,11 @@ public class Textures {
         OVERLAY_TOP_ROCK_BREAKER_ACTIVE_GLOW,
         OVERLAY_TOP_SCANNER_ACTIVE,
         OVERLAY_TOP_SCANNER_ACTIVE_GLOW,
+        OVERLAY_TOP_INDUSTRIAL_APIARY_ACTIVE,
+        OVERLAY_TOP_INDUSTRIAL_APIARY_ACTIVE_GLOW,
+
         OVERLAY_FRONT_POTIONBREWER_ACTIVE,
         OVERLAY_FRONT_POTIONBREWER_ACTIVE_GLOW,
-
         OVERLAY_FRONT_REPLICATOR_ACTIVE,
         OVERLAY_FRONT_REPLICATOR_ACTIVE_GLOW,
         OVERLAY_FRONT_MASSFAB_ACTIVE,
@@ -730,18 +739,19 @@ public class Textures {
         OVERLAY_FRONT_STEAM_EXTRACTOR_ACTIVE_GLOW,
         OVERLAY_FRONT_BOXINATOR_ACTIVE,
         OVERLAY_FRONT_BOXINATOR_ACTIVE_GLOW,
-
         OVERLAY_FRONT_ROCK_BREAKER_ACTIVE,
         OVERLAY_FRONT_ROCK_BREAKER_ACTIVE_GLOW,
         OVERLAY_FRONT_SCANNER_ACTIVE,
         OVERLAY_FRONT_SCANNER_ACTIVE_GLOW,
+        OVERLAY_FRONT_INDUSTRIAL_APIARY_ACTIVE,
+        OVERLAY_FRONT_INDUSTRIAL_APIARY_ACTIVE_GLOW,
+
         OVERLAY_BOTTOM_POTIONBREWER_ACTIVE,
         OVERLAY_BOTTOM_POTIONBREWER_ACTIVE_GLOW,
         OVERLAY_BOTTOM_REPLICATOR_ACTIVE,
         OVERLAY_BOTTOM_REPLICATOR_ACTIVE_GLOW,
         OVERLAY_BOTTOM_MASSFAB_ACTIVE,
         OVERLAY_BOTTOM_MASSFAB_ACTIVE_GLOW,
-
         OVERLAY_BOTTOM_STEAM_HAMMER_ACTIVE,
         OVERLAY_BOTTOM_STEAM_HAMMER_ACTIVE_GLOW,
         OVERLAY_BOTTOM_STEAM_FURNACE_ACTIVE,
@@ -763,6 +773,8 @@ public class Textures {
         OVERLAY_BOTTOM_ROCK_BREAKER_ACTIVE_GLOW,
         OVERLAY_BOTTOM_SCANNER_ACTIVE,
         OVERLAY_BOTTOM_SCANNER_ACTIVE_GLOW,
+        OVERLAY_BOTTOM_INDUSTRIAL_APIARY_ACTIVE,
+        OVERLAY_BOTTOM_INDUSTRIAL_APIARY_ACTIVE_GLOW,
 
         OVERLAY_SIDE_POTIONBREWER_ACTIVE,
         OVERLAY_SIDE_POTIONBREWER_ACTIVE_GLOW,
@@ -787,11 +799,13 @@ public class Textures {
         OVERLAY_SIDE_DISASSEMBLER_ACTIVE_GLOW,
         OVERLAY_SIDE_BOXINATOR_ACTIVE,
         OVERLAY_SIDE_BOXINATOR_ACTIVE_GLOW,
-
         OVERLAY_SIDE_ROCK_BREAKER_ACTIVE,
         OVERLAY_SIDE_ROCK_BREAKER_ACTIVE_GLOW,
         OVERLAY_SIDE_SCANNER_ACTIVE,
         OVERLAY_SIDE_SCANNER_ACTIVE_GLOW,
+        OVERLAY_SIDE_INDUSTRIAL_APIARY_ACTIVE,
+        OVERLAY_SIDE_INDUSTRIAL_APIARY_ACTIVE_GLOW,
+
         OVERLAY_ADV_PUMP,
         OVERLAY_TELEPORTER,
         OVERLAY_TELEPORTER_GLOW,