From 108a11c119333aa995f3d907774d8670d2aa3763 Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Fri, 28 Apr 2023 12:04:41 -0400 Subject: [PATCH] Fix? --- src/main/java/magicbees/main/Config.java | 9 ++------- .../magicbees/main/utils/compat/BloodHelper.java | 12 +++++++++++- .../main/utils/compat/ThaumcraftHelper.java | 2 ++ 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index a37e7bc..e82bcf1 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -3,6 +3,7 @@ package magicbees.main; import java.io.File; import java.lang.reflect.Field; +import magicbees.main.utils.compat.BloodHelper; import net.minecraft.item.Item; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; @@ -56,8 +57,6 @@ import magicbees.main.utils.LogHelper; import magicbees.main.utils.VersionInfo; import magicbees.main.utils.compat.BotaniaHelper; import magicbees.main.utils.compat.ThaumcraftHelper; -import magicbees.main.utils.compat.bloodmagic.ItemBloodFrame; -import magicbees.main.utils.compat.bloodmagic.ItemFrenziedFrame; import magicbees.storage.BackpackDefinition; import magicbees.tileentity.TileEntityEffectJar; import magicbees.tileentity.TileEntityMagicApiary; @@ -490,11 +489,7 @@ public class Config { GameRegistry.registerItem(voidGrafter, voidGrafter.getUnlocalizedName(), CommonProxy.DOMAIN); if (Loader.isModLoaded("AWWayofTime")) { - hiveFrameBlood = new ItemBloodFrame(); - GameRegistry.registerItem(hiveFrameBlood, hiveFrameBlood.getUnlocalizedName(), CommonProxy.DOMAIN); - - hiveFrameFrenzy = new ItemFrenziedFrame(); - GameRegistry.registerItem(hiveFrameFrenzy, hiveFrameFrenzy.getUnlocalizedName(), CommonProxy.DOMAIN); + BloodHelper.getItems(); } } diff --git a/src/main/java/magicbees/main/utils/compat/BloodHelper.java b/src/main/java/magicbees/main/utils/compat/BloodHelper.java index ad7ed96..1d76015 100644 --- a/src/main/java/magicbees/main/utils/compat/BloodHelper.java +++ b/src/main/java/magicbees/main/utils/compat/BloodHelper.java @@ -1,5 +1,10 @@ package magicbees.main.utils.compat; +import cpw.mods.fml.common.registry.GameRegistry; +import magicbees.main.CommonProxy; +import magicbees.main.Config; +import magicbees.main.utils.compat.bloodmagic.ItemBloodFrame; +import magicbees.main.utils.compat.bloodmagic.ItemFrenziedFrame; import net.minecraft.util.IIcon; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; @@ -32,7 +37,12 @@ public class BloodHelper implements IModHelper { public static void getBlocks() {} - public static void getItems() {} + public static void getItems() { + Config.hiveFrameBlood = new ItemBloodFrame(); + GameRegistry.registerItem(Config.hiveFrameBlood, Config.hiveFrameBlood.getUnlocalizedName(), CommonProxy.DOMAIN); + + Config.hiveFrameFrenzy = new ItemFrenziedFrame(); + GameRegistry.registerItem(Config.hiveFrameFrenzy, Config.hiveFrameFrenzy.getUnlocalizedName(), CommonProxy.DOMAIN);} public static void doBloodMagicModuleConfigs(Configuration configuration) { Property p; diff --git a/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java b/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java index a32071f..a1b0310 100644 --- a/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java +++ b/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java @@ -33,6 +33,8 @@ import thaumcraft.api.crafting.InfusionRecipe; import thaumcraft.api.research.ResearchCategories; import thaumcraft.api.research.ResearchItem; import thaumcraft.api.research.ResearchPage; +import magicbees.main.utils.compat.bloodmagic.ItemBloodFrame; +import magicbees.main.utils.compat.bloodmagic.ItemFrenziedFrame; public class ThaumcraftHelper implements IModHelper {