Revert "Add recipes and research nodes"

This reverts commit 1e0c7d3c5e.

src/main/java/magicbees/main/Config.java

@@ -14,6 +14,7 @@ import net.minecraftforge.common.config.Property;
 import net.minecraftforge.oredict.OreDictionary;
 
 import cpw.mods.fml.client.event.ConfigChangedEvent;
+import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.event.FMLInterModComms;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.registry.GameRegistry;
@@ -148,7 +149,6 @@ public class Config {
     public static ItemMagicHiveFrame hiveFrameOblivion;
     public static Item hiveFrameBlood;
     public static Item hiveFrameFrenzy;
-    public static Item hiveFrameBloodBase;
 
     // ----- Backpacks ------------------------------------------
     public static Item thaumaturgeBackpackT1;
@@ -209,6 +209,8 @@ public class Config {
         magicCapsule = new ItemCapsule(CapsuleType.MAGIC, capsuleStackSizeMax);
         voidCapsule = new ItemCapsule(CapsuleType.VOID, capsuleStackSizeMax);
 
+        bloodMagicActive = Loader.isModLoaded("AWWayofTime");
+
         setupThaumcraftItems();
         setupBotaniaItems();
 
@@ -250,7 +252,7 @@ public class Config {
         p = configuration.get(CATEGORY_MODULES, "ArsMagica", true);
         arsMagicaActive = p.getBoolean();
 
-        p = configuration.get(CATEGORY_MODULES, "BloodMagic", true);
+        p = configuration.get(CATEGORY_MODULES, "AWWayofTime", true);
         bloodMagicActive = p.getBoolean();
 
         p = configuration.get(CATEGORY_MODULES, "EquivalentExchange", true);
@@ -486,7 +488,7 @@ public class Config {
             voidGrafter = new ItemVoidGrafter();
             GameRegistry.registerItem(voidGrafter, voidGrafter.getUnlocalizedName(), CommonProxy.DOMAIN);
 
-            if (BloodHelper.isActive()) {
+            if (Loader.isModLoaded("AWWayofTime")) {
                 BloodHelper.getItems();
             }
 

src/main/java/magicbees/main/utils/compat/BloodHelper.java

@@ -5,7 +5,6 @@ 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;
@@ -13,13 +12,8 @@ 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;
-import thaumcraft.api.aspects.Aspect;
-import thaumcraft.api.aspects.AspectList;
-import thaumcraft.common.config.ConfigItems;
 
 public class BloodHelper implements IModHelper {
 
@@ -34,15 +28,11 @@ public class BloodHelper implements IModHelper {
     }
 
     public void preInit() {
-        if (Loader.isModLoaded(Name) && Config.thaumcraftActive) {
+        if (Loader.isModLoaded(Name)) {
             isBloodMagicActive = true;
         }
     }
 
-    public static void bloodMagicInstalled() {
-        isBloodMagicActive = true;
-    }
-
     public void init() {}
 
     public void postInit() {}
@@ -50,12 +40,6 @@ 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.hiveFrameBlood = new ItemBloodFrame();
         GameRegistry
                 .registerItem(Config.hiveFrameBlood, Config.hiveFrameBlood.getUnlocalizedName(), CommonProxy.DOMAIN);
@@ -69,32 +53,22 @@ public class BloodHelper implements IModHelper {
 
     public static void getRecipes() {
         AltarRecipeRegistry.registerAltarRecipe(
-                new ItemStack(Config.hiveFrameBloodBase),
+                new ItemStack(Config.hiveFrameBlood),
                 new ItemStack(Config.hiveFrameMagic),
-                1,
-                5000,
+                3,
+                30000,
                 20,
                 20,
                 false);
-    }
 
-    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",
+        AltarRecipeRegistry.registerAltarRecipe(
                 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 });
-
+                new ItemStack(Config.hiveFrameNecrotic),
+                3,
+                30000,
+                20,
+                20,
+                false);
     }
 
     public static void doBloodMagicModuleConfigs(Configuration configuration) {

src/main/java/magicbees/main/utils/compat/ModHelperManager.java

@@ -39,6 +39,5 @@ public class ModHelperManager {
         helpers.add(new RedstoneArsenalHelper());
         helpers.add(new BotaniaHelper());
         helpers.add(new AppliedEnergisticsHelper());
-        helpers.add(new BloodHelper());
     }
 }

src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java

@@ -202,14 +202,6 @@ public class ThaumcraftHelper implements IModHelper {
     public static Item nuggetPork;
     public static Item zombieBrain;
 
-    public static ResearchItem bloodFramePage;
-    public static ResearchPage bloodFrame1;
-    public static ResearchPage bloodFrame2;
-
-    public static ResearchItem frenzyFramePage;
-    public static ResearchPage frenzyFrame1;
-    public static ResearchPage frenzyFrame2;
-
     public static Class<? extends TileEntity> nodeClass;
 
     public static final String Name = "Thaumcraft";
@@ -272,9 +264,6 @@ public class ThaumcraftHelper implements IModHelper {
     private static Object essenceOblivion;
     private static Object visAuraProvider;
 
-    public static Object bloodFrame;
-    public static Object frenziedFrame;
-
     private static Object voidScoop;
     private static Object voidGrafter;
 
@@ -442,10 +431,6 @@ public class ThaumcraftHelper implements IModHelper {
                 new AspectList().add(Aspect.ORDER, 5),
                 new Object[] { "  T", " s ", "s  ", 's', Items.stick, 'T',
                         new ItemStack(miscResource, 1, MiscResource.VOID_INGOT.ordinal()) });
-
-        if (BloodHelper.isActive()) {
-            BloodHelper.thaumRecipes();
-        }
     }
 
     private static void setupResearch() {
@@ -534,6 +519,7 @@ public class ThaumcraftHelper implements IModHelper {
                         .setPages(getResearchPage("MB_GrafterVoid.1"), new ResearchPage((IArcaneRecipe) voidGrafter))
                         .setParents("MB_Grafter").setParentsHidden("VOIDMETAL").setSecondary().setConcealed()
                         .registerResearchItem();
+        //
 
         new ResearchItem(
                 "MB_FrameMagic",
@@ -689,43 +675,6 @@ public class ThaumcraftHelper implements IModHelper {
                                 getResearchPage("MB_VisAuraProvider.1"),
                                 new ResearchPage((IArcaneRecipe) visAuraProvider))
                         .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);
-        }
     }
 
     private static ResearchPage getResearchPage(String ident) {
@@ -921,6 +870,5 @@ public class ThaumcraftHelper implements IModHelper {
                 item,
                 new int[] { item.getItemDamage() },
                 new AspectList().add(Aspect.VOID, 6).add((Aspect) aspectTime, 8));
-
     }
 }

src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodBaseFrame.java

@@ -1,137 +0,0 @@
-package magicbees.main.utils.compat.bloodmagic;
-
-import java.util.List;
-
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.StatCollector;
-import net.minecraft.world.World;
-
-import WayofTime.alchemicalWizardry.common.items.EnergyItems;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import forestry.api.apiculture.*;
-import magicbees.main.CommonProxy;
-import magicbees.main.utils.TabMagicBees;
-
-public class ItemBloodBaseFrame extends EnergyItems implements IHiveFrame {
-
-    private final IBeeModifier beeModifier = new BloodFrameBeeModifier();
-    private EntityPlayer owner = null;
-
-    public ItemBloodBaseFrame() {
-        super();
-        this.maxStackSize = 1;
-        this.setMaxDamage(1);
-        setEnergyUsed(1000);
-        setCreativeTab(TabMagicBees.tabMagicBees);
-        this.setUnlocalizedName("bloodSoakedFrame");
-    }
-
-    private static class BloodFrameBeeModifier implements IBeeModifier {
-
-        @Override
-        public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
-            return 1;
-        }
-
-        @Override
-        public float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) {
-            return 1;
-        }
-
-        @Override
-        public float getProductionModifier(IBeeGenome genome, float currentModifier) {
-            return 2;
-        }
-
-        @Override
-        public float getFloweringModifier(IBeeGenome genome, float currentModifier) {
-            return 1;
-        }
-
-        @Override
-        public float getGeneticDecay(IBeeGenome genome, float currentModifier) {
-            return (float) 0.8;
-        }
-
-        @Override
-        public boolean isSealed() {
-            return false;
-        }
-
-        @Override
-        public boolean isSelfLighted() {
-            return false;
-        }
-
-        @Override
-        public boolean isSunlightSimulated() {
-            return false;
-        }
-
-        @Override
-        public boolean isHellish() {
-            return false;
-        }
-
-        @Override
-        public float getTerritoryModifier(IBeeGenome genome, float currentModifier) {
-            return 1;
-        }
-    }
-
-    @Override
-    public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) {
-        par3List.add(StatCollector.translateToLocal("You feel gross touching this"));
-
-        if (!(par1ItemStack.getTagCompound() == null)) {
-            par3List.add(
-                    StatCollector.translateToLocal("tooltip.owner.currentowner") + " "
-                            + par1ItemStack.getTagCompound().getString("ownerName"));
-        }
-
-    }
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public void registerIcons(IIconRegister iconRegister) {
-        this.itemIcon = iconRegister.registerIcon(CommonProxy.DOMAIN + ":bloodSoakedFrame");
-    }
-
-    @Override
-    public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) {
-
-        if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer)) {
-            owner = par3EntityPlayer;
-            if (par1ItemStack.getItemDamage() > 0) {
-                if (EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) {
-                    par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() - 1);
-                }
-            }
-        }
-
-        return par1ItemStack;
-    }
-
-    @Override
-    public ItemStack frameUsed(IBeeHousing housing, ItemStack frame, IBee queen, int wear) {
-        if (EnergyItems.canSyphonInContainer(frame, getEnergyUsed() * wear)) {
-            if (owner != null) {
-                EnergyItems.drainPlayerNetwork(owner, getEnergyUsed() * wear);
-            }
-        } else {
-            frame.setItemDamage(frame.getItemDamage() + wear);
-            if (frame.getItemDamage() >= frame.getMaxDamage()) {
-                return null;
-            }
-        }
-        return frame;
-    }
-
-    @Override
-    public IBeeModifier getBeeModifier() {
-        return beeModifier;
-    }
-}

