From 8b41b92359da401833cd7fbef7949311fadd3889 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Sat, 27 Jan 2024 17:46:16 +0100 Subject: [PATCH] Revert "Add GT version checks to avoid crash with GT6" This reverts commit 0c4239c954875d64a802f28cbc715f52c5cb381b. --- src/main/java/magicbees/bees/BeeProductHelper.java | 3 ++- src/main/java/magicbees/main/Config.java | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/magicbees/bees/BeeProductHelper.java b/src/main/java/magicbees/bees/BeeProductHelper.java index d24722e..db7ce50 100644 --- a/src/main/java/magicbees/bees/BeeProductHelper.java +++ b/src/main/java/magicbees/bees/BeeProductHelper.java @@ -131,6 +131,7 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; +import cpw.mods.fml.common.Loader; import gregtech.api.enums.Materials; import magicbees.item.types.CombType; import magicbees.item.types.DropType; @@ -261,7 +262,7 @@ public class BeeProductHelper { } public static void initOreDictSProducts() { - boolean isGTLoaded = Config.isGTLoaded; + boolean isGTLoaded = Loader.isModLoaded("gregtech"); SILVER.addProduct(ForestryHelper.itemHoneycomb, 0.10f); if (OreDictionary.getOres("nuggetSilver").size() > 0) { SILVER.addSpecialty( diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index 8814699..ad97dde 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -164,8 +164,7 @@ public class Config { public static Configuration configuration; // ---- Loaded mods ----------------------------------------- - public static boolean isGTLoaded = Loader.isModLoaded("gregtech") - && !Loader.instance().getIndexedModList().get("gregtech").getVersion().startsWith("GT6"); + public static boolean isGTLoaded = Loader.isModLoaded("gregtech"); public Config(File configFile) { configuration = new Configuration(configFile);