aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/xmod/ob
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/ob')
-rw-r--r--src/main/java/gtPlusPlus/xmod/ob/HANDLER_OpenBlocks.java11
-rw-r--r--src/main/java/gtPlusPlus/xmod/ob/SprinklerHandler.java5
2 files changed, 7 insertions, 9 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/ob/HANDLER_OpenBlocks.java b/src/main/java/gtPlusPlus/xmod/ob/HANDLER_OpenBlocks.java
index 065b28c7e7..2f9178678d 100644
--- a/src/main/java/gtPlusPlus/xmod/ob/HANDLER_OpenBlocks.java
+++ b/src/main/java/gtPlusPlus/xmod/ob/HANDLER_OpenBlocks.java
@@ -1,22 +1,19 @@
package gtPlusPlus.xmod.ob;
-import gtPlusPlus.core.lib.LoadedMods;
+import static gregtech.api.enums.Mods.OpenBlocks;
+
import gtPlusPlus.core.util.Utils;
public class HANDLER_OpenBlocks {
- public static void preInit() {
- if (LoadedMods.OpenBlocks) {}
- }
-
public static void init() {
- if (LoadedMods.OpenBlocks) {
+ if (OpenBlocks.isModLoaded()) {
GliderHandler.populateBlacklist();
}
}
public static void postInit() {
- if (LoadedMods.OpenBlocks) {
+ if (OpenBlocks.isModLoaded()) {
Utils.registerEvent(new GliderHandler());
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/ob/SprinklerHandler.java b/src/main/java/gtPlusPlus/xmod/ob/SprinklerHandler.java
index 3b80442d45..37133444e5 100644
--- a/src/main/java/gtPlusPlus/xmod/ob/SprinklerHandler.java
+++ b/src/main/java/gtPlusPlus/xmod/ob/SprinklerHandler.java
@@ -1,5 +1,7 @@
package gtPlusPlus.xmod.ob;
+import static gregtech.api.enums.Mods.Forestry;
+
import java.util.HashMap;
import net.minecraft.init.Items;
@@ -8,7 +10,6 @@ import net.minecraft.item.ItemStack;
import com.google.common.base.Objects;
import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.util.minecraft.ItemUtils;
/**
@@ -45,7 +46,7 @@ public class SprinklerHandler {
f = new ItemStack(Items.dye, 1, 15);
SprinklerHandler.registerSprinklerFertilizer(f);
- if (LoadedMods.Forestry) {
+ if (Forestry.isModLoaded()) {
f = ItemUtils.getCorrectStacktype("Forestry:fertilizerBio", 1);
if (f != null) {
registerSprinklerFertilizer(f);