From 66c5bdf2ca56b4b8b4a850b8b4083ab62cbc4981 Mon Sep 17 00:00:00 2001 From: Alastors <78517796+Alastors@users.noreply.github.com> Date: Sat, 29 Apr 2023 02:13:36 -0400 Subject: [PATCH] please fucking work --- .../main/utils/compat/BloodHelper.java | 10 ++-- .../main/utils/compat/ThaumcraftHelper.java | 49 ++++++------------- 2 files changed, 18 insertions(+), 41 deletions(-) diff --git a/src/main/java/magicbees/main/utils/compat/BloodHelper.java b/src/main/java/magicbees/main/utils/compat/BloodHelper.java index 1fd2d96..9e7e518 100644 --- a/src/main/java/magicbees/main/utils/compat/BloodHelper.java +++ b/src/main/java/magicbees/main/utils/compat/BloodHelper.java @@ -13,7 +13,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import magicbees.main.CommonProxy; import magicbees.main.Config; -import magicbees.main.utils.compat.bloodmagic.ItemBloodBaseFrame; import magicbees.main.utils.compat.bloodmagic.ItemBloodFrame; import magicbees.main.utils.compat.bloodmagic.ItemFrenziedFrame; import thaumcraft.api.ThaumcraftApi; @@ -50,11 +49,10 @@ public class BloodHelper implements IModHelper { public static void getBlocks() {} public static void getItems() { - Config.hiveFrameBloodBase = new ItemBloodBaseFrame(); - GameRegistry.registerItem( - Config.hiveFrameBloodBase, - Config.hiveFrameBloodBase.getUnlocalizedName(), - CommonProxy.DOMAIN); + /* + * Config.hiveFrameBloodBase = new ItemBloodBaseFrame(); GameRegistry.registerItem( Config.hiveFrameBloodBase, + * Config.hiveFrameBloodBase.getUnlocalizedName(), CommonProxy.DOMAIN); + */ Config.hiveFrameBlood = new ItemBloodFrame(); GameRegistry diff --git a/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java b/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java index 2043e2b..f6d0352 100644 --- a/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java +++ b/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java @@ -444,7 +444,7 @@ public class ThaumcraftHelper implements IModHelper { new ItemStack(miscResource, 1, MiscResource.VOID_INGOT.ordinal()) }); if (BloodHelper.isActive()) { - BloodHelper.thaumRecipes(); + // BloodHelper.thaumRecipes(); } } @@ -691,40 +691,19 @@ public class ThaumcraftHelper implements IModHelper { .setParentsHidden("VISPOWER").registerResearchItem(); if (BloodHelper.isActive()) { - bloodFrame1 = new ResearchPage("bloodFrame.1"); - bloodFrame2 = new ResearchPage((IArcaneRecipe) bloodFrame); - - bloodFramePage = new ResearchItem( - "MB_BloodFrame", - category, - new AspectList().add(Aspect.LIFE, 1).add(Aspect.ORDER, 1).add(Aspect.HEAL, 1) - .add(Aspect.EXCHANGE, 1).add(Aspect.GREED, 1), - -4, - 3, - 1, - new ItemStack(Config.hiveFrameBlood)); - - frenzyFrame1 = new ResearchPage("frenziedFrame.1"); - frenzyFrame2 = new ResearchPage((IArcaneRecipe) frenziedFrame); - - frenzyFramePage = new ResearchItem( - "MB_FrenziedFrame", - category, - new AspectList().add(Aspect.LIFE, 1).add(Aspect.ORDER, 1).add(Aspect.HEAL, 1) - .add(Aspect.EXCHANGE, 1).add(Aspect.GREED, 1), - -5, - 3, - 1, - new ItemStack(Config.hiveFrameFrenzy)); - - bloodFramePage.setPages(bloodFrame1, bloodFrame2); - bloodFramePage.setParents("MB_FrameMagic"); - - frenzyFramePage.setPages(frenzyFrame1, frenzyFrame2); - frenzyFramePage.setParents("MB_FrameMagic"); - - ResearchCategories.addResearch(bloodFramePage); - ResearchCategories.addResearch(frenzyFramePage); + /* + * bloodFrame1 = new ResearchPage("bloodFrame.1"); bloodFrame2 = new ResearchPage((IArcaneRecipe) + * bloodFrame); bloodFramePage = new ResearchItem( "MB_BloodFrame", category, new + * AspectList().add(Aspect.LIFE, 1).add(Aspect.ORDER, 1).add(Aspect.HEAL, 1) .add(Aspect.EXCHANGE, + * 1).add(Aspect.GREED, 1), -4, 3, 1, new ItemStack(Config.hiveFrameBlood)); frenzyFrame1 = new + * ResearchPage("frenziedFrame.1"); frenzyFrame2 = new ResearchPage((IArcaneRecipe) frenziedFrame); + * frenzyFramePage = new ResearchItem( "MB_FrenziedFrame", category, new AspectList().add(Aspect.LIFE, + * 1).add(Aspect.ORDER, 1).add(Aspect.HEAL, 1) .add(Aspect.EXCHANGE, 1).add(Aspect.GREED, 1), -5, 3, 1, new + * ItemStack(Config.hiveFrameFrenzy)); bloodFramePage.setPages(bloodFrame1, bloodFrame2); + * bloodFramePage.setParents("MB_FrameMagic"); frenzyFramePage.setPages(frenzyFrame1, frenzyFrame2); + * frenzyFramePage.setParents("MB_FrameMagic"); ResearchCategories.addResearch(bloodFramePage); + * ResearchCategories.addResearch(frenzyFramePage); + */ } }