From 0c4239c954875d64a802f28cbc715f52c5cb381b Mon Sep 17 00:00:00 2001 From: kappa_maintainer Date: Sat, 27 Jan 2024 12:56:31 +0800 Subject: [PATCH] Add GT version checks to avoid crash with GT6 --- 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 db7ce50..d24722e 100644 --- a/src/main/java/magicbees/bees/BeeProductHelper.java +++ b/src/main/java/magicbees/bees/BeeProductHelper.java @@ -131,7 +131,6 @@ 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; @@ -262,7 +261,7 @@ public class BeeProductHelper { } public static void initOreDictSProducts() { - boolean isGTLoaded = Loader.isModLoaded("gregtech"); + boolean isGTLoaded = Config.isGTLoaded; 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 ad97dde..8814699 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -164,7 +164,8 @@ public class Config { public static Configuration configuration; // ---- Loaded mods ----------------------------------------- - public static boolean isGTLoaded = Loader.isModLoaded("gregtech"); + public static boolean isGTLoaded = Loader.isModLoaded("gregtech") + && !Loader.instance().getIndexedModList().get("gregtech").getVersion().startsWith("GT6"); public Config(File configFile) { configuration = new Configuration(configFile);