Skip to content

fix gt loader check #214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
UltraProdigy merged 2 commits into from
Jul 29, 2026
Merged

fix gt loader check #214

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
249873d
fix gt loader check
felixfour Jul 29, 2026
3962c12
rename
felixfour Jul 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/main/scala/li/cil/oc/integration/forestry/UpgradeBeekeeperUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* */
public final class UpgradeBeekeeperUtil {

private static final boolean GT_LOADED = Loader.isModLoaded("gregtech");
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 */
Expand All @@ -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)
Expand All @@ -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();
Expand Down Expand Up @@ -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();
}
Expand Down