From 249873d275bf4edc1d104e042828f4c311a1daa8 Mon Sep 17 00:00:00 2001
From: __felix__ <134875831+felixfour@users.noreply.github.com>
Date: Wed, 29 Jul 2026 06:57:14 -0400
Subject: [PATCH 1/2] fix gt loader check

---
 .../li/cil/oc/integration/forestry/UpgradeBeekeeperUtil.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/scala/li/cil/oc/integration/forestry/UpgradeBeekeeperUtil.java b/src/main/scala/li/cil/oc/integration/forestry/UpgradeBeekeeperUtil.java
index fc4f2c4098..069c6db846 100644
--- a/src/main/scala/li/cil/oc/integration/forestry/UpgradeBeekeeperUtil.java
+++ b/src/main/scala/li/cil/oc/integration/forestry/UpgradeBeekeeperUtil.java
@@ -17,7 +17,7 @@
  * */
 public final class UpgradeBeekeeperUtil {
 
-    private static final boolean GT_LOADED = Loader.isModLoaded("gregtech");
+    private static final boolean GT_LOADED = Loader.isModLoaded("gregtech_nh");
     private UpgradeBeekeeperUtil() {}
 
     /** Returns an IBeeHousing TileEntity at position pos. Can be an Industrial Apiary */

From 3962c1238d80471f924bc214f8e6b53be8552a99 Mon Sep 17 00:00:00 2001
From: __felix__ <134875831+felixfour@users.noreply.github.com>
Date: Wed, 29 Jul 2026 07:55:32 -0400
Subject: [PATCH 2/2] rename

---
 .../cil/oc/integration/forestry/UpgradeBeekeeperUtil.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/scala/li/cil/oc/integration/forestry/UpgradeBeekeeperUtil.java b/src/main/scala/li/cil/oc/integration/forestry/UpgradeBeekeeperUtil.java
index 069c6db846..536efebf5b 100644
--- a/src/main/scala/li/cil/oc/integration/forestry/UpgradeBeekeeperUtil.java
+++ b/src/main/scala/li/cil/oc/integration/forestry/UpgradeBeekeeperUtil.java
@@ -17,7 +17,7 @@
  * */
 public final class UpgradeBeekeeperUtil {
 
-    private static final boolean GT_LOADED = Loader.isModLoaded("gregtech_nh");
+    private static final boolean GT5U_NH_LOADED = Loader.isModLoaded("gregtech_nh");
     private UpgradeBeekeeperUtil() {}
 
     /** Returns an IBeeHousing TileEntity at position pos. Can be an Industrial Apiary */
@@ -32,7 +32,7 @@ public static IBeeHousing getBeeHousingAt(BlockPosition pos) {
         if (te instanceof IBeeHousing)
             return (IBeeHousing)te;
 
-        if (!GT_LOADED)
+        if (!GT5U_NH_LOADED)
             return null;
 
         // Scala doesn't compile if these checks are of the form (a instanceof B b)
@@ -46,7 +46,7 @@ public static IBeeHousing getBeeHousingAt(BlockPosition pos) {
 
     /** Returns a Tile Entity for Industrial Apiaries at position pos, or null if none exist */
     public static MTEIndustrialApiary getGTIApiaryAt(BlockPosition pos) {
-        if (!GT_LOADED || pos.world().isEmpty())
+        if (!GT5U_NH_LOADED || pos.world().isEmpty())
             return null;
 
         World world = pos.world().get();
@@ -86,7 +86,7 @@ public static boolean swapDrone(BlockPosition pos, IInventory hostInv, int slot)
     }
 
     public static int getMaxIndustrialUpgradeCount() {
-        if (!GT_LOADED)
+        if (!GT5U_NH_LOADED)
             return 0;
         return MTEIndustrialApiary.getMaxUpgradeCount();
     }