src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodFrame.java

@@ -117,10 +117,12 @@ public class ItemBloodFrame extends EnergyItems implements IHiveFrame {
 
     @Override
     public ItemStack frameUsed(IBeeHousing housing, ItemStack frame, IBee queen, int wear) {
+        // TODO Auto-generated method stub
         if (EnergyItems.canSyphonInContainer(frame, getEnergyUsed() * wear)) {
             if (owner != null) {
                 EnergyItems.drainPlayerNetwork(owner, getEnergyUsed() * wear);
             }
+            // EnergyItems.syphonWhileInContainer(frame, getEnergyUsed() * wear);
         } else {
             frame.setItemDamage(frame.getItemDamage() + wear);
             if (frame.getItemDamage() >= frame.getMaxDamage()) {

src/main/java/magicbees/main/utils/compat/bloodmagic/ItemFrenziedFrame.java

@@ -116,10 +116,12 @@ public class ItemFrenziedFrame extends EnergyItems implements IHiveFrame {
 
     @Override
     public ItemStack frameUsed(IBeeHousing housing, ItemStack frame, IBee queen, int wear) {
+        // TODO Auto-generated method stub
         if (EnergyItems.canSyphonInContainer(frame, getEnergyUsed() * wear)) {
             if (owner != null) {
                 EnergyItems.drainPlayerNetwork(owner, getEnergyUsed() * wear);
             }
+            // EnergyItems.syphonWhileInContainer(frame, getEnergyUsed() * wear);
         } else {
             frame.setItemDamage(frame.getItemDamage() + wear);
             if (frame.getItemDamage() >= frame.getMaxDamage()) {