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

Revert "a"

Browse Source 
This reverts commit 5e5a80fb5c.
This commit is contained in:
Alastors committed 2023-04-29 02:26:06 -04:00
1 parent 840771f5f4
commit fddc31a8f5
2 files changed
+22 -12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/magicbees/main/Config.java
+1 -1
View File
@@ -490,7 +490,7 @@ public class Config {
GameRegistry.registerItem(voidGrafter, voidGrafter.getUnlocalizedName(), CommonProxy.DOMAIN);
if (BloodHelper.isActive()) {
// BloodHelper.getItems();
BloodHelper.getItems();
}
}
}
src/main/java/magicbees/main/utils/compat/BloodHelper.java
+21 -11
View File
@@ -5,6 +5,7 @@ import net.minecraft.util.IIcon;
import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.common.config.Property;
import WayofTime.alchemicalWizardry.ModItems;
import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipeRegistry;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.registry.GameRegistry;
@@ -14,6 +15,10 @@ import magicbees.main.CommonProxy;
import magicbees.main.Config;
import magicbees.main.utils.compat.bloodmagic.ItemBloodFrame;
import magicbees.main.utils.compat.bloodmagic.ItemFrenziedFrame;
import thaumcraft.api.ThaumcraftApi;
import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.aspects.AspectList;
import thaumcraft.common.config.ConfigItems;
public class BloodHelper implements IModHelper {
@@ -70,17 +75,22 @@ public class BloodHelper implements IModHelper {
}
public static void thaumRecipes() {
/*
* ThaumcraftHelper.bloodFrame = ThaumcraftApi.addArcaneCraftingRecipe( "MB_BloodFrame", new
* ItemStack(Config.hiveFrameBlood), new AspectList().add(Aspect.AIR, 50).add(Aspect.FIRE, 50).add(Aspect.WATER,
* 50).add(Aspect.EARTH, 50) .add(Aspect.ORDER, 50).add(Aspect.ENTROPY, 50), new Object[] { "sbs", "bFb", "sbs",
* 's', ModItems.imbuedSlate, 'b', ModItems.bucketLife, 'F', Config.hiveFrameBloodBase });
* ThaumcraftHelper.frenziedFrame = ThaumcraftApi.addArcaneCraftingRecipe( "MB_FrenziedFrame", new
* ItemStack(Config.hiveFrameFrenzy), new AspectList().add(Aspect.AIR, 50).add(Aspect.FIRE,
* 50).add(Aspect.WATER, 50).add(Aspect.EARTH, 50) .add(Aspect.ORDER, 50).add(Aspect.ENTROPY, 50), new Object[]
* { "sns", "nFn", "sns", 's', ModItems.imbuedSlate, 'n', new ItemStack(ConfigItems.itemResource, 1, 1), 'F',
* Config.hiveFrameBloodBase });
*/
ThaumcraftHelper.bloodFrame = ThaumcraftApi.addArcaneCraftingRecipe(
"MB_BloodFrame",
new ItemStack(Config.hiveFrameBlood),
new AspectList().add(Aspect.AIR, 50).add(Aspect.FIRE, 50).add(Aspect.WATER, 50).add(Aspect.EARTH, 50)
.add(Aspect.ORDER, 50).add(Aspect.ENTROPY, 50),
new Object[] { "sbs", "bFb", "sbs", 's', ModItems.imbuedSlate, 'b', ModItems.bucketLife, 'F',
Config.hiveFrameBloodBase });
ThaumcraftHelper.frenziedFrame = ThaumcraftApi.addArcaneCraftingRecipe(
"MB_FrenziedFrame",
new ItemStack(Config.hiveFrameFrenzy),
new AspectList().add(Aspect.AIR, 50).add(Aspect.FIRE, 50).add(Aspect.WATER, 50).add(Aspect.EARTH, 50)
.add(Aspect.ORDER, 50).add(Aspect.ENTROPY, 50),
new Object[] { "sns", "nFn", "sns", 's', ModItems.imbuedSlate, 'n',
new ItemStack(ConfigItems.itemResource, 1, 1), 'F', Config.hiveFrameBloodBase });
}
public static void doBloodMagicModuleConfigs(Configuration configuration) {