upstream/MagicBees
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/MagicBees.git synced 2026-11-12 00:08:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "please fucking work"

Browse Source 
This reverts commit 66c5bdf2ca.
This commit is contained in:
Alastors committed 2023-04-29 02:26:08 -04:00
1 parent fddc31a8f5
commit cf6536c17f
2 files changed
+41 -18
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/magicbees/main/utils/compat/BloodHelper.java
+6 -4
View File
@@ -13,6 +13,7 @@ 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;
@@ -49,10 +50,11 @@ 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
src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java
+35 -14
View File
@@ -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,19 +691,40 @@ 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);
}
}