diff --git a/src/main/java/tombenpotter/emt/ElectroMagicTools.java b/src/main/java/tombenpotter/emt/ElectroMagicTools.java index e284b50..408f797 100644 --- a/src/main/java/tombenpotter/emt/ElectroMagicTools.java +++ b/src/main/java/tombenpotter/emt/ElectroMagicTools.java @@ -27,10 +27,9 @@ import net.minecraftforge.common.MinecraftForge; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import tombenpotter.emt.common.commands.CommandOutputs; +import tombenpotter.emt.common.modules.ModuleRegistry; import tombenpotter.emt.common.modules.base.entities.BaseEntityRegistry; -import tombenpotter.emt.common.module.ic2.recipes.EMTInitRecipes; -import tombenpotter.emt.common.module.ic2.recipes.EMTPostInitRecipes; -import tombenpotter.emt.common.module.ic2.recipes.UuMInfusionRecipes; +import tombenpotter.emt.common.modules.ic2.IC2RecipeRegistry; import tombenpotter.emt.common.util.*; import tombenpotter.emt.proxies.CommonProxy; @@ -55,13 +54,10 @@ public class ElectroMagicTools { ConfigHandler.init(event.getSuggestedConfigurationFile()); FMLCommonHandler.instance().bus().register(new EventHandlerEMT()); - RegistryHandler.registerIc2Registrys(); - RegistryHandler.registerVanillaRegistrys(); + ModuleRegistry.registerModules(); EssentiasOutputs.addPrimalOutputs(); EssentiasOutputs.addOutputs(); -// ModuleRegistry.RegisterModules(); - ElectroMagicTools.logger.info(localize("console.EMT.preInit.end")); } @@ -75,8 +71,7 @@ public class ElectroMagicTools { MinecraftForge.EVENT_BUS.register(new EntityEventHandler()); ElectroMagicTools.logger.info(localize("console.EMT.init.loot")); DungeonChestGenerator.generateLoot(); - ElectroMagicTools.logger.info(localize("console.EMT.init.recipes")); - EMTInitRecipes.add(); + ElectroMagicTools.logger.info(localize("console.EMT.init.entities")); BaseEntityRegistry.registerEMTEntities(); ElectroMagicTools.logger.info(localize("console.EMT.init.guiHandler")); @@ -90,9 +85,9 @@ public class ElectroMagicTools { ElectroMagicTools.logger.info(localize("console.EMT.postInit.begin")); ElectroMagicTools.logger.info(localize("console.EMT.postInit.recipes")); - EMTPostInitRecipes.add(); + IC2RecipeRegistry.registerLateRecipes(); ElectroMagicTools.logger.info(localize("console.EMT.postInit.uumatter")); - UuMInfusionRecipes.add(); + IC2RecipeRegistry.registerUUMInfusionRecipes(); RegistryHandler.registerIc2PostRegistrys(); ElectroMagicTools.logger.info(localize("console.EMT.postInit.end")); diff --git a/src/main/java/tombenpotter/emt/common/module/base/items/ItemEMTBaubles.java b/src/main/java/tombenpotter/emt/common/module/base/items/ItemEMTBaubles.java deleted file mode 100644 index 4189753..0000000 --- a/src/main/java/tombenpotter/emt/common/module/base/items/ItemEMTBaubles.java +++ /dev/null @@ -1,213 +0,0 @@ -package tombenpotter.emt.common.module.base.items; - -import baubles.api.BaubleType; -import baubles.api.IBauble; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import ic2.api.item.ElectricItem; -import ic2.api.item.IElectricItem; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.DamageSource; -import net.minecraft.util.IIcon; -import tombenpotter.emt.ElectroMagicTools; -import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.util.ConfigHandler; -import tombenpotter.emt.common.util.TextHelper; - -import java.util.List; -import java.util.Random; - -public class ItemEMTBaubles extends Item implements IBauble { - - public IIcon[] icon = new IIcon[16]; - public static int wornTick; - public Random random = new Random(); - - public ItemEMTBaubles() { - this.setCreativeTab(ElectroMagicTools.tabEMT); - this.setMaxDamage(0); - this.setMaxStackSize(1); - this.setUnlocalizedName(ModInformation.modid); - setHasSubtypes(true); - - wornTick = 0; - } - - @Override - public String getUnlocalizedName(ItemStack itemstack) { - String name = ""; - switch (itemstack.getItemDamage()) { - case 0: { - name = "euMaker.armor"; - break; - } - case 1: { - name = "euMaker.inventory"; - break; - } - case 2: { - name = "oneRing"; - break; - } - default: - name = "nothing"; - break; - } - return getUnlocalizedName() + "." + name; - } - - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister ri) { - this.icon[0] = ri.registerIcon(ModInformation.texturePath + ":armoreumaker"); - this.icon[1] = ri.registerIcon(ModInformation.texturePath + ":inventoryeumaker"); - this.icon[2] = ri.registerIcon(ModInformation.texturePath + ":onering"); - } - - @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage(int meta) { - return this.icon[meta]; - } - - @SuppressWarnings({"rawtypes", "unchecked"}) - @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List list) { - list.add(new ItemStack(this, 1, 0)); - list.add(new ItemStack(this, 1, 1)); - list.add(new ItemStack(this, 1, 2)); - } - - @SideOnly(Side.CLIENT) - public boolean hasEffect(ItemStack stack) { - if (stack.getItemDamage() == 2) { - return true; - } else { - return false; - } - } - - @Override - public BaubleType getBaubleType(ItemStack stack) { - if (stack.getItemDamage() <= 2) { - return BaubleType.RING; - } else { - return null; - } - } - - @Override - public void onWornTick(ItemStack stack, EntityLivingBase player) { - if (!player.worldObj.isRemote) { - if (stack != null) { - if (stack.getItemDamage() == 0) { - if (player instanceof EntityPlayer) { - int energyLeft = ConfigHandler.armorBaubleProduction; - for (int i = 0; i < ((EntityPlayer) player).inventory.armorInventory.length; i++) { - if (energyLeft > 0) { - if ((((EntityPlayer) player).inventory.armorInventory[i] != null) && (((EntityPlayer) player).inventory.armorInventory[i].getItem() instanceof IElectricItem)) { - double sentPacket = ElectricItem.manager.charge(((EntityPlayer) player).inventory.armorInventory[i], energyLeft, 4, false, false); - energyLeft -= sentPacket; - } - } - } - } - } - } - if (stack != null) { - if (stack.getItemDamage() == 1) { - if (player instanceof EntityPlayer) { - int energyLeft = ConfigHandler.inventoryBaubleProdution; - for (int i = 0; i < ((EntityPlayer) player).inventory.mainInventory.length; i++) { - if (energyLeft > 0) { - if ((((EntityPlayer) player).inventory.mainInventory[i] != null) && (((EntityPlayer) player).inventory.mainInventory[i].getItem() instanceof IElectricItem)) { - double sentPacket = ElectricItem.manager.charge(((EntityPlayer) player).inventory.mainInventory[i], energyLeft, 4, false, false); - energyLeft -= sentPacket; - } - } - } - } - } - } - - if (stack != null && stack.getItemDamage() == 2) { - if (player instanceof EntityPlayer) { - ((EntityPlayer) player).capabilities.disableDamage = true; - - wornTick++; - - NBTTagCompound tag = new NBTTagCompound(); - tag.setInteger("MindCorruption", wornTick); - ((EntityPlayer) player).writeToNBT(tag); - int corruption = tag.getInteger("MindCorruption"); - if (tag != null && corruption != wornTick) { - wornTick = corruption; - } - - if (corruption == 0) - ((EntityPlayer) player).addChatMessage(new ChatComponentText(TextHelper.PURPLE + "You have worn the Ring. Your soul has now been forever " + TextHelper.PURPLE + "tainted. " + TextHelper.RED + TextHelper.ITALIC + "Beware of wearing the ring. The tainting will only " + TextHelper.RED + TextHelper.ITALIC + "increase, and strange things will start happening.")); - - if (corruption > 6000 && corruption < 24000 && random.nextInt(2000) == 0) - player.addPotionEffect(new PotionEffect(Potion.blindness.id, 500, 2, false)); - - if (corruption >= 6000 && corruption < 24000 && random.nextInt(2000) == 0) - player.addPotionEffect(new PotionEffect(Potion.confusion.id, 500, 2, false)); - - if (corruption >= 24000 && corruption < 72000 && random.nextInt(2000) == 0) { - for (int i = 0; i <= 5; i++) - ((EntityPlayer) player).capabilities.disableDamage = false; - - player.attackEntityFrom(DamageSource.magic, 5); - } - - if (corruption >= 72000 && corruption < 120000 && random.nextInt(4000) == 0) { - for (int i = 0; i <= 100; i++) - ((EntityPlayer) player).capabilities.disableDamage = false; - - player.motionY = 2; - } - - if (corruption >= 120000 && random.nextInt(10000) == 0) { - for (int i = 0; i <= 510; i++) - ((EntityPlayer) player).capabilities.disableDamage = false; - - player.addPotionEffect(new PotionEffect(Potion.wither.id, 5000, 4, false)); - } - } - } - } - } - - @Override - public void onEquipped(ItemStack stack, EntityLivingBase player) { - if (stack != null && stack.getItemDamage() == 2) { - player.setInvisible(true); - } - } - - @Override - public void onUnequipped(ItemStack stack, EntityLivingBase player) { - if (stack != null && stack.getItemDamage() == 2) { - player.setInvisible(false); - if (player instanceof EntityPlayer && !((EntityPlayer) player).capabilities.isCreativeMode) - ((EntityPlayer) player).capabilities.disableDamage = false; - } - } - - @Override - public boolean canEquip(ItemStack stack, EntityLivingBase player) { - return true; - } - - @Override - public boolean canUnequip(ItemStack stack, EntityLivingBase player) { - return true; - } -} diff --git a/src/main/java/tombenpotter/emt/common/module/base/items/foci/ItemBaseFocus.java b/src/main/java/tombenpotter/emt/common/module/base/items/foci/ItemBaseFocus.java deleted file mode 100644 index fa8d16f..0000000 --- a/src/main/java/tombenpotter/emt/common/module/base/items/foci/ItemBaseFocus.java +++ /dev/null @@ -1,146 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - -package tombenpotter.emt.common.module.base.items.foci; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.EnumRarity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.StatCollector; -import net.minecraft.world.World; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; -import thaumcraft.api.wands.IWandFocus; -import tombenpotter.emt.ElectroMagicTools; -import tombenpotter.emt.ModInformation; - -import java.util.List; - -public abstract class ItemBaseFocus extends Item implements IWandFocus { - - private IIcon ornament, depth; - - public ItemBaseFocus(String unlocName, String textureName) { - super(); - - setUnlocalizedName(ModInformation.modid + "." + unlocName); - setTextureName(ModInformation.texturePath + ":" + textureName); - setCreativeTab(ElectroMagicTools.tabEMT); - setMaxDamage(1); - setNoRepair(); - setMaxStackSize(1); - } - - boolean hasOrnament() { - return false; - } - - boolean hasDepth() { - return false; - } - - @Override - public int getFocusColor() { - return 0; - } - - @Override - public boolean isItemTool(ItemStack par1ItemStack) { - return true; - } - - @Override - public EnumRarity getRarity(ItemStack itemstack) { - return EnumRarity.rare; - } - - @Override - public IIcon getFocusDepthLayerIcon() { - return depth; - } - - @Override - public IIcon getOrnament() { - return ornament; - } - - @Override - public WandFocusAnimation getAnimation() { - return WandFocusAnimation.WAVE; - } - - @Override - public AspectList getVisCost() { - return null; - } - - public boolean isUseItem() { - return isVisCostPerTick(); - } - - @Override - public boolean isVisCostPerTick() { - return false; - } - - @Override - public ItemStack onFocusRightClick(ItemStack paramItemStack, World paramWorld, EntityPlayer paramEntityPlayer, MovingObjectPosition paramMovingObjectPosition) { - if (isUseItem()) - paramEntityPlayer.setItemInUse(paramItemStack, Integer.MAX_VALUE); - return paramItemStack; - } - - @Override - public void onUsingFocusTick(ItemStack itemstack, EntityPlayer player, int count) { - - } - - @Override - public void onPlayerStoppedUsingFocus(ItemStack itemstack, World world, EntityPlayer player, int count) { - } - - @Override - public String getSortingHelper(ItemStack itemstack) { - return "00"; - } - - @Override - public boolean onFocusBlockStartBreak(ItemStack itemstack, int x, int y, int z, EntityPlayer player) { - return false; - } - - @Override - public boolean acceptsEnchant(int id) { - return false; - } - - @Override - public int getItemEnchantability() { - return 5; - } - - @SuppressWarnings({"rawtypes", "unchecked"}) - @Override - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { - AspectList cost = getVisCost(); - if (cost != null && cost.size() > 0) { - list.add(StatCollector.translateToLocal(isVisCostPerTick() ? "item.Focus.cost2" : "item.Focus.cost1")); - for (Aspect aspect : cost.getAspectsSorted()) { - float amount = cost.getAmount(aspect) / 100.0F; - list.add(" " + '\u00a7' + aspect.getChatcolor() + aspect.getName() + '\u00a7' + "r x " + amount); - } - } - } -} diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/IC2ModuleBlockRegistry.java b/src/main/java/tombenpotter/emt/common/module/ic2/IC2ModuleBlockRegistry.java deleted file mode 100644 index c1794a2..0000000 --- a/src/main/java/tombenpotter/emt/common/module/ic2/IC2ModuleBlockRegistry.java +++ /dev/null @@ -1,53 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - -package tombenpotter.emt.common.module.ic2; - -import cpw.mods.fml.common.registry.GameRegistry; -import net.minecraft.block.Block; -import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.module.ic2.blocks.*; -import tombenpotter.emt.common.module.ic2.items.blocks.*; - -public class IC2ModuleBlockRegistry { - - public static Block essentiaGens; - public static Block shield; - public static Block emtSolars; - public static Block emtMachines; - public static Block emtSolars2; - public static Block portableNode; - public static Block essentiaGenerator; - - public static void registerBlocks() { - shield = new BlockShield().setBlockName(ModInformation.modid + ".shield"); - GameRegistry.registerBlock(shield, "ShieldBlock"); - - portableNode = new BlockPortableNode().setBlockName(ModInformation.modid + ".portablenode"); - GameRegistry.registerBlock(portableNode, "PortableNode"); - - emtSolars = new BlockEMTSolars().setBlockName(ModInformation.modid + ".emtsolars"); - GameRegistry.registerBlock(emtSolars, ItemBlockEMTSolars.class, "EMTSolars"); - - emtSolars2 = new BlockEMTSolars2().setBlockName(ModInformation.modid + ".emtsolars2"); - GameRegistry.registerBlock(emtSolars2, ItemBlockEMTSolars2.class, "EMTSolars2"); - - emtMachines = new BlockEMTMachines().setBlockName(ModInformation.modid + ".emtmachines"); - GameRegistry.registerBlock(emtMachines, ItemBlockEMTMachines.class, "EMTMachines"); - - essentiaGens = new BlockEssentiaGenerators().setBlockName(ModInformation.modid + ".essentiaGens"); - GameRegistry.registerBlock(essentiaGens, ItemBlockEssentiaGenerators.class, "EssentiaGenerators"); - - essentiaGenerator = new BlockEssentiaGenerator().setBlockName(ModInformation.modid + ".essentiaGenerator"); - GameRegistry.registerBlock(essentiaGenerator, ItemBlockEssentiaGenerator.class, "Essentia Generator"); - } -} diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/IC2ModuleItemRegistry.java b/src/main/java/tombenpotter/emt/common/module/ic2/IC2ModuleItemRegistry.java deleted file mode 100644 index 8fe6f7c..0000000 --- a/src/main/java/tombenpotter/emt/common/module/ic2/IC2ModuleItemRegistry.java +++ /dev/null @@ -1,163 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - -package tombenpotter.emt.common.module.ic2; - -import cpw.mods.fml.common.registry.GameRegistry; -import net.minecraft.item.Item; -import net.minecraft.item.ItemArmor; -import net.minecraftforge.common.util.EnumHelper; -import thaumcraft.api.ThaumcraftApi; -import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.module.base.items.*; -import tombenpotter.emt.common.modules.base.items.ItemMaterials; -import tombenpotter.emt.common.modules.base.items.armor.ItemFeatherWing; -import tombenpotter.emt.common.modules.base.items.armor.ItemThaumiumReinforcedWing; -import tombenpotter.emt.common.modules.base.items.foci.ItemChristmasFocus; -import tombenpotter.emt.common.modules.base.items.foci.ItemExplosionFocus; -import tombenpotter.emt.common.modules.base.items.foci.ItemShieldFocus; -import tombenpotter.emt.common.module.ic2.items.ItemElectricScribingTools; -import tombenpotter.emt.common.module.ic2.items.armor.boots.ItemElectricBootsTraveller; -import tombenpotter.emt.common.module.ic2.items.armor.boots.ItemNanoBootsTraveller; -import tombenpotter.emt.common.module.ic2.items.armor.boots.ItemQuantumBootsTraveller; -import tombenpotter.emt.common.module.ic2.items.armor.goggles.ItemElectricGoggles; -import tombenpotter.emt.common.module.ic2.items.armor.goggles.ItemNanoGoggles; -import tombenpotter.emt.common.module.ic2.items.armor.goggles.ItemQuantumGoggles; -import tombenpotter.emt.common.module.ic2.items.armor.goggles.ItemSolarHelmetRevealing; -import tombenpotter.emt.common.module.ic2.items.armor.wings.ItemNanoWing; -import tombenpotter.emt.common.module.ic2.items.armor.wings.ItemQuantumWing; -import tombenpotter.emt.common.module.ic2.items.foci.ItemChargeFocus; -import tombenpotter.emt.common.module.ic2.items.foci.ItemWandChargingFocus; -import tombenpotter.emt.common.module.ic2.items.tools.ItemElectricHoeGrowth; -import tombenpotter.emt.common.module.ic2.items.tools.ItemElectricThorHammer; -import tombenpotter.emt.common.module.ic2.items.tools.chainsaws.ItemDiamondChainsaw; -import tombenpotter.emt.common.module.ic2.items.tools.chainsaws.ItemStreamChainsaw; -import tombenpotter.emt.common.module.ic2.items.tools.chainsaws.ItemThaumiumChainsaw; -import tombenpotter.emt.common.module.ic2.items.tools.drills.ItemRockbreakerDrill; -import tombenpotter.emt.common.module.ic2.items.tools.drills.ItemThaumiumDrill; -import tombenpotter.emt.common.module.ic2.items.tools.omnitools.ItemOmnitoolDiamond; -import tombenpotter.emt.common.module.ic2.items.tools.omnitools.ItemOmnitoolIron; -import tombenpotter.emt.common.module.ic2.items.tools.omnitools.ItemOmnitoolThaumium; -import tombenpotter.emt.common.modules.base.items.tools.ItemThorHammerBroken; -import tombenpotter.emt.common.modules.base.items.tools.ItemThorHammer; - -public class IC2ModuleItemRegistry { - - public static Item thaumiumDrill; - public static Item thaumiumChainsaw; - public static Item quantumThaumicHelmet; - public static Item diamondChainsaw; - public static Item ironOmnitool; - public static Item diamondOmnitool; - public static Item thaumiumOmnitool; - public static Item nanoThaumicHelmet; - public static Item explosionFocus; - public static Item christmasFocus; - public static Item shieldFocus; - public static Item electricGoggles; - public static Item streamChainsaw; - public static Item rockbreakerDrill; - public static Item solarHelmetRevealing; - public static Item thorHammer; - public static Item taintedThorHammer; - public static Item electricThorHammer; - public static Item electricBootsTraveller; - public static Item quantumBootsTraveller; - public static Item nanoBootsTraveller; - public static Item electricScribingTools; - public static Item itemEMTItems; - public static Item electricHoeGrowth; - public static Item chargeFocus; - public static Item emtBauble; - public static Item wandChargeFocus; - public static Item featherWing; - public static Item thaumiumWing; - public static Item nanoWing; - public static Item quantumWing; - - public static ItemArmor.ArmorMaterial featherWingMaterial = EnumHelper.addArmorMaterial("FEATEHRWiNG", 1, new int[]{2, 2, 2, 2}, 6); - - public static void registerItems() { - itemEMTItems = new ItemMaterials().setUnlocalizedName(ModInformation.modid + ".emtitems"); - GameRegistry.registerItem(itemEMTItems, "EMTItems"); - emtBauble = new ItemEMTBaubles().setUnlocalizedName(ModInformation.modid + ".emtbauble"); - GameRegistry.registerItem(emtBauble, "EMTBaubles"); - - electricGoggles = new ItemElectricGoggles(ItemArmor.ArmorMaterial.IRON, 3, 0).setUnlocalizedName(ModInformation.modid + ".goggles.electric"); - GameRegistry.registerItem(electricGoggles, "ElectricGogglesRevealing"); - nanoThaumicHelmet = new ItemNanoGoggles(ItemArmor.ArmorMaterial.DIAMOND, 3, 0).setUnlocalizedName(ModInformation.modid + ".goggles.nano"); - GameRegistry.registerItem(nanoThaumicHelmet, "NanosuitGogglesRevealing"); - quantumThaumicHelmet = new ItemQuantumGoggles(ItemArmor.ArmorMaterial.DIAMOND, 3, 0).setUnlocalizedName(ModInformation.modid + ".goggles.quantum"); - GameRegistry.registerItem(quantumThaumicHelmet, "QuantumGogglesRevealing"); - solarHelmetRevealing = new ItemSolarHelmetRevealing(ItemArmor.ArmorMaterial.DIAMOND, 3, 0).setUnlocalizedName(ModInformation.modid + ".goggles.solar"); - GameRegistry.registerItem(solarHelmetRevealing, "SolarHelmetRevealing"); - - electricBootsTraveller = new ItemElectricBootsTraveller(3, 3).setUnlocalizedName(ModInformation.modid + ".boots.traveller.electric"); - GameRegistry.registerItem(electricBootsTraveller, "ElectricBootsTraveller"); - nanoBootsTraveller = new ItemNanoBootsTraveller(3, 3).setUnlocalizedName(ModInformation.modid + ".boots.traveller.nano"); - GameRegistry.registerItem(nanoBootsTraveller, "NanoBootsTraveller"); - quantumBootsTraveller = new ItemQuantumBootsTraveller(3, 3).setUnlocalizedName(ModInformation.modid + ".boots.traveller.quantum"); - GameRegistry.registerItem(quantumBootsTraveller, "QuantumBootsTraveller"); - - electricScribingTools = new ItemElectricScribingTools().setUnlocalizedName(ModInformation.modid + ".scribingtools.electric"); - GameRegistry.registerItem(electricScribingTools, "ElectricScribingTools"); - - featherWing = new ItemFeatherWing(featherWingMaterial, 7, 1).setUnlocalizedName(ModInformation.modid + ".wing.feather"); - GameRegistry.registerItem(featherWing, "FeatherWing"); - thaumiumWing = new ItemThaumiumReinforcedWing(ThaumcraftApi.armorMatThaumium, 7, 1).setUnlocalizedName(ModInformation.modid + ".wing.thaumium"); - GameRegistry.registerItem(thaumiumWing, "ThaumiumWing"); - nanoWing = new ItemNanoWing(ItemArmor.ArmorMaterial.DIAMOND, 7, 1).setUnlocalizedName(ModInformation.modid + ".wing.nano"); - GameRegistry.registerItem(nanoWing, "NanosuitWing"); - quantumWing = new ItemQuantumWing(ItemArmor.ArmorMaterial.DIAMOND, 7, 1).setUnlocalizedName(ModInformation.modid + ".wing.quantum"); - GameRegistry.registerItem(quantumWing, "QuantumWing"); - - taintedThorHammer = new ItemThorHammerBroken().setUnlocalizedName(ModInformation.modid + ".hammer.broken"); - GameRegistry.registerItem(taintedThorHammer, "TaintedMjolnir"); - thorHammer = new ItemThorHammer().setUnlocalizedName(ModInformation.modid + ".hammer"); - GameRegistry.registerItem(thorHammer, "Mjolnir"); - electricThorHammer = new ItemElectricThorHammer().setUnlocalizedName(ModInformation.modid + ".hammer.electric"); - GameRegistry.registerItem(electricThorHammer, "SuperchargedMjolnir"); - - thaumiumDrill = new ItemThaumiumDrill().setUnlocalizedName(ModInformation.modid + ".drill.thaumium"); - GameRegistry.registerItem(thaumiumDrill, "ThaumiumDrill"); - - diamondChainsaw = new ItemDiamondChainsaw().setUnlocalizedName(ModInformation.modid + ".chainsaw.diamond"); - GameRegistry.registerItem(diamondChainsaw, "DiamondChainsaw"); - thaumiumChainsaw = new ItemThaumiumChainsaw().setUnlocalizedName(ModInformation.modid + ".chainsaw.thaumium"); - GameRegistry.registerItem(thaumiumChainsaw, "ThaumiumChainsaw"); - - ironOmnitool = new ItemOmnitoolIron().setUnlocalizedName(ModInformation.modid + ".omnitool.iron"); - GameRegistry.registerItem(ironOmnitool, "Omnitool"); - diamondOmnitool = new ItemOmnitoolDiamond().setUnlocalizedName(ModInformation.modid + ".omnitool.diamond"); - GameRegistry.registerItem(diamondOmnitool, "Diamond Omnitool"); - thaumiumOmnitool = new ItemOmnitoolThaumium().setUnlocalizedName(ModInformation.modid + ".omnitool.thaumium"); - GameRegistry.registerItem(thaumiumOmnitool, "ThaumiumOmnitool"); - - streamChainsaw = new ItemStreamChainsaw().setUnlocalizedName(ModInformation.modid + ".chainsaw.stream"); - GameRegistry.registerItem(streamChainsaw, "ChainsawStream"); - rockbreakerDrill = new ItemRockbreakerDrill().setUnlocalizedName(ModInformation.modid + ".drill.rockbreaker"); - GameRegistry.registerItem(rockbreakerDrill, "DrillRockbreaker"); - electricHoeGrowth = new ItemElectricHoeGrowth().setUnlocalizedName(ModInformation.modid + ".hoeofgrowth.electric"); - GameRegistry.registerItem(electricHoeGrowth, "ElectricHoeGrowth"); - - explosionFocus = new ItemExplosionFocus(); - GameRegistry.registerItem(explosionFocus, "ExplosionFocus"); - christmasFocus = new ItemChristmasFocus(); - GameRegistry.registerItem(christmasFocus, "ChristmasFocus"); - shieldFocus = new ItemShieldFocus(); - GameRegistry.registerItem(shieldFocus, "ShieldFocus"); - chargeFocus = new ItemChargeFocus(); - GameRegistry.registerItem(chargeFocus, "ChargingFocus"); - wandChargeFocus = new ItemWandChargingFocus(); - GameRegistry.registerItem(wandChargeFocus, "WandChargingFocus"); - } -} diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/items/foci/ItemChargeFocus.java b/src/main/java/tombenpotter/emt/common/module/ic2/items/foci/ItemChargeFocus.java index 3a55952..4ad0d5b 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/items/foci/ItemChargeFocus.java +++ b/src/main/java/tombenpotter/emt/common/module/ic2/items/foci/ItemChargeFocus.java @@ -21,7 +21,7 @@ import net.minecraft.world.World; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.common.items.wands.ItemWandCasting; -import tombenpotter.emt.common.module.base.items.foci.ItemBaseFocus; +import tombenpotter.emt.common.modules.base.items.foci.ItemBaseFocus; import tombenpotter.emt.common.util.ConfigHandler; public class ItemChargeFocus extends ItemBaseFocus { diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/items/foci/ItemWandChargingFocus.java b/src/main/java/tombenpotter/emt/common/module/ic2/items/foci/ItemWandChargingFocus.java index 7cb5f2c..d66cd15 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/items/foci/ItemWandChargingFocus.java +++ b/src/main/java/tombenpotter/emt/common/module/ic2/items/foci/ItemWandChargingFocus.java @@ -6,7 +6,7 @@ import net.minecraft.item.ItemStack; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.common.items.wands.ItemWandCasting; -import tombenpotter.emt.common.module.base.items.foci.ItemBaseFocus; +import tombenpotter.emt.common.modules.base.items.foci.ItemBaseFocus; import tombenpotter.emt.common.util.ConfigHandler; public class ItemWandChargingFocus extends ItemBaseFocus { diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/recipes/EMTInitRecipes.java b/src/main/java/tombenpotter/emt/common/module/ic2/recipes/EMTInitRecipes.java deleted file mode 100644 index 4216743..0000000 --- a/src/main/java/tombenpotter/emt/common/module/ic2/recipes/EMTInitRecipes.java +++ /dev/null @@ -1,76 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - -package tombenpotter.emt.common.module.ic2.recipes; - -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.registry.GameRegistry; -import ic2.api.item.IC2Items; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; -import net.minecraftforge.oredict.OreDictionary; -import thaumcraft.common.config.ConfigItems; -import tombenpotter.emt.ElectroMagicTools; -import tombenpotter.emt.common.module.ic2.IC2ModuleItemRegistry; -import tombenpotter.emt.common.util.TextHelper; - -public class EMTInitRecipes { - - public static void add() { - - /** Crafting Recipes **/ - ironOmnitool = GameRegistry.addShapedRecipe(new ItemStack(IC2ModuleItemRegistry.ironOmnitool), "X", "Z", "Y", 'X', new ItemStack(IC2Items.getItem("chainsaw").getItem(), 1, OreDictionary.WILDCARD_VALUE), 'Y', new ItemStack(IC2Items.getItem("miningDrill").getItem(), 1, OreDictionary.WILDCARD_VALUE), 'Z', IC2Items.getItem("plateiron")); - diamondChainsaw = GameRegistry.addShapedRecipe(new ItemStack(IC2ModuleItemRegistry.diamondChainsaw), " X ", "XYX", 'X', new ItemStack(Items.diamond), 'Y', new ItemStack(IC2Items.getItem("chainsaw").getItem(), 1, OreDictionary.WILDCARD_VALUE)); - ductTape = GameRegistry.addShapedRecipe(new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 9), "XXX", "YYY", "XXX", 'X', new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 8), 'Y', new ItemStack(Items.paper)); - featherMesh = GameRegistry.addShapedRecipe(new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 7), "XYX", "YXY", "XYX", 'X', new ItemStack(Items.feather), 'Y', new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 9)); - featherWing = GameRegistry.addShapedRecipe(new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 12), "XYZ", "XYZ", "XYZ", 'X', new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 7), 'Y', new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 8), 'Z', new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 11)); - featherWings = GameRegistry.addShapedRecipe(new ItemStack(IC2ModuleItemRegistry.featherWing), "XX", 'X', new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 12)); - taintedFeathers = GameRegistry.addShapedRecipe(new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 14), " X ", "XYX", " X ", 'X', new ItemStack(ConfigItems.itemResource, 1, 12), 'Y', new ItemStack(Items.feather)); - - if (!Loader.isModLoaded("gregtech_addon")) { - GameRegistry.addShapedRecipe(IC2Items.getItem("diamondDrill"), " Y ", "YXY", 'Y', new ItemStack(Items.diamond), 'X', new ItemStack(IC2Items.getItem("miningDrill").getItem(), 1, OreDictionary.WILDCARD_VALUE)); - } else { - ElectroMagicTools.logger.info(TextHelper.localize("console.EMT.modLoaded.GT")); - } - - GameRegistry.addRecipe(IC2Items.getItem("nanoHelmet"), "XYX", "XZX", 'X', IC2Items.getItem("carbonPlate"), 'Y', new ItemStack(IC2Items.getItem("energyCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), 'Z', new ItemStack(IC2Items.getItem("nightvisionGoggles").getItem(), 1, OreDictionary.WILDCARD_VALUE)); - GameRegistry.addShapedRecipe(IC2Items.getItem("generator"), "X", "Y", "Z", 'X', new ItemStack(IC2Items.getItem("chargedReBattery").getItem(), 1, OreDictionary.WILDCARD_VALUE), 'Y', IC2Items.getItem("machine"), 'Z', new ItemStack(Blocks.furnace)); - GameRegistry.addShapedRecipe(IC2Items.getItem("generator"), "X", "Y", "Z", 'X', IC2Items.getItem("reBattery"), 'Y', IC2Items.getItem("machine"), 'Z', new ItemStack(Blocks.furnace)); - - /** OreDict Crafting Recipes **/ - for (int i = 0; i < OreDictionary.getOres("logWood").size(); i++) { - cardboard = GameRegistry.addShapedRecipe(new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 11), "XXX", "YYY", "XXX", 'X', new ItemStack(Items.paper), 'Y', OreDictionary.getOres("logWood").get(i)); - } - for (int i = 0; i < OreDictionary.getOres("itemRubber").size(); i++) { - rubberBall = GameRegistry.addShapedRecipe(new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 10), "XX", "XX", 'X', OreDictionary.getOres("itemRubber").get(i)); - } - - /** Smelting Recipes **/ - GameRegistry.addSmelting(new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 1), new ItemStack(ConfigItems.itemResource, 1, 6), 0.0F); - GameRegistry.addSmelting(new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 2), new ItemStack(ConfigItems.itemResource, 1, 6), 0.0F); - GameRegistry.addSmelting(new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 3), new ItemStack(ConfigItems.itemResource, 1, 3), 0.0F); - GameRegistry.addSmelting(new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 4), new ItemStack(ConfigItems.itemResource, 1, 3), 0.0F); - GameRegistry.addSmelting(new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 10), new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 2, 8), 0.0F); - } - - public static IRecipe ironOmnitool; - public static IRecipe diamondChainsaw; - public static IRecipe ductTape; - public static IRecipe rubberBall; - public static IRecipe featherMesh; - public static IRecipe cardboard; - public static IRecipe featherWing; - public static IRecipe featherWings; - public static IRecipe taintedFeathers; -} diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/recipes/EMTPostInitRecipes.java b/src/main/java/tombenpotter/emt/common/module/ic2/recipes/EMTPostInitRecipes.java deleted file mode 100644 index 8038962..0000000 --- a/src/main/java/tombenpotter/emt/common/module/ic2/recipes/EMTPostInitRecipes.java +++ /dev/null @@ -1,317 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - -package tombenpotter.emt.common.module.ic2.recipes; - -import cpw.mods.fml.common.registry.GameRegistry; -import ic2.api.item.IC2Items; -import ic2.api.recipe.IRecipeInput; -import ic2.api.recipe.RecipeInputItemStack; -import ic2.api.recipe.Recipes; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.oredict.OreDictionary; -import thaumcraft.api.ThaumcraftApi; -import thaumcraft.api.crafting.CrucibleRecipe; -import thaumcraft.api.crafting.InfusionRecipe; -import thaumcraft.api.crafting.ShapedArcaneRecipe; -import thaumcraft.api.crafting.ShapelessArcaneRecipe; -import thaumcraft.common.config.ConfigBlocks; -import thaumcraft.common.config.ConfigItems; -import tombenpotter.emt.ElectroMagicTools; -import tombenpotter.emt.common.module.ic2.IC2ModuleBlockRegistry; -import tombenpotter.emt.common.module.ic2.IC2ModuleItemRegistry; -import tombenpotter.emt.common.util.ConfigHandler; -import tombenpotter.emt.common.util.CraftingAspects; -import tombenpotter.emt.common.util.TextHelper; - -import java.util.Iterator; - -public class EMTPostInitRecipes { - - public static void add() { - - /** Infusion Recipes **/ - - thaumiumDrill = ThaumcraftApi.addInfusionCraftingRecipe("Thaumium Drill", new ItemStack(IC2ModuleItemRegistry.thaumiumDrill), 5, CraftingAspects.thaumiumDrillCrafting, new ItemStack(IC2Items.getItem("diamondDrill").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Items.diamond), new ItemStack(Items.diamond), new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 5), new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 5), new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 5), IC2Items.getItem("denseplateiron")}); - - thaumiumChainsaw = ThaumcraftApi.addInfusionCraftingRecipe("Thaumium Chainsaw", new ItemStack(IC2ModuleItemRegistry.thaumiumChainsaw), 5, CraftingAspects.thaumiumChainsawCrafting, new ItemStack(IC2ModuleItemRegistry.diamondChainsaw, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Items.diamond), new ItemStack(Items.diamond), new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 5), new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 5), new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 5), IC2Items.getItem("denseplateiron")}); - - thaumicQuantumHelmet = ThaumcraftApi.addInfusionCraftingRecipe("Quantum Goggles of Revealing", new ItemStack(IC2ModuleItemRegistry.quantumThaumicHelmet), 6, CraftingAspects.thaumicQuantumHelmetCrafting, new ItemStack(IC2ModuleItemRegistry.nanoThaumicHelmet, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Items.diamond), new ItemStack(Items.milk_bucket), new ItemStack(IC2Items.getItem("quantumHelmet").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 5), new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 5), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("advancedCircuit")}); - - thaumicNanoHelmet = ThaumcraftApi.addInfusionCraftingRecipe("Nanosuit Goggles of Revealing", new ItemStack(IC2ModuleItemRegistry.nanoThaumicHelmet), 5, CraftingAspects.thaumicNanoHelmetCrafting, new ItemStack(IC2ModuleItemRegistry.electricGoggles, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Items.diamond), new ItemStack(Items.gold_ingot), new ItemStack(IC2Items.getItem("nanoHelmet").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 5), new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 5), IC2Items.getItem("carbonPlate"), IC2Items.getItem("electronicCircuit")}); - - thaumiumOmnitool = ThaumcraftApi.addInfusionCraftingRecipe("Thaumium Omnitool", new ItemStack(IC2ModuleItemRegistry.thaumiumOmnitool), 6, CraftingAspects.thaumiumOmnitoolCrafting, new ItemStack(IC2ModuleItemRegistry.thaumiumChainsaw, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(IC2ModuleItemRegistry.thaumiumDrill, 1, OreDictionary.WILDCARD_VALUE), new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 5), new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 5), new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 5), IC2Items.getItem("carbonPlate"), IC2Items.getItem("plateobsidian")}); - - diamondOmnitoolToThaumium = ThaumcraftApi.addInfusionCraftingRecipe("Thaumium Omnitool", new ItemStack(IC2ModuleItemRegistry.thaumiumOmnitool), 6, CraftingAspects.thaumiumOmnitoolCrafting, new ItemStack(IC2ModuleItemRegistry.diamondOmnitool, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Blocks.diamond_block), new ItemStack(ConfigBlocks.blockMetalDevice, 1, 9), new ItemStack(ConfigBlocks.blockMetalDevice, 1, 9), new ItemStack(IC2Items.getItem("energyCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("carbonPlate"), IC2Items.getItem("advancedCircuit")}); - - explosionFocus = ThaumcraftApi.addInfusionCraftingRecipe("Explosion Focus", new ItemStack(IC2ModuleItemRegistry.explosionFocus), 6, CraftingAspects.laserFocusCrafting, new ItemStack(ConfigItems.itemFocusHellbat, 1), new ItemStack[]{new ItemStack(IC2Items.getItem("miningLaser").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(Items.arrow), new ItemStack(Items.gunpowder), new ItemStack(Items.firework_charge), new ItemStack(ConfigItems.itemResource, 1, 1)}); - - shieldFocus = ThaumcraftApi.addInfusionCraftingRecipe("Shield Focus", new ItemStack(IC2ModuleItemRegistry.shieldFocus), 4, CraftingAspects.shieldFocusCrafting, new ItemStack(ConfigItems.itemFocusPortableHole, 1), new ItemStack[]{IC2Items.getItem("reinforcedStone"), IC2Items.getItem("reinforcedGlass"), IC2Items.getItem("reinforcedStone"), IC2Items.getItem("reinforcedGlass"), new ItemStack(Blocks.soul_sand), new ItemStack(Blocks.obsidian), new ItemStack(Blocks.obsidian)}); - - potentiaGenerator = ThaumcraftApi.addInfusionCraftingRecipe("Potentia Generator", new ItemStack(IC2ModuleBlockRegistry.essentiaGens, 1, 0), 6, CraftingAspects.potentiaGeneratorCrafting, IC2Items.getItem("semifluidGenerator"), new ItemStack[]{new ItemStack(Items.diamond), new ItemStack(ConfigItems.itemFocusTrade), new ItemStack(Blocks.hopper), new ItemStack(ConfigBlocks.blockJar), IC2Items.getItem("mvTransformer"), IC2Items.getItem("advancedMachine"), IC2Items.getItem("orewashingplant"), IC2Items.getItem("scrap")}); - - streamChainsaw = ThaumcraftApi.addInfusionCraftingRecipe("Chainsaw of the Stream", new ItemStack(IC2ModuleItemRegistry.streamChainsaw), 6, CraftingAspects.streamChaisnawCrafting, new ItemStack(IC2ModuleItemRegistry.thaumiumChainsaw, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Items.water_bucket), new ItemStack(ConfigItems.itemAxeElemental), new ItemStack(ConfigBlocks.blockMagicalLog), new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("overclockerUpgrade")}); - - rockbreakerDrill = ThaumcraftApi.addInfusionCraftingRecipe("Drill of the Rockbreaker", new ItemStack(IC2ModuleItemRegistry.rockbreakerDrill), 6, CraftingAspects.rockbreakerDrillCrafting, new ItemStack(IC2ModuleItemRegistry.thaumiumDrill, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Items.flint_and_steel), new ItemStack(Items.fire_charge), new ItemStack(ConfigItems.itemPickElemental), new ItemStack(ConfigItems.itemShovelElemental), new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("reinforcedStone"), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("overclockerUpgrade")}); - - thorHammer = ThaumcraftApi.addInfusionCraftingRecipe("Mjolnir", new ItemStack(IC2ModuleItemRegistry.thorHammer), 7, CraftingAspects.thorHammerCrafting, new ItemStack(IC2ModuleItemRegistry.taintedThorHammer, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 6), new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 6), new ItemStack(ConfigItems.itemSwordElemental), new ItemStack(ConfigItems.itemResource, 1, 1), new ItemStack(ConfigItems.itemFocusShock), IC2Items.getItem("rubber")}); - - superchargedThorHammer = ThaumcraftApi.addInfusionCraftingRecipe("Supercharged Mjolnir", new ItemStack(IC2ModuleItemRegistry.electricThorHammer), 10, CraftingAspects.superchargedThorHammerCrafting, new ItemStack(IC2ModuleItemRegistry.thorHammer, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 6), new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 6), new ItemStack(Blocks.web), new ItemStack(ConfigItems.itemFocusHellbat), new ItemStack(ConfigItems.itemSwordElemental), new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("iridiumPlate"), new ItemStack(IC2Items.getItem("nanoSaber").getItem(), 1, OreDictionary.WILDCARD_VALUE)}); - - wandRecharger = ThaumcraftApi.addInfusionCraftingRecipe("Industrial Wand Charging Station", new ItemStack(IC2ModuleBlockRegistry.emtMachines, 1, 0), 6, CraftingAspects.wandCharger, new ItemStack(ConfigBlocks.blockStoneDevice, 1, 5), new ItemStack[]{IC2Items.getItem("replicator"), IC2Items.getItem("iridiumPlate"), new ItemStack(Blocks.diamond_block), new ItemStack(ConfigItems.itemShard, 1, 5), new ItemStack(ConfigBlocks.blockJar)}); - - solarHelmetRevealing = ThaumcraftApi.addInfusionCraftingRecipe("Solar Helmet of Revealing", new ItemStack(IC2ModuleItemRegistry.solarHelmetRevealing), 5, CraftingAspects.solarHelmetRevealing, new ItemStack(IC2ModuleItemRegistry.quantumThaumicHelmet, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 1), IC2Items.getItem("glassFiberCableItem"), new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ConfigItems.itemShard, 1, 4)}); - - electricBootsTravel = ThaumcraftApi.addInfusionCraftingRecipe("Electric Boots of the Traveller", new ItemStack(IC2ModuleItemRegistry.electricBootsTraveller), 2, CraftingAspects.electricBootsTravel, new ItemStack(ConfigItems.itemBootsTraveller), new ItemStack[]{new ItemStack(Items.diamond), IC2Items.getItem("elemotor"), IC2Items.getItem("coil"), IC2Items.getItem("hazmatBoots"), new ItemStack(IC2Items.getItem("advBattery").getItem(), 1, OreDictionary.WILDCARD_VALUE)}); - - nanoBootsTravel = ThaumcraftApi.addInfusionCraftingRecipe("Nano Boots of the Traveller", new ItemStack(IC2ModuleItemRegistry.nanoBootsTraveller), 2, CraftingAspects.nanoBootsTravel, new ItemStack(IC2ModuleItemRegistry.electricBootsTraveller, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Items.diamond), new ItemStack(IC2Items.getItem("nanoBoots").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(IC2Items.getItem("energyCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE)}); - - quantumBootsTravel = ThaumcraftApi.addInfusionCraftingRecipe("Quantum Boots of the Traveller", new ItemStack(IC2ModuleItemRegistry.quantumBootsTraveller), 2, CraftingAspects.quantumBootsTravel, new ItemStack(IC2ModuleItemRegistry.nanoBootsTraveller, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Blocks.diamond_block), new ItemStack(IC2Items.getItem("quantumBoots").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("iridiumPlate")}); - - etheralProcessor = ThaumcraftApi.addInfusionCraftingRecipe("Etheral Processor", new ItemStack(IC2ModuleBlockRegistry.emtMachines, 1, 1), 3, CraftingAspects.etherealProcessor, IC2Items.getItem("macerator"), new ItemStack[]{IC2Items.getItem("electroFurnace"), new ItemStack(ConfigBlocks.blockMetalDevice, 1, 9), new ItemStack(Blocks.end_stone), new ItemStack(Blocks.end_stone), new ItemStack(Blocks.iron_block), new ItemStack(Blocks.iron_block), new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 5), new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 5)}); - - tripleCompressedSolar = ThaumcraftApi.addInfusionCraftingRecipe("Compressed Solars", new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 2), 2, CraftingAspects.compressedSolars, new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 1), new ItemStack[]{new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 1), new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 1), new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 1), new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 1), new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 1), new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 1), new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 1), new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 1)}); - - electricHoeGrowth = ThaumcraftApi.addInfusionCraftingRecipe("Electric Hoe of Growth", new ItemStack(IC2ModuleItemRegistry.electricHoeGrowth), 4, CraftingAspects.electricHoeGrowth, new ItemStack(ConfigItems.itemHoeElemental), new ItemStack[]{new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(IC2Items.getItem("electricHoe").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(Items.dye, 1, 15), IC2Items.getItem("elemotor"), IC2Items.getItem("coil"), new ItemStack(Blocks.sapling, 1, OreDictionary.WILDCARD_VALUE)}); - - chargeFocus = ThaumcraftApi.addInfusionCraftingRecipe("Wand Focus: Charging", new ItemStack(IC2ModuleItemRegistry.chargeFocus), 4, CraftingAspects.chargeFocus, new ItemStack(IC2Items.getItem("advBattery").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{IC2Items.getItem("generator"), IC2Items.getItem("batBox"), new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 5), new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 5), new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE)}); - - wandChargeFocus = ThaumcraftApi.addInfusionCraftingRecipe("Wand Focus: Wand Charging", new ItemStack(IC2ModuleItemRegistry.wandChargeFocus), 5, CraftingAspects.wandChargeFocus, new ItemStack(IC2ModuleBlockRegistry.emtMachines, 1, 0), new ItemStack[]{new ItemStack(IC2ModuleItemRegistry.chargeFocus), new ItemStack(IC2Items.getItem("energyPack").getItem(), 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("iridiumPlate")}); - - inventoryChargingRing = ThaumcraftApi.addInfusionCraftingRecipe("Inventory Charging Ring", new ItemStack(IC2ModuleItemRegistry.emtBauble, 1, 1), 6, CraftingAspects.inventoryChargingRing, new ItemStack(ConfigItems.itemBaubleBlanks, 1, 1), new ItemStack[]{new ItemStack(IC2ModuleItemRegistry.thaumiumDrill, 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("generator"), IC2Items.getItem("geothermalGenerator"), IC2Items.getItem("waterMill"), IC2Items.getItem("solarPanel"), IC2Items.getItem("windMill"), IC2Items.getItem("nuclearReactor")}); - - armorChargingRing = ThaumcraftApi.addInfusionCraftingRecipe("Armor Charging Ring", new ItemStack(IC2ModuleItemRegistry.emtBauble, 1, 0), 6, CraftingAspects.armorChargingRing, new ItemStack(ConfigItems.itemBaubleBlanks, 1, 1), new ItemStack[]{new ItemStack(IC2ModuleItemRegistry.electricBootsTraveller, 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("generator"), IC2Items.getItem("geothermalGenerator"), IC2Items.getItem("waterMill"), IC2Items.getItem("solarPanel"), IC2Items.getItem("windMill"), IC2Items.getItem("nuclearReactor")}); - - nanoWings = ThaumcraftApi.addInfusionCraftingRecipe("Nanosuit Wings", new ItemStack(IC2ModuleItemRegistry.nanoWing), 4, CraftingAspects.nanoWing, new ItemStack(IC2ModuleItemRegistry.thaumiumWing), new ItemStack[]{IC2Items.getItem("carbonPlate"), IC2Items.getItem("carbonPlate"), IC2Items.getItem("carbonPlate"), new ItemStack(IC2Items.getItem("nanoBodyarmor").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ConfigItems.itemResource, 1, 1)}); - - quantumWings = ThaumcraftApi.addInfusionCraftingRecipe("Quantum Wings", new ItemStack(IC2ModuleItemRegistry.quantumWing), 6, CraftingAspects.quantumWing, new ItemStack(IC2ModuleItemRegistry.nanoWing, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{IC2Items.getItem("iridiumPlate"), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("iridiumPlate"), new ItemStack(IC2Items.getItem("quantumBodyarmor").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ConfigItems.itemResource, 1, 1)}); - - /** Arcane Worktable Recipes **/ - - diamondOmnitool = ThaumcraftApi.addShapelessArcaneCraftingRecipe("Diamond Omnitool", new ItemStack(IC2ModuleItemRegistry.diamondOmnitool), CraftingAspects.diamondOmnitoolCrafting, new ItemStack(IC2ModuleItemRegistry.diamondChainsaw, 1, OreDictionary.WILDCARD_VALUE), new ItemStack(IC2Items.getItem("diamondDrill").getItem(), 1, OreDictionary.WILDCARD_VALUE)); - - ironOmnitoolToDiamond = ThaumcraftApi.addArcaneCraftingRecipe("Diamond Omnitool", new ItemStack(IC2ModuleItemRegistry.diamondOmnitool), CraftingAspects.diamondOmnitoolCrafting, "XAX", "XBX", "XAX", 'X', new ItemStack(Items.diamond), 'A', IC2Items.getItem("advancedCircuit"), 'B', new ItemStack(IC2ModuleItemRegistry.ironOmnitool, 1, OreDictionary.WILDCARD_VALUE)); - - christmasFocus = ThaumcraftApi.addArcaneCraftingRecipe("Kris-tmas Focus", new ItemStack(IC2ModuleItemRegistry.christmasFocus), CraftingAspects.christmasFocusCrafting, "XYX", "YZY", "XYX", 'X', new ItemStack(Blocks.snow), 'Y', new ItemStack(Blocks.pumpkin), 'Z', new ItemStack(ConfigItems.itemFocusFrost)); - - electricGoggles = ThaumcraftApi.addArcaneCraftingRecipe("Electric Goggles", new ItemStack(IC2ModuleItemRegistry.electricGoggles), CraftingAspects.electricGogglesCrafting, " Y ", "AZA", "BXB", 'Z', new ItemStack(ConfigItems.itemGoggles), 'X', IC2Items.getItem("electronicCircuit"), 'Y', new ItemStack(Items.diamond_helmet), 'A', new ItemStack(IC2Items.getItem("chargedReBattery").getItem(), 1, OreDictionary.WILDCARD_VALUE), 'B', Items.repeater); - - shieldBlock = ThaumcraftApi.addArcaneCraftingRecipe("Shield Blocks", new ItemStack(IC2ModuleBlockRegistry.shield, 8), CraftingAspects.shieldBlockCrafting, "XYX", "X X", "XYX", 'X', new ItemStack(Blocks.glass), 'Y', new ItemStack(Blocks.obsidian)); - - tinyUranium = ThaumcraftApi.addShapelessArcaneCraftingRecipe("Tiny Uranium", new ItemStack(IC2Items.getItem("smallUran235").getItem(), 7), CraftingAspects.tinyUraniumCrafting, IC2Items.getItem("Uran238")); - - compressedSolar = ThaumcraftApi.addArcaneCraftingRecipe("Compressed Solars", new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 0), CraftingAspects.compressedSolars, "XXX", "XXX", "XXX", 'X', IC2Items.getItem("solarPanel")); - - doubleCompressedSolar = ThaumcraftApi.addArcaneCraftingRecipe("Compressed Solars", new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 1), CraftingAspects.compressedSolars, "XXX", "XXX", "XXX", 'X', new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 0)); - - electricScribingTools = ThaumcraftApi.addArcaneCraftingRecipe("Electric Scribing Tools", new ItemStack(IC2ModuleItemRegistry.electricScribingTools), CraftingAspects.electricScribingTools, "YXY", "XZX", "YXY", 'Y', IC2Items.getItem("electronicCircuit"), 'X', new ItemStack(ConfigItems.itemInkwell), 'Z', new ItemStack(IC2Items.getItem("energyCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE)); - - thaumiumWing = ThaumcraftApi.addArcaneCraftingRecipe("Thaumium Reinforced Wings", new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 15), CraftingAspects.thaumiumWing, "XYZ", "XYZ", "XYZ", 'X', new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 14), 'Y', new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 5), 'Z', new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 13)); - - thaumiumWings = ThaumcraftApi.addArcaneCraftingRecipe("Thaumium Reinforced Wings", new ItemStack(IC2ModuleItemRegistry.thaumiumWing), CraftingAspects.thaumiumWing, "XX", 'X', new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 15)); - - /** Crucible Recipes **/ - - ignisGenerator = ThaumcraftApi.addCrucibleRecipe("Ignis Generator", new ItemStack(IC2ModuleBlockRegistry.essentiaGens, 1, 1), new ItemStack(IC2ModuleBlockRegistry.essentiaGens, 1, 0), CraftingAspects.ignisGeneratorCrafting); - - auramGenerator = ThaumcraftApi.addCrucibleRecipe("Auram Generator", new ItemStack(IC2ModuleBlockRegistry.essentiaGens, 1, 2), new ItemStack(IC2ModuleBlockRegistry.essentiaGens, 1, 0), CraftingAspects.auramGeneratorCrafting); - - arborGenerator = ThaumcraftApi.addCrucibleRecipe("Arbor Generator", new ItemStack(IC2ModuleBlockRegistry.essentiaGens, 1, 3), new ItemStack(IC2ModuleBlockRegistry.essentiaGens, 1, 0), CraftingAspects.arborGeneratorCrafting); - - aerGenerator = ThaumcraftApi.addCrucibleRecipe("Aer Generator", new ItemStack(IC2ModuleBlockRegistry.essentiaGens, 1, 4), new ItemStack(IC2ModuleBlockRegistry.essentiaGens, 1, 0), CraftingAspects.aerGenerator); - - waterSolar = ThaumcraftApi.addCrucibleRecipe("Water Infused Solar Panels", new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 3), new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 0), CraftingAspects.waterSolars); - - doubleWaterSolar = ThaumcraftApi.addCrucibleRecipe("Water Infused Solar Panels", new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 4), new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 1), CraftingAspects.waterSolars); - - tripleWaterSolar = ThaumcraftApi.addCrucibleRecipe("Water Infused Solar Panels", new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 5), new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 2), CraftingAspects.waterSolars); - - darkSolar = ThaumcraftApi.addCrucibleRecipe("Entropy Infused Solar Panels", new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 6), new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 0), CraftingAspects.darkSolars); - - doubleDarkSolar = ThaumcraftApi.addCrucibleRecipe("Entropy Infused Solar Panels", new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 7), new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 1), CraftingAspects.darkSolars); - - tripleDarkSolar = ThaumcraftApi.addCrucibleRecipe("Entropy Infused Solar Panels", new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 8), new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 2), CraftingAspects.darkSolars); - - orderSolar = ThaumcraftApi.addCrucibleRecipe("Order Infused Solar Panels", new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 9), new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 0), CraftingAspects.orderSolars); - - doubleOrderSolar = ThaumcraftApi.addCrucibleRecipe("Order Infused Solar Panels", new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 10), new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 1), CraftingAspects.orderSolars); - - tripleOrderSolar = ThaumcraftApi.addCrucibleRecipe("Order Infused Solar Panels", new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 11), new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 2), CraftingAspects.orderSolars); - - fireSolar = ThaumcraftApi.addCrucibleRecipe("Fire Infused Solar Panels", new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 12), new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 0), CraftingAspects.fireSolars); - - doubleFireSolar = ThaumcraftApi.addCrucibleRecipe("Fire Infused Solar Panels", new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 13), new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 1), CraftingAspects.fireSolars); - - tripleFireSolar = ThaumcraftApi.addCrucibleRecipe("Fire Infused Solar Panels", new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 14), new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 2), CraftingAspects.fireSolars); - - airSolar = ThaumcraftApi.addCrucibleRecipe("Air Infused Solar Panels", new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 15), new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 0), CraftingAspects.airSolars); - - doubleAirSolar = ThaumcraftApi.addCrucibleRecipe("Air Infused Solar Panels", new ItemStack(IC2ModuleBlockRegistry.emtSolars2, 1, 0), new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 1), CraftingAspects.airSolars); - - tripleAirSolar = ThaumcraftApi.addCrucibleRecipe("Air Infused Solar Panels", new ItemStack(IC2ModuleBlockRegistry.emtSolars2, 1, 1), new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 2), CraftingAspects.airSolars); - - earthSolar = ThaumcraftApi.addCrucibleRecipe("Earth Infused Solar Panels", new ItemStack(IC2ModuleBlockRegistry.emtSolars2, 1, 2), new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 0), CraftingAspects.earthSolars); - - doubleEarthSolar = ThaumcraftApi.addCrucibleRecipe("Earth Infused Solar Panels", new ItemStack(IC2ModuleBlockRegistry.emtSolars2, 1, 3), new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 1), CraftingAspects.earthSolars); - - tripleEarthSolar = ThaumcraftApi.addCrucibleRecipe("Earth Infused Solar Panels", new ItemStack(IC2ModuleBlockRegistry.emtSolars2, 1, 4), new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 2), CraftingAspects.earthSolars); - - portableNode = ThaumcraftApi.addCrucibleRecipe("Portable Node", new ItemStack(IC2ModuleBlockRegistry.portableNode), new ItemStack(ConfigItems.itemJarFilled), CraftingAspects.portableNode); - - /** IC2 Stuff related recipes **/ - - /* Ore Clusters Macerator Recipes */ - ItemStack ironClusterRecipe = IC2Items.getItem("smallIronDust").copy(); - ironClusterRecipe.stackSize = 22; - Recipes.macerator.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigItems.itemNugget, 1, 16)), null, ironClusterRecipe); - - ItemStack goldClusterRecipe = IC2Items.getItem("smallGoldDust").copy(); - goldClusterRecipe.stackSize = 22; - Recipes.macerator.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigItems.itemNugget, 1, 31)), null, goldClusterRecipe); - - ItemStack copperClusterRecipe = IC2Items.getItem("smallCopperDust").copy(); - copperClusterRecipe.stackSize = 22; - Recipes.macerator.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigItems.itemNugget, 1, 17)), null, copperClusterRecipe); - - ItemStack tinClusterRecipe = IC2Items.getItem("smallTinDust").copy(); - tinClusterRecipe.stackSize = 22; - Recipes.macerator.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigItems.itemNugget, 1, 18)), null, tinClusterRecipe); - - ItemStack silverClusterRecipe = IC2Items.getItem("smallSilverDust").copy(); - silverClusterRecipe.stackSize = 22; - Recipes.macerator.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigItems.itemNugget, 1, 19)), null, silverClusterRecipe); - - ItemStack leadClusterRecipe = IC2Items.getItem("smallLeadDust").copy(); - leadClusterRecipe.stackSize = 22; - Recipes.macerator.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigItems.itemNugget, 1, 20)), null, leadClusterRecipe); - - /* Thaumium Plates Recipes */ - thaumiumPlate = GameRegistry.addShapedRecipe(new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 5), "X", "Y", "Z", 'Y', new ItemStack(ConfigItems.itemResource, 1, 2), 'X', new ItemStack(IC2Items.getItem("ForgeHammer").getItem(), 1, OreDictionary.WILDCARD_VALUE), 'Z', new ItemStack(Blocks.obsidian)); - Recipes.metalformerRolling.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigItems.itemResource, 1, 2)), null, new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 5)); - - /* Iron Sheet Recipe */ - Recipes.metalformerRolling.addRecipe(new RecipeInputItemStack(IC2Items.getItem("denseplateiron")), null, new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 13)); - - /* Ore Processing for Amber and Cinnabar */ - if (ConfigHandler.removeAmberAndCinnabarMacerating == true) { - for (Iterator it = Recipes.macerator.getRecipes().keySet().iterator(); it.hasNext(); ) { - IRecipeInput input = it.next(); - if (input.matches(new ItemStack(ConfigBlocks.blockCustomOre, 1, 7))) { - it.remove(); - ElectroMagicTools.logger.info(TextHelper.localize("console.EMT.recipes.amberConflict")); - } - } - - for (Iterator it = Recipes.macerator.getRecipes().keySet().iterator(); it.hasNext(); ) { - IRecipeInput input = it.next(); - if (input.matches(new ItemStack(ConfigBlocks.blockCustomOre, 1, 0))) { - it.remove(); - ElectroMagicTools.logger.info(TextHelper.localize("console.EMT.recipes.cinnabarConflict")); - } - } - } - ItemStack crushedAmberRecipe = new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 1); - crushedAmberRecipe.stackSize = 2; - Recipes.macerator.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigBlocks.blockCustomOre, 1, 7)), null, crushedAmberRecipe); - - ItemStack crushedCinnabarRecipe = new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 3); - crushedCinnabarRecipe.stackSize = 2; - Recipes.macerator.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigBlocks.blockCustomOre, 1, 0)), null, crushedCinnabarRecipe); - - NBTTagCompound waterAmount = new NBTTagCompound(); - waterAmount.setInteger("amount", 1000); - - ItemStack smallCopperDust = IC2Items.getItem("smallCopperDust"); - smallCopperDust.stackSize = 2; - ItemStack smallTinDust = IC2Items.getItem("smallTinDust"); - smallCopperDust.stackSize = 2; - - Recipes.oreWashing.addRecipe(new RecipeInputItemStack(new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 1)), waterAmount, new ItemStack[]{new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 2), smallCopperDust, IC2Items.getItem("stoneDust")}); - Recipes.oreWashing.addRecipe(new RecipeInputItemStack(new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 3)), waterAmount, new ItemStack[]{new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 4), smallTinDust, IC2Items.getItem("stoneDust")}); - - NBTTagCompound heatAmount = new NBTTagCompound(); - heatAmount.setInteger("minHeat", 1000); - - Recipes.centrifuge.addRecipe(new RecipeInputItemStack(new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 2)), heatAmount, new ItemStack[]{IC2Items.getItem("smallCopperDust"), new ItemStack(ConfigItems.itemResource, 1, 6)}); - Recipes.centrifuge.addRecipe(new RecipeInputItemStack(new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 4)), heatAmount, new ItemStack[]{IC2Items.getItem("smallTinDust"), new ItemStack(ConfigItems.itemResource, 1, 3)}); - } - - public static InfusionRecipe thaumiumDrill; - public static InfusionRecipe thaumiumChainsaw; - public static InfusionRecipe thaumicQuantumHelmet; - public static InfusionRecipe thaumiumOmnitool; - public static InfusionRecipe thaumicNanoHelmet; - public static InfusionRecipe explosionFocus; - public static InfusionRecipe shieldFocus; - public static InfusionRecipe potentiaGenerator; - public static InfusionRecipe streamChainsaw; - public static InfusionRecipe rockbreakerDrill; - public static InfusionRecipe thorHammer; - public static InfusionRecipe superchargedThorHammer; - public static InfusionRecipe wandRecharger; - public static InfusionRecipe solarHelmetRevealing; - public static InfusionRecipe electricBootsTravel; - public static InfusionRecipe nanoBootsTravel; - public static InfusionRecipe quantumBootsTravel; - public static InfusionRecipe diamondOmnitoolToThaumium; - public static InfusionRecipe etheralProcessor; - public static InfusionRecipe tripleCompressedSolar; - public static InfusionRecipe electricHoeGrowth; - public static InfusionRecipe chargeFocus; - public static InfusionRecipe wandChargeFocus; - public static InfusionRecipe inventoryChargingRing; - public static InfusionRecipe armorChargingRing; - public static InfusionRecipe nanoWings; - public static InfusionRecipe quantumWings; - - public static ShapelessArcaneRecipe diamondOmnitool; - public static ShapelessArcaneRecipe tinyUranium; - public static ShapedArcaneRecipe christmasFocus; - public static ShapedArcaneRecipe electricGoggles; - public static ShapedArcaneRecipe shieldBlock; - public static ShapedArcaneRecipe compressedSolar; - public static ShapedArcaneRecipe doubleCompressedSolar; - public static ShapedArcaneRecipe ironOmnitoolToDiamond; - public static ShapedArcaneRecipe electricScribingTools; - public static ShapedArcaneRecipe thaumiumWing; - public static ShapedArcaneRecipe thaumiumWings; - - public static CrucibleRecipe ignisGenerator; - public static CrucibleRecipe auramGenerator; - public static CrucibleRecipe arborGenerator; - public static CrucibleRecipe aerGenerator; - public static CrucibleRecipe waterSolar; - public static CrucibleRecipe doubleWaterSolar; - public static CrucibleRecipe tripleWaterSolar; - public static CrucibleRecipe darkSolar; - public static CrucibleRecipe doubleDarkSolar; - public static CrucibleRecipe tripleDarkSolar; - public static CrucibleRecipe orderSolar; - public static CrucibleRecipe doubleOrderSolar; - public static CrucibleRecipe tripleOrderSolar; - public static CrucibleRecipe fireSolar; - public static CrucibleRecipe doubleFireSolar; - public static CrucibleRecipe tripleFireSolar; - public static CrucibleRecipe airSolar; - public static CrucibleRecipe doubleAirSolar; - public static CrucibleRecipe tripleAirSolar; - public static CrucibleRecipe earthSolar; - public static CrucibleRecipe doubleEarthSolar; - public static CrucibleRecipe tripleEarthSolar; - public static CrucibleRecipe portableNode; - - public static IRecipe thaumiumPlate; -} diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/recipes/UuMInfusionRecipes.java b/src/main/java/tombenpotter/emt/common/module/ic2/recipes/UuMInfusionRecipes.java deleted file mode 100644 index 9c49fb6..0000000 --- a/src/main/java/tombenpotter/emt/common/module/ic2/recipes/UuMInfusionRecipes.java +++ /dev/null @@ -1,113 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2014 Tombenpotter. - * All rights reserved. - * - * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html - * - * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. - * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. - * http://www.minecraftforum.net/topic/1585216- - ******************************************************************************/ - -package tombenpotter.emt.common.module.ic2.recipes; - -import ic2.api.item.IC2Items; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; -import thaumcraft.api.ThaumcraftApi; -import thaumcraft.api.crafting.InfusionRecipe; -import thaumcraft.common.config.ConfigBlocks; -import thaumcraft.common.config.ConfigItems; -import tombenpotter.emt.common.module.ic2.IC2ModuleItemRegistry; -import tombenpotter.emt.common.util.CraftingAspects; - -public class UuMInfusionRecipes { - - public static ItemStack uuMCell = new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 16); - - public static void add() { - - ItemStack iridium = IC2Items.getItem("iridiumOre").copy(); - iridium.stackSize = 2; - uraniumToIridium = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", iridium, 4, CraftingAspects.uuMatterInfusions, IC2Items.getItem("Uran238"), new ItemStack[]{uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell}); - - ItemStack uranium = IC2Items.getItem("Uran238").copy(); - uranium.stackSize = 2; - diamondToUranium = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", uranium, 4, CraftingAspects.lesserUUMInfusions, new ItemStack(Items.diamond), new ItemStack[]{uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell}); - - ItemStack diamond = new ItemStack(Items.diamond).copy(); - diamond.stackSize = 1; - goldToDiamond = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", diamond, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(Items.gold_ingot), new ItemStack[]{uuMCell, uuMCell, uuMCell, uuMCell}); - - ItemStack gold = new ItemStack(Items.gold_ingot).copy(); - gold.stackSize = 2; - ironToGold = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", gold, 4, CraftingAspects.cheapestUUMInfusions, new ItemStack(Items.iron_ingot), new ItemStack[]{uuMCell, uuMCell, uuMCell}); - - ItemStack ironOre = new ItemStack(Blocks.iron_ore).copy(); - ironOre.stackSize = 16; - stoneBricksToIronOre = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", ironOre, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(Blocks.stonebrick), new ItemStack[]{uuMCell, uuMCell}); - - /** - * ItemStack copperOre = Items.getItem("copperOre").copy(); BUGGED IN 1.6 IF IC2 OREGEN IS DISABLED - **/ - ItemStack copperOre = IC2Items.getItem("crushedCopperOre").copy(); - copperOre.stackSize = 32; - arcaneStoneToCopperOre = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", copperOre, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 6), new ItemStack[]{uuMCell, uuMCell}); - - /** - * ItemStack tinOre = Items.getItem("tinOre").copy(); BUGGED IN 1.6 IF IC2 OREGEN IS DISABLED - **/ - ItemStack tinOre = IC2Items.getItem("crushedTinOre").copy(); - tinOre.stackSize = 32; - arcaneStoneBricksToTinOre = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", tinOre, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 7), new ItemStack[]{uuMCell, uuMCell}); - - /** - * ItemStack leadOre = Items.getItem("leadOre").copy(); BUGGED IN 1.6 IF IC2 OREGEN IS DISABLED - **/ - ItemStack leadOre = IC2Items.getItem("crushedLeadOre").copy(); - leadOre.stackSize = 32; - amberBlockToLeadOre = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", leadOre, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(ConfigBlocks.blockCosmeticOpaque, 1, 0), new ItemStack[]{uuMCell, uuMCell}); - - ItemStack uraniumOre = IC2Items.getItem("uraniumOre").copy(); - uraniumOre.stackSize = 8; - amberBricksToUraniumOre = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", uraniumOre, 4, CraftingAspects.lesserUUMInfusions, new ItemStack(ConfigBlocks.blockCosmeticOpaque, 1, 1), new ItemStack[]{uuMCell, uuMCell, uuMCell}); - - ItemStack coal = new ItemStack(Items.coal, 1, 0).copy(); - coal.stackSize = 16; - charcoalToCoal = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", coal, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(Items.coal, 1, 1), new ItemStack[]{uuMCell, uuMCell}); - - ItemStack stickyResin = IC2Items.getItem("resin").copy(); - stickyResin.stackSize = 21; - shardToResin = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", stickyResin, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{uuMCell, uuMCell, uuMCell}); - - ItemStack redstone = new ItemStack(Items.redstone).copy(); - redstone.stackSize = 24; - shardToRedstone = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", redstone, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{uuMCell, uuMCell, uuMCell}); - - ItemStack lapisLazuli = new ItemStack(Items.dye, 1, 4).copy(); - lapisLazuli.stackSize = 8; - shardToLapis = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", lapisLazuli, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{uuMCell, uuMCell, uuMCell}); - - ItemStack glowstone = new ItemStack(Blocks.glowstone).copy(); - glowstone.stackSize = 1; - glowstoneDustToBlock = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", glowstone, 4, CraftingAspects.cheapestUUMInfusions, new ItemStack(Items.glowstone_dust), new ItemStack[]{uuMCell}); - } - - public static InfusionRecipe uraniumToIridium; - public static InfusionRecipe diamondToUranium; - public static InfusionRecipe goldToDiamond; - public static InfusionRecipe ironToGold; - public static InfusionRecipe stoneBricksToIronOre; - public static InfusionRecipe arcaneStoneToCopperOre; - public static InfusionRecipe arcaneStoneBricksToTinOre; - public static InfusionRecipe amberBlockToLeadOre; - public static InfusionRecipe amberBricksToUraniumOre; - public static InfusionRecipe charcoalToCoal; - public static InfusionRecipe shardToResin; - public static InfusionRecipe shardToRedstone; - public static InfusionRecipe shardToLapis; - public static InfusionRecipe glowstoneDustToBlock; -} diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/TileEntityEtherealMacerator.java b/src/main/java/tombenpotter/emt/common/module/ic2/tile/TileEntityEtherealMacerator.java index 96b5e5c..4ca3deb 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/TileEntityEtherealMacerator.java +++ b/src/main/java/tombenpotter/emt/common/module/ic2/tile/TileEntityEtherealMacerator.java @@ -25,7 +25,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraftforge.oredict.OreDictionary; import thaumcraft.common.config.ConfigItems; -import tombenpotter.emt.common.module.ic2.IC2ModuleBlockRegistry; +import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityEtherealMacerator extends TileEntityEMT implements ISidedInventory, IWrenchable { @@ -276,7 +276,7 @@ public class TileEntityEtherealMacerator extends TileEntityEMT implements ISided @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(IC2ModuleBlockRegistry.emtMachines, 1, 1); + return new ItemStack(IC2BlockRegistry.emtMachines, 1, 1); } @Override diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/air/TileEntityAirSolar.java b/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/air/TileEntityAirSolar.java index 0f028d5..717d82b 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/air/TileEntityAirSolar.java +++ b/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/air/TileEntityAirSolar.java @@ -14,7 +14,7 @@ package tombenpotter.emt.common.module.ic2.tile.solars.air; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.module.ic2.IC2ModuleBlockRegistry; +import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; import tombenpotter.emt.common.module.ic2.tile.solars.TileEntitySolarBase; import tombenpotter.emt.common.util.ConfigHandler; @@ -35,6 +35,6 @@ public class TileEntityAirSolar extends TileEntitySolarBase { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 15); + return new ItemStack(IC2BlockRegistry.emtSolars, 1, 15); } } diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/air/TileEntityDoubleAirSolar.java b/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/air/TileEntityDoubleAirSolar.java index 8d579e2..193f6a3 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/air/TileEntityDoubleAirSolar.java +++ b/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/air/TileEntityDoubleAirSolar.java @@ -14,7 +14,7 @@ package tombenpotter.emt.common.module.ic2.tile.solars.air; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.module.ic2.IC2ModuleBlockRegistry; +import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityDoubleAirSolar extends TileEntityAirSolar { @@ -25,6 +25,6 @@ public class TileEntityDoubleAirSolar extends TileEntityAirSolar { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(IC2ModuleBlockRegistry.emtSolars2, 1, 0); + return new ItemStack(IC2BlockRegistry.emtSolars2, 1, 0); } } diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/air/TileEntityTripleAirSolar.java b/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/air/TileEntityTripleAirSolar.java index d346403..8749197 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/air/TileEntityTripleAirSolar.java +++ b/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/air/TileEntityTripleAirSolar.java @@ -14,7 +14,7 @@ package tombenpotter.emt.common.module.ic2.tile.solars.air; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.module.ic2.IC2ModuleBlockRegistry; +import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityTripleAirSolar extends TileEntityAirSolar { @@ -25,6 +25,6 @@ public class TileEntityTripleAirSolar extends TileEntityAirSolar { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(IC2ModuleBlockRegistry.emtSolars2, 1, 1); + return new ItemStack(IC2BlockRegistry.emtSolars2, 1, 1); } } diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/compressed/TileEntityCompressedSolar.java b/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/compressed/TileEntityCompressedSolar.java index 745b869..cc4fd99 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/compressed/TileEntityCompressedSolar.java +++ b/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/compressed/TileEntityCompressedSolar.java @@ -14,7 +14,7 @@ package tombenpotter.emt.common.module.ic2.tile.solars.compressed; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.module.ic2.IC2ModuleBlockRegistry; +import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; import tombenpotter.emt.common.module.ic2.tile.solars.TileEntitySolarBase; import tombenpotter.emt.common.util.ConfigHandler; @@ -26,6 +26,6 @@ public class TileEntityCompressedSolar extends TileEntitySolarBase { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 0); + return new ItemStack(IC2BlockRegistry.emtSolars, 1, 0); } } diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/compressed/TileEntityDoubleCompressedSolar.java b/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/compressed/TileEntityDoubleCompressedSolar.java index 374ed2f..e2c1d0d 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/compressed/TileEntityDoubleCompressedSolar.java +++ b/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/compressed/TileEntityDoubleCompressedSolar.java @@ -14,7 +14,7 @@ package tombenpotter.emt.common.module.ic2.tile.solars.compressed; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.module.ic2.IC2ModuleBlockRegistry; +import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; import tombenpotter.emt.common.module.ic2.tile.solars.TileEntitySolarBase; import tombenpotter.emt.common.util.ConfigHandler; @@ -26,6 +26,6 @@ public class TileEntityDoubleCompressedSolar extends TileEntitySolarBase { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 1); + return new ItemStack(IC2BlockRegistry.emtSolars, 1, 1); } } diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/compressed/TileEntityTripleCompressedSolar.java b/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/compressed/TileEntityTripleCompressedSolar.java index b68230d..b1dca48 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/compressed/TileEntityTripleCompressedSolar.java +++ b/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/compressed/TileEntityTripleCompressedSolar.java @@ -14,7 +14,7 @@ package tombenpotter.emt.common.module.ic2.tile.solars.compressed; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.module.ic2.IC2ModuleBlockRegistry; +import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; import tombenpotter.emt.common.module.ic2.tile.solars.TileEntitySolarBase; import tombenpotter.emt.common.util.ConfigHandler; @@ -26,6 +26,6 @@ public class TileEntityTripleCompressedSolar extends TileEntitySolarBase { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 2); + return new ItemStack(IC2BlockRegistry.emtSolars, 1, 2); } } diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/dark/TileEntityDarkSolar.java b/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/dark/TileEntityDarkSolar.java index 6136ca6..7582c7a 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/dark/TileEntityDarkSolar.java +++ b/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/dark/TileEntityDarkSolar.java @@ -14,7 +14,7 @@ package tombenpotter.emt.common.module.ic2.tile.solars.dark; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.module.ic2.IC2ModuleBlockRegistry; +import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; import tombenpotter.emt.common.module.ic2.tile.solars.TileEntitySolarBase; import tombenpotter.emt.common.util.ConfigHandler; @@ -33,6 +33,6 @@ public class TileEntityDarkSolar extends TileEntitySolarBase { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 6); + return new ItemStack(IC2BlockRegistry.emtSolars, 1, 6); } } diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/dark/TileEntityDoubleDarkSolar.java b/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/dark/TileEntityDoubleDarkSolar.java index e3cb7f8..c2fcf39 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/dark/TileEntityDoubleDarkSolar.java +++ b/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/dark/TileEntityDoubleDarkSolar.java @@ -14,7 +14,7 @@ package tombenpotter.emt.common.module.ic2.tile.solars.dark; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.module.ic2.IC2ModuleBlockRegistry; +import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityDoubleDarkSolar extends TileEntityDarkSolar { @@ -25,6 +25,6 @@ public class TileEntityDoubleDarkSolar extends TileEntityDarkSolar { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 7); + return new ItemStack(IC2BlockRegistry.emtSolars, 1, 7); } } diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/dark/TileEntityTripleDarkSolar.java b/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/dark/TileEntityTripleDarkSolar.java index b126c8a..436363b 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/dark/TileEntityTripleDarkSolar.java +++ b/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/dark/TileEntityTripleDarkSolar.java @@ -14,7 +14,7 @@ package tombenpotter.emt.common.module.ic2.tile.solars.dark; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.module.ic2.IC2ModuleBlockRegistry; +import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityTripleDarkSolar extends TileEntityDarkSolar { @@ -25,6 +25,6 @@ public class TileEntityTripleDarkSolar extends TileEntityDarkSolar { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 8); + return new ItemStack(IC2BlockRegistry.emtSolars, 1, 8); } } diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/earth/TileEntityDoubleEarthSolar.java b/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/earth/TileEntityDoubleEarthSolar.java index 6820874..ff2abe0 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/earth/TileEntityDoubleEarthSolar.java +++ b/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/earth/TileEntityDoubleEarthSolar.java @@ -14,7 +14,7 @@ package tombenpotter.emt.common.module.ic2.tile.solars.earth; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.module.ic2.IC2ModuleBlockRegistry; +import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityDoubleEarthSolar extends TileEntityEarthSolar { @@ -25,6 +25,6 @@ public class TileEntityDoubleEarthSolar extends TileEntityEarthSolar { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(IC2ModuleBlockRegistry.emtSolars2, 1, 3); + return new ItemStack(IC2BlockRegistry.emtSolars2, 1, 3); } } diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/earth/TileEntityEarthSolar.java b/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/earth/TileEntityEarthSolar.java index 74cd9a3..7de4495 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/earth/TileEntityEarthSolar.java +++ b/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/earth/TileEntityEarthSolar.java @@ -14,7 +14,7 @@ package tombenpotter.emt.common.module.ic2.tile.solars.earth; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.module.ic2.IC2ModuleBlockRegistry; +import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; import tombenpotter.emt.common.module.ic2.tile.solars.TileEntitySolarBase; import tombenpotter.emt.common.util.ConfigHandler; @@ -35,6 +35,6 @@ public class TileEntityEarthSolar extends TileEntitySolarBase { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(IC2ModuleBlockRegistry.emtSolars2, 1, 2); + return new ItemStack(IC2BlockRegistry.emtSolars2, 1, 2); } } diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/earth/TileEntityTripleEarthSolar.java b/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/earth/TileEntityTripleEarthSolar.java index 86e2f13..4c281dc 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/earth/TileEntityTripleEarthSolar.java +++ b/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/earth/TileEntityTripleEarthSolar.java @@ -14,7 +14,7 @@ package tombenpotter.emt.common.module.ic2.tile.solars.earth; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.module.ic2.IC2ModuleBlockRegistry; +import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityTripleEarthSolar extends TileEntityEarthSolar { @@ -25,6 +25,6 @@ public class TileEntityTripleEarthSolar extends TileEntityEarthSolar { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(IC2ModuleBlockRegistry.emtSolars2, 1, 4); + return new ItemStack(IC2BlockRegistry.emtSolars2, 1, 4); } } diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/fire/TileEntityDoubleFireSolar.java b/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/fire/TileEntityDoubleFireSolar.java index eddf02c..6cc6d12 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/fire/TileEntityDoubleFireSolar.java +++ b/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/fire/TileEntityDoubleFireSolar.java @@ -14,7 +14,7 @@ package tombenpotter.emt.common.module.ic2.tile.solars.fire; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.module.ic2.IC2ModuleBlockRegistry; +import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityDoubleFireSolar extends TileEntityFireSolar { @@ -25,6 +25,6 @@ public class TileEntityDoubleFireSolar extends TileEntityFireSolar { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 13); + return new ItemStack(IC2BlockRegistry.emtSolars, 1, 13); } } diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/fire/TileEntityFireSolar.java b/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/fire/TileEntityFireSolar.java index 48b0606..906e983 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/fire/TileEntityFireSolar.java +++ b/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/fire/TileEntityFireSolar.java @@ -14,7 +14,7 @@ package tombenpotter.emt.common.module.ic2.tile.solars.fire; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.module.ic2.IC2ModuleBlockRegistry; +import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; import tombenpotter.emt.common.module.ic2.tile.solars.TileEntitySolarBase; import tombenpotter.emt.common.util.ConfigHandler; @@ -43,6 +43,6 @@ public class TileEntityFireSolar extends TileEntitySolarBase { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 12); + return new ItemStack(IC2BlockRegistry.emtSolars, 1, 12); } } diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/fire/TileEntityTripleFireSolar.java b/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/fire/TileEntityTripleFireSolar.java index 40abe77..9e75486 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/fire/TileEntityTripleFireSolar.java +++ b/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/fire/TileEntityTripleFireSolar.java @@ -14,7 +14,7 @@ package tombenpotter.emt.common.module.ic2.tile.solars.fire; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.module.ic2.IC2ModuleBlockRegistry; +import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityTripleFireSolar extends TileEntityFireSolar { @@ -25,6 +25,6 @@ public class TileEntityTripleFireSolar extends TileEntityFireSolar { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 14); + return new ItemStack(IC2BlockRegistry.emtSolars, 1, 14); } } diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/order/TileEntityDoubleOrderSolar.java b/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/order/TileEntityDoubleOrderSolar.java index 3056605..6eff7ce 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/order/TileEntityDoubleOrderSolar.java +++ b/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/order/TileEntityDoubleOrderSolar.java @@ -14,7 +14,7 @@ package tombenpotter.emt.common.module.ic2.tile.solars.order; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.module.ic2.IC2ModuleBlockRegistry; +import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityDoubleOrderSolar extends TileEntityOrderSolar { @@ -25,6 +25,6 @@ public class TileEntityDoubleOrderSolar extends TileEntityOrderSolar { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 10); + return new ItemStack(IC2BlockRegistry.emtSolars, 1, 10); } } diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/order/TileEntityOrderSolar.java b/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/order/TileEntityOrderSolar.java index 999a16a..0c8270d 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/order/TileEntityOrderSolar.java +++ b/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/order/TileEntityOrderSolar.java @@ -14,7 +14,7 @@ package tombenpotter.emt.common.module.ic2.tile.solars.order; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.module.ic2.IC2ModuleBlockRegistry; +import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; import tombenpotter.emt.common.module.ic2.tile.solars.TileEntitySolarBase; import tombenpotter.emt.common.util.ConfigHandler; @@ -33,6 +33,6 @@ public class TileEntityOrderSolar extends TileEntitySolarBase { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 9); + return new ItemStack(IC2BlockRegistry.emtSolars, 1, 9); } } diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/order/TileEntityTripleOrderSolar.java b/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/order/TileEntityTripleOrderSolar.java index b0a3886..6045bae 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/order/TileEntityTripleOrderSolar.java +++ b/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/order/TileEntityTripleOrderSolar.java @@ -14,7 +14,7 @@ package tombenpotter.emt.common.module.ic2.tile.solars.order; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.module.ic2.IC2ModuleBlockRegistry; +import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityTripleOrderSolar extends TileEntityOrderSolar { @@ -25,6 +25,6 @@ public class TileEntityTripleOrderSolar extends TileEntityOrderSolar { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 11); + return new ItemStack(IC2BlockRegistry.emtSolars, 1, 11); } } diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/water/TileEntityDoubleWaterSolar.java b/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/water/TileEntityDoubleWaterSolar.java index 3069b19..4b4b1f4 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/water/TileEntityDoubleWaterSolar.java +++ b/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/water/TileEntityDoubleWaterSolar.java @@ -14,7 +14,7 @@ package tombenpotter.emt.common.module.ic2.tile.solars.water; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.module.ic2.IC2ModuleBlockRegistry; +import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityDoubleWaterSolar extends TileEntityWaterSolar { @@ -25,6 +25,6 @@ public class TileEntityDoubleWaterSolar extends TileEntityWaterSolar { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 4); + return new ItemStack(IC2BlockRegistry.emtSolars, 1, 4); } } diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/water/TileEntityTripleWaterSolar.java b/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/water/TileEntityTripleWaterSolar.java index f1f2d14..2b17429 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/water/TileEntityTripleWaterSolar.java +++ b/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/water/TileEntityTripleWaterSolar.java @@ -14,7 +14,7 @@ package tombenpotter.emt.common.module.ic2.tile.solars.water; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.module.ic2.IC2ModuleBlockRegistry; +import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityTripleWaterSolar extends TileEntityWaterSolar { @@ -25,6 +25,6 @@ public class TileEntityTripleWaterSolar extends TileEntityWaterSolar { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 5); + return new ItemStack(IC2BlockRegistry.emtSolars, 1, 5); } } diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/water/TileEntityWaterSolar.java b/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/water/TileEntityWaterSolar.java index af70b24..24e56dc 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/water/TileEntityWaterSolar.java +++ b/src/main/java/tombenpotter/emt/common/module/ic2/tile/solars/water/TileEntityWaterSolar.java @@ -14,7 +14,7 @@ package tombenpotter.emt.common.module.ic2.tile.solars.water; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.module.ic2.IC2ModuleBlockRegistry; +import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; import tombenpotter.emt.common.module.ic2.tile.solars.TileEntitySolarBase; import tombenpotter.emt.common.util.ConfigHandler; @@ -33,6 +33,6 @@ public class TileEntityWaterSolar extends TileEntitySolarBase { @Override public ItemStack getWrenchDrop(EntityPlayer entityPlayer) { - return new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 3); + return new ItemStack(IC2BlockRegistry.emtSolars, 1, 3); } } diff --git a/src/main/java/tombenpotter/emt/common/module/vanilla/VanillaBlocksRegistry.java b/src/main/java/tombenpotter/emt/common/module/vanilla/VanillaBlocksRegistry.java deleted file mode 100644 index 4e33657..0000000 --- a/src/main/java/tombenpotter/emt/common/module/vanilla/VanillaBlocksRegistry.java +++ /dev/null @@ -1,8 +0,0 @@ -package tombenpotter.emt.common.module.vanilla; - -public class VanillaBlocksRegistry { - - public static void registerBlocks() { - - } -} diff --git a/src/main/java/tombenpotter/emt/common/module/vanilla/VanillaItemstacks.java b/src/main/java/tombenpotter/emt/common/module/vanilla/VanillaItemstacks.java deleted file mode 100644 index 2b83cc4..0000000 --- a/src/main/java/tombenpotter/emt/common/module/vanilla/VanillaItemstacks.java +++ /dev/null @@ -1,78 +0,0 @@ -package tombenpotter.emt.common.module.vanilla; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; - -public class VanillaItemstacks { - public static ItemStack woodenDrill = new ItemStack(VanillaItemsRegistry.woodenDrill); - public static ItemStack stoneDrill = new ItemStack(VanillaItemsRegistry.stoneDrill); - public static ItemStack ironDrill = new ItemStack(VanillaItemsRegistry.ironDrill); - public static ItemStack goldenDrill = new ItemStack(VanillaItemsRegistry.goldenDrill); - public static ItemStack diamondDrill = new ItemStack(VanillaItemsRegistry.diamondDrill); - public static ItemStack copperDrill = new ItemStack(VanillaItemsRegistry.copperDrill); - public static ItemStack tinDrill = new ItemStack(VanillaItemsRegistry.tinDrill); - public static ItemStack leadDrill = new ItemStack(VanillaItemsRegistry.leadDrill); - public static ItemStack bronzeDrill = new ItemStack(VanillaItemsRegistry.bronzeDrill); - - public static ItemStack woodenChainsaw = new ItemStack(VanillaItemsRegistry.woodenChainsaw); - public static ItemStack stoneChainsaw = new ItemStack(VanillaItemsRegistry.stoneChainsaw); - public static ItemStack ironChainsaw = new ItemStack(VanillaItemsRegistry.ironChainsaw); - public static ItemStack goldenChainsaw = new ItemStack(VanillaItemsRegistry.goldenChainsaw); - public static ItemStack diamondChainsaw = new ItemStack(VanillaItemsRegistry.diamondChainsaw); - public static ItemStack copperChainsaw = new ItemStack(VanillaItemsRegistry.copperChainsaw); - public static ItemStack tinChainsaw = new ItemStack(VanillaItemsRegistry.tinChainsaw); - public static ItemStack leadChainsaw = new ItemStack(VanillaItemsRegistry.leadChainsaw); - public static ItemStack bronzeChainsaw = new ItemStack(VanillaItemsRegistry.bronzeChainsaw); - - public static ItemStack ironOmnitool = new ItemStack(VanillaItemsRegistry.ironOmnitool); - public static ItemStack goldenOmnitool = new ItemStack(VanillaItemsRegistry.goldenOmnitool); - public static ItemStack diamondOmnitool = new ItemStack(VanillaItemsRegistry.diamondOmnitool); - public static ItemStack copperOmnitool = new ItemStack(VanillaItemsRegistry.copperOmnitool); - public static ItemStack tinOmnitool = new ItemStack(VanillaItemsRegistry.tinOmnitool); - public static ItemStack leadOmnitool = new ItemStack(VanillaItemsRegistry.leadOmnitool); - public static ItemStack bronzeOmnitool = new ItemStack(VanillaItemsRegistry.bronzeOmnitool); - - public static ItemStack woodenDrillTop = new ItemStack(VanillaItemsRegistry.craftingComponents, 1, 0); - public static ItemStack stoneDrillTop = new ItemStack(VanillaItemsRegistry.craftingComponents, 1, 1); - public static ItemStack ironDrillTop = new ItemStack(VanillaItemsRegistry.craftingComponents, 1, 2); - public static ItemStack goldenDrillTop = new ItemStack(VanillaItemsRegistry.craftingComponents, 1, 3); - public static ItemStack diamondDrillTop = new ItemStack(VanillaItemsRegistry.craftingComponents, 1, 4); - public static ItemStack copperDrillTop = new ItemStack(VanillaItemsRegistry.craftingComponents, 1, 5); - public static ItemStack tinDrillTop = new ItemStack(VanillaItemsRegistry.craftingComponents, 1, 6); - public static ItemStack leadDrillTop = new ItemStack(VanillaItemsRegistry.craftingComponents, 1, 7); - public static ItemStack bronzeDrillTop = new ItemStack(VanillaItemsRegistry.craftingComponents, 1, 8); - - public static ItemStack woodenChainsawTop = new ItemStack(VanillaItemsRegistry.craftingComponents, 1, 9); - public static ItemStack stoneChainsawTop = new ItemStack(VanillaItemsRegistry.craftingComponents, 1, 10); - public static ItemStack ironChainsawTop = new ItemStack(VanillaItemsRegistry.craftingComponents, 1, 11); - public static ItemStack goldenChainsawTop = new ItemStack(VanillaItemsRegistry.craftingComponents, 1, 12); - public static ItemStack diamondChainsawTop = new ItemStack(VanillaItemsRegistry.craftingComponents, 1, 13); - public static ItemStack copperChainsawTop = new ItemStack(VanillaItemsRegistry.craftingComponents, 1, 14); - public static ItemStack tinChainsawTop = new ItemStack(VanillaItemsRegistry.craftingComponents, 1, 15); - public static ItemStack leadChainsawTop = new ItemStack(VanillaItemsRegistry.craftingComponents, 1, 16); - public static ItemStack bronzeChainsawTop = new ItemStack(VanillaItemsRegistry.craftingComponents, 1, 17); - - public static ItemStack ironOmnitoolTop = new ItemStack(VanillaItemsRegistry.craftingComponents, 1, 18); - public static ItemStack goldenOmnitoolTop = new ItemStack(VanillaItemsRegistry.craftingComponents, 1, 19); - public static ItemStack diamondOmnitoolTop = new ItemStack(VanillaItemsRegistry.craftingComponents, 1, 20); - public static ItemStack copperOmnitoolTop = new ItemStack(VanillaItemsRegistry.craftingComponents, 1, 21); - public static ItemStack tinOmnitoolTop = new ItemStack(VanillaItemsRegistry.craftingComponents, 1, 22); - public static ItemStack leadOmnitoolTop = new ItemStack(VanillaItemsRegistry.craftingComponents, 1, 23); - public static ItemStack bronzeOmnitoolTop = new ItemStack(VanillaItemsRegistry.craftingComponents, 1, 24); - - public static ItemStack woodenShard = new ItemStack(VanillaItemsRegistry.craftingComponents, 1, 25); - public static ItemStack stoneShard = new ItemStack(VanillaItemsRegistry.craftingComponents, 1, 26); - public static ItemStack ironShard = new ItemStack(VanillaItemsRegistry.craftingComponents, 1, 27); - public static ItemStack goldenShard = new ItemStack(VanillaItemsRegistry.craftingComponents, 1, 28); - public static ItemStack obsidianShard = new ItemStack(VanillaItemsRegistry.craftingComponents, 1, 29); - public static ItemStack copperShard = new ItemStack(VanillaItemsRegistry.craftingComponents, 1, 30); - public static ItemStack tinShard = new ItemStack(VanillaItemsRegistry.craftingComponents, 1, 31); - public static ItemStack leadShard = new ItemStack(VanillaItemsRegistry.craftingComponents, 1, 32); - public static ItemStack bronzeShard = new ItemStack(VanillaItemsRegistry.craftingComponents, 1, 33); - - public static ItemStack woodenCarver = new ItemStack(VanillaItemsRegistry.woodCarver, 1, OreDictionary.WILDCARD_VALUE); - public static ItemStack stoneCarver = new ItemStack(VanillaItemsRegistry.stoneCarver, 1, OreDictionary.WILDCARD_VALUE); - public static ItemStack ironCarver = new ItemStack(VanillaItemsRegistry.ironCarver, 1, OreDictionary.WILDCARD_VALUE); - public static ItemStack obsidianCarver = new ItemStack(VanillaItemsRegistry.obsidianCarver, 1, OreDictionary.WILDCARD_VALUE); - public static ItemStack diamondCarver = new ItemStack(VanillaItemsRegistry.obsidianCarver, 1, OreDictionary.WILDCARD_VALUE); -} diff --git a/src/main/java/tombenpotter/emt/common/module/vanilla/VanillaRecipesRegistry.java b/src/main/java/tombenpotter/emt/common/module/vanilla/VanillaRecipesRegistry.java deleted file mode 100644 index 5cb0742..0000000 --- a/src/main/java/tombenpotter/emt/common/module/vanilla/VanillaRecipesRegistry.java +++ /dev/null @@ -1,188 +0,0 @@ -package tombenpotter.emt.common.module.vanilla; - -import cpw.mods.fml.common.registry.GameRegistry; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; -import net.minecraftforge.oredict.OreDictionary; - -public class VanillaRecipesRegistry { - - public static IRecipe woodenDrill, stoneDrill, ironDrill, goldenDrill, diamondDrill, copperDrill, tinDrill, leadDrill, bronzeDrill; - public static IRecipe woodenChainsaw, stoneChainsaw, ironChainsaw, goldenChainsaw, diamondChainsaw, copperChainsaw, tinChainsaw, leadChainsaw, bronzeChainsaw; - public static IRecipe ironOmnitool, goldenOmnitool, diamondOmnitool, copperOmnitool, tinOmnitool, leadOmnitool, bronzeOmnitool; - public static IRecipe woodenDrillTop, stoneDrillTop, ironDrillTop, goldenDrillTop, diamondDrillTop, copperDrillTop, tinDrillTop, leadDrillTop, bronzeDrillTop; - public static IRecipe woodenChainsawTop, stoneChainsawTop, ironChainsawTop, goldenChainsawTop, diamondChainsawTop, copperChainsawTop, tinChainsawTop, leadChainsawTop, bronzeChainsawTop; - public static IRecipe woodenCarver, stoneCarver, ironCarver, obsidianCarver, diamondCarver; - - public static void registerRecipes() { - addMiscRecipes(); - addCarversRecipes(); - addShardsRecipes(); - addDrillTopRecipes(); - addDrillRecipe(); - addChainsawTopRecipes(); - addChainsawRecipes(); - } - - public static void addMiscRecipes() { - } - - public static void addCarversRecipes() { - for (int i = 0; i < OreDictionary.getOres("logWood").size(); i++) { - woodenCarver = GameRegistry.addShapedRecipe(VanillaItemstacks.woodenCarver, " X ", "YYY", 'X', Items.flint, 'Y', OreDictionary.getOres("logWood").get(i)); - } - stoneCarver = GameRegistry.addShapedRecipe(VanillaItemstacks.stoneCarver, " X ", "YYY", 'X', Items.flint, 'Y', Blocks.stone); - ironCarver = GameRegistry.addShapedRecipe(VanillaItemstacks.ironCarver, " X ", "YYY", 'X', VanillaItemstacks.ironShard, 'Y', Blocks.stone); - obsidianCarver = GameRegistry.addShapedRecipe(VanillaItemstacks.obsidianCarver, " X ", "YYY", 'X', VanillaItemstacks.ironShard, 'Y', Blocks.obsidian); - diamondCarver = GameRegistry.addShapedRecipe(VanillaItemstacks.ironCarver, " X ", "YYY", "ZZZ", 'X', VanillaItemstacks.obsidianShard, 'Y', Items.diamond, 'Z', Blocks.obsidian); - } - - public static void addShardsRecipes() { - addCarverRecipe(VanillaItemstacks.woodenShard, "logWood"); - addCarverRecipe(VanillaItemstacks.stoneShard, "stone"); - addCarverRecipe(VanillaItemstacks.ironShard, "ingotIron"); - addCarverRecipe(VanillaItemstacks.goldenShard, "ingotGold"); - addCarverRecipe(VanillaItemstacks.obsidianShard, new ItemStack(Blocks.obsidian)); - - if (isOreRegistered("ingotCopper")) - addCarverRecipe(VanillaItemstacks.copperShard, "ingotCopper"); - if (isOreRegistered("ingotTin")) - addCarverRecipe(VanillaItemstacks.tinShard, "ingotTin"); - if (isOreRegistered("ingotLead")) - addCarverRecipe(VanillaItemstacks.leadShard, "ingotLead"); - if (isOreRegistered("ingotBronze")) - addCarverRecipe(VanillaItemstacks.bronzeShard, "ingotBronze"); - } - - public static void addDrillTopRecipes() { - woodenDrillTop = drillTopRecipe(VanillaItemstacks.woodenDrillTop, "plankWood", VanillaItemstacks.woodenShard); - stoneDrillTop = drillTopRecipe(VanillaItemstacks.stoneDrillTop, "stone", VanillaItemstacks.stoneShard); - ironDrillTop = drillTopRecipe(VanillaItemstacks.ironDrillTop, "ingotIron", VanillaItemstacks.ironShard); - goldenDrillTop = drillTopRecipe(VanillaItemstacks.goldenDrillTop, "ingotGold", VanillaItemstacks.goldenShard); - diamondDrillTop = drillTopRecipe(VanillaItemstacks.diamondDrillTop, "gemDiamond", VanillaItemstacks.obsidianShard); - - if (isOreRegistered("ingotCopper")) - copperDrillTop = drillTopRecipe(VanillaItemstacks.copperDrillTop, "ingotCopper", VanillaItemstacks.copperShard); - if (isOreRegistered("ingotTin")) - tinDrillTop = drillTopRecipe(VanillaItemstacks.tinDrillTop, "ingotTin", VanillaItemstacks.tinShard); - if (isOreRegistered("ingotLead")) - leadDrillTop = drillTopRecipe(VanillaItemstacks.leadDrillTop, "ingotLead", VanillaItemstacks.leadShard); - if (isOreRegistered("ingotBronze")) - bronzeDrillTop = drillTopRecipe(VanillaItemstacks.bronzeDrillTop, "ingotBronze", VanillaItemstacks.bronzeShard); - } - - public static void addChainsawTopRecipes() { - woodenChainsawTop = chainsawTopRecipe(VanillaItemstacks.woodenChainsawTop, "plankWood", VanillaItemstacks.woodenShard); - stoneChainsawTop = chainsawTopRecipe(VanillaItemstacks.stoneChainsawTop, "stone", VanillaItemstacks.stoneShard); - ironChainsawTop = chainsawTopRecipe(VanillaItemstacks.ironChainsawTop, "ingotIron", VanillaItemstacks.ironShard); - goldenChainsawTop = chainsawTopRecipe(VanillaItemstacks.goldenChainsawTop, "ingotGold", VanillaItemstacks.goldenShard); - diamondChainsawTop = chainsawTopRecipe(VanillaItemstacks.diamondChainsawTop, "gemDiamond", VanillaItemstacks.obsidianShard); - - if (isOreRegistered("ingotCopper")) - copperChainsawTop = chainsawTopRecipe(VanillaItemstacks.copperChainsawTop, "ingotCopper", VanillaItemstacks.copperShard); - if (isOreRegistered("ingotTin")) - tinChainsawTop = chainsawTopRecipe(VanillaItemstacks.tinChainsawTop, "ingotTin", VanillaItemstacks.tinShard); - if (isOreRegistered("ingotLead")) - leadChainsawTop = chainsawTopRecipe(VanillaItemstacks.leadChainsawTop, "ingotLead", VanillaItemstacks.leadShard); - if (isOreRegistered("ingotBronze")) - bronzeChainsawTop = chainsawTopRecipe(VanillaItemstacks.bronzeChainsawTop, "ingotBronze", VanillaItemstacks.bronzeShard); - } - - public static void addDrillRecipe() { - woodenDrill = toolRecipe(VanillaItemstacks.woodenDrill, VanillaItemstacks.woodenDrillTop, "plankWood", "stickWood"); - stoneDrill = toolRecipe(VanillaItemstacks.stoneDrill, VanillaItemstacks.stoneDrillTop, "stone", "cobblestone"); - ironDrill = toolRecipe(VanillaItemstacks.ironDrill, VanillaItemstacks.ironDrillTop, "ingotIron", new ItemStack(Items.leather)); - goldenDrill = toolRecipe(VanillaItemstacks.goldenDrill, VanillaItemstacks.goldenDrillTop, "ingotGold", new ItemStack(Blocks.obsidian)); - diamondDrill = toolRecipe(VanillaItemstacks.diamondDrill, VanillaItemstacks.diamondDrillTop, "gemDiamond", "ingotGold"); - - if (isOreRegistered("ingotCopper") && isOreRegistered("ingotTin")) - copperDrill = toolRecipe(VanillaItemstacks.copperDrill, VanillaItemstacks.copperDrillTop, "ingotCopper", "ingotTin"); - if (isOreRegistered("ingotTin")) - tinDrill = toolRecipe(VanillaItemstacks.tinDrill, VanillaItemstacks.tinDrillTop, "ingotTin", "ingotGold"); - if (isOreRegistered("ingotLead")) - leadDrill = toolRecipe(VanillaItemstacks.leadDrill, VanillaItemstacks.leadDrillTop, "ingotLead", "ingotIron"); - if (isOreRegistered("ingotBronze")) - bronzeDrill = toolRecipe(VanillaItemstacks.bronzeDrill, VanillaItemstacks.bronzeDrillTop, "ingotBronze", new ItemStack(Blocks.obsidian)); - } - - public static void addChainsawRecipes() { - woodenChainsaw = toolRecipe(VanillaItemstacks.woodenChainsaw, VanillaItemstacks.woodenChainsawTop, "plankWood", "stickWood"); - stoneChainsaw = toolRecipe(VanillaItemstacks.stoneChainsaw, VanillaItemstacks.stoneChainsawTop, "stone", "cobblestone"); - ironChainsaw = toolRecipe(VanillaItemstacks.ironChainsaw, VanillaItemstacks.ironChainsawTop, "ingotIron", new ItemStack(Items.leather)); - goldenChainsaw = toolRecipe(VanillaItemstacks.goldenChainsaw, VanillaItemstacks.goldenChainsawTop, "ingotGold", new ItemStack(Blocks.obsidian)); - diamondChainsaw = toolRecipe(VanillaItemstacks.diamondChainsaw, VanillaItemstacks.diamondChainsawTop, "gemDiamond", "ingotGold"); - - if (isOreRegistered("ingotCopper") && isOreRegistered("ingotTin")) - copperChainsaw = toolRecipe(VanillaItemstacks.copperChainsaw, VanillaItemstacks.copperChainsawTop, "ingotCopper", "ingotTin"); - if (isOreRegistered("ingotTin")) - tinChainsaw = toolRecipe(VanillaItemstacks.tinChainsaw, VanillaItemstacks.tinChainsawTop, "ingotTin", "ingotGold"); - if (isOreRegistered("ingotLead")) - leadChainsaw = toolRecipe(VanillaItemstacks.leadChainsaw, VanillaItemstacks.leadChainsawTop, "ingotLead", "ingotIron"); - if (isOreRegistered("ingotBronze")) - bronzeChainsaw = toolRecipe(VanillaItemstacks.bronzeChainsaw, VanillaItemstacks.bronzeChainsawTop, "ingotBronze", new ItemStack(Blocks.obsidian)); - } - - public static IRecipe toolRecipe(ItemStack output, ItemStack X, String Y, ItemStack Z) { - if (isOreRegistered(Y)) { - for (int i = 0; i < OreDictionary.getOres(Y).size(); i++) { - return GameRegistry.addShapedRecipe(output, " X ", " Y ", "YZY", 'X', X, 'Y', OreDictionary.getOres(Y).get(i), 'Z', Z); - } - } - return null; - } - - public static IRecipe toolRecipe(ItemStack output, ItemStack X, String Y, String Z) { - if (isOreRegistered(Y) && isOreRegistered(Z)) { - for (int i = 0; i < OreDictionary.getOres(Y).size(); i++) { - for (int j = 0; j < OreDictionary.getOres(Z).size(); j++) { - return GameRegistry.addShapedRecipe(output, " X ", " Y ", "YZY", 'X', X, 'Y', OreDictionary.getOres(Y).get(j), 'Z', OreDictionary.getOres(Z).get(i)); - } - } - } - return null; - } - - public static IRecipe drillTopRecipe(ItemStack output, String X, ItemStack Y) { - if (isOreRegistered(X)) { - for (int i = 0; i < OreDictionary.getOres(X).size(); i++) { - return GameRegistry.addShapedRecipe(output, " Y ", "XXX", 'X', OreDictionary.getOres(X).get(i), 'Y', Y); - } - } - return null; - } - - public static IRecipe chainsawTopRecipe(ItemStack output, String X, ItemStack Y) { - if (isOreRegistered(X)) { - for (int i = 0; i < OreDictionary.getOres(X).size(); i++) { - return GameRegistry.addShapedRecipe(output, " Y ", "XYX", "XYX", 'X', OreDictionary.getOres(X).get(i), 'Y', Y); - } - } - return null; - } - - public static void addCarverRecipe(ItemStack output, ItemStack input) { - GameRegistry.addShapelessRecipe(output, VanillaItemstacks.woodenCarver, input); - GameRegistry.addShapelessRecipe(output, VanillaItemstacks.stoneCarver, input); - GameRegistry.addShapelessRecipe(output, VanillaItemstacks.ironCarver, input); - GameRegistry.addShapelessRecipe(output, VanillaItemstacks.obsidianCarver, input); - GameRegistry.addShapelessRecipe(output, VanillaItemstacks.diamondCarver, input); - } - - public static void addCarverRecipe(ItemStack output, String input) { - if (isOreRegistered(input)) { - for (int i = 0; i < OreDictionary.getOres(input).size(); i++) { - GameRegistry.addShapelessRecipe(output, VanillaItemstacks.woodenCarver, OreDictionary.getOres(input).get(i)); - GameRegistry.addShapelessRecipe(output, VanillaItemstacks.stoneCarver, OreDictionary.getOres(input).get(i)); - GameRegistry.addShapelessRecipe(output, VanillaItemstacks.ironCarver, OreDictionary.getOres(input).get(i)); - GameRegistry.addShapelessRecipe(output, VanillaItemstacks.obsidianCarver, OreDictionary.getOres(input).get(i)); - GameRegistry.addShapelessRecipe(output, VanillaItemstacks.diamondCarver, OreDictionary.getOres(input).get(i)); - } - } - } - - public static boolean isOreRegistered(String ore) { - return !OreDictionary.getOres(ore).isEmpty(); - } -} diff --git a/src/main/java/tombenpotter/emt/common/modules/ModuleRegistry.java b/src/main/java/tombenpotter/emt/common/modules/ModuleRegistry.java index fa7691c..a1eccbf 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ModuleRegistry.java +++ b/src/main/java/tombenpotter/emt/common/modules/ModuleRegistry.java @@ -1,17 +1,32 @@ package tombenpotter.emt.common.modules; +import tombenpotter.emt.ElectroMagicTools; +import tombenpotter.emt.common.modules.base.BaseRecipeRegistry; +import tombenpotter.emt.common.modules.base.blocks.BaseBlockRegistry; +import tombenpotter.emt.common.modules.base.items.BaseItemRegistry; +import tombenpotter.emt.common.modules.ic2.IC2RecipeRegistry; +import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; +import tombenpotter.emt.common.modules.ic2.items.IC2ItemRegistry; +import tombenpotter.emt.common.modules.te.TERecipeRegistry; +import tombenpotter.emt.common.modules.te.blocks.TEBlockRegistry; +import tombenpotter.emt.common.modules.te.items.TEItemRegistry; +import tombenpotter.emt.common.util.ConfigHandler; + +import static tombenpotter.emt.common.util.TextHelper.localize; + public class ModuleRegistry { public static void registerModules() { -/* + BaseBlockRegistry.registerBaseBlocks(); - BaseItemRegistry.registerBaseItems(); - BaseRecipeRegistry.registerBaseRecipes(); + BaseItemRegistry.registerItems(); + BaseRecipeRegistry.registerRecipes(); if (ConfigHandler.enableIC2Module) { - IC2BlockRegistry.registerIC2Blocks(); - IC2ItemRegistry.registerIC2Items(); - IC2RecipeRegistry.registerIC2Recipes(); + IC2BlockRegistry.registerBlocks(); + IC2ItemRegistry.registerItems(); + ElectroMagicTools.logger.info(localize("console.EMT.init.recipes.ic2")); + IC2RecipeRegistry.registerEarlyRecipes(); } if (ConfigHandler.enableTEModule) { @@ -19,6 +34,5 @@ public class ModuleRegistry { TEItemRegistry.registerTEItems(); TERecipeRegistry.registerTERecipes(); } - */ } } diff --git a/src/main/java/tombenpotter/emt/common/modules/base/BaseItemStacks.java b/src/main/java/tombenpotter/emt/common/modules/base/BaseItemStacks.java new file mode 100644 index 0000000..66a1ba1 --- /dev/null +++ b/src/main/java/tombenpotter/emt/common/modules/base/BaseItemStacks.java @@ -0,0 +1,79 @@ +package tombenpotter.emt.common.modules.base; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; +import tombenpotter.emt.common.modules.base.items.BaseItemRegistry; + +public class BaseItemStacks { + public static ItemStack woodenDrill = new ItemStack(BaseItemRegistry.woodenDrill); + public static ItemStack stoneDrill = new ItemStack(BaseItemRegistry.stoneDrill); + public static ItemStack ironDrill = new ItemStack(BaseItemRegistry.ironDrill); + public static ItemStack goldenDrill = new ItemStack(BaseItemRegistry.goldenDrill); + public static ItemStack diamondDrill = new ItemStack(BaseItemRegistry.diamondDrill); + public static ItemStack copperDrill = new ItemStack(BaseItemRegistry.copperDrill); + public static ItemStack tinDrill = new ItemStack(BaseItemRegistry.tinDrill); + public static ItemStack leadDrill = new ItemStack(BaseItemRegistry.leadDrill); + public static ItemStack bronzeDrill = new ItemStack(BaseItemRegistry.bronzeDrill); + + public static ItemStack woodenChainsaw = new ItemStack(BaseItemRegistry.woodenChainsaw); + public static ItemStack stoneChainsaw = new ItemStack(BaseItemRegistry.stoneChainsaw); + public static ItemStack ironChainsaw = new ItemStack(BaseItemRegistry.ironChainsaw); + public static ItemStack goldenChainsaw = new ItemStack(BaseItemRegistry.goldenChainsaw); + public static ItemStack diamondChainsaw = new ItemStack(BaseItemRegistry.diamondChainsaw); + public static ItemStack copperChainsaw = new ItemStack(BaseItemRegistry.copperChainsaw); + public static ItemStack tinChainsaw = new ItemStack(BaseItemRegistry.tinChainsaw); + public static ItemStack leadChainsaw = new ItemStack(BaseItemRegistry.leadChainsaw); + public static ItemStack bronzeChainsaw = new ItemStack(BaseItemRegistry.bronzeChainsaw); + + public static ItemStack ironOmnitool = new ItemStack(BaseItemRegistry.ironOmnitool); + public static ItemStack goldenOmnitool = new ItemStack(BaseItemRegistry.goldenOmnitool); + public static ItemStack diamondOmnitool = new ItemStack(BaseItemRegistry.diamondOmnitool); + public static ItemStack copperOmnitool = new ItemStack(BaseItemRegistry.copperOmnitool); + public static ItemStack tinOmnitool = new ItemStack(BaseItemRegistry.tinOmnitool); + public static ItemStack leadOmnitool = new ItemStack(BaseItemRegistry.leadOmnitool); + public static ItemStack bronzeOmnitool = new ItemStack(BaseItemRegistry.bronzeOmnitool); + + public static ItemStack woodenDrillTop = new ItemStack(BaseItemRegistry.craftingComponents, 1, 0); + public static ItemStack stoneDrillTop = new ItemStack(BaseItemRegistry.craftingComponents, 1, 1); + public static ItemStack ironDrillTop = new ItemStack(BaseItemRegistry.craftingComponents, 1, 2); + public static ItemStack goldenDrillTop = new ItemStack(BaseItemRegistry.craftingComponents, 1, 3); + public static ItemStack diamondDrillTop = new ItemStack(BaseItemRegistry.craftingComponents, 1, 4); + public static ItemStack copperDrillTop = new ItemStack(BaseItemRegistry.craftingComponents, 1, 5); + public static ItemStack tinDrillTop = new ItemStack(BaseItemRegistry.craftingComponents, 1, 6); + public static ItemStack leadDrillTop = new ItemStack(BaseItemRegistry.craftingComponents, 1, 7); + public static ItemStack bronzeDrillTop = new ItemStack(BaseItemRegistry.craftingComponents, 1, 8); + + public static ItemStack woodenChainsawTop = new ItemStack(BaseItemRegistry.craftingComponents, 1, 9); + public static ItemStack stoneChainsawTop = new ItemStack(BaseItemRegistry.craftingComponents, 1, 10); + public static ItemStack ironChainsawTop = new ItemStack(BaseItemRegistry.craftingComponents, 1, 11); + public static ItemStack goldenChainsawTop = new ItemStack(BaseItemRegistry.craftingComponents, 1, 12); + public static ItemStack diamondChainsawTop = new ItemStack(BaseItemRegistry.craftingComponents, 1, 13); + public static ItemStack copperChainsawTop = new ItemStack(BaseItemRegistry.craftingComponents, 1, 14); + public static ItemStack tinChainsawTop = new ItemStack(BaseItemRegistry.craftingComponents, 1, 15); + public static ItemStack leadChainsawTop = new ItemStack(BaseItemRegistry.craftingComponents, 1, 16); + public static ItemStack bronzeChainsawTop = new ItemStack(BaseItemRegistry.craftingComponents, 1, 17); + + public static ItemStack ironOmnitoolTop = new ItemStack(BaseItemRegistry.craftingComponents, 1, 18); + public static ItemStack goldenOmnitoolTop = new ItemStack(BaseItemRegistry.craftingComponents, 1, 19); + public static ItemStack diamondOmnitoolTop = new ItemStack(BaseItemRegistry.craftingComponents, 1, 20); + public static ItemStack copperOmnitoolTop = new ItemStack(BaseItemRegistry.craftingComponents, 1, 21); + public static ItemStack tinOmnitoolTop = new ItemStack(BaseItemRegistry.craftingComponents, 1, 22); + public static ItemStack leadOmnitoolTop = new ItemStack(BaseItemRegistry.craftingComponents, 1, 23); + public static ItemStack bronzeOmnitoolTop = new ItemStack(BaseItemRegistry.craftingComponents, 1, 24); + + public static ItemStack woodenShard = new ItemStack(BaseItemRegistry.craftingComponents, 1, 25); + public static ItemStack stoneShard = new ItemStack(BaseItemRegistry.craftingComponents, 1, 26); + public static ItemStack ironShard = new ItemStack(BaseItemRegistry.craftingComponents, 1, 27); + public static ItemStack goldenShard = new ItemStack(BaseItemRegistry.craftingComponents, 1, 28); + public static ItemStack obsidianShard = new ItemStack(BaseItemRegistry.craftingComponents, 1, 29); + public static ItemStack copperShard = new ItemStack(BaseItemRegistry.craftingComponents, 1, 30); + public static ItemStack tinShard = new ItemStack(BaseItemRegistry.craftingComponents, 1, 31); + public static ItemStack leadShard = new ItemStack(BaseItemRegistry.craftingComponents, 1, 32); + public static ItemStack bronzeShard = new ItemStack(BaseItemRegistry.craftingComponents, 1, 33); + + public static ItemStack woodenCarver = new ItemStack(BaseItemRegistry.woodCarver, 1, OreDictionary.WILDCARD_VALUE); + public static ItemStack stoneCarver = new ItemStack(BaseItemRegistry.stoneCarver, 1, OreDictionary.WILDCARD_VALUE); + public static ItemStack ironCarver = new ItemStack(BaseItemRegistry.ironCarver, 1, OreDictionary.WILDCARD_VALUE); + public static ItemStack obsidianCarver = new ItemStack(BaseItemRegistry.obsidianCarver, 1, OreDictionary.WILDCARD_VALUE); + public static ItemStack diamondCarver = new ItemStack(BaseItemRegistry.obsidianCarver, 1, OreDictionary.WILDCARD_VALUE); +} diff --git a/src/main/java/tombenpotter/emt/common/modules/base/BaseRecipeRegistry.java b/src/main/java/tombenpotter/emt/common/modules/base/BaseRecipeRegistry.java index 6d17720..c878f20 100644 --- a/src/main/java/tombenpotter/emt/common/modules/base/BaseRecipeRegistry.java +++ b/src/main/java/tombenpotter/emt/common/modules/base/BaseRecipeRegistry.java @@ -1,17 +1,188 @@ package tombenpotter.emt.common.modules.base; +import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipe; +import net.minecraftforge.oredict.OreDictionary; + public class BaseRecipeRegistry { - private static void registerShapedRecipes() { + public static IRecipe woodenDrill, stoneDrill, ironDrill, goldenDrill, diamondDrill, copperDrill, tinDrill, leadDrill, bronzeDrill; + public static IRecipe woodenChainsaw, stoneChainsaw, ironChainsaw, goldenChainsaw, diamondChainsaw, copperChainsaw, tinChainsaw, leadChainsaw, bronzeChainsaw; + public static IRecipe ironOmnitool, goldenOmnitool, diamondOmnitool, copperOmnitool, tinOmnitool, leadOmnitool, bronzeOmnitool; + public static IRecipe woodenDrillTop, stoneDrillTop, ironDrillTop, goldenDrillTop, diamondDrillTop, copperDrillTop, tinDrillTop, leadDrillTop, bronzeDrillTop; + public static IRecipe woodenChainsawTop, stoneChainsawTop, ironChainsawTop, goldenChainsawTop, diamondChainsawTop, copperChainsawTop, tinChainsawTop, leadChainsawTop, bronzeChainsawTop; + public static IRecipe woodenCarver, stoneCarver, ironCarver, obsidianCarver, diamondCarver; - } + public static void registerRecipes() { + addMiscRecipes(); + addCarversRecipes(); + addShardsRecipes(); + addDrillTopRecipes(); + addDrillRecipe(); + addChainsawTopRecipes(); + addChainsawRecipes(); + } - private static void registerShapelessRecipes() { + public static void addMiscRecipes() { + } - } + public static void addCarversRecipes() { + for (int i = 0; i < OreDictionary.getOres("logWood").size(); i++) { + woodenCarver = GameRegistry.addShapedRecipe(BaseItemStacks.woodenCarver, " X ", "YYY", 'X', Items.flint, 'Y', OreDictionary.getOres("logWood").get(i)); + } + stoneCarver = GameRegistry.addShapedRecipe(BaseItemStacks.stoneCarver, " X ", "YYY", 'X', Items.flint, 'Y', Blocks.stone); + ironCarver = GameRegistry.addShapedRecipe(BaseItemStacks.ironCarver, " X ", "YYY", 'X', BaseItemStacks.ironShard, 'Y', Blocks.stone); + obsidianCarver = GameRegistry.addShapedRecipe(BaseItemStacks.obsidianCarver, " X ", "YYY", 'X', BaseItemStacks.ironShard, 'Y', Blocks.obsidian); + diamondCarver = GameRegistry.addShapedRecipe(BaseItemStacks.ironCarver, " X ", "YYY", "ZZZ", 'X', BaseItemStacks.obsidianShard, 'Y', Items.diamond, 'Z', Blocks.obsidian); + } - public static void registerBaseRecipes() { - registerShapedRecipes(); - registerShapelessRecipes(); - } + public static void addShardsRecipes() { + addCarverRecipe(BaseItemStacks.woodenShard, "logWood"); + addCarverRecipe(BaseItemStacks.stoneShard, "stone"); + addCarverRecipe(BaseItemStacks.ironShard, "ingotIron"); + addCarverRecipe(BaseItemStacks.goldenShard, "ingotGold"); + addCarverRecipe(BaseItemStacks.obsidianShard, new ItemStack(Blocks.obsidian)); + + if (isOreRegistered("ingotCopper")) + addCarverRecipe(BaseItemStacks.copperShard, "ingotCopper"); + if (isOreRegistered("ingotTin")) + addCarverRecipe(BaseItemStacks.tinShard, "ingotTin"); + if (isOreRegistered("ingotLead")) + addCarverRecipe(BaseItemStacks.leadShard, "ingotLead"); + if (isOreRegistered("ingotBronze")) + addCarverRecipe(BaseItemStacks.bronzeShard, "ingotBronze"); + } + + public static void addDrillTopRecipes() { + woodenDrillTop = drillTopRecipe(BaseItemStacks.woodenDrillTop, "plankWood", BaseItemStacks.woodenShard); + stoneDrillTop = drillTopRecipe(BaseItemStacks.stoneDrillTop, "stone", BaseItemStacks.stoneShard); + ironDrillTop = drillTopRecipe(BaseItemStacks.ironDrillTop, "ingotIron", BaseItemStacks.ironShard); + goldenDrillTop = drillTopRecipe(BaseItemStacks.goldenDrillTop, "ingotGold", BaseItemStacks.goldenShard); + diamondDrillTop = drillTopRecipe(BaseItemStacks.diamondDrillTop, "gemDiamond", BaseItemStacks.obsidianShard); + + if (isOreRegistered("ingotCopper")) + copperDrillTop = drillTopRecipe(BaseItemStacks.copperDrillTop, "ingotCopper", BaseItemStacks.copperShard); + if (isOreRegistered("ingotTin")) + tinDrillTop = drillTopRecipe(BaseItemStacks.tinDrillTop, "ingotTin", BaseItemStacks.tinShard); + if (isOreRegistered("ingotLead")) + leadDrillTop = drillTopRecipe(BaseItemStacks.leadDrillTop, "ingotLead", BaseItemStacks.leadShard); + if (isOreRegistered("ingotBronze")) + bronzeDrillTop = drillTopRecipe(BaseItemStacks.bronzeDrillTop, "ingotBronze", BaseItemStacks.bronzeShard); + } + + public static void addChainsawTopRecipes() { + woodenChainsawTop = chainsawTopRecipe(BaseItemStacks.woodenChainsawTop, "plankWood", BaseItemStacks.woodenShard); + stoneChainsawTop = chainsawTopRecipe(BaseItemStacks.stoneChainsawTop, "stone", BaseItemStacks.stoneShard); + ironChainsawTop = chainsawTopRecipe(BaseItemStacks.ironChainsawTop, "ingotIron", BaseItemStacks.ironShard); + goldenChainsawTop = chainsawTopRecipe(BaseItemStacks.goldenChainsawTop, "ingotGold", BaseItemStacks.goldenShard); + diamondChainsawTop = chainsawTopRecipe(BaseItemStacks.diamondChainsawTop, "gemDiamond", BaseItemStacks.obsidianShard); + + if (isOreRegistered("ingotCopper")) + copperChainsawTop = chainsawTopRecipe(BaseItemStacks.copperChainsawTop, "ingotCopper", BaseItemStacks.copperShard); + if (isOreRegistered("ingotTin")) + tinChainsawTop = chainsawTopRecipe(BaseItemStacks.tinChainsawTop, "ingotTin", BaseItemStacks.tinShard); + if (isOreRegistered("ingotLead")) + leadChainsawTop = chainsawTopRecipe(BaseItemStacks.leadChainsawTop, "ingotLead", BaseItemStacks.leadShard); + if (isOreRegistered("ingotBronze")) + bronzeChainsawTop = chainsawTopRecipe(BaseItemStacks.bronzeChainsawTop, "ingotBronze", BaseItemStacks.bronzeShard); + } + + public static void addDrillRecipe() { + woodenDrill = toolRecipe(BaseItemStacks.woodenDrill, BaseItemStacks.woodenDrillTop, "plankWood", "stickWood"); + stoneDrill = toolRecipe(BaseItemStacks.stoneDrill, BaseItemStacks.stoneDrillTop, "stone", "cobblestone"); + ironDrill = toolRecipe(BaseItemStacks.ironDrill, BaseItemStacks.ironDrillTop, "ingotIron", new ItemStack(Items.leather)); + goldenDrill = toolRecipe(BaseItemStacks.goldenDrill, BaseItemStacks.goldenDrillTop, "ingotGold", new ItemStack(Blocks.obsidian)); + diamondDrill = toolRecipe(BaseItemStacks.diamondDrill, BaseItemStacks.diamondDrillTop, "gemDiamond", "ingotGold"); + + if (isOreRegistered("ingotCopper") && isOreRegistered("ingotTin")) + copperDrill = toolRecipe(BaseItemStacks.copperDrill, BaseItemStacks.copperDrillTop, "ingotCopper", "ingotTin"); + if (isOreRegistered("ingotTin")) + tinDrill = toolRecipe(BaseItemStacks.tinDrill, BaseItemStacks.tinDrillTop, "ingotTin", "ingotGold"); + if (isOreRegistered("ingotLead")) + leadDrill = toolRecipe(BaseItemStacks.leadDrill, BaseItemStacks.leadDrillTop, "ingotLead", "ingotIron"); + if (isOreRegistered("ingotBronze")) + bronzeDrill = toolRecipe(BaseItemStacks.bronzeDrill, BaseItemStacks.bronzeDrillTop, "ingotBronze", new ItemStack(Blocks.obsidian)); + } + + public static void addChainsawRecipes() { + woodenChainsaw = toolRecipe(BaseItemStacks.woodenChainsaw, BaseItemStacks.woodenChainsawTop, "plankWood", "stickWood"); + stoneChainsaw = toolRecipe(BaseItemStacks.stoneChainsaw, BaseItemStacks.stoneChainsawTop, "stone", "cobblestone"); + ironChainsaw = toolRecipe(BaseItemStacks.ironChainsaw, BaseItemStacks.ironChainsawTop, "ingotIron", new ItemStack(Items.leather)); + goldenChainsaw = toolRecipe(BaseItemStacks.goldenChainsaw, BaseItemStacks.goldenChainsawTop, "ingotGold", new ItemStack(Blocks.obsidian)); + diamondChainsaw = toolRecipe(BaseItemStacks.diamondChainsaw, BaseItemStacks.diamondChainsawTop, "gemDiamond", "ingotGold"); + + if (isOreRegistered("ingotCopper") && isOreRegistered("ingotTin")) + copperChainsaw = toolRecipe(BaseItemStacks.copperChainsaw, BaseItemStacks.copperChainsawTop, "ingotCopper", "ingotTin"); + if (isOreRegistered("ingotTin")) + tinChainsaw = toolRecipe(BaseItemStacks.tinChainsaw, BaseItemStacks.tinChainsawTop, "ingotTin", "ingotGold"); + if (isOreRegistered("ingotLead")) + leadChainsaw = toolRecipe(BaseItemStacks.leadChainsaw, BaseItemStacks.leadChainsawTop, "ingotLead", "ingotIron"); + if (isOreRegistered("ingotBronze")) + bronzeChainsaw = toolRecipe(BaseItemStacks.bronzeChainsaw, BaseItemStacks.bronzeChainsawTop, "ingotBronze", new ItemStack(Blocks.obsidian)); + } + + public static IRecipe toolRecipe(ItemStack output, ItemStack X, String Y, ItemStack Z) { + if (isOreRegistered(Y)) { + for (int i = 0; i < OreDictionary.getOres(Y).size(); i++) { + return GameRegistry.addShapedRecipe(output, " X ", " Y ", "YZY", 'X', X, 'Y', OreDictionary.getOres(Y).get(i), 'Z', Z); + } + } + return null; + } + + public static IRecipe toolRecipe(ItemStack output, ItemStack X, String Y, String Z) { + if (isOreRegistered(Y) && isOreRegistered(Z)) { + for (int i = 0; i < OreDictionary.getOres(Y).size(); i++) { + for (int j = 0; j < OreDictionary.getOres(Z).size(); j++) { + return GameRegistry.addShapedRecipe(output, " X ", " Y ", "YZY", 'X', X, 'Y', OreDictionary.getOres(Y).get(j), 'Z', OreDictionary.getOres(Z).get(i)); + } + } + } + return null; + } + + public static IRecipe drillTopRecipe(ItemStack output, String X, ItemStack Y) { + if (isOreRegistered(X)) { + for (int i = 0; i < OreDictionary.getOres(X).size(); i++) { + return GameRegistry.addShapedRecipe(output, " Y ", "XXX", 'X', OreDictionary.getOres(X).get(i), 'Y', Y); + } + } + return null; + } + + public static IRecipe chainsawTopRecipe(ItemStack output, String X, ItemStack Y) { + if (isOreRegistered(X)) { + for (int i = 0; i < OreDictionary.getOres(X).size(); i++) { + return GameRegistry.addShapedRecipe(output, " Y ", "XYX", "XYX", 'X', OreDictionary.getOres(X).get(i), 'Y', Y); + } + } + return null; + } + + public static void addCarverRecipe(ItemStack output, ItemStack input) { + GameRegistry.addShapelessRecipe(output, BaseItemStacks.woodenCarver, input); + GameRegistry.addShapelessRecipe(output, BaseItemStacks.stoneCarver, input); + GameRegistry.addShapelessRecipe(output, BaseItemStacks.ironCarver, input); + GameRegistry.addShapelessRecipe(output, BaseItemStacks.obsidianCarver, input); + GameRegistry.addShapelessRecipe(output, BaseItemStacks.diamondCarver, input); + } + + public static void addCarverRecipe(ItemStack output, String input) { + if (isOreRegistered(input)) { + for (int i = 0; i < OreDictionary.getOres(input).size(); i++) { + GameRegistry.addShapelessRecipe(output, BaseItemStacks.woodenCarver, OreDictionary.getOres(input).get(i)); + GameRegistry.addShapelessRecipe(output, BaseItemStacks.stoneCarver, OreDictionary.getOres(input).get(i)); + GameRegistry.addShapelessRecipe(output, BaseItemStacks.ironCarver, OreDictionary.getOres(input).get(i)); + GameRegistry.addShapelessRecipe(output, BaseItemStacks.obsidianCarver, OreDictionary.getOres(input).get(i)); + GameRegistry.addShapelessRecipe(output, BaseItemStacks.diamondCarver, OreDictionary.getOres(input).get(i)); + } + } + } + + public static boolean isOreRegistered(String ore) { + return !OreDictionary.getOres(ore).isEmpty(); + } } diff --git a/src/main/java/tombenpotter/emt/common/module/vanilla/VanillaItemsRegistry.java b/src/main/java/tombenpotter/emt/common/modules/base/items/BaseItemRegistry.java similarity index 96% rename from src/main/java/tombenpotter/emt/common/module/vanilla/VanillaItemsRegistry.java rename to src/main/java/tombenpotter/emt/common/modules/base/items/BaseItemRegistry.java index 9725ae7..e3c6fdf 100644 --- a/src/main/java/tombenpotter/emt/common/module/vanilla/VanillaItemsRegistry.java +++ b/src/main/java/tombenpotter/emt/common/modules/base/items/BaseItemRegistry.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.module.vanilla; +package tombenpotter.emt.common.modules.base.items; import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.init.Blocks; @@ -8,14 +8,10 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.oredict.OreDictionary; import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.modules.base.items.ItemBaseBaubles; -import tombenpotter.emt.common.modules.base.items.ItemCraftingComponents; -import tombenpotter.emt.common.modules.base.items.ItemMaterials; -import tombenpotter.emt.common.modules.base.items.ItemShardCarver; import tombenpotter.emt.common.modules.base.items.foci.ItemChristmasFocus; import tombenpotter.emt.common.modules.base.items.tools.*; -public class VanillaItemsRegistry { +public class BaseItemRegistry { public static Item woodenDrill, stoneDrill, ironDrill, goldenDrill, diamondDrill, copperDrill, tinDrill, leadDrill, bronzeDrill; public static Item woodenChainsaw, stoneChainsaw, ironChainsaw, goldenChainsaw, diamondChainsaw, copperChainsaw, tinChainsaw, leadChainsaw, bronzeChainsaw; diff --git a/src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemChristmasFocus.java b/src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemChristmasFocus.java index 4975619..0cc2a7d 100644 --- a/src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemChristmasFocus.java +++ b/src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemChristmasFocus.java @@ -20,9 +20,8 @@ import net.minecraft.world.World; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.common.items.wands.ItemWandCasting; -import tombenpotter.emt.common.module.base.items.foci.*; -public class ItemChristmasFocus extends tombenpotter.emt.common.module.base.items.foci.ItemBaseFocus { +public class ItemChristmasFocus extends ItemBaseFocus { private static final AspectList visCost = new AspectList().add(Aspect.ORDER, 500).add(Aspect.AIR, 500); diff --git a/src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemExplosionFocus.java b/src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemExplosionFocus.java index 439b277..e1ab84e 100644 --- a/src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemExplosionFocus.java +++ b/src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemExplosionFocus.java @@ -21,7 +21,7 @@ import thaumcraft.api.aspects.AspectList; import thaumcraft.common.items.wands.ItemWandCasting; import tombenpotter.emt.common.modules.base.entities.EntityLaser; -public class ItemExplosionFocus extends tombenpotter.emt.common.module.base.items.foci.ItemBaseFocus { +public class ItemExplosionFocus extends ItemBaseFocus { private static final AspectList visCost = new AspectList().add(Aspect.FIRE, 200).add(Aspect.ENTROPY, 200); diff --git a/src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemShieldFocus.java b/src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemShieldFocus.java index eef16ab..eae3e1d 100644 --- a/src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemShieldFocus.java +++ b/src/main/java/tombenpotter/emt/common/modules/base/items/foci/ItemShieldFocus.java @@ -20,10 +20,9 @@ import net.minecraft.world.World; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.common.items.wands.ItemWandCasting; -import tombenpotter.emt.common.module.base.items.foci.*; -import tombenpotter.emt.common.module.ic2.IC2ModuleBlockRegistry; +import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; -public class ItemShieldFocus extends tombenpotter.emt.common.module.base.items.foci.ItemBaseFocus { +public class ItemShieldFocus extends ItemBaseFocus { private static final AspectList visCost = new AspectList().add(Aspect.ORDER, 10).add(Aspect.WATER, 10).add(Aspect.AIR, 10); @@ -65,18 +64,18 @@ public class ItemShieldFocus extends tombenpotter.emt.common.module.base.items.f // Player Level if (player.worldObj.isAirBlock(x + 1, y, z) && player.worldObj.isAirBlock(x - 1, y, z) && player.worldObj.isAirBlock(x, y, z + 1) && player.worldObj.isAirBlock(x, y, z - 1)) { - player.worldObj.setBlock(x + 1, y, z, IC2ModuleBlockRegistry.shield); - player.worldObj.setBlock(x - 1, y, z, IC2ModuleBlockRegistry.shield); - player.worldObj.setBlock(x, y, z + 1, IC2ModuleBlockRegistry.shield); - player.worldObj.setBlock(x, y, z - 1, IC2ModuleBlockRegistry.shield); + player.worldObj.setBlock(x + 1, y, z, IC2BlockRegistry.shield); + player.worldObj.setBlock(x - 1, y, z, IC2BlockRegistry.shield); + player.worldObj.setBlock(x, y, z + 1, IC2BlockRegistry.shield); + player.worldObj.setBlock(x, y, z - 1, IC2BlockRegistry.shield); } // Above the player if (player.worldObj.isAirBlock(x + 1, y + 1, z) && player.worldObj.isAirBlock(x - 1, y + 1, z) && player.worldObj.isAirBlock(x, y + 1, z + 1) && player.worldObj.isAirBlock(x, y + 1, z - 1)) { - player.worldObj.setBlock(x + 1, y + 1, z, IC2ModuleBlockRegistry.shield); - player.worldObj.setBlock(x - 1, y + 1, z, IC2ModuleBlockRegistry.shield); - player.worldObj.setBlock(x, y + 1, z + 1, IC2ModuleBlockRegistry.shield); - player.worldObj.setBlock(x, y + 1, z - 1, IC2ModuleBlockRegistry.shield); + player.worldObj.setBlock(x + 1, y + 1, z, IC2BlockRegistry.shield); + player.worldObj.setBlock(x - 1, y + 1, z, IC2BlockRegistry.shield); + player.worldObj.setBlock(x, y + 1, z + 1, IC2BlockRegistry.shield); + player.worldObj.setBlock(x, y + 1, z - 1, IC2BlockRegistry.shield); } } } @@ -88,7 +87,7 @@ public class ItemShieldFocus extends tombenpotter.emt.common.module.base.items.f int z = MathHelper.floor_double(player.posZ); // Player Level - if ((player.worldObj.getBlock(x + 1, y, z) == IC2ModuleBlockRegistry.shield) && (player.worldObj.getBlock(x - 1, y, z) == IC2ModuleBlockRegistry.shield) && (player.worldObj.getBlock(x, y, z + 1) == IC2ModuleBlockRegistry.shield) && (player.worldObj.getBlock(x, y, z - 1) == IC2ModuleBlockRegistry.shield)) { + if ((player.worldObj.getBlock(x + 1, y, z) == IC2BlockRegistry.shield) && (player.worldObj.getBlock(x - 1, y, z) == IC2BlockRegistry.shield) && (player.worldObj.getBlock(x, y, z + 1) == IC2BlockRegistry.shield) && (player.worldObj.getBlock(x, y, z - 1) == IC2BlockRegistry.shield)) { player.worldObj.setBlockToAir(x + 1, y, z); player.worldObj.setBlockToAir(x - 1, y, z); player.worldObj.setBlockToAir(x, y, z + 1); @@ -96,7 +95,7 @@ public class ItemShieldFocus extends tombenpotter.emt.common.module.base.items.f } // Above the player - if ((player.worldObj.getBlock(x + 1, y + 1, z) == IC2ModuleBlockRegistry.shield) && (player.worldObj.getBlock(x - 1, y + 1, z) == IC2ModuleBlockRegistry.shield) && (player.worldObj.getBlock(x, y + 1, z + 1) == IC2ModuleBlockRegistry.shield) && (player.worldObj.getBlock(x, y + 1, z - 1) == IC2ModuleBlockRegistry.shield)) { + if ((player.worldObj.getBlock(x + 1, y + 1, z) == IC2BlockRegistry.shield) && (player.worldObj.getBlock(x - 1, y + 1, z) == IC2BlockRegistry.shield) && (player.worldObj.getBlock(x, y + 1, z + 1) == IC2BlockRegistry.shield) && (player.worldObj.getBlock(x, y + 1, z - 1) == IC2BlockRegistry.shield)) { player.worldObj.setBlockToAir(x + 1, y + 1, z); player.worldObj.setBlockToAir(x - 1, y + 1, z); player.worldObj.setBlockToAir(x, y + 1, z + 1); diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/IC2RecipeRegistry.java b/src/main/java/tombenpotter/emt/common/modules/ic2/IC2RecipeRegistry.java index db1980b..1bfc55b 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/IC2RecipeRegistry.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/IC2RecipeRegistry.java @@ -1,17 +1,464 @@ +/******************************************************************************* + * Copyright (c) 2014 Tombenpotter. + * All rights reserved. + * + * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 + * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html + * + * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. + * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. + * http://www.minecraftforum.net/topic/1585216- + ******************************************************************************/ + package tombenpotter.emt.common.modules.ic2; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.registry.GameRegistry; +import ic2.api.item.IC2Items; +import ic2.api.recipe.IRecipeInput; +import ic2.api.recipe.RecipeInputItemStack; +import ic2.api.recipe.Recipes; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipe; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.oredict.OreDictionary; +import thaumcraft.api.ThaumcraftApi; +import thaumcraft.api.crafting.CrucibleRecipe; +import thaumcraft.api.crafting.InfusionRecipe; +import thaumcraft.api.crafting.ShapedArcaneRecipe; +import thaumcraft.api.crafting.ShapelessArcaneRecipe; +import thaumcraft.common.config.ConfigBlocks; +import thaumcraft.common.config.ConfigItems; +import tombenpotter.emt.ElectroMagicTools; +import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; +import tombenpotter.emt.common.modules.ic2.items.IC2ItemRegistry; +import tombenpotter.emt.common.util.ConfigHandler; +import tombenpotter.emt.common.util.CraftingAspects; +import tombenpotter.emt.common.util.TextHelper; + +import java.util.Iterator; + public class IC2RecipeRegistry { - private static void registerShapedRecipes() { + public static ItemStack uuMCell = new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 16); + + private static void registerShapedRecipes() { + + /** Crafting Recipes **/ + ironOmnitool = GameRegistry.addShapedRecipe(new ItemStack(IC2ItemRegistry.ironOmnitool), "X", "Z", "Y", 'X', new ItemStack(IC2Items.getItem("chainsaw").getItem(), 1, OreDictionary.WILDCARD_VALUE), 'Y', new ItemStack(IC2Items.getItem("miningDrill").getItem(), 1, OreDictionary.WILDCARD_VALUE), 'Z', IC2Items.getItem("plateiron")); + diamondChainsaw = GameRegistry.addShapedRecipe(new ItemStack(IC2ItemRegistry.diamondChainsaw), " X ", "XYX", 'X', new ItemStack(Items.diamond), 'Y', new ItemStack(IC2Items.getItem("chainsaw").getItem(), 1, OreDictionary.WILDCARD_VALUE)); + ductTape = GameRegistry.addShapedRecipe(new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 9), "XXX", "YYY", "XXX", 'X', new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 8), 'Y', new ItemStack(Items.paper)); + featherMesh = GameRegistry.addShapedRecipe(new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 7), "XYX", "YXY", "XYX", 'X', new ItemStack(Items.feather), 'Y', new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 9)); + featherWing = GameRegistry.addShapedRecipe(new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 12), "XYZ", "XYZ", "XYZ", 'X', new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 7), 'Y', new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 8), 'Z', new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 11)); + featherWings = GameRegistry.addShapedRecipe(new ItemStack(IC2ItemRegistry.featherWing), "XX", 'X', new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 12)); + taintedFeathers = GameRegistry.addShapedRecipe(new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 14), " X ", "XYX", " X ", 'X', new ItemStack(ConfigItems.itemResource, 1, 12), 'Y', new ItemStack(Items.feather)); + + if (!Loader.isModLoaded("gregtech_addon")) { + GameRegistry.addShapedRecipe(IC2Items.getItem("diamondDrill"), " Y ", "YXY", 'Y', new ItemStack(Items.diamond), 'X', new ItemStack(IC2Items.getItem("miningDrill").getItem(), 1, OreDictionary.WILDCARD_VALUE)); + } else { + ElectroMagicTools.logger.info(TextHelper.localize("console.EMT.modLoaded.GT")); + } + + GameRegistry.addRecipe(IC2Items.getItem("nanoHelmet"), "XYX", "XZX", 'X', IC2Items.getItem("carbonPlate"), 'Y', new ItemStack(IC2Items.getItem("energyCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), 'Z', new ItemStack(IC2Items.getItem("nightvisionGoggles").getItem(), 1, OreDictionary.WILDCARD_VALUE)); + GameRegistry.addShapedRecipe(IC2Items.getItem("generator"), "X", "Y", "Z", 'X', new ItemStack(IC2Items.getItem("chargedReBattery").getItem(), 1, OreDictionary.WILDCARD_VALUE), 'Y', IC2Items.getItem("machine"), 'Z', new ItemStack(Blocks.furnace)); + GameRegistry.addShapedRecipe(IC2Items.getItem("generator"), "X", "Y", "Z", 'X', IC2Items.getItem("reBattery"), 'Y', IC2Items.getItem("machine"), 'Z', new ItemStack(Blocks.furnace)); + + /** OreDict Crafting Recipes **/ + for (int i = 0; i < OreDictionary.getOres("logWood").size(); i++) { + cardboard = GameRegistry.addShapedRecipe(new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 11), "XXX", "YYY", "XXX", 'X', new ItemStack(Items.paper), 'Y', OreDictionary.getOres("logWood").get(i)); + } + for (int i = 0; i < OreDictionary.getOres("itemRubber").size(); i++) { + rubberBall = GameRegistry.addShapedRecipe(new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 10), "XX", "XX", 'X', OreDictionary.getOres("itemRubber").get(i)); + } + + /** Smelting Recipes **/ + GameRegistry.addSmelting(new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 1), new ItemStack(ConfigItems.itemResource, 1, 6), 0.0F); + GameRegistry.addSmelting(new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 2), new ItemStack(ConfigItems.itemResource, 1, 6), 0.0F); + GameRegistry.addSmelting(new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 3), new ItemStack(ConfigItems.itemResource, 1, 3), 0.0F); + GameRegistry.addSmelting(new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 4), new ItemStack(ConfigItems.itemResource, 1, 3), 0.0F); + GameRegistry.addSmelting(new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 10), new ItemStack(IC2ItemRegistry.itemEMTItems, 2, 8), 0.0F); + } + + private static void registerShaplessRecipes() { } - private static void registerShapelessRecipes() { + private static void registerSmeltingRecipes() { } - public static void registerIC2Recipes() { + public static void registerEarlyRecipes() { registerShapedRecipes(); - registerShapelessRecipes(); + registerShaplessRecipes(); + registerSmeltingRecipes(); } + + public static void registerUUMInfusionRecipes() { + + ItemStack iridium = IC2Items.getItem("iridiumOre").copy(); + iridium.stackSize = 2; + uraniumToIridium = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", iridium, 4, CraftingAspects.uuMatterInfusions, IC2Items.getItem("Uran238"), new ItemStack[]{uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell}); + + ItemStack uranium = IC2Items.getItem("Uran238").copy(); + uranium.stackSize = 2; + diamondToUranium = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", uranium, 4, CraftingAspects.lesserUUMInfusions, new ItemStack(Items.diamond), new ItemStack[]{uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell, uuMCell}); + + ItemStack diamond = new ItemStack(Items.diamond).copy(); + diamond.stackSize = 1; + goldToDiamond = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", diamond, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(Items.gold_ingot), new ItemStack[]{uuMCell, uuMCell, uuMCell, uuMCell}); + + ItemStack gold = new ItemStack(Items.gold_ingot).copy(); + gold.stackSize = 2; + ironToGold = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", gold, 4, CraftingAspects.cheapestUUMInfusions, new ItemStack(Items.iron_ingot), new ItemStack[]{uuMCell, uuMCell, uuMCell}); + + ItemStack ironOre = new ItemStack(Blocks.iron_ore).copy(); + ironOre.stackSize = 16; + stoneBricksToIronOre = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", ironOre, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(Blocks.stonebrick), new ItemStack[]{uuMCell, uuMCell}); + + /** + * ItemStack copperOre = Items.getItem("copperOre").copy(); BUGGED IN 1.6 IF IC2 OREGEN IS DISABLED + **/ + ItemStack copperOre = IC2Items.getItem("crushedCopperOre").copy(); + copperOre.stackSize = 32; + arcaneStoneToCopperOre = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", copperOre, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 6), new ItemStack[]{uuMCell, uuMCell}); + + /** + * ItemStack tinOre = Items.getItem("tinOre").copy(); BUGGED IN 1.6 IF IC2 OREGEN IS DISABLED + **/ + ItemStack tinOre = IC2Items.getItem("crushedTinOre").copy(); + tinOre.stackSize = 32; + arcaneStoneBricksToTinOre = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", tinOre, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 7), new ItemStack[]{uuMCell, uuMCell}); + + /** + * ItemStack leadOre = Items.getItem("leadOre").copy(); BUGGED IN 1.6 IF IC2 OREGEN IS DISABLED + **/ + ItemStack leadOre = IC2Items.getItem("crushedLeadOre").copy(); + leadOre.stackSize = 32; + amberBlockToLeadOre = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", leadOre, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(ConfigBlocks.blockCosmeticOpaque, 1, 0), new ItemStack[]{uuMCell, uuMCell}); + + ItemStack uraniumOre = IC2Items.getItem("uraniumOre").copy(); + uraniumOre.stackSize = 8; + amberBricksToUraniumOre = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", uraniumOre, 4, CraftingAspects.lesserUUMInfusions, new ItemStack(ConfigBlocks.blockCosmeticOpaque, 1, 1), new ItemStack[]{uuMCell, uuMCell, uuMCell}); + + ItemStack coal = new ItemStack(Items.coal, 1, 0).copy(); + coal.stackSize = 16; + charcoalToCoal = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", coal, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(Items.coal, 1, 1), new ItemStack[]{uuMCell, uuMCell}); + + ItemStack stickyResin = IC2Items.getItem("resin").copy(); + stickyResin.stackSize = 21; + shardToResin = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", stickyResin, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{uuMCell, uuMCell, uuMCell}); + + ItemStack redstone = new ItemStack(Items.redstone).copy(); + redstone.stackSize = 24; + shardToRedstone = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", redstone, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{uuMCell, uuMCell, uuMCell}); + + ItemStack lapisLazuli = new ItemStack(Items.dye, 1, 4).copy(); + lapisLazuli.stackSize = 8; + shardToLapis = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", lapisLazuli, 4, CraftingAspects.cheapUUMInfusions, new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{uuMCell, uuMCell, uuMCell}); + + ItemStack glowstone = new ItemStack(Blocks.glowstone).copy(); + glowstone.stackSize = 1; + glowstoneDustToBlock = ThaumcraftApi.addInfusionCraftingRecipe("UU-Matter Infusion", glowstone, 4, CraftingAspects.cheapestUUMInfusions, new ItemStack(Items.glowstone_dust), new ItemStack[]{uuMCell}); + } + + public static void registerLateRecipes() { + /** Infusion Recipes **/ + + thaumiumDrill = ThaumcraftApi.addInfusionCraftingRecipe("Thaumium Drill", new ItemStack(IC2ItemRegistry.thaumiumDrill), 5, CraftingAspects.thaumiumDrillCrafting, new ItemStack(IC2Items.getItem("diamondDrill").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Items.diamond), new ItemStack(Items.diamond), new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 5), new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 5), new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 5), IC2Items.getItem("denseplateiron")}); + + thaumiumChainsaw = ThaumcraftApi.addInfusionCraftingRecipe("Thaumium Chainsaw", new ItemStack(IC2ItemRegistry.thaumiumChainsaw), 5, CraftingAspects.thaumiumChainsawCrafting, new ItemStack(IC2ItemRegistry.diamondChainsaw, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Items.diamond), new ItemStack(Items.diamond), new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 5), new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 5), new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 5), IC2Items.getItem("denseplateiron")}); + + thaumicQuantumHelmet = ThaumcraftApi.addInfusionCraftingRecipe("Quantum Goggles of Revealing", new ItemStack(IC2ItemRegistry.quantumThaumicHelmet), 6, CraftingAspects.thaumicQuantumHelmetCrafting, new ItemStack(IC2ItemRegistry.nanoThaumicHelmet, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Items.diamond), new ItemStack(Items.milk_bucket), new ItemStack(IC2Items.getItem("quantumHelmet").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 5), new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 5), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("advancedCircuit")}); + + thaumicNanoHelmet = ThaumcraftApi.addInfusionCraftingRecipe("Nanosuit Goggles of Revealing", new ItemStack(IC2ItemRegistry.nanoThaumicHelmet), 5, CraftingAspects.thaumicNanoHelmetCrafting, new ItemStack(IC2ItemRegistry.electricGoggles, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Items.diamond), new ItemStack(Items.gold_ingot), new ItemStack(IC2Items.getItem("nanoHelmet").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 5), new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 5), IC2Items.getItem("carbonPlate"), IC2Items.getItem("electronicCircuit")}); + + thaumiumOmnitool = ThaumcraftApi.addInfusionCraftingRecipe("Thaumium Omnitool", new ItemStack(IC2ItemRegistry.thaumiumOmnitool), 6, CraftingAspects.thaumiumOmnitoolCrafting, new ItemStack(IC2ItemRegistry.thaumiumChainsaw, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(IC2ItemRegistry.thaumiumDrill, 1, OreDictionary.WILDCARD_VALUE), new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 5), new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 5), new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 5), IC2Items.getItem("carbonPlate"), IC2Items.getItem("plateobsidian")}); + + diamondOmnitoolToThaumium = ThaumcraftApi.addInfusionCraftingRecipe("Thaumium Omnitool", new ItemStack(IC2ItemRegistry.thaumiumOmnitool), 6, CraftingAspects.thaumiumOmnitoolCrafting, new ItemStack(IC2ItemRegistry.diamondOmnitool, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Blocks.diamond_block), new ItemStack(ConfigBlocks.blockMetalDevice, 1, 9), new ItemStack(ConfigBlocks.blockMetalDevice, 1, 9), new ItemStack(IC2Items.getItem("energyCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("carbonPlate"), IC2Items.getItem("advancedCircuit")}); + + explosionFocus = ThaumcraftApi.addInfusionCraftingRecipe("Explosion Focus", new ItemStack(IC2ItemRegistry.explosionFocus), 6, CraftingAspects.laserFocusCrafting, new ItemStack(ConfigItems.itemFocusHellbat, 1), new ItemStack[]{new ItemStack(IC2Items.getItem("miningLaser").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(Items.arrow), new ItemStack(Items.gunpowder), new ItemStack(Items.firework_charge), new ItemStack(ConfigItems.itemResource, 1, 1)}); + + shieldFocus = ThaumcraftApi.addInfusionCraftingRecipe("Shield Focus", new ItemStack(IC2ItemRegistry.shieldFocus), 4, CraftingAspects.shieldFocusCrafting, new ItemStack(ConfigItems.itemFocusPortableHole, 1), new ItemStack[]{IC2Items.getItem("reinforcedStone"), IC2Items.getItem("reinforcedGlass"), IC2Items.getItem("reinforcedStone"), IC2Items.getItem("reinforcedGlass"), new ItemStack(Blocks.soul_sand), new ItemStack(Blocks.obsidian), new ItemStack(Blocks.obsidian)}); + + potentiaGenerator = ThaumcraftApi.addInfusionCraftingRecipe("Potentia Generator", new ItemStack(IC2BlockRegistry.essentiaGens, 1, 0), 6, CraftingAspects.potentiaGeneratorCrafting, IC2Items.getItem("semifluidGenerator"), new ItemStack[]{new ItemStack(Items.diamond), new ItemStack(ConfigItems.itemFocusTrade), new ItemStack(Blocks.hopper), new ItemStack(ConfigBlocks.blockJar), IC2Items.getItem("mvTransformer"), IC2Items.getItem("advancedMachine"), IC2Items.getItem("orewashingplant"), IC2Items.getItem("scrap")}); + + streamChainsaw = ThaumcraftApi.addInfusionCraftingRecipe("Chainsaw of the Stream", new ItemStack(IC2ItemRegistry.streamChainsaw), 6, CraftingAspects.streamChaisnawCrafting, new ItemStack(IC2ItemRegistry.thaumiumChainsaw, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Items.water_bucket), new ItemStack(ConfigItems.itemAxeElemental), new ItemStack(ConfigBlocks.blockMagicalLog), new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("overclockerUpgrade")}); + + rockbreakerDrill = ThaumcraftApi.addInfusionCraftingRecipe("Drill of the Rockbreaker", new ItemStack(IC2ItemRegistry.rockbreakerDrill), 6, CraftingAspects.rockbreakerDrillCrafting, new ItemStack(IC2ItemRegistry.thaumiumDrill, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Items.flint_and_steel), new ItemStack(Items.fire_charge), new ItemStack(ConfigItems.itemPickElemental), new ItemStack(ConfigItems.itemShovelElemental), new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("reinforcedStone"), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("overclockerUpgrade")}); + + thorHammer = ThaumcraftApi.addInfusionCraftingRecipe("Mjolnir", new ItemStack(IC2ItemRegistry.thorHammer), 7, CraftingAspects.thorHammerCrafting, new ItemStack(IC2ItemRegistry.taintedThorHammer, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 6), new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 6), new ItemStack(ConfigItems.itemSwordElemental), new ItemStack(ConfigItems.itemResource, 1, 1), new ItemStack(ConfigItems.itemFocusShock), IC2Items.getItem("rubber")}); + + superchargedThorHammer = ThaumcraftApi.addInfusionCraftingRecipe("Supercharged Mjolnir", new ItemStack(IC2ItemRegistry.electricThorHammer), 10, CraftingAspects.superchargedThorHammerCrafting, new ItemStack(IC2ItemRegistry.thorHammer, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 6), new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 6), new ItemStack(Blocks.web), new ItemStack(ConfigItems.itemFocusHellbat), new ItemStack(ConfigItems.itemSwordElemental), new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("iridiumPlate"), new ItemStack(IC2Items.getItem("nanoSaber").getItem(), 1, OreDictionary.WILDCARD_VALUE)}); + + wandRecharger = ThaumcraftApi.addInfusionCraftingRecipe("Industrial Wand Charging Station", new ItemStack(IC2BlockRegistry.emtMachines, 1, 0), 6, CraftingAspects.wandCharger, new ItemStack(ConfigBlocks.blockStoneDevice, 1, 5), new ItemStack[]{IC2Items.getItem("replicator"), IC2Items.getItem("iridiumPlate"), new ItemStack(Blocks.diamond_block), new ItemStack(ConfigItems.itemShard, 1, 5), new ItemStack(ConfigBlocks.blockJar)}); + + solarHelmetRevealing = ThaumcraftApi.addInfusionCraftingRecipe("Solar Helmet of Revealing", new ItemStack(IC2ItemRegistry.solarHelmetRevealing), 5, CraftingAspects.solarHelmetRevealing, new ItemStack(IC2ItemRegistry.quantumThaumicHelmet, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(IC2BlockRegistry.emtSolars, 1, 1), IC2Items.getItem("glassFiberCableItem"), new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ConfigItems.itemShard, 1, 4)}); + + electricBootsTravel = ThaumcraftApi.addInfusionCraftingRecipe("Electric Boots of the Traveller", new ItemStack(IC2ItemRegistry.electricBootsTraveller), 2, CraftingAspects.electricBootsTravel, new ItemStack(ConfigItems.itemBootsTraveller), new ItemStack[]{new ItemStack(Items.diamond), IC2Items.getItem("elemotor"), IC2Items.getItem("coil"), IC2Items.getItem("hazmatBoots"), new ItemStack(IC2Items.getItem("advBattery").getItem(), 1, OreDictionary.WILDCARD_VALUE)}); + + nanoBootsTravel = ThaumcraftApi.addInfusionCraftingRecipe("Nano Boots of the Traveller", new ItemStack(IC2ItemRegistry.nanoBootsTraveller), 2, CraftingAspects.nanoBootsTravel, new ItemStack(IC2ItemRegistry.electricBootsTraveller, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Items.diamond), new ItemStack(IC2Items.getItem("nanoBoots").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(IC2Items.getItem("energyCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE)}); + + quantumBootsTravel = ThaumcraftApi.addInfusionCraftingRecipe("Quantum Boots of the Traveller", new ItemStack(IC2ItemRegistry.quantumBootsTraveller), 2, CraftingAspects.quantumBootsTravel, new ItemStack(IC2ItemRegistry.nanoBootsTraveller, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Blocks.diamond_block), new ItemStack(IC2Items.getItem("quantumBoots").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("iridiumPlate")}); + + etheralProcessor = ThaumcraftApi.addInfusionCraftingRecipe("Etheral Processor", new ItemStack(IC2BlockRegistry.emtMachines, 1, 1), 3, CraftingAspects.etherealProcessor, IC2Items.getItem("macerator"), new ItemStack[]{IC2Items.getItem("electroFurnace"), new ItemStack(ConfigBlocks.blockMetalDevice, 1, 9), new ItemStack(Blocks.end_stone), new ItemStack(Blocks.end_stone), new ItemStack(Blocks.iron_block), new ItemStack(Blocks.iron_block), new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 5), new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 5)}); + + tripleCompressedSolar = ThaumcraftApi.addInfusionCraftingRecipe("Compressed Solars", new ItemStack(IC2BlockRegistry.emtSolars, 1, 2), 2, CraftingAspects.compressedSolars, new ItemStack(IC2BlockRegistry.emtSolars, 1, 1), new ItemStack[]{new ItemStack(IC2BlockRegistry.emtSolars, 1, 1), new ItemStack(IC2BlockRegistry.emtSolars, 1, 1), new ItemStack(IC2BlockRegistry.emtSolars, 1, 1), new ItemStack(IC2BlockRegistry.emtSolars, 1, 1), new ItemStack(IC2BlockRegistry.emtSolars, 1, 1), new ItemStack(IC2BlockRegistry.emtSolars, 1, 1), new ItemStack(IC2BlockRegistry.emtSolars, 1, 1), new ItemStack(IC2BlockRegistry.emtSolars, 1, 1)}); + + electricHoeGrowth = ThaumcraftApi.addInfusionCraftingRecipe("Electric Hoe of Growth", new ItemStack(IC2ItemRegistry.electricHoeGrowth), 4, CraftingAspects.electricHoeGrowth, new ItemStack(ConfigItems.itemHoeElemental), new ItemStack[]{new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(IC2Items.getItem("electricHoe").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(Items.dye, 1, 15), IC2Items.getItem("elemotor"), IC2Items.getItem("coil"), new ItemStack(Blocks.sapling, 1, OreDictionary.WILDCARD_VALUE)}); + + chargeFocus = ThaumcraftApi.addInfusionCraftingRecipe("Wand Focus: Charging", new ItemStack(IC2ItemRegistry.chargeFocus), 4, CraftingAspects.chargeFocus, new ItemStack(IC2Items.getItem("advBattery").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{IC2Items.getItem("generator"), IC2Items.getItem("batBox"), new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 5), new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE)}); + + wandChargeFocus = ThaumcraftApi.addInfusionCraftingRecipe("Wand Focus: Wand Charging", new ItemStack(IC2ItemRegistry.wandChargeFocus), 5, CraftingAspects.wandChargeFocus, new ItemStack(IC2BlockRegistry.emtMachines, 1, 0), new ItemStack[]{new ItemStack(IC2ItemRegistry.chargeFocus), new ItemStack(IC2Items.getItem("energyPack").getItem(), 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("iridiumPlate")}); + + inventoryChargingRing = ThaumcraftApi.addInfusionCraftingRecipe("Inventory Charging Ring", new ItemStack(IC2ItemRegistry.emtBauble, 1, 1), 6, CraftingAspects.inventoryChargingRing, new ItemStack(ConfigItems.itemBaubleBlanks, 1, 1), new ItemStack[]{new ItemStack(IC2ItemRegistry.thaumiumDrill, 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("generator"), IC2Items.getItem("geothermalGenerator"), IC2Items.getItem("waterMill"), IC2Items.getItem("solarPanel"), IC2Items.getItem("windMill"), IC2Items.getItem("nuclearReactor")}); + + armorChargingRing = ThaumcraftApi.addInfusionCraftingRecipe("Armor Charging Ring", new ItemStack(IC2ItemRegistry.emtBauble, 1, 0), 6, CraftingAspects.armorChargingRing, new ItemStack(ConfigItems.itemBaubleBlanks, 1, 1), new ItemStack[]{new ItemStack(IC2ItemRegistry.electricBootsTraveller, 1, OreDictionary.WILDCARD_VALUE), IC2Items.getItem("generator"), IC2Items.getItem("geothermalGenerator"), IC2Items.getItem("waterMill"), IC2Items.getItem("solarPanel"), IC2Items.getItem("windMill"), IC2Items.getItem("nuclearReactor")}); + + nanoWings = ThaumcraftApi.addInfusionCraftingRecipe("Nanosuit Wings", new ItemStack(IC2ItemRegistry.nanoWing), 4, CraftingAspects.nanoWing, new ItemStack(IC2ItemRegistry.thaumiumWing), new ItemStack[]{IC2Items.getItem("carbonPlate"), IC2Items.getItem("carbonPlate"), IC2Items.getItem("carbonPlate"), new ItemStack(IC2Items.getItem("nanoBodyarmor").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ConfigItems.itemResource, 1, 1)}); + + quantumWings = ThaumcraftApi.addInfusionCraftingRecipe("Quantum Wings", new ItemStack(IC2ItemRegistry.quantumWing), 6, CraftingAspects.quantumWing, new ItemStack(IC2ItemRegistry.nanoWing, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{IC2Items.getItem("iridiumPlate"), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("iridiumPlate"), new ItemStack(IC2Items.getItem("quantumBodyarmor").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ConfigItems.itemResource, 1, 1)}); + + /** Arcane Worktable Recipes **/ + + diamondOmnitool = ThaumcraftApi.addShapelessArcaneCraftingRecipe("Diamond Omnitool", new ItemStack(IC2ItemRegistry.diamondOmnitool), CraftingAspects.diamondOmnitoolCrafting, new ItemStack(IC2ItemRegistry.diamondChainsaw, 1, OreDictionary.WILDCARD_VALUE), new ItemStack(IC2Items.getItem("diamondDrill").getItem(), 1, OreDictionary.WILDCARD_VALUE)); + + ironOmnitoolToDiamond = ThaumcraftApi.addArcaneCraftingRecipe("Diamond Omnitool", new ItemStack(IC2ItemRegistry.diamondOmnitool), CraftingAspects.diamondOmnitoolCrafting, "XAX", "XBX", "XAX", 'X', new ItemStack(Items.diamond), 'A', IC2Items.getItem("advancedCircuit"), 'B', new ItemStack(IC2ItemRegistry.ironOmnitool, 1, OreDictionary.WILDCARD_VALUE)); + + christmasFocus = ThaumcraftApi.addArcaneCraftingRecipe("Kris-tmas Focus", new ItemStack(IC2ItemRegistry.christmasFocus), CraftingAspects.christmasFocusCrafting, "XYX", "YZY", "XYX", 'X', new ItemStack(Blocks.snow), 'Y', new ItemStack(Blocks.pumpkin), 'Z', new ItemStack(ConfigItems.itemFocusFrost)); + + electricGoggles = ThaumcraftApi.addArcaneCraftingRecipe("Electric Goggles", new ItemStack(IC2ItemRegistry.electricGoggles), CraftingAspects.electricGogglesCrafting, " Y ", "AZA", "BXB", 'Z', new ItemStack(ConfigItems.itemGoggles), 'X', IC2Items.getItem("electronicCircuit"), 'Y', new ItemStack(Items.diamond_helmet), 'A', new ItemStack(IC2Items.getItem("chargedReBattery").getItem(), 1, OreDictionary.WILDCARD_VALUE), 'B', Items.repeater); + + shieldBlock = ThaumcraftApi.addArcaneCraftingRecipe("Shield Blocks", new ItemStack(IC2BlockRegistry.shield, 8), CraftingAspects.shieldBlockCrafting, "XYX", "X X", "XYX", 'X', new ItemStack(Blocks.glass), 'Y', new ItemStack(Blocks.obsidian)); + + tinyUranium = ThaumcraftApi.addShapelessArcaneCraftingRecipe("Tiny Uranium", new ItemStack(IC2Items.getItem("smallUran235").getItem(), 7), CraftingAspects.tinyUraniumCrafting, IC2Items.getItem("Uran238")); + + compressedSolar = ThaumcraftApi.addArcaneCraftingRecipe("Compressed Solars", new ItemStack(IC2BlockRegistry.emtSolars, 1, 0), CraftingAspects.compressedSolars, "XXX", "XXX", "XXX", 'X', IC2Items.getItem("solarPanel")); + + doubleCompressedSolar = ThaumcraftApi.addArcaneCraftingRecipe("Compressed Solars", new ItemStack(IC2BlockRegistry.emtSolars, 1, 1), CraftingAspects.compressedSolars, "XXX", "XXX", "XXX", 'X', new ItemStack(IC2BlockRegistry.emtSolars, 1, 0)); + + electricScribingTools = ThaumcraftApi.addArcaneCraftingRecipe("Electric Scribing Tools", new ItemStack(IC2ItemRegistry.electricScribingTools), CraftingAspects.electricScribingTools, "YXY", "XZX", "YXY", 'Y', IC2Items.getItem("electronicCircuit"), 'X', new ItemStack(ConfigItems.itemInkwell), 'Z', new ItemStack(IC2Items.getItem("energyCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE)); + + thaumiumWing = ThaumcraftApi.addArcaneCraftingRecipe("Thaumium Reinforced Wings", new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 15), CraftingAspects.thaumiumWing, "XYZ", "XYZ", "XYZ", 'X', new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 14), 'Y', new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 5), 'Z', new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 13)); + + thaumiumWings = ThaumcraftApi.addArcaneCraftingRecipe("Thaumium Reinforced Wings", new ItemStack(IC2ItemRegistry.thaumiumWing), CraftingAspects.thaumiumWing, "XX", 'X', new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 15)); + + /** Crucible Recipes **/ + + ignisGenerator = ThaumcraftApi.addCrucibleRecipe("Ignis Generator", new ItemStack(IC2BlockRegistry.essentiaGens, 1, 1), new ItemStack(IC2BlockRegistry.essentiaGens, 1, 0), CraftingAspects.ignisGeneratorCrafting); + + auramGenerator = ThaumcraftApi.addCrucibleRecipe("Auram Generator", new ItemStack(IC2BlockRegistry.essentiaGens, 1, 2), new ItemStack(IC2BlockRegistry.essentiaGens, 1, 0), CraftingAspects.auramGeneratorCrafting); + + arborGenerator = ThaumcraftApi.addCrucibleRecipe("Arbor Generator", new ItemStack(IC2BlockRegistry.essentiaGens, 1, 3), new ItemStack(IC2BlockRegistry.essentiaGens, 1, 0), CraftingAspects.arborGeneratorCrafting); + + aerGenerator = ThaumcraftApi.addCrucibleRecipe("Aer Generator", new ItemStack(IC2BlockRegistry.essentiaGens, 1, 4), new ItemStack(IC2BlockRegistry.essentiaGens, 1, 0), CraftingAspects.aerGenerator); + + waterSolar = ThaumcraftApi.addCrucibleRecipe("Water Infused Solar Panels", new ItemStack(IC2BlockRegistry.emtSolars, 1, 3), new ItemStack(IC2BlockRegistry.emtSolars, 1, 0), CraftingAspects.waterSolars); + + doubleWaterSolar = ThaumcraftApi.addCrucibleRecipe("Water Infused Solar Panels", new ItemStack(IC2BlockRegistry.emtSolars, 1, 4), new ItemStack(IC2BlockRegistry.emtSolars, 1, 1), CraftingAspects.waterSolars); + + tripleWaterSolar = ThaumcraftApi.addCrucibleRecipe("Water Infused Solar Panels", new ItemStack(IC2BlockRegistry.emtSolars, 1, 5), new ItemStack(IC2BlockRegistry.emtSolars, 1, 2), CraftingAspects.waterSolars); + + darkSolar = ThaumcraftApi.addCrucibleRecipe("Entropy Infused Solar Panels", new ItemStack(IC2BlockRegistry.emtSolars, 1, 6), new ItemStack(IC2BlockRegistry.emtSolars, 1, 0), CraftingAspects.darkSolars); + + doubleDarkSolar = ThaumcraftApi.addCrucibleRecipe("Entropy Infused Solar Panels", new ItemStack(IC2BlockRegistry.emtSolars, 1, 7), new ItemStack(IC2BlockRegistry.emtSolars, 1, 1), CraftingAspects.darkSolars); + + tripleDarkSolar = ThaumcraftApi.addCrucibleRecipe("Entropy Infused Solar Panels", new ItemStack(IC2BlockRegistry.emtSolars, 1, 8), new ItemStack(IC2BlockRegistry.emtSolars, 1, 2), CraftingAspects.darkSolars); + + orderSolar = ThaumcraftApi.addCrucibleRecipe("Order Infused Solar Panels", new ItemStack(IC2BlockRegistry.emtSolars, 1, 9), new ItemStack(IC2BlockRegistry.emtSolars, 1, 0), CraftingAspects.orderSolars); + + doubleOrderSolar = ThaumcraftApi.addCrucibleRecipe("Order Infused Solar Panels", new ItemStack(IC2BlockRegistry.emtSolars, 1, 10), new ItemStack(IC2BlockRegistry.emtSolars, 1, 1), CraftingAspects.orderSolars); + + tripleOrderSolar = ThaumcraftApi.addCrucibleRecipe("Order Infused Solar Panels", new ItemStack(IC2BlockRegistry.emtSolars, 1, 11), new ItemStack(IC2BlockRegistry.emtSolars, 1, 2), CraftingAspects.orderSolars); + + fireSolar = ThaumcraftApi.addCrucibleRecipe("Fire Infused Solar Panels", new ItemStack(IC2BlockRegistry.emtSolars, 1, 12), new ItemStack(IC2BlockRegistry.emtSolars, 1, 0), CraftingAspects.fireSolars); + + doubleFireSolar = ThaumcraftApi.addCrucibleRecipe("Fire Infused Solar Panels", new ItemStack(IC2BlockRegistry.emtSolars, 1, 13), new ItemStack(IC2BlockRegistry.emtSolars, 1, 1), CraftingAspects.fireSolars); + + tripleFireSolar = ThaumcraftApi.addCrucibleRecipe("Fire Infused Solar Panels", new ItemStack(IC2BlockRegistry.emtSolars, 1, 14), new ItemStack(IC2BlockRegistry.emtSolars, 1, 2), CraftingAspects.fireSolars); + + airSolar = ThaumcraftApi.addCrucibleRecipe("Air Infused Solar Panels", new ItemStack(IC2BlockRegistry.emtSolars, 1, 15), new ItemStack(IC2BlockRegistry.emtSolars, 1, 0), CraftingAspects.airSolars); + + doubleAirSolar = ThaumcraftApi.addCrucibleRecipe("Air Infused Solar Panels", new ItemStack(IC2BlockRegistry.emtSolars2, 1, 0), new ItemStack(IC2BlockRegistry.emtSolars, 1, 1), CraftingAspects.airSolars); + + tripleAirSolar = ThaumcraftApi.addCrucibleRecipe("Air Infused Solar Panels", new ItemStack(IC2BlockRegistry.emtSolars2, 1, 1), new ItemStack(IC2BlockRegistry.emtSolars, 1, 2), CraftingAspects.airSolars); + + earthSolar = ThaumcraftApi.addCrucibleRecipe("Earth Infused Solar Panels", new ItemStack(IC2BlockRegistry.emtSolars2, 1, 2), new ItemStack(IC2BlockRegistry.emtSolars, 1, 0), CraftingAspects.earthSolars); + + doubleEarthSolar = ThaumcraftApi.addCrucibleRecipe("Earth Infused Solar Panels", new ItemStack(IC2BlockRegistry.emtSolars2, 1, 3), new ItemStack(IC2BlockRegistry.emtSolars, 1, 1), CraftingAspects.earthSolars); + + tripleEarthSolar = ThaumcraftApi.addCrucibleRecipe("Earth Infused Solar Panels", new ItemStack(IC2BlockRegistry.emtSolars2, 1, 4), new ItemStack(IC2BlockRegistry.emtSolars, 1, 2), CraftingAspects.earthSolars); + + portableNode = ThaumcraftApi.addCrucibleRecipe("Portable Node", new ItemStack(IC2BlockRegistry.portableNode), new ItemStack(ConfigItems.itemJarFilled), CraftingAspects.portableNode); + + /** IC2 Stuff related recipes **/ + + /* Ore Clusters Macerator Recipes */ + ItemStack ironClusterRecipe = IC2Items.getItem("smallIronDust").copy(); + ironClusterRecipe.stackSize = 22; + Recipes.macerator.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigItems.itemNugget, 1, 16)), null, ironClusterRecipe); + + ItemStack goldClusterRecipe = IC2Items.getItem("smallGoldDust").copy(); + goldClusterRecipe.stackSize = 22; + Recipes.macerator.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigItems.itemNugget, 1, 31)), null, goldClusterRecipe); + + ItemStack copperClusterRecipe = IC2Items.getItem("smallCopperDust").copy(); + copperClusterRecipe.stackSize = 22; + Recipes.macerator.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigItems.itemNugget, 1, 17)), null, copperClusterRecipe); + + ItemStack tinClusterRecipe = IC2Items.getItem("smallTinDust").copy(); + tinClusterRecipe.stackSize = 22; + Recipes.macerator.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigItems.itemNugget, 1, 18)), null, tinClusterRecipe); + + ItemStack silverClusterRecipe = IC2Items.getItem("smallSilverDust").copy(); + silverClusterRecipe.stackSize = 22; + Recipes.macerator.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigItems.itemNugget, 1, 19)), null, silverClusterRecipe); + + ItemStack leadClusterRecipe = IC2Items.getItem("smallLeadDust").copy(); + leadClusterRecipe.stackSize = 22; + Recipes.macerator.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigItems.itemNugget, 1, 20)), null, leadClusterRecipe); + + /* Thaumium Plates Recipes */ + thaumiumPlate = GameRegistry.addShapedRecipe(new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 5), "X", "Y", "Z", 'Y', new ItemStack(ConfigItems.itemResource, 1, 2), 'X', new ItemStack(IC2Items.getItem("ForgeHammer").getItem(), 1, OreDictionary.WILDCARD_VALUE), 'Z', new ItemStack(Blocks.obsidian)); + Recipes.metalformerRolling.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigItems.itemResource, 1, 2)), null, new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 5)); + + /* Iron Sheet Recipe */ + Recipes.metalformerRolling.addRecipe(new RecipeInputItemStack(IC2Items.getItem("denseplateiron")), null, new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 13)); + + /* Ore Processing for Amber and Cinnabar */ + if (ConfigHandler.removeAmberAndCinnabarMacerating) { + for (Iterator it = Recipes.macerator.getRecipes().keySet().iterator(); it.hasNext(); ) { + IRecipeInput input = it.next(); + if (input.matches(new ItemStack(ConfigBlocks.blockCustomOre, 1, 7))) { + it.remove(); + ElectroMagicTools.logger.info(TextHelper.localize("console.EMT.recipes.amberConflict")); + } + } + + for (Iterator it = Recipes.macerator.getRecipes().keySet().iterator(); it.hasNext(); ) { + IRecipeInput input = it.next(); + if (input.matches(new ItemStack(ConfigBlocks.blockCustomOre, 1, 0))) { + it.remove(); + ElectroMagicTools.logger.info(TextHelper.localize("console.EMT.recipes.cinnabarConflict")); + } + } + } + ItemStack crushedAmberRecipe = new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 1); + crushedAmberRecipe.stackSize = 2; + Recipes.macerator.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigBlocks.blockCustomOre, 1, 7)), null, crushedAmberRecipe); + + ItemStack crushedCinnabarRecipe = new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 3); + crushedCinnabarRecipe.stackSize = 2; + Recipes.macerator.addRecipe(new RecipeInputItemStack(new ItemStack(ConfigBlocks.blockCustomOre, 1, 0)), null, crushedCinnabarRecipe); + + NBTTagCompound waterAmount = new NBTTagCompound(); + waterAmount.setInteger("amount", 1000); + + ItemStack smallCopperDust = IC2Items.getItem("smallCopperDust"); + smallCopperDust.stackSize = 2; + ItemStack smallTinDust = IC2Items.getItem("smallTinDust"); + smallCopperDust.stackSize = 2; + + Recipes.oreWashing.addRecipe(new RecipeInputItemStack(new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 1)), waterAmount, new ItemStack[]{new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 2), smallCopperDust, IC2Items.getItem("stoneDust")}); + Recipes.oreWashing.addRecipe(new RecipeInputItemStack(new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 3)), waterAmount, new ItemStack[]{new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 4), smallTinDust, IC2Items.getItem("stoneDust")}); + + NBTTagCompound heatAmount = new NBTTagCompound(); + heatAmount.setInteger("minHeat", 1000); + + Recipes.centrifuge.addRecipe(new RecipeInputItemStack(new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 2)), heatAmount, new ItemStack[]{IC2Items.getItem("smallCopperDust"), new ItemStack(ConfigItems.itemResource, 1, 6)}); + Recipes.centrifuge.addRecipe(new RecipeInputItemStack(new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 4)), heatAmount, new ItemStack[]{IC2Items.getItem("smallTinDust"), new ItemStack(ConfigItems.itemResource, 1, 3)}); + + } + + public static IRecipe ironOmnitool; + public static IRecipe diamondChainsaw; + public static IRecipe ductTape; + public static IRecipe rubberBall; + public static IRecipe featherMesh; + public static IRecipe cardboard; + public static IRecipe featherWing; + public static IRecipe featherWings; + public static IRecipe taintedFeathers; + + public static InfusionRecipe uraniumToIridium; + public static InfusionRecipe diamondToUranium; + public static InfusionRecipe goldToDiamond; + public static InfusionRecipe ironToGold; + public static InfusionRecipe stoneBricksToIronOre; + public static InfusionRecipe arcaneStoneToCopperOre; + public static InfusionRecipe arcaneStoneBricksToTinOre; + public static InfusionRecipe amberBlockToLeadOre; + public static InfusionRecipe amberBricksToUraniumOre; + public static InfusionRecipe charcoalToCoal; + public static InfusionRecipe shardToResin; + public static InfusionRecipe shardToRedstone; + public static InfusionRecipe shardToLapis; + public static InfusionRecipe glowstoneDustToBlock; + + public static InfusionRecipe thaumiumDrill; + public static InfusionRecipe thaumiumChainsaw; + public static InfusionRecipe thaumicQuantumHelmet; + public static InfusionRecipe thaumiumOmnitool; + public static InfusionRecipe thaumicNanoHelmet; + public static InfusionRecipe explosionFocus; + public static InfusionRecipe shieldFocus; + public static InfusionRecipe potentiaGenerator; + public static InfusionRecipe streamChainsaw; + public static InfusionRecipe rockbreakerDrill; + public static InfusionRecipe thorHammer; + public static InfusionRecipe superchargedThorHammer; + public static InfusionRecipe wandRecharger; + public static InfusionRecipe solarHelmetRevealing; + public static InfusionRecipe electricBootsTravel; + public static InfusionRecipe nanoBootsTravel; + public static InfusionRecipe quantumBootsTravel; + public static InfusionRecipe diamondOmnitoolToThaumium; + public static InfusionRecipe etheralProcessor; + public static InfusionRecipe tripleCompressedSolar; + public static InfusionRecipe electricHoeGrowth; + public static InfusionRecipe chargeFocus; + public static InfusionRecipe wandChargeFocus; + public static InfusionRecipe inventoryChargingRing; + public static InfusionRecipe armorChargingRing; + public static InfusionRecipe nanoWings; + public static InfusionRecipe quantumWings; + + public static ShapelessArcaneRecipe diamondOmnitool; + public static ShapelessArcaneRecipe tinyUranium; + public static ShapedArcaneRecipe christmasFocus; + public static ShapedArcaneRecipe electricGoggles; + public static ShapedArcaneRecipe shieldBlock; + public static ShapedArcaneRecipe compressedSolar; + public static ShapedArcaneRecipe doubleCompressedSolar; + public static ShapedArcaneRecipe ironOmnitoolToDiamond; + public static ShapedArcaneRecipe electricScribingTools; + public static ShapedArcaneRecipe thaumiumWing; + public static ShapedArcaneRecipe thaumiumWings; + + public static CrucibleRecipe ignisGenerator; + public static CrucibleRecipe auramGenerator; + public static CrucibleRecipe arborGenerator; + public static CrucibleRecipe aerGenerator; + public static CrucibleRecipe waterSolar; + public static CrucibleRecipe doubleWaterSolar; + public static CrucibleRecipe tripleWaterSolar; + public static CrucibleRecipe darkSolar; + public static CrucibleRecipe doubleDarkSolar; + public static CrucibleRecipe tripleDarkSolar; + public static CrucibleRecipe orderSolar; + public static CrucibleRecipe doubleOrderSolar; + public static CrucibleRecipe tripleOrderSolar; + public static CrucibleRecipe fireSolar; + public static CrucibleRecipe doubleFireSolar; + public static CrucibleRecipe tripleFireSolar; + public static CrucibleRecipe airSolar; + public static CrucibleRecipe doubleAirSolar; + public static CrucibleRecipe tripleAirSolar; + public static CrucibleRecipe earthSolar; + public static CrucibleRecipe doubleEarthSolar; + public static CrucibleRecipe tripleEarthSolar; + public static CrucibleRecipe portableNode; + + public static IRecipe thaumiumPlate; } diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/IC2ModuleResearch.java b/src/main/java/tombenpotter/emt/common/modules/ic2/IC2Research.java similarity index 61% rename from src/main/java/tombenpotter/emt/common/module/ic2/IC2ModuleResearch.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/IC2Research.java index dc060f7..30abc9b 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/IC2ModuleResearch.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/IC2Research.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.module.ic2; +package tombenpotter.emt.common.modules.ic2; import ic2.api.item.IC2Items; import net.minecraft.item.ItemStack; @@ -19,14 +19,13 @@ import thaumcraft.api.aspects.AspectList; import thaumcraft.api.research.ResearchCategories; import thaumcraft.api.research.ResearchItem; import thaumcraft.api.research.ResearchPage; -import tombenpotter.emt.common.module.ic2.recipes.EMTInitRecipes; -import tombenpotter.emt.common.module.ic2.recipes.EMTPostInitRecipes; -import tombenpotter.emt.common.module.ic2.recipes.UuMInfusionRecipes; +import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; +import tombenpotter.emt.common.modules.ic2.items.IC2ItemRegistry; import tombenpotter.emt.common.util.ConfigHandler; import tombenpotter.emt.common.util.EMTResearchItem; import tombenpotter.emt.common.util.ResearchAspects; -public class IC2ModuleResearch { +public class IC2Research { public static void addResearchTab() { ResourceLocation background = new ResourceLocation("thaumcraft", "textures/gui/gui_researchback.png"); @@ -44,57 +43,57 @@ public class IC2ModuleResearch { research.setPages(new ResearchPage(text)); text = "1"; - research = new EMTResearchItem("Diamond Chainsaw", "EMT", new AspectList(), 5, -6, 0, new ItemStack(IC2ModuleItemRegistry.diamondChainsaw)).setRound().setAutoUnlock().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTInitRecipes.diamondChainsaw)); + research = new EMTResearchItem("Diamond Chainsaw", "EMT", new AspectList(), 5, -6, 0, new ItemStack(IC2ItemRegistry.diamondChainsaw)).setRound().setAutoUnlock().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.diamondChainsaw)); text = "1"; - research = new EMTResearchItem("Thaumium Plate", "EMT", new AspectList(), 6, -6, 0, new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 5)).setRound().setAutoUnlock().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.thaumiumPlate)); + research = new EMTResearchItem("Thaumium Plate", "EMT", new AspectList(), 6, -6, 0, new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 5)).setRound().setAutoUnlock().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.thaumiumPlate)); text = "1"; research = new EMTResearchItem("Macerating Native Ore Clusters", "EMT", new AspectList(), 5, -7, 0, IC2Items.getItem("smallGoldDust")).setRound().setAutoUnlock().registerResearchItem(); research.setPages(new ResearchPage(text)); text = "1"; - research = new EMTResearchItem("The Legend", "EMT", new AspectList(), 5, -5, 0, new ItemStack(IC2ModuleItemRegistry.taintedThorHammer)).setRound().setAutoUnlock().registerResearchItem(); + research = new EMTResearchItem("The Legend", "EMT", new AspectList(), 5, -5, 0, new ItemStack(IC2ItemRegistry.taintedThorHammer)).setRound().setAutoUnlock().registerResearchItem(); research.setPages(new ResearchPage(text)); text = "1"; - research = new EMTResearchItem("Lightning Summoner", "EMT", new AspectList(), 6, -5, 0, new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 6)).setRound().setAutoUnlock().registerResearchItem(); + research = new EMTResearchItem("Lightning Summoner", "EMT", new AspectList(), 6, -5, 0, new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 6)).setRound().setAutoUnlock().registerResearchItem(); research.setPages(new ResearchPage(text)); text = "1"; - research = new EMTResearchItem("The One Ring", "EMT", new AspectList(), 6, -7, 0, new ItemStack(IC2ModuleItemRegistry.emtBauble, 1, 2)).setRound().setAutoUnlock().registerResearchItem(); + research = new EMTResearchItem("The One Ring", "EMT", new AspectList(), 6, -7, 0, new ItemStack(IC2ItemRegistry.emtBauble, 1, 2)).setRound().setAutoUnlock().registerResearchItem(); research.setPages(new ResearchPage(text)); text = "1"; - research = new EMTResearchItem("Feather Wings", "EMT", new AspectList(), 0, 2, 0, new ItemStack(IC2ModuleItemRegistry.featherWing)).setRound().setAutoUnlock().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTInitRecipes.rubberBall), new ResearchPage(EMTInitRecipes.ductTape), new ResearchPage(EMTInitRecipes.featherMesh), new ResearchPage(EMTInitRecipes.cardboard), new ResearchPage(EMTInitRecipes.featherWing), new ResearchPage(EMTInitRecipes.featherWings)); + research = new EMTResearchItem("Feather Wings", "EMT", new AspectList(), 0, 2, 0, new ItemStack(IC2ItemRegistry.featherWing)).setRound().setAutoUnlock().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.rubberBall), new ResearchPage(IC2RecipeRegistry.ductTape), new ResearchPage(IC2RecipeRegistry.featherMesh), new ResearchPage(IC2RecipeRegistry.cardboard), new ResearchPage(IC2RecipeRegistry.featherWing), new ResearchPage(IC2RecipeRegistry.featherWings)); /** Research that can be disabled **/ if (ConfigHandler.thaumiumDrillResearch == false) { text = "1"; - research = new EMTResearchItem("Thaumium Drill", "EMT", ResearchAspects.thaumiumDrillResearch, -1, -2, 1, new ItemStack(IC2ModuleItemRegistry.thaumiumDrill)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.thaumiumDrill)); + research = new EMTResearchItem("Thaumium Drill", "EMT", ResearchAspects.thaumiumDrillResearch, -1, -2, 1, new ItemStack(IC2ItemRegistry.thaumiumDrill)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.thaumiumDrill)); } if (ConfigHandler.thaumiumChainsawResearch == false) { text = "1"; - research = new EMTResearchItem("Thaumium Chainsaw", "EMT", ResearchAspects.thaumiumChainsawResearch, -2, -2, 1, new ItemStack(IC2ModuleItemRegistry.thaumiumChainsaw)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.thaumiumChainsaw)); + research = new EMTResearchItem("Thaumium Chainsaw", "EMT", ResearchAspects.thaumiumChainsawResearch, -2, -2, 1, new ItemStack(IC2ItemRegistry.thaumiumChainsaw)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.thaumiumChainsaw)); } if (ConfigHandler.electricGooglesResearch == false) { text = "1"; - research = new EMTResearchItem("Electric Goggles", "EMT", ResearchAspects.electricGogglesResearch, 1, -2, 1, new ItemStack(IC2ModuleItemRegistry.electricGoggles)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.electricGoggles)); + research = new EMTResearchItem("Electric Goggles", "EMT", ResearchAspects.electricGogglesResearch, 1, -2, 1, new ItemStack(IC2ItemRegistry.electricGoggles)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.electricGoggles)); } if (ConfigHandler.electricGooglesResearch == false) { if (ConfigHandler.nanoGooglesResearch == false) { text = "1"; - research = new EMTResearchItem("Nanosuit Goggles of Revealing", "EMT", ResearchAspects.thaumicNanoHelmet, 2, -2, 2, new ItemStack(IC2ModuleItemRegistry.nanoThaumicHelmet)).setParents("Electric Goggles").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.thaumicNanoHelmet)); + research = new EMTResearchItem("Nanosuit Goggles of Revealing", "EMT", ResearchAspects.thaumicNanoHelmet, 2, -2, 2, new ItemStack(IC2ItemRegistry.nanoThaumicHelmet)).setParents("Electric Goggles").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.thaumicNanoHelmet)); } } @@ -102,167 +101,167 @@ public class IC2ModuleResearch { if (ConfigHandler.nanoGooglesResearch == false) { if (ConfigHandler.quantumGooglesResearch == false) { text = "1"; - research = new EMTResearchItem("Quantum Goggles of Revealing", "EMT", ResearchAspects.thaumicQuantumHelmet, 3, -2, 3, new ItemStack(IC2ModuleItemRegistry.quantumThaumicHelmet)).setParents("Nanosuit Goggles of Revealing").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.thaumicQuantumHelmet)); + research = new EMTResearchItem("Quantum Goggles of Revealing", "EMT", ResearchAspects.thaumicQuantumHelmet, 3, -2, 3, new ItemStack(IC2ItemRegistry.quantumThaumicHelmet)).setParents("Nanosuit Goggles of Revealing").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.thaumicQuantumHelmet)); } } } if (ConfigHandler.ironOmnitoolResearch == false) { text = "1"; - research = new EMTResearchItem("Iron Omnitool", "EMT", new AspectList(), -2, 0, 0, new ItemStack(IC2ModuleItemRegistry.ironOmnitool)).setParents("Electric Magic Tools").setRound().setAutoUnlock().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTInitRecipes.ironOmnitool)); + research = new EMTResearchItem("Iron Omnitool", "EMT", new AspectList(), -2, 0, 0, new ItemStack(IC2ItemRegistry.ironOmnitool)).setParents("Electric Magic Tools").setRound().setAutoUnlock().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.ironOmnitool)); } if (ConfigHandler.ironOmnitoolResearch == false) { if (ConfigHandler.diamondOmnitoolResearch == false) { text = "1"; - research = new EMTResearchItem("Diamond Omnitool", "EMT", ResearchAspects.diamondOmnitoolResearch, -4, 0, 1, new ItemStack(IC2ModuleItemRegistry.diamondOmnitool)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.diamondOmnitool), new ResearchPage(EMTPostInitRecipes.ironOmnitoolToDiamond)); + research = new EMTResearchItem("Diamond Omnitool", "EMT", ResearchAspects.diamondOmnitoolResearch, -4, 0, 1, new ItemStack(IC2ItemRegistry.diamondOmnitool)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.diamondOmnitool), new ResearchPage(IC2RecipeRegistry.ironOmnitoolToDiamond)); } } if (ConfigHandler.thaumiumDrillResearch == false && ConfigHandler.thaumiumChainsawResearch == false) { if (ConfigHandler.thaumiumOmnitoolResearch == false) { text = "1"; - research = new EMTResearchItem("Thaumium Omnitool", "EMT", ResearchAspects.thaumiumOmnitoolResearch, -6, 0, 2, new ItemStack(IC2ModuleItemRegistry.thaumiumOmnitool)).setParentsHidden("Thaumium Drill", "Thaumium Chainsaw").setParents("Diamond Omnitool").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.thaumiumOmnitool), new ResearchPage(EMTPostInitRecipes.diamondOmnitoolToThaumium)); + research = new EMTResearchItem("Thaumium Omnitool", "EMT", ResearchAspects.thaumiumOmnitoolResearch, -6, 0, 2, new ItemStack(IC2ItemRegistry.thaumiumOmnitool)).setParentsHidden("Thaumium Drill", "Thaumium Chainsaw").setParents("Diamond Omnitool").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.thaumiumOmnitool), new ResearchPage(IC2RecipeRegistry.diamondOmnitoolToThaumium)); } } if (ConfigHandler.explosionFocusResearch == false) { text = "1"; - research = new EMTResearchItem("Explosion Focus", "EMT", ResearchAspects.laserFocusResearch, 2, 3, 2, new ItemStack(IC2ModuleItemRegistry.explosionFocus)).setParents("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.explosionFocus)); + research = new EMTResearchItem("Explosion Focus", "EMT", ResearchAspects.laserFocusResearch, 2, 3, 2, new ItemStack(IC2ItemRegistry.explosionFocus)).setParents("Electric Magic Tools").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.explosionFocus)); } if (ConfigHandler.christmasFocusResearch == false) { text = "1"; - research = new EMTResearchItem("Kris-tmas Focus", "EMT", ResearchAspects.christmasFocusResearch, 3, 3, 1, new ItemStack(IC2ModuleItemRegistry.christmasFocus)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.christmasFocus)); + research = new EMTResearchItem("Kris-tmas Focus", "EMT", ResearchAspects.christmasFocusResearch, 3, 3, 1, new ItemStack(IC2ItemRegistry.christmasFocus)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.christmasFocus)); } if (ConfigHandler.shieldFocusResearch == false) { text = "1"; - research = new EMTResearchItem("Shield Focus", "EMT", ResearchAspects.shieldFocusResearch, 4, 3, 2, new ItemStack(IC2ModuleItemRegistry.shieldFocus)).setParents("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.shieldFocus)); + research = new EMTResearchItem("Shield Focus", "EMT", ResearchAspects.shieldFocusResearch, 4, 3, 2, new ItemStack(IC2ItemRegistry.shieldFocus)).setParents("Electric Magic Tools").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.shieldFocus)); } if (ConfigHandler.shieldFocusResearch == false) { if (ConfigHandler.shieldBlockResearch == false) { text = "1"; - research = new EMTResearchItem("Shield Block", "EMT", ResearchAspects.shieldBlockResearch, 4, 5, 1, new ItemStack(IC2ModuleBlockRegistry.shield)).setSecondary().setParents("Shield Focus").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.shieldBlock)); + research = new EMTResearchItem("Shield Block", "EMT", ResearchAspects.shieldBlockResearch, 4, 5, 1, new ItemStack(IC2BlockRegistry.shield)).setSecondary().setParents("Shield Focus").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.shieldBlock)); } } if (ConfigHandler.potentiaGeneratorResearch == false) { text = "1"; - research = new EMTResearchItem("Potentia Generator", "EMT", ResearchAspects.potentiaGeneratorResearch, -2, 3, 3, new ItemStack(IC2ModuleBlockRegistry.essentiaGens, 1, 0)).setParents("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.potentiaGenerator)); + research = new EMTResearchItem("Potentia Generator", "EMT", ResearchAspects.potentiaGeneratorResearch, -2, 3, 3, new ItemStack(IC2BlockRegistry.essentiaGens, 1, 0)).setParents("Electric Magic Tools").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.potentiaGenerator)); } if (ConfigHandler.potentiaGeneratorResearch == false) { if (ConfigHandler.ignisGeneratorResearch == false) { text = "1"; - research = new EMTResearchItem("Ignis Generator", "EMT", ResearchAspects.ignisGeneratorResearch, -3, 4, 1, new ItemStack(IC2ModuleBlockRegistry.essentiaGens, 1, 1)).setSecondary().setParents("Potentia Generator").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.ignisGenerator)); + research = new EMTResearchItem("Ignis Generator", "EMT", ResearchAspects.ignisGeneratorResearch, -3, 4, 1, new ItemStack(IC2BlockRegistry.essentiaGens, 1, 1)).setSecondary().setParents("Potentia Generator").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.ignisGenerator)); } } if (ConfigHandler.potentiaGeneratorResearch == false) { if (ConfigHandler.auramGeneratorResearch == false) { text = "1"; - research = new EMTResearchItem("Auram Generator", "EMT", ResearchAspects.auramGeneratorResearch, -1, 4, 1, new ItemStack(IC2ModuleBlockRegistry.essentiaGens, 1, 2)).setSecondary().setParents("Potentia Generator").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.auramGenerator)); + research = new EMTResearchItem("Auram Generator", "EMT", ResearchAspects.auramGeneratorResearch, -1, 4, 1, new ItemStack(IC2BlockRegistry.essentiaGens, 1, 2)).setSecondary().setParents("Potentia Generator").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.auramGenerator)); } } if (ConfigHandler.potentiaGeneratorResearch == false) { if (ConfigHandler.arborGeneratorResearch == false) { text = "1"; - research = new EMTResearchItem("Arbor Generator", "EMT", ResearchAspects.arborGeneratorResearch, -2, 5, 1, new ItemStack(IC2ModuleBlockRegistry.essentiaGens, 1, 3)).setSecondary().setParents("Potentia Generator").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.arborGenerator)); + research = new EMTResearchItem("Arbor Generator", "EMT", ResearchAspects.arborGeneratorResearch, -2, 5, 1, new ItemStack(IC2BlockRegistry.essentiaGens, 1, 3)).setSecondary().setParents("Potentia Generator").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.arborGenerator)); } } if (ConfigHandler.potentiaGeneratorResearch == false) { if (ConfigHandler.aerGeneratorResearch == false) { text = "1"; - research = new EMTResearchItem("Aer Generator", "EMT", ResearchAspects.aerGenerator, -2, 6, 1, new ItemStack(IC2ModuleBlockRegistry.essentiaGens, 1, 4)).setSecondary().setParents("Potentia Generator").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.aerGenerator)); + research = new EMTResearchItem("Aer Generator", "EMT", ResearchAspects.aerGenerator, -2, 6, 1, new ItemStack(IC2BlockRegistry.essentiaGens, 1, 4)).setSecondary().setParents("Potentia Generator").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.aerGenerator)); } } if (ConfigHandler.potentiaGeneratorResearch == false) { if (ConfigHandler.wandChargingSationResearch == false) { text = "1"; - research = new EMTResearchItem("Industrial Wand Charging Station", "EMT", ResearchAspects.wandCharger, -4, 2, 3, new ItemStack(IC2ModuleBlockRegistry.emtMachines, 1, 0)).setParents("Potentia Generator").registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.wandRecharger)); + research = new EMTResearchItem("Industrial Wand Charging Station", "EMT", ResearchAspects.wandCharger, -4, 2, 3, new ItemStack(IC2BlockRegistry.emtMachines, 1, 0)).setParents("Potentia Generator").registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.wandRecharger)); } } if (ConfigHandler.thaumiumChainsawResearch == false) { if (ConfigHandler.streamChainsawResearch == false) { text = "1"; - research = new EMTResearchItem("Chainsaw of the Stream", "EMT", ResearchAspects.streamChainsawResearch, -3, -4, 3, new ItemStack(IC2ModuleItemRegistry.streamChainsaw)).setParents("Thaumium Chainsaw").registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.streamChainsaw)); + research = new EMTResearchItem("Chainsaw of the Stream", "EMT", ResearchAspects.streamChainsawResearch, -3, -4, 3, new ItemStack(IC2ItemRegistry.streamChainsaw)).setParents("Thaumium Chainsaw").registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.streamChainsaw)); } } if (ConfigHandler.thaumiumDrillResearch == false) { if (ConfigHandler.rockbreakerDrillResearch == false) { text = "1"; - research = new EMTResearchItem("Drill of the Rockbreaker", "EMT", ResearchAspects.rockbreakerDrillResearch, 0, -4, 3, new ItemStack(IC2ModuleItemRegistry.rockbreakerDrill)).setParents("Thaumium Drill").registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.rockbreakerDrill)); + research = new EMTResearchItem("Drill of the Rockbreaker", "EMT", ResearchAspects.rockbreakerDrillResearch, 0, -4, 3, new ItemStack(IC2ItemRegistry.rockbreakerDrill)).setParents("Thaumium Drill").registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.rockbreakerDrill)); } } if (ConfigHandler.tinyUraniumResearch == false) { text = "1"; research = new EMTResearchItem("Tiny Uranium", "EMT", ResearchAspects.tinyUraniumResearch, -5, -5, 1, IC2Items.getItem("Uran238")).setSecondary().setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.tinyUranium)); + research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.tinyUranium)); } if (ConfigHandler.thorHammerResearch == false) { text = "1"; - research = new EMTResearchItem("Mjolnir", "EMT", ResearchAspects.thorHammerResearch, -5, 5, 3, new ItemStack(IC2ModuleItemRegistry.thorHammer)).setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.thorHammer)); + research = new EMTResearchItem("Mjolnir", "EMT", ResearchAspects.thorHammerResearch, -5, 5, 3, new ItemStack(IC2ItemRegistry.thorHammer)).setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.thorHammer)); } if (ConfigHandler.thorHammerResearch == false) { if (ConfigHandler.superchargedThorHammerResearch == false) { text = "1"; - research = new EMTResearchItem("Supercharged Mjolnir", "EMT", ResearchAspects.superchargedThorHammerResearch, -6, 6, 3, new ItemStack(IC2ModuleItemRegistry.electricThorHammer)).setParents("Mjolnir").registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.superchargedThorHammer)); + research = new EMTResearchItem("Supercharged Mjolnir", "EMT", ResearchAspects.superchargedThorHammerResearch, -6, 6, 3, new ItemStack(IC2ItemRegistry.electricThorHammer)).setParents("Mjolnir").registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.superchargedThorHammer)); } } if (ConfigHandler.compressedSolarsResearch == false) { text = "1"; - research = new EMTResearchItem("Compressed Solars", "EMT", ResearchAspects.compressedSolars, -4, -5, 2, new ItemStack(IC2ModuleBlockRegistry.emtSolars)).setParentsHidden("Potentia Generator").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.compressedSolar), new ResearchPage(EMTPostInitRecipes.doubleCompressedSolar), new ResearchPage(EMTPostInitRecipes.tripleCompressedSolar)); + research = new EMTResearchItem("Compressed Solars", "EMT", ResearchAspects.compressedSolars, -4, -5, 2, new ItemStack(IC2BlockRegistry.emtSolars)).setParentsHidden("Potentia Generator").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.compressedSolar), new ResearchPage(IC2RecipeRegistry.doubleCompressedSolar), new ResearchPage(IC2RecipeRegistry.tripleCompressedSolar)); } if (ConfigHandler.compressedSolarsResearch == false) { if (ConfigHandler.solarHelmetResearch == false) { text = "1"; - research = new EMTResearchItem("Solar Helmet of Revealing", "EMT", ResearchAspects.solarHelmetRevealing, -2, -5, 1, new ItemStack(IC2ModuleItemRegistry.solarHelmetRevealing)).setSecondary().setParents("Compressed Solars").setParentsHidden("Quantum Goggles of Revealing").registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.solarHelmetRevealing)); + research = new EMTResearchItem("Solar Helmet of Revealing", "EMT", ResearchAspects.solarHelmetRevealing, -2, -5, 1, new ItemStack(IC2ItemRegistry.solarHelmetRevealing)).setSecondary().setParents("Compressed Solars").setParentsHidden("Quantum Goggles of Revealing").registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.solarHelmetRevealing)); } } if (ConfigHandler.electricBootsResearch == false) { text = "1"; - research = new EMTResearchItem("Electric Boots of the Traveller", "EMT", ResearchAspects.electricBootsTravel, 2, 0, 1, new ItemStack(IC2ModuleItemRegistry.electricBootsTraveller)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.electricBootsTravel)); + research = new EMTResearchItem("Electric Boots of the Traveller", "EMT", ResearchAspects.electricBootsTravel, 2, 0, 1, new ItemStack(IC2ItemRegistry.electricBootsTraveller)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.electricBootsTravel)); } if (ConfigHandler.electricBootsResearch == false) { if (ConfigHandler.nanoBootsResearch == false) { text = "1"; - research = new EMTResearchItem("Nano Boots of the Traveller", "EMT", ResearchAspects.nanoBootsTravel, 4, 0, 2, new ItemStack(IC2ModuleItemRegistry.nanoBootsTraveller)).setParents("Electric Boots of the Traveller").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.nanoBootsTravel)); + research = new EMTResearchItem("Nano Boots of the Traveller", "EMT", ResearchAspects.nanoBootsTravel, 4, 0, 2, new ItemStack(IC2ItemRegistry.nanoBootsTraveller)).setParents("Electric Boots of the Traveller").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.nanoBootsTravel)); } } @@ -270,130 +269,130 @@ public class IC2ModuleResearch { if (ConfigHandler.nanoBootsResearch == false) { if (ConfigHandler.quantumBootsResearch == false) { text = "1"; - research = new EMTResearchItem("Quantum Boots of the Traveller", "EMT", ResearchAspects.quantumBootsTravel, 6, 0, 3, new ItemStack(IC2ModuleItemRegistry.quantumBootsTraveller)).setParents("Nano Boots of the Traveller").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.quantumBootsTravel)); + research = new EMTResearchItem("Quantum Boots of the Traveller", "EMT", ResearchAspects.quantumBootsTravel, 6, 0, 3, new ItemStack(IC2ItemRegistry.quantumBootsTraveller)).setParents("Nano Boots of the Traveller").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.quantumBootsTravel)); } } } if (ConfigHandler.electricScribingToolsResearch == false) { text = "1"; - research = new EMTResearchItem("Electric Scribing Tools", "EMT", ResearchAspects.electricScribingTools, -6, -5, 1, new ItemStack(IC2ModuleItemRegistry.electricScribingTools)).setSecondary().setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.electricScribingTools)); + research = new EMTResearchItem("Electric Scribing Tools", "EMT", ResearchAspects.electricScribingTools, -6, -5, 1, new ItemStack(IC2ItemRegistry.electricScribingTools)).setSecondary().setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.electricScribingTools)); } if (ConfigHandler.etherealProcessorResearch == false) { text = "1"; - research = new EMTResearchItem("Etheral Processor", "EMT", ResearchAspects.etherealProcessor, -1, 2, 2, new ItemStack(IC2ModuleBlockRegistry.emtMachines, 1, 1)).setParents("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.etheralProcessor)); + research = new EMTResearchItem("Etheral Processor", "EMT", ResearchAspects.etherealProcessor, -1, 2, 2, new ItemStack(IC2BlockRegistry.emtMachines, 1, 1)).setParents("Electric Magic Tools").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.etheralProcessor)); } if (ConfigHandler.compressedSolarsResearch == false) { if (ConfigHandler.waterSolarsResearch == false) { text = "1"; - research = new EMTResearchItem("Water Infused Solar Panels", "EMT", ResearchAspects.waterSolars, -7, -7, 1, new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 3)).setSecondary().setParents("Compressed Solars").registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.waterSolar), new ResearchPage(EMTPostInitRecipes.doubleWaterSolar), new ResearchPage(EMTPostInitRecipes.tripleWaterSolar)); + research = new EMTResearchItem("Water Infused Solar Panels", "EMT", ResearchAspects.waterSolars, -7, -7, 1, new ItemStack(IC2BlockRegistry.emtSolars, 1, 3)).setSecondary().setParents("Compressed Solars").registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.waterSolar), new ResearchPage(IC2RecipeRegistry.doubleWaterSolar), new ResearchPage(IC2RecipeRegistry.tripleWaterSolar)); } } if (ConfigHandler.compressedSolarsResearch == false) { if (ConfigHandler.darkSolarsResearch == false) { text = "1"; - research = new EMTResearchItem("Entropy Infused Solar Panels", "EMT", ResearchAspects.darkSolars, -8, -6, 1, new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 6)).setSecondary().setParents("Compressed Solars").registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.darkSolar), new ResearchPage(EMTPostInitRecipes.doubleDarkSolar), new ResearchPage(EMTPostInitRecipes.tripleDarkSolar)); + research = new EMTResearchItem("Entropy Infused Solar Panels", "EMT", ResearchAspects.darkSolars, -8, -6, 1, new ItemStack(IC2BlockRegistry.emtSolars, 1, 6)).setSecondary().setParents("Compressed Solars").registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.darkSolar), new ResearchPage(IC2RecipeRegistry.doubleDarkSolar), new ResearchPage(IC2RecipeRegistry.tripleDarkSolar)); } } if (ConfigHandler.compressedSolarsResearch == false) { if (ConfigHandler.orderSolarsResearch == false) { text = "1"; - research = new EMTResearchItem("Order Infused Solar Panels", "EMT", ResearchAspects.orderSolars, -6, -8, 1, new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 9)).setSecondary().setParents("Compressed Solars").registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.orderSolar), new ResearchPage(EMTPostInitRecipes.doubleOrderSolar), new ResearchPage(EMTPostInitRecipes.tripleOrderSolar)); + research = new EMTResearchItem("Order Infused Solar Panels", "EMT", ResearchAspects.orderSolars, -6, -8, 1, new ItemStack(IC2BlockRegistry.emtSolars, 1, 9)).setSecondary().setParents("Compressed Solars").registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.orderSolar), new ResearchPage(IC2RecipeRegistry.doubleOrderSolar), new ResearchPage(IC2RecipeRegistry.tripleOrderSolar)); } } if (ConfigHandler.compressedSolarsResearch == false) { if (ConfigHandler.fireSolarsResearch == false) { text = "1"; - research = new EMTResearchItem("Fire Infused Solar Panels", "EMT", ResearchAspects.fireSolars, -5, -7, 1, new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 12)).setSecondary().setParents("Compressed Solars").registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.fireSolar), new ResearchPage(EMTPostInitRecipes.doubleFireSolar), new ResearchPage(EMTPostInitRecipes.tripleFireSolar)); + research = new EMTResearchItem("Fire Infused Solar Panels", "EMT", ResearchAspects.fireSolars, -5, -7, 1, new ItemStack(IC2BlockRegistry.emtSolars, 1, 12)).setSecondary().setParents("Compressed Solars").registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.fireSolar), new ResearchPage(IC2RecipeRegistry.doubleFireSolar), new ResearchPage(IC2RecipeRegistry.tripleFireSolar)); } } if (ConfigHandler.compressedSolarsResearch == false) { if (ConfigHandler.airSolarsResearch == false) { text = "1"; - research = new EMTResearchItem("Air Infused Solar Panels", "EMT", ResearchAspects.airSolars, -4, -6, 1, new ItemStack(IC2ModuleBlockRegistry.emtSolars, 1, 15)).setSecondary().setParents("Compressed Solars").registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.airSolar), new ResearchPage(EMTPostInitRecipes.doubleAirSolar), new ResearchPage(EMTPostInitRecipes.tripleAirSolar)); + research = new EMTResearchItem("Air Infused Solar Panels", "EMT", ResearchAspects.airSolars, -4, -6, 1, new ItemStack(IC2BlockRegistry.emtSolars, 1, 15)).setSecondary().setParents("Compressed Solars").registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.airSolar), new ResearchPage(IC2RecipeRegistry.doubleAirSolar), new ResearchPage(IC2RecipeRegistry.tripleAirSolar)); } } if (ConfigHandler.compressedSolarsResearch == false) { if (ConfigHandler.earthSolarsResearch == false) { text = "1"; - research = new EMTResearchItem("Earth Infused Solar Panels", "EMT", ResearchAspects.earthSolars, -6, -7, 1, new ItemStack(IC2ModuleBlockRegistry.emtSolars2, 1, 2)).setSecondary().setParents("Compressed Solars").registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.earthSolar), new ResearchPage(EMTPostInitRecipes.doubleEarthSolar), new ResearchPage(EMTPostInitRecipes.tripleEarthSolar)); + research = new EMTResearchItem("Earth Infused Solar Panels", "EMT", ResearchAspects.earthSolars, -6, -7, 1, new ItemStack(IC2BlockRegistry.emtSolars2, 1, 2)).setSecondary().setParents("Compressed Solars").registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.earthSolar), new ResearchPage(IC2RecipeRegistry.doubleEarthSolar), new ResearchPage(IC2RecipeRegistry.tripleEarthSolar)); } } if (ConfigHandler.uuMInfusionResearch == false) { text = "1"; - research = new EMTResearchItem("UU-Matter Infusion", "EMT", ResearchAspects.uuMInfusion, 5, 5, 3, new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 16)).setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(UuMInfusionRecipes.charcoalToCoal), new ResearchPage(UuMInfusionRecipes.glowstoneDustToBlock), new ResearchPage(UuMInfusionRecipes.stoneBricksToIronOre), new ResearchPage(UuMInfusionRecipes.arcaneStoneToCopperOre), new ResearchPage(UuMInfusionRecipes.arcaneStoneBricksToTinOre), new ResearchPage(UuMInfusionRecipes.amberBlockToLeadOre), new ResearchPage(UuMInfusionRecipes.amberBricksToUraniumOre), new ResearchPage(UuMInfusionRecipes.shardToResin), new ResearchPage(UuMInfusionRecipes.shardToRedstone), new ResearchPage(UuMInfusionRecipes.shardToLapis), new ResearchPage(UuMInfusionRecipes.ironToGold), new ResearchPage(UuMInfusionRecipes.goldToDiamond), new ResearchPage(UuMInfusionRecipes.diamondToUranium), new ResearchPage(UuMInfusionRecipes.uraniumToIridium)); + research = new EMTResearchItem("UU-Matter Infusion", "EMT", ResearchAspects.uuMInfusion, 5, 5, 3, new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 16)).setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.charcoalToCoal), new ResearchPage(IC2RecipeRegistry.glowstoneDustToBlock), new ResearchPage(IC2RecipeRegistry.stoneBricksToIronOre), new ResearchPage(IC2RecipeRegistry.arcaneStoneToCopperOre), new ResearchPage(IC2RecipeRegistry.arcaneStoneBricksToTinOre), new ResearchPage(IC2RecipeRegistry.amberBlockToLeadOre), new ResearchPage(IC2RecipeRegistry.amberBricksToUraniumOre), new ResearchPage(IC2RecipeRegistry.shardToResin), new ResearchPage(IC2RecipeRegistry.shardToRedstone), new ResearchPage(IC2RecipeRegistry.shardToLapis), new ResearchPage(IC2RecipeRegistry.ironToGold), new ResearchPage(IC2RecipeRegistry.goldToDiamond), new ResearchPage(IC2RecipeRegistry.diamondToUranium), new ResearchPage(IC2RecipeRegistry.uraniumToIridium)); } if (ConfigHandler.portableNodeResarch == false) { text = "1"; - research = new EMTResearchItem("Portable Node", "EMT", ResearchAspects.portableNode, 2, 5, 3, new ItemStack(IC2ModuleBlockRegistry.portableNode)).setParents("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.portableNode)); + research = new EMTResearchItem("Portable Node", "EMT", ResearchAspects.portableNode, 2, 5, 3, new ItemStack(IC2BlockRegistry.portableNode)).setParents("Electric Magic Tools").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.portableNode)); } if (ConfigHandler.electricHoeGrowthResearch == false) { text = "1"; - research = new EMTResearchItem("Electric Hoe of Growth", "EMT", ResearchAspects.electricHoeGrowth, -1, -4, 2, new ItemStack(IC2ModuleItemRegistry.electricHoeGrowth)).setParents("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.electricHoeGrowth)); + research = new EMTResearchItem("Electric Hoe of Growth", "EMT", ResearchAspects.electricHoeGrowth, -1, -4, 2, new ItemStack(IC2ItemRegistry.electricHoeGrowth)).setParents("Electric Magic Tools").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.electricHoeGrowth)); } if (ConfigHandler.chargeFocusResearch == false) { text = "1"; - research = new EMTResearchItem("Wand Focus: Charging", "EMT", ResearchAspects.chargeFocus, 5, 3, 2, new ItemStack(IC2ModuleItemRegistry.chargeFocus)).setParents("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.chargeFocus)); + research = new EMTResearchItem("Wand Focus: Charging", "EMT", ResearchAspects.chargeFocus, 5, 3, 2, new ItemStack(IC2ItemRegistry.chargeFocus)).setParents("Electric Magic Tools").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.chargeFocus)); } if (ConfigHandler.wandChargeFocusResearch == false) { text = "1"; - research = new EMTResearchItem("Wand Focus: Wand Charging", "EMT", ResearchAspects.wandChargeFocus, 7, 3, 3, new ItemStack(IC2ModuleItemRegistry.wandChargeFocus)).setParents("Wand Focus: Charging").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.wandChargeFocus)); + research = new EMTResearchItem("Wand Focus: Wand Charging", "EMT", ResearchAspects.wandChargeFocus, 7, 3, 3, new ItemStack(IC2ItemRegistry.wandChargeFocus)).setParents("Wand Focus: Charging").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.wandChargeFocus)); } if (ConfigHandler.inventoryChargingRing == false) { text = "1"; - research = new EMTResearchItem("Inventory Charging Ring", "EMT", ResearchAspects.inventoryChargingRing, 0, -5, 3, new ItemStack(IC2ModuleItemRegistry.emtBauble, 1, 1)).setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.inventoryChargingRing)); + research = new EMTResearchItem("Inventory Charging Ring", "EMT", ResearchAspects.inventoryChargingRing, 0, -5, 3, new ItemStack(IC2ItemRegistry.emtBauble, 1, 1)).setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.inventoryChargingRing)); } if (ConfigHandler.armorChargingRing == false) { text = "1"; - research = new EMTResearchItem("Armor Charging Ring", "EMT", ResearchAspects.armorChargingRing, 0, -7, 3, new ItemStack(IC2ModuleItemRegistry.emtBauble, 1, 0)).setSecondary().setParents("Inventory Charging Ring").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.armorChargingRing)); + research = new EMTResearchItem("Armor Charging Ring", "EMT", ResearchAspects.armorChargingRing, 0, -7, 3, new ItemStack(IC2ItemRegistry.emtBauble, 1, 0)).setSecondary().setParents("Inventory Charging Ring").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.armorChargingRing)); } if (ConfigHandler.thaumiumWingResearch == false) { text = "1"; - research = new EMTResearchItem("Thaumium Reinforced Wings", "EMT", ResearchAspects.thaumiumWing, 0, 4, 0, new ItemStack(IC2ModuleItemRegistry.thaumiumWing)).setSecondary().setParents("Feather Wings").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.thaumiumWing), new ResearchPage(EMTPostInitRecipes.thaumiumWings)); + research = new EMTResearchItem("Thaumium Reinforced Wings", "EMT", ResearchAspects.thaumiumWing, 0, 4, 0, new ItemStack(IC2ItemRegistry.thaumiumWing)).setSecondary().setParents("Feather Wings").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.thaumiumWing), new ResearchPage(IC2RecipeRegistry.thaumiumWings)); } if (ConfigHandler.nanoWingResearch == false) { text = "1"; - research = new EMTResearchItem("Nanosuit Wings", "EMT", ResearchAspects.nanoWing, 0, 6, 2, new ItemStack(IC2ModuleItemRegistry.nanoWing)).setParents("Thaumium Reinforced Wings").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.nanoWings)); + research = new EMTResearchItem("Nanosuit Wings", "EMT", ResearchAspects.nanoWing, 0, 6, 2, new ItemStack(IC2ItemRegistry.nanoWing)).setParents("Thaumium Reinforced Wings").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.nanoWings)); } if (ConfigHandler.quantumWingsResearch == false) { text = "1"; - research = new EMTResearchItem("Quantum Wings", "EMT", ResearchAspects.quantumWing, 0, 8, 3, new ItemStack(IC2ModuleItemRegistry.quantumWing)).setParents("Nanosuit Wings").setConcealed().registerResearchItem(); - research.setPages(new ResearchPage(text), new ResearchPage(EMTPostInitRecipes.quantumWings)); + research = new EMTResearchItem("Quantum Wings", "EMT", ResearchAspects.quantumWing, 0, 8, 3, new ItemStack(IC2ItemRegistry.quantumWing)).setParents("Nanosuit Wings").setConcealed().registerResearchItem(); + research.setPages(new ResearchPage(text), new ResearchPage(IC2RecipeRegistry.quantumWings)); } } } diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/IC2BlockRegistry.java b/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/IC2BlockRegistry.java index c5345a2..0dff523 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/IC2BlockRegistry.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/IC2BlockRegistry.java @@ -1,8 +1,53 @@ +/******************************************************************************* + * Copyright (c) 2014 Tombenpotter. + * All rights reserved. + * + * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 + * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html + * + * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. + * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. + * http://www.minecraftforum.net/topic/1585216- + ******************************************************************************/ + package tombenpotter.emt.common.modules.ic2.blocks; +import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraft.block.Block; +import tombenpotter.emt.ModInformation; +import tombenpotter.emt.common.module.ic2.blocks.*; +import tombenpotter.emt.common.module.ic2.items.blocks.*; + public class IC2BlockRegistry { - public static void registerIC2Blocks() { + public static Block essentiaGens; + public static Block shield; + public static Block emtSolars; + public static Block emtMachines; + public static Block emtSolars2; + public static Block portableNode; + public static Block essentiaGenerator; - } + public static void registerBlocks() { + shield = new BlockShield().setBlockName(ModInformation.modid + ".shield"); + GameRegistry.registerBlock(shield, "ShieldBlock"); + + portableNode = new BlockPortableNode().setBlockName(ModInformation.modid + ".portablenode"); + GameRegistry.registerBlock(portableNode, "PortableNode"); + + emtSolars = new BlockEMTSolars().setBlockName(ModInformation.modid + ".emtsolars"); + GameRegistry.registerBlock(emtSolars, ItemBlockEMTSolars.class, "EMTSolars"); + + emtSolars2 = new BlockEMTSolars2().setBlockName(ModInformation.modid + ".emtsolars2"); + GameRegistry.registerBlock(emtSolars2, ItemBlockEMTSolars2.class, "EMTSolars2"); + + emtMachines = new BlockEMTMachines().setBlockName(ModInformation.modid + ".emtmachines"); + GameRegistry.registerBlock(emtMachines, ItemBlockEMTMachines.class, "EMTMachines"); + + essentiaGens = new BlockEssentiaGenerators().setBlockName(ModInformation.modid + ".essentiaGens"); + GameRegistry.registerBlock(essentiaGens, ItemBlockEssentiaGenerators.class, "EssentiaGenerators"); + + essentiaGenerator = new BlockEssentiaGenerator().setBlockName(ModInformation.modid + ".essentiaGenerator"); + GameRegistry.registerBlock(essentiaGenerator, ItemBlockEssentiaGenerator.class, "Essentia Generator"); + } } diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/items/IC2ItemRegistry.java b/src/main/java/tombenpotter/emt/common/modules/ic2/items/IC2ItemRegistry.java index 12b2c89..0c4502a 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/items/IC2ItemRegistry.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/items/IC2ItemRegistry.java @@ -1,14 +1,162 @@ +/******************************************************************************* + * Copyright (c) 2014 Tombenpotter. + * All rights reserved. + * + * This program and the accompanying materials are made available under the terms of the GNU Public License v3.0 + * which accompanies this distribution, and is available at http://www.gnu.org/licenses/gpl.html + * + * This class was made by Tombenpotter and is distributed as a part of the Electro-Magic Tools mod. + * Electro-Magic Tools is a derivative work on Thaumcraft 4 (c) Azanor 2012. + * http://www.minecraftforum.net/topic/1585216- + ******************************************************************************/ + package tombenpotter.emt.common.modules.ic2.items; import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.item.Item; +import net.minecraft.item.ItemArmor; +import net.minecraftforge.common.util.EnumHelper; +import thaumcraft.api.ThaumcraftApi; +import tombenpotter.emt.ModInformation; +import tombenpotter.emt.common.module.ic2.items.ItemElectricScribingTools; +import tombenpotter.emt.common.module.ic2.items.armor.boots.ItemElectricBootsTraveller; +import tombenpotter.emt.common.module.ic2.items.armor.boots.ItemNanoBootsTraveller; +import tombenpotter.emt.common.module.ic2.items.armor.boots.ItemQuantumBootsTraveller; +import tombenpotter.emt.common.module.ic2.items.armor.goggles.ItemElectricGoggles; +import tombenpotter.emt.common.module.ic2.items.armor.goggles.ItemNanoGoggles; +import tombenpotter.emt.common.module.ic2.items.armor.goggles.ItemQuantumGoggles; +import tombenpotter.emt.common.module.ic2.items.armor.goggles.ItemSolarHelmetRevealing; +import tombenpotter.emt.common.module.ic2.items.armor.wings.ItemNanoWing; +import tombenpotter.emt.common.module.ic2.items.armor.wings.ItemQuantumWing; +import tombenpotter.emt.common.module.ic2.items.foci.ItemChargeFocus; +import tombenpotter.emt.common.module.ic2.items.foci.ItemWandChargingFocus; +import tombenpotter.emt.common.module.ic2.items.tools.ItemElectricHoeGrowth; +import tombenpotter.emt.common.module.ic2.items.tools.ItemElectricThorHammer; +import tombenpotter.emt.common.module.ic2.items.tools.chainsaws.ItemDiamondChainsaw; +import tombenpotter.emt.common.module.ic2.items.tools.chainsaws.ItemStreamChainsaw; +import tombenpotter.emt.common.module.ic2.items.tools.chainsaws.ItemThaumiumChainsaw; +import tombenpotter.emt.common.module.ic2.items.tools.drills.ItemRockbreakerDrill; +import tombenpotter.emt.common.module.ic2.items.tools.drills.ItemThaumiumDrill; +import tombenpotter.emt.common.module.ic2.items.tools.omnitools.ItemOmnitoolDiamond; +import tombenpotter.emt.common.module.ic2.items.tools.omnitools.ItemOmnitoolIron; +import tombenpotter.emt.common.module.ic2.items.tools.omnitools.ItemOmnitoolThaumium; +import tombenpotter.emt.common.modules.base.items.ItemMaterials; +import tombenpotter.emt.common.modules.base.items.armor.ItemFeatherWing; +import tombenpotter.emt.common.modules.base.items.armor.ItemThaumiumReinforcedWing; +import tombenpotter.emt.common.modules.base.items.foci.ItemChristmasFocus; +import tombenpotter.emt.common.modules.base.items.foci.ItemExplosionFocus; +import tombenpotter.emt.common.modules.base.items.foci.ItemShieldFocus; +import tombenpotter.emt.common.modules.base.items.tools.ItemThorHammer; +import tombenpotter.emt.common.modules.base.items.tools.ItemThorHammerBroken; public class IC2ItemRegistry { - public static Item ic2Baubles; + public static Item thaumiumDrill; + public static Item thaumiumChainsaw; + public static Item quantumThaumicHelmet; + public static Item diamondChainsaw; + public static Item ironOmnitool; + public static Item diamondOmnitool; + public static Item thaumiumOmnitool; + public static Item nanoThaumicHelmet; + public static Item explosionFocus; + public static Item christmasFocus; + public static Item shieldFocus; + public static Item electricGoggles; + public static Item streamChainsaw; + public static Item rockbreakerDrill; + public static Item solarHelmetRevealing; + public static Item thorHammer; + public static Item taintedThorHammer; + public static Item electricThorHammer; + public static Item electricBootsTraveller; + public static Item quantumBootsTraveller; + public static Item nanoBootsTraveller; + public static Item electricScribingTools; + public static Item itemEMTItems; + public static Item electricHoeGrowth; + public static Item chargeFocus; + public static Item emtBauble; + public static Item wandChargeFocus; + public static Item featherWing; + public static Item thaumiumWing; + public static Item nanoWing; + public static Item quantumWing; - public static void registerIC2Items() { - ic2Baubles = new ItemIC2Baubles(); - GameRegistry.registerItem(ic2Baubles, "IC2Baubles"); - } + public static ItemArmor.ArmorMaterial featherWingMaterial = EnumHelper.addArmorMaterial("FEATEHRWiNG", 1, new int[]{2, 2, 2, 2}, 6); + + public static void registerItems() { + itemEMTItems = new ItemMaterials().setUnlocalizedName(ModInformation.modid + ".emtitems"); + GameRegistry.registerItem(itemEMTItems, "EMTItems"); + emtBauble = new ItemIC2Baubles().setUnlocalizedName(ModInformation.modid + ".emtbauble"); + GameRegistry.registerItem(emtBauble, "EMTBaubles"); + + electricGoggles = new ItemElectricGoggles(ItemArmor.ArmorMaterial.IRON, 3, 0).setUnlocalizedName(ModInformation.modid + ".goggles.electric"); + GameRegistry.registerItem(electricGoggles, "ElectricGogglesRevealing"); + nanoThaumicHelmet = new ItemNanoGoggles(ItemArmor.ArmorMaterial.DIAMOND, 3, 0).setUnlocalizedName(ModInformation.modid + ".goggles.nano"); + GameRegistry.registerItem(nanoThaumicHelmet, "NanosuitGogglesRevealing"); + quantumThaumicHelmet = new ItemQuantumGoggles(ItemArmor.ArmorMaterial.DIAMOND, 3, 0).setUnlocalizedName(ModInformation.modid + ".goggles.quantum"); + GameRegistry.registerItem(quantumThaumicHelmet, "QuantumGogglesRevealing"); + solarHelmetRevealing = new ItemSolarHelmetRevealing(ItemArmor.ArmorMaterial.DIAMOND, 3, 0).setUnlocalizedName(ModInformation.modid + ".goggles.solar"); + GameRegistry.registerItem(solarHelmetRevealing, "SolarHelmetRevealing"); + + electricBootsTraveller = new ItemElectricBootsTraveller(3, 3).setUnlocalizedName(ModInformation.modid + ".boots.traveller.electric"); + GameRegistry.registerItem(electricBootsTraveller, "ElectricBootsTraveller"); + nanoBootsTraveller = new ItemNanoBootsTraveller(3, 3).setUnlocalizedName(ModInformation.modid + ".boots.traveller.nano"); + GameRegistry.registerItem(nanoBootsTraveller, "NanoBootsTraveller"); + quantumBootsTraveller = new ItemQuantumBootsTraveller(3, 3).setUnlocalizedName(ModInformation.modid + ".boots.traveller.quantum"); + GameRegistry.registerItem(quantumBootsTraveller, "QuantumBootsTraveller"); + + electricScribingTools = new ItemElectricScribingTools().setUnlocalizedName(ModInformation.modid + ".scribingtools.electric"); + GameRegistry.registerItem(electricScribingTools, "ElectricScribingTools"); + + featherWing = new ItemFeatherWing(featherWingMaterial, 7, 1).setUnlocalizedName(ModInformation.modid + ".wing.feather"); + GameRegistry.registerItem(featherWing, "FeatherWing"); + thaumiumWing = new ItemThaumiumReinforcedWing(ThaumcraftApi.armorMatThaumium, 7, 1).setUnlocalizedName(ModInformation.modid + ".wing.thaumium"); + GameRegistry.registerItem(thaumiumWing, "ThaumiumWing"); + nanoWing = new ItemNanoWing(ItemArmor.ArmorMaterial.DIAMOND, 7, 1).setUnlocalizedName(ModInformation.modid + ".wing.nano"); + GameRegistry.registerItem(nanoWing, "NanosuitWing"); + quantumWing = new ItemQuantumWing(ItemArmor.ArmorMaterial.DIAMOND, 7, 1).setUnlocalizedName(ModInformation.modid + ".wing.quantum"); + GameRegistry.registerItem(quantumWing, "QuantumWing"); + + taintedThorHammer = new ItemThorHammerBroken().setUnlocalizedName(ModInformation.modid + ".hammer.broken"); + GameRegistry.registerItem(taintedThorHammer, "TaintedMjolnir"); + thorHammer = new ItemThorHammer().setUnlocalizedName(ModInformation.modid + ".hammer"); + GameRegistry.registerItem(thorHammer, "Mjolnir"); + electricThorHammer = new ItemElectricThorHammer().setUnlocalizedName(ModInformation.modid + ".hammer.electric"); + GameRegistry.registerItem(electricThorHammer, "SuperchargedMjolnir"); + + thaumiumDrill = new ItemThaumiumDrill().setUnlocalizedName(ModInformation.modid + ".drill.thaumium"); + GameRegistry.registerItem(thaumiumDrill, "ThaumiumDrill"); + + diamondChainsaw = new ItemDiamondChainsaw().setUnlocalizedName(ModInformation.modid + ".chainsaw.diamond"); + GameRegistry.registerItem(diamondChainsaw, "DiamondChainsaw"); + thaumiumChainsaw = new ItemThaumiumChainsaw().setUnlocalizedName(ModInformation.modid + ".chainsaw.thaumium"); + GameRegistry.registerItem(thaumiumChainsaw, "ThaumiumChainsaw"); + + ironOmnitool = new ItemOmnitoolIron().setUnlocalizedName(ModInformation.modid + ".omnitool.iron"); + GameRegistry.registerItem(ironOmnitool, "Omnitool"); + diamondOmnitool = new ItemOmnitoolDiamond().setUnlocalizedName(ModInformation.modid + ".omnitool.diamond"); + GameRegistry.registerItem(diamondOmnitool, "Diamond Omnitool"); + thaumiumOmnitool = new ItemOmnitoolThaumium().setUnlocalizedName(ModInformation.modid + ".omnitool.thaumium"); + GameRegistry.registerItem(thaumiumOmnitool, "ThaumiumOmnitool"); + + streamChainsaw = new ItemStreamChainsaw().setUnlocalizedName(ModInformation.modid + ".chainsaw.stream"); + GameRegistry.registerItem(streamChainsaw, "ChainsawStream"); + rockbreakerDrill = new ItemRockbreakerDrill().setUnlocalizedName(ModInformation.modid + ".drill.rockbreaker"); + GameRegistry.registerItem(rockbreakerDrill, "DrillRockbreaker"); + electricHoeGrowth = new ItemElectricHoeGrowth().setUnlocalizedName(ModInformation.modid + ".hoeofgrowth.electric"); + GameRegistry.registerItem(electricHoeGrowth, "ElectricHoeGrowth"); + + explosionFocus = new ItemExplosionFocus(); + GameRegistry.registerItem(explosionFocus, "ExplosionFocus"); + christmasFocus = new ItemChristmasFocus(); + GameRegistry.registerItem(christmasFocus, "ChristmasFocus"); + shieldFocus = new ItemShieldFocus(); + GameRegistry.registerItem(shieldFocus, "ShieldFocus"); + chargeFocus = new ItemChargeFocus(); + GameRegistry.registerItem(chargeFocus, "ChargingFocus"); + wandChargeFocus = new ItemWandChargingFocus(); + GameRegistry.registerItem(wandChargeFocus, "WandChargingFocus"); + } } diff --git a/src/main/java/tombenpotter/emt/common/module/ic2/IC2ModuleTERegistry.java b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/IC2TERegistry.java similarity index 98% rename from src/main/java/tombenpotter/emt/common/module/ic2/IC2ModuleTERegistry.java rename to src/main/java/tombenpotter/emt/common/modules/ic2/tile/IC2TERegistry.java index 0a713e7..812dad1 100644 --- a/src/main/java/tombenpotter/emt/common/module/ic2/IC2ModuleTERegistry.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/IC2TERegistry.java @@ -10,7 +10,7 @@ * http://www.minecraftforum.net/topic/1585216- ******************************************************************************/ -package tombenpotter.emt.common.module.ic2; +package tombenpotter.emt.common.modules.ic2.tile; import cpw.mods.fml.common.registry.GameRegistry; import tombenpotter.emt.common.modules.base.tile.TileEntityPortableNode; @@ -39,7 +39,7 @@ import tombenpotter.emt.common.module.ic2.tile.solars.water.TileEntityDoubleWate import tombenpotter.emt.common.module.ic2.tile.solars.water.TileEntityTripleWaterSolar; import tombenpotter.emt.common.module.ic2.tile.solars.water.TileEntityWaterSolar; -public class IC2ModuleTERegistry { +public class IC2TERegistry { public static void registerTEs() { diff --git a/src/main/java/tombenpotter/emt/common/util/CreativeTabEMT.java b/src/main/java/tombenpotter/emt/common/util/CreativeTabEMT.java index 30ede79..b373616 100644 --- a/src/main/java/tombenpotter/emt/common/util/CreativeTabEMT.java +++ b/src/main/java/tombenpotter/emt/common/util/CreativeTabEMT.java @@ -15,7 +15,7 @@ package tombenpotter.emt.common.util; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.module.ic2.IC2ModuleItemRegistry; +import tombenpotter.emt.common.modules.ic2.items.IC2ItemRegistry; public class CreativeTabEMT extends CreativeTabs { @@ -26,7 +26,7 @@ public class CreativeTabEMT extends CreativeTabs { @Override public ItemStack getIconItemStack() { - return new ItemStack(IC2ModuleItemRegistry.thorHammer); + return new ItemStack(IC2ItemRegistry.thorHammer); } @Override diff --git a/src/main/java/tombenpotter/emt/common/util/DungeonChestGenerator.java b/src/main/java/tombenpotter/emt/common/util/DungeonChestGenerator.java index fe30f7d..1ff98e0 100644 --- a/src/main/java/tombenpotter/emt/common/util/DungeonChestGenerator.java +++ b/src/main/java/tombenpotter/emt/common/util/DungeonChestGenerator.java @@ -3,16 +3,16 @@ package tombenpotter.emt.common.util; import net.minecraft.item.ItemStack; import net.minecraft.util.WeightedRandomChestContent; import net.minecraftforge.common.ChestGenHooks; -import tombenpotter.emt.common.module.ic2.IC2ModuleItemRegistry; +import tombenpotter.emt.common.modules.ic2.items.IC2ItemRegistry; public class DungeonChestGenerator { public static void generateLoot() { if (!ConfigHandler.thorHammerResearch) { - ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(IC2ModuleItemRegistry.taintedThorHammer), 0, 1, ConfigHandler.chanceTaintedMjolnir)); + ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(IC2ItemRegistry.taintedThorHammer), 0, 1, ConfigHandler.chanceTaintedMjolnir)); } if (!ConfigHandler.oneRingSpawn) { - ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(IC2ModuleItemRegistry.emtBauble, 1, 2), 0, 1, ConfigHandler.chanceOneRing)); + ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(IC2ItemRegistry.emtBauble, 1, 2), 0, 1, ConfigHandler.chanceOneRing)); } } } diff --git a/src/main/java/tombenpotter/emt/common/util/EntityEventHandler.java b/src/main/java/tombenpotter/emt/common/util/EntityEventHandler.java index 67d2bd3..efb6b65 100644 --- a/src/main/java/tombenpotter/emt/common/util/EntityEventHandler.java +++ b/src/main/java/tombenpotter/emt/common/util/EntityEventHandler.java @@ -6,7 +6,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraftforge.event.entity.living.LivingDropsEvent; import thaumcraft.common.entities.monster.EntityTaintChicken; -import tombenpotter.emt.common.module.ic2.IC2ModuleItemRegistry; +import tombenpotter.emt.common.modules.ic2.items.IC2ItemRegistry; public class EntityEventHandler { @@ -17,11 +17,11 @@ public class EntityEventHandler { if (event.entityLiving instanceof EntityCreeper) { EntityCreeper creeper = (EntityCreeper) event.entityLiving; if (creeper.getPowered()) { - event.entityLiving.entityDropItem(new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 6), 1); + event.entityLiving.entityDropItem(new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 6), 1); } } if (event.entityLiving instanceof EntityTaintChicken) { - event.entityLiving.entityDropItem(new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 14), 1); + event.entityLiving.entityDropItem(new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 14), 1); } } } diff --git a/src/main/java/tombenpotter/emt/common/util/EventHandlerEMT.java b/src/main/java/tombenpotter/emt/common/util/EventHandlerEMT.java index bbd6344..ee76e26 100644 --- a/src/main/java/tombenpotter/emt/common/util/EventHandlerEMT.java +++ b/src/main/java/tombenpotter/emt/common/util/EventHandlerEMT.java @@ -23,7 +23,7 @@ import net.minecraftforge.event.entity.living.LivingDropsEvent; import thaumcraft.common.entities.monster.EntityTaintChicken; import tombenpotter.emt.ElectroMagicTools; import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.module.ic2.IC2ModuleItemRegistry; +import tombenpotter.emt.common.modules.ic2.items.IC2ItemRegistry; import tombenpotter.emt.common.modules.base.items.ItemShardCarver; public class EventHandlerEMT { @@ -34,19 +34,19 @@ public class EventHandlerEMT { if (event.entityLiving instanceof EntityCreeper) { EntityCreeper creeper = (EntityCreeper) event.entityLiving; if (creeper.getPowered()) { - event.drops.add(new EntityItem(event.entityLiving.worldObj, event.entityLiving.posX, event.entityLiving.posY, event.entityLiving.posZ, new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 6))); + event.drops.add(new EntityItem(event.entityLiving.worldObj, event.entityLiving.posX, event.entityLiving.posY, event.entityLiving.posZ, new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 6))); } } if (event.entityLiving instanceof EntityTaintChicken) { - event.drops.add(new EntityItem(event.entityLiving.worldObj, event.entityLiving.posX, event.entityLiving.posY, event.entityLiving.posZ, new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 1, 14))); + event.drops.add(new EntityItem(event.entityLiving.worldObj, event.entityLiving.posX, event.entityLiving.posY, event.entityLiving.posZ, new ItemStack(IC2ItemRegistry.itemEMTItems, 1, 14))); } } if (event.entityLiving instanceof EntityCreeper) { - event.entityLiving.entityDropItem(new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 6), 1); + event.entityLiving.entityDropItem(new ItemStack(IC2ItemRegistry.itemEMTItems, 6), 1); } if (event.entityLiving instanceof EntityTaintChicken) { - event.entityLiving.entityDropItem(new ItemStack(IC2ModuleItemRegistry.itemEMTItems, 14), 1); + event.entityLiving.entityDropItem(new ItemStack(IC2ItemRegistry.itemEMTItems, 14), 1); } } diff --git a/src/main/java/tombenpotter/emt/common/util/RegistryHandler.java b/src/main/java/tombenpotter/emt/common/util/RegistryHandler.java index 776e60b..8291ee7 100644 --- a/src/main/java/tombenpotter/emt/common/util/RegistryHandler.java +++ b/src/main/java/tombenpotter/emt/common/util/RegistryHandler.java @@ -1,33 +1,11 @@ package tombenpotter.emt.common.util; -import tombenpotter.emt.common.module.ic2.IC2ModuleBlockRegistry; -import tombenpotter.emt.common.module.ic2.IC2ModuleItemRegistry; -import tombenpotter.emt.common.module.ic2.IC2ModuleResearch; -import tombenpotter.emt.common.module.ic2.IC2ModuleTERegistry; -import tombenpotter.emt.common.module.vanilla.VanillaBlocksRegistry; -import tombenpotter.emt.common.module.vanilla.VanillaItemsRegistry; -import tombenpotter.emt.common.module.vanilla.VanillaRecipesRegistry; +import tombenpotter.emt.common.modules.ic2.IC2Research; public class RegistryHandler { - public static void registerVanillaRegistrys() { - VanillaBlocksRegistry.registerBlocks(); - VanillaItemsRegistry.registerItems(); - VanillaRecipesRegistry.registerRecipes(); - } - - public static void registerIc2Registrys() { - IC2ModuleItemRegistry.registerItems(); - IC2ModuleBlockRegistry.registerBlocks(); - IC2ModuleTERegistry.registerTEs(); - } - public static void registerIc2PostRegistrys() { - IC2ModuleResearch.addResearchTab(); - IC2ModuleResearch.addResearch(); - } - - public static void registerTeRegistrys() { - + IC2Research.addResearchTab(); + IC2Research.addResearch(); } }