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

32 files changed, 72 insertions, 0 deletions

diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang
index c1e45e9286..1e4caa00f6 100644
--- a/src/main/resources/assets/gregtech/lang/en_US.lang
+++ b/src/main/resources/assets/gregtech/lang/en_US.lang
@@ -134,6 +134,28 @@ GT5U.machines.stalled_vent.tooltip.extended=§7Progress was lost, but not
 GT5U.machines.stalled_vent.tooltip.extended.1=§7the recipe's output.
 GT5U.machines.oreprocessor=§eRunning Mode: %s §cTime: %s s
 GT5U.machines.oreprocessor.void=§eVoid Stone Dust: %s
+GT5U.machines.industrialapiary.pollen.tooltip=Retrevie Pollen
+GT5U.machines.industrialapiary.pollen.tooltip.1=§cWARNING: INCREASES LAG
+GT5U.machines.industrialapiary.cancel.tooltip=§cCancel process
+GT5U.machines.industrialapiary.cancel.tooltip.1=§7Will also disable machine (soft mallet)
+GT5U.machines.industrialapiary.cancel.tooltip.2=§7§oCan't stop princess breeding
+GT5U.machines.industrialapiary.speedlocked.tooltip=§rAcceleration: %1$dx §7§o(locked to maximum)
+GT5U.machines.industrialapiary.speedlocked.tooltip.1=§7Energy usage: +%2$s EU/t
+GT5U.machines.industrialapiary.speedlocked.tooltip.2=§7§oRight-click to unlock
+GT5U.machines.industrialapiary.speed.tooltip=Acceleration: %1$dx
+GT5U.machines.industrialapiary.speed.tooltip.1=§7Energy usage: +%2$s EU/t
+GT5U.machines.industrialapiary.speed.tooltip.2=§7§oRight-click to lock at maximum
+GT5U.machines.industrialapiary.info.tooltip=Energy required: %1$s EU/t
+GT5U.machines.industrialapiary.info.tooltip.1=Temperature: %2$s
+GT5U.machines.industrialapiary.info.tooltip.2=Humidity: %3$s
+GT5U.machines.industrialapiary.info.tooltip.3=§7§oInsert analyzed bee to see more info
+GT5U.machines.industrialapiary.infoextended.tooltip=Energy required: %1$s EU/t
+GT5U.machines.industrialapiary.infoextended.tooltip.1=Temperature: %2$s
+GT5U.machines.industrialapiary.infoextended.tooltip.2=Humidity: %3$s
+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.recipe_filter.representation_slot.tooltip=Click with a machine to set filter
 
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_BOTTOM_INDUSTRIAL_APIARY.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_BOTTOM_INDUSTRIAL_APIARY.png
new file mode 100644
index 0000000000..6c7e63b924
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_BOTTOM_INDUSTRIAL_APIARY.png
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_BOTTOM_INDUSTRIAL_APIARY_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_BOTTOM_INDUSTRIAL_APIARY_ACTIVE.png
new file mode 100644
index 0000000000..6c7e63b924
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_BOTTOM_INDUSTRIAL_APIARY_ACTIVE.png
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_BOTTOM_INDUSTRIAL_APIARY_ACTIVE_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_BOTTOM_INDUSTRIAL_APIARY_ACTIVE_GLOW.png
new file mode 100644
index 0000000000..6c7e63b924
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_BOTTOM_INDUSTRIAL_APIARY_ACTIVE_GLOW.png
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_BOTTOM_INDUSTRIAL_APIARY_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_BOTTOM_INDUSTRIAL_APIARY_GLOW.png
new file mode 100644
index 0000000000..6c7e63b924
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_BOTTOM_INDUSTRIAL_APIARY_GLOW.png
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_INDUSTRIAL_APIARY.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_INDUSTRIAL_APIARY.png
new file mode 100644
index 0000000000..9676dc210e
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_INDUSTRIAL_APIARY.png
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_INDUSTRIAL_APIARY_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_INDUSTRIAL_APIARY_ACTIVE.png
new file mode 100644
index 0000000000..64e96e1a90
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_INDUSTRIAL_APIARY_ACTIVE.png
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_INDUSTRIAL_APIARY_ACTIVE.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_INDUSTRIAL_APIARY_ACTIVE.png.mcmeta
new file mode 100644
index 0000000000..07dc1943ab
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_INDUSTRIAL_APIARY_ACTIVE.png.mcmeta
@@ -0,0 +1,6 @@
+{
+   "animation": {
+      "frametime": 3
+   }
+}
+
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_INDUSTRIAL_APIARY_ACTIVE_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_INDUSTRIAL_APIARY_ACTIVE_GLOW.png
new file mode 100644
index 0000000000..d7ac33e480
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_INDUSTRIAL_APIARY_ACTIVE_GLOW.png
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_INDUSTRIAL_APIARY_ACTIVE_GLOW.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_INDUSTRIAL_APIARY_ACTIVE_GLOW.png.mcmeta
new file mode 100644
index 0000000000..07dc1943ab
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_INDUSTRIAL_APIARY_ACTIVE_GLOW.png.mcmeta
@@ -0,0 +1,6 @@
+{
+   "animation": {
+      "frametime": 3
+   }
+}
+
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_INDUSTRIAL_APIARY_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_INDUSTRIAL_APIARY_GLOW.png
new file mode 100644
index 0000000000..6c7e63b924
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_INDUSTRIAL_APIARY_GLOW.png
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SIDE_INDUSTRIAL_APIARY.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SIDE_INDUSTRIAL_APIARY.png
new file mode 100644
index 0000000000..5bbc94f2fd
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SIDE_INDUSTRIAL_APIARY.png
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SIDE_INDUSTRIAL_APIARY_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SIDE_INDUSTRIAL_APIARY_ACTIVE.png
new file mode 100644
index 0000000000..445380129a
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SIDE_INDUSTRIAL_APIARY_ACTIVE.png
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SIDE_INDUSTRIAL_APIARY_ACTIVE.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SIDE_INDUSTRIAL_APIARY_ACTIVE.png.mcmeta
new file mode 100644
index 0000000000..07dc1943ab
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SIDE_INDUSTRIAL_APIARY_ACTIVE.png.mcmeta
@@ -0,0 +1,6 @@
+{
+   "animation": {
+      "frametime": 3
+   }
+}
+
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SIDE_INDUSTRIAL_APIARY_ACTIVE_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SIDE_INDUSTRIAL_APIARY_ACTIVE_GLOW.png
new file mode 100644
index 0000000000..175d3cd187
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SIDE_INDUSTRIAL_APIARY_ACTIVE_GLOW.png
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SIDE_INDUSTRIAL_APIARY_ACTIVE_GLOW.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SIDE_INDUSTRIAL_APIARY_ACTIVE_GLOW.png.mcmeta
new file mode 100644
index 0000000000..07dc1943ab
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SIDE_INDUSTRIAL_APIARY_ACTIVE_GLOW.png.mcmeta
@@ -0,0 +1,6 @@
+{
+   "animation": {
+      "frametime": 3
+   }
+}
+
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SIDE_INDUSTRIAL_APIARY_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SIDE_INDUSTRIAL_APIARY_GLOW.png
new file mode 100644
index 0000000000..6c7e63b924
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SIDE_INDUSTRIAL_APIARY_GLOW.png
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TOP_INDUSTRIAL_APIARY.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TOP_INDUSTRIAL_APIARY.png
new file mode 100644
index 0000000000..d150d18097
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TOP_INDUSTRIAL_APIARY.png
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TOP_INDUSTRIAL_APIARY_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TOP_INDUSTRIAL_APIARY_ACTIVE.png
new file mode 100644
index 0000000000..01718a8a3b
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TOP_INDUSTRIAL_APIARY_ACTIVE.png
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TOP_INDUSTRIAL_APIARY_ACTIVE.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TOP_INDUSTRIAL_APIARY_ACTIVE.png.mcmeta
new file mode 100644
index 0000000000..cd2c2be182
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TOP_INDUSTRIAL_APIARY_ACTIVE.png.mcmeta
@@ -0,0 +1,13 @@
+{
+  "animation": {
+    "frametime": 1,
+    "frames": [
+      { "index": 0, "time": 90 },
+      { "index": 1, "time": 2 },
+      { "index": 0, "time": 1 },
+      { "index": 1, "time": 2 },
+  
+	 
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TOP_INDUSTRIAL_APIARY_ACTIVE_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TOP_INDUSTRIAL_APIARY_ACTIVE_GLOW.png
new file mode 100644
index 0000000000..121c7e0266
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TOP_INDUSTRIAL_APIARY_ACTIVE_GLOW.png
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TOP_INDUSTRIAL_APIARY_ACTIVE_GLOW.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TOP_INDUSTRIAL_APIARY_ACTIVE_GLOW.png.mcmeta
new file mode 100644
index 0000000000..cd2c2be182
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TOP_INDUSTRIAL_APIARY_ACTIVE_GLOW.png.mcmeta
@@ -0,0 +1,13 @@
+{
+  "animation": {
+    "frametime": 1,
+    "frames": [
+      { "index": 0, "time": 90 },
+      { "index": 1, "time": 2 },
+      { "index": 0, "time": 1 },
+      { "index": 1, "time": 2 },
+  
+	 
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TOP_INDUSTRIAL_APIARY_GLOW.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TOP_INDUSTRIAL_APIARY_GLOW.png
new file mode 100644
index 0000000000..81e7361539
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TOP_INDUSTRIAL_APIARY_GLOW.png
diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/IndustrialApiary.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/IndustrialApiary.png
new file mode 100644
index 0000000000..261f569cd7
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/gui/basicmachines/IndustrialApiary.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/200.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/200.png
new file mode 100644
index 0000000000..57e349f48f
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/200.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/201.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/201.png
new file mode 100644
index 0000000000..183ffe343f
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/201.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/202.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/202.png
new file mode 100644
index 0000000000..04a4508383
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/202.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/203.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/203.png
new file mode 100644
index 0000000000..6955484d4b
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/203.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/204.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/204.png
new file mode 100644
index 0000000000..2f9d227a35
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/204.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/205.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/205.png
new file mode 100644
index 0000000000..78a97208a9
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/205.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/206.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/206.png
new file mode 100644
index 0000000000..6c90d87036
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/206.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/207.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/207.png
new file mode 100644
index 0000000000..3f971630a6
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/207.png