some new textures, cleanup.

This commit is contained in:
fewizz committed 2015-07-25 01:12:33 +03:00
1 parent 96ebbf9d05
commit 0fd5269d7b
74 files changed
+118 -267

No files matched your search

@@ -4,7 +4,7 @@ public class ModInformation {
public static final String name = "Electro-Magic Tools";
public static final String modid = "EMT";
public static final String version = "2.0.0Alpha4";
public static final String version = "1.2.0";
public static final String texturePath = "electromagictools";
public static final String guiFactory = "tombenpotter.emt.client.gui.config.EMTGuiFactory";
public static final String clientProxy = "tombenpotter.emt.proxies.ClientProxy";
@@ -27,7 +27,6 @@ public class EMTGuiConfig extends GuiConfig {
list.add(new ConfigElement<ConfigCategory>(config.getCategory(CATEGORY_VALUES.toLowerCase())));
list.add(new ConfigElement<ConfigCategory>(config.getCategory(CATEGORY_RESEARCH.toLowerCase())));
list.add(new ConfigElement<ConfigCategory>(config.getCategory(CATEGORY_OUTPUTS.toLowerCase())));
list.add(new ConfigElement<ConfigCategory>(config.getCategory(CATEGORY_MODULES.toLowerCase())));
return list;
}
@@ -10,7 +10,7 @@
* http://www.minecraftforum.net/topic/1585216-
******************************************************************************/
package tombenpotter.emt;
package tombenpotter.emt.common;
import ic2.api.item.IC2Items;
import net.minecraft.item.ItemStack;
@@ -14,6 +14,7 @@ package tombenpotter.emt.common;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.registry.GameRegistry;
import ic2.api.item.ElectricItem;
import ic2.api.item.IC2Items;
import ic2.api.recipe.IRecipeInput;
import ic2.api.recipe.RecipeInputItemStack;
@@ -37,6 +38,7 @@ import tombenpotter.emt.common.blocks.BlockRegistry;
import tombenpotter.emt.common.items.ItemRegistry;
import tombenpotter.emt.common.util.ConfigHandler;
import tombenpotter.emt.common.util.CraftingAspects;
import tombenpotter.emt.common.util.RandomHelper;
import tombenpotter.emt.common.util.TextHelper;
import java.util.Iterator;
@@ -48,8 +50,8 @@ public class RecipeRegistry {
private static void registerShapedRecipes() {
/** Crafting Recipes **/
ironOmnitool = GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.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(ItemRegistry.diamondChainsaw), " X ", "XYX", 'X', new ItemStack(Items.diamond), 'Y', new ItemStack(IC2Items.getItem("chainsaw").getItem(), 1, OreDictionary.WILDCARD_VALUE));
ironOmnitool = GameRegistry.addShapedRecipe(RandomHelper.getChargedItem(ItemRegistry.ironOmnitool, 10), "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(RandomHelper.getChargedItem(ItemRegistry.diamondChainsaw, 10), " X ", "XYX", 'X', new ItemStack(Items.diamond), 'Y', new ItemStack(IC2Items.getItem("chainsaw").getItem(), 1, OreDictionary.WILDCARD_VALUE));
ductTape = GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.itemEMTItems, 1, 9), "XXX", "YYY", "XXX", 'X', new ItemStack(ItemRegistry.itemEMTItems, 1, 8), 'Y', new ItemStack(Items.paper));
featherMesh = GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.itemEMTItems, 1, 7), "XYX", "YXY", "XYX", 'X', new ItemStack(Items.feather), 'Y', new ItemStack(ItemRegistry.itemEMTItems, 1, 9));
featherWing = GameRegistry.addShapedRecipe(new ItemStack(ItemRegistry.itemEMTItems, 1, 12), "XYZ", "XYZ", "XYZ", 'X', new ItemStack(ItemRegistry.itemEMTItems, 1, 7), 'Y', new ItemStack(ItemRegistry.itemEMTItems, 1, 8), 'Z', new ItemStack(ItemRegistry.itemEMTItems, 1, 11));
@@ -166,15 +168,15 @@ public class RecipeRegistry {
public static void registerLateRecipes() {
/** Infusion Recipes **/
thaumiumDrill = ThaumcraftApi.addInfusionCraftingRecipe("Thaumium Drill", new ItemStack(ItemRegistry.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(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), IC2Items.getItem("denseplateiron")});
thaumiumDrill = ThaumcraftApi.addInfusionCraftingRecipe("Thaumium Drill", RandomHelper.getChargedItem(ItemRegistry.thaumiumDrill, 10), 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(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), IC2Items.getItem("denseplateiron")});
thaumiumChainsaw = ThaumcraftApi.addInfusionCraftingRecipe("Thaumium Chainsaw", new ItemStack(ItemRegistry.thaumiumChainsaw), 5, CraftingAspects.thaumiumChainsawCrafting, new ItemStack(ItemRegistry.diamondChainsaw, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Items.diamond), new ItemStack(Items.diamond), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), IC2Items.getItem("denseplateiron")});
thaumiumChainsaw = ThaumcraftApi.addInfusionCraftingRecipe("Thaumium Chainsaw", RandomHelper.getChargedItem(ItemRegistry.thaumiumChainsaw, 10), 5, CraftingAspects.thaumiumChainsawCrafting, new ItemStack(ItemRegistry.diamondChainsaw, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Items.diamond), new ItemStack(Items.diamond), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), IC2Items.getItem("denseplateiron")});
thaumicQuantumHelmet = ThaumcraftApi.addInfusionCraftingRecipe("Quantum Goggles of Revealing", new ItemStack(ItemRegistry.quantumThaumicHelmet), 6, CraftingAspects.thaumicQuantumHelmetCrafting, new ItemStack(ItemRegistry.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(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("advancedCircuit")});
thaumicQuantumHelmet = ThaumcraftApi.addInfusionCraftingRecipe("Quantum Goggles of Revealing", RandomHelper.getChargedItem(ItemRegistry.quantumThaumicHelmet, 10), 6, CraftingAspects.thaumicQuantumHelmetCrafting, new ItemStack(ItemRegistry.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(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("advancedCircuit")});
thaumicNanoHelmet = ThaumcraftApi.addInfusionCraftingRecipe("Nanosuit Goggles of Revealing", new ItemStack(ItemRegistry.nanoThaumicHelmet), 5, CraftingAspects.thaumicNanoHelmetCrafting, new ItemStack(ItemRegistry.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(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), IC2Items.getItem("carbonPlate"), IC2Items.getItem("electronicCircuit")});
thaumicNanoHelmet = ThaumcraftApi.addInfusionCraftingRecipe("Nanosuit Goggles of Revealing", RandomHelper.getChargedItem(ItemRegistry.nanoThaumicHelmet, 10), 5, CraftingAspects.thaumicNanoHelmetCrafting, new ItemStack(ItemRegistry.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(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), IC2Items.getItem("carbonPlate"), IC2Items.getItem("electronicCircuit")});
thaumiumOmnitool = ThaumcraftApi.addInfusionCraftingRecipe("Thaumium Omnitool", new ItemStack(ItemRegistry.thaumiumOmnitool), 6, CraftingAspects.thaumiumOmnitoolCrafting, new ItemStack(ItemRegistry.thaumiumChainsaw, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(ItemRegistry.thaumiumDrill, 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), IC2Items.getItem("carbonPlate"), IC2Items.getItem("plateobsidian")});
thaumiumOmnitool = ThaumcraftApi.addInfusionCraftingRecipe("Thaumium Omnitool", RandomHelper.getChargedItem(ItemRegistry.thaumiumOmnitool, 10), 6, CraftingAspects.thaumiumOmnitoolCrafting, new ItemStack(ItemRegistry.thaumiumChainsaw, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(ItemRegistry.thaumiumDrill, 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), IC2Items.getItem("carbonPlate"), IC2Items.getItem("plateobsidian")});
diamondOmnitoolToThaumium = ThaumcraftApi.addInfusionCraftingRecipe("Thaumium Omnitool", new ItemStack(ItemRegistry.thaumiumOmnitool), 6, CraftingAspects.thaumiumOmnitoolCrafting, new ItemStack(ItemRegistry.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")});
@@ -184,29 +186,29 @@ public class RecipeRegistry {
potentiaGenerator = ThaumcraftApi.addInfusionCraftingRecipe("Potentia Generator", new ItemStack(BlockRegistry.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(ItemRegistry.streamChainsaw), 6, CraftingAspects.streamChaisnawCrafting, new ItemStack(ItemRegistry.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")});
streamChainsaw = ThaumcraftApi.addInfusionCraftingRecipe("Chainsaw of the Stream", RandomHelper.getChargedItem(ItemRegistry.streamChainsaw, 10), 6, CraftingAspects.streamChaisnawCrafting, new ItemStack(ItemRegistry.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(ItemRegistry.rockbreakerDrill), 6, CraftingAspects.rockbreakerDrillCrafting, new ItemStack(ItemRegistry.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")});
rockbreakerDrill = ThaumcraftApi.addInfusionCraftingRecipe("Drill of the Rockbreaker", RandomHelper.getChargedItem(ItemRegistry.rockbreakerDrill, 10), 6, CraftingAspects.rockbreakerDrillCrafting, new ItemStack(ItemRegistry.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(ItemRegistry.thorHammer), 7, CraftingAspects.thorHammerCrafting, new ItemStack(ItemRegistry.taintedThorHammer, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(ItemRegistry.itemEMTItems, 1, 6), new ItemStack(ItemRegistry.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(ItemRegistry.electricThorHammer), 10, CraftingAspects.superchargedThorHammerCrafting, new ItemStack(ItemRegistry.thorHammer, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(ItemRegistry.itemEMTItems, 1, 6), new ItemStack(ItemRegistry.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)});
superchargedThorHammer = ThaumcraftApi.addInfusionCraftingRecipe("Supercharged Mjolnir", RandomHelper.getChargedItem(ItemRegistry.electricThorHammer, 10), 10, CraftingAspects.superchargedThorHammerCrafting, new ItemStack(ItemRegistry.thorHammer, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(ItemRegistry.itemEMTItems, 1, 6), new ItemStack(ItemRegistry.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(BlockRegistry.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(ItemRegistry.solarHelmetRevealing), 5, CraftingAspects.solarHelmetRevealing, new ItemStack(ItemRegistry.quantumThaumicHelmet, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(BlockRegistry.emtSolars, 1, 1), IC2Items.getItem("glassFiberCableItem"), new ItemStack(IC2Items.getItem("lapotronCrystal").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ConfigItems.itemShard, 1, 4)});
solarHelmetRevealing = ThaumcraftApi.addInfusionCraftingRecipe("Solar Helmet of Revealing", RandomHelper.getChargedItem(ItemRegistry.solarHelmetRevealing, 10), 5, CraftingAspects.solarHelmetRevealing, new ItemStack(ItemRegistry.quantumThaumicHelmet, 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(BlockRegistry.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(ItemRegistry.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)});
electricBootsTravel = ThaumcraftApi.addInfusionCraftingRecipe("Electric Boots of the Traveller", RandomHelper.getChargedItem(ItemRegistry.electricBootsTraveller, 10), 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(ItemRegistry.nanoBootsTraveller), 2, CraftingAspects.nanoBootsTravel, new ItemStack(ItemRegistry.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)});
nanoBootsTravel = ThaumcraftApi.addInfusionCraftingRecipe("Nano Boots of the Traveller", RandomHelper.getChargedItem(ItemRegistry.nanoBootsTraveller, 10), 2, CraftingAspects.nanoBootsTravel, new ItemStack(ItemRegistry.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(ItemRegistry.quantumBootsTraveller), 2, CraftingAspects.quantumBootsTravel, new ItemStack(ItemRegistry.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")});
quantumBootsTravel = ThaumcraftApi.addInfusionCraftingRecipe("Quantum Boots of the Traveller", RandomHelper.getChargedItem(ItemRegistry.quantumBootsTraveller, 10), 2, CraftingAspects.quantumBootsTravel, new ItemStack(ItemRegistry.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(BlockRegistry.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(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5)});
tripleCompressedSolar = ThaumcraftApi.addInfusionCraftingRecipe("Compressed Solars", new ItemStack(BlockRegistry.emtSolars, 1, 2), 2, CraftingAspects.compressedSolars, new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack[]{new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 1), new ItemStack(BlockRegistry.emtSolars, 1, 1)});
electricHoeGrowth = ThaumcraftApi.addInfusionCraftingRecipe("Electric Hoe of Growth", new ItemStack(ItemRegistry.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)});
electricHoeGrowth = ThaumcraftApi.addInfusionCraftingRecipe("Electric Hoe of Growth", RandomHelper.getChargedItem(ItemRegistry.electricHoeGrowth, 10), 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(ItemRegistry.chargeFocus), 4, CraftingAspects.chargeFocus, new ItemStack(IC2Items.getItem("advBattery").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{IC2Items.getItem("generator"), IC2Items.getItem("batBox"), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ItemRegistry.itemEMTItems, 1, 5), new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE), new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE)});
@@ -216,21 +218,21 @@ public class RecipeRegistry {
armorChargingRing = ThaumcraftApi.addInfusionCraftingRecipe("Armor Charging Ring", new ItemStack(ItemRegistry.emtBauble, 1, 0), 6, CraftingAspects.armorChargingRing, new ItemStack(ConfigItems.itemBaubleBlanks, 1, 1), new ItemStack[]{new ItemStack(ItemRegistry.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(ItemRegistry.nanoWing), 4, CraftingAspects.nanoWing, new ItemStack(ItemRegistry.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)});
nanoWings = ThaumcraftApi.addInfusionCraftingRecipe("Nanosuit Wings", RandomHelper.getChargedItem(ItemRegistry.nanoWing, 10), 4, CraftingAspects.nanoWing, new ItemStack(ItemRegistry.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(ItemRegistry.quantumWing), 6, CraftingAspects.quantumWing, new ItemStack(ItemRegistry.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)});
quantumWings = ThaumcraftApi.addInfusionCraftingRecipe("Quantum Wings", RandomHelper.getChargedItem(ItemRegistry.quantumWing, 10), 6, CraftingAspects.quantumWing, new ItemStack(ItemRegistry.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)});
infusedQuantumArmor = ThaumcraftApi.addInfusionCraftingRecipe("InfusedQuantumArmor", new ItemStack(ItemRegistry.quantumArmor), 5, CraftingAspects.quantumWing, new ItemStack(IC2Items.getItem("quantumBodyarmor").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Items.diamond), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("iridiumPlate"), new ItemStack(BlockRegistry.shield), new ItemStack(BlockRegistry.shield)});
infusedQuantumArmor = ThaumcraftApi.addInfusionCraftingRecipe("InfusedQuantumArmor", RandomHelper.getChargedItem(ItemRegistry.quantumArmor, 10), 5, CraftingAspects.quantumWing, new ItemStack(IC2Items.getItem("quantumBodyarmor").getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack[]{new ItemStack(Items.diamond), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("iridiumPlate"), IC2Items.getItem("iridiumPlate"), new ItemStack(BlockRegistry.shield), new ItemStack(BlockRegistry.shield)});
/** Arcane Worktable Recipes **/
diamondOmnitool = ThaumcraftApi.addShapelessArcaneCraftingRecipe("Diamond Omnitool", new ItemStack(ItemRegistry.diamondOmnitool), CraftingAspects.diamondOmnitoolCrafting, new ItemStack(ItemRegistry.diamondChainsaw, 1, OreDictionary.WILDCARD_VALUE), new ItemStack(IC2Items.getItem("diamondDrill").getItem(), 1, OreDictionary.WILDCARD_VALUE));
diamondOmnitool = ThaumcraftApi.addShapelessArcaneCraftingRecipe("Diamond Omnitool", RandomHelper.getChargedItem(ItemRegistry.diamondOmnitool, 10), CraftingAspects.diamondOmnitoolCrafting, new ItemStack(ItemRegistry.diamondChainsaw, 1, OreDictionary.WILDCARD_VALUE), new ItemStack(IC2Items.getItem("diamondDrill").getItem(), 1, OreDictionary.WILDCARD_VALUE));
ironOmnitoolToDiamond = ThaumcraftApi.addArcaneCraftingRecipe("Diamond Omnitool", new ItemStack(ItemRegistry.diamondOmnitool), CraftingAspects.diamondOmnitoolCrafting, "XAX", "XBX", "XAX", 'X', new ItemStack(Items.diamond), 'A', IC2Items.getItem("advancedCircuit"), 'B', new ItemStack(ItemRegistry.ironOmnitool, 1, OreDictionary.WILDCARD_VALUE));
christmasFocus = ThaumcraftApi.addArcaneCraftingRecipe("Kris-tmas Focus", new ItemStack(ItemRegistry.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(ItemRegistry.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);
electricGoggles = ThaumcraftApi.addArcaneCraftingRecipe("Electric Goggles", RandomHelper.getChargedItem(ItemRegistry.electricGoggles, 10), 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(BlockRegistry.shield, 8), CraftingAspects.shieldBlockCrafting, "XYX", "X X", "XYX", 'X', new ItemStack(Blocks.glass), 'Y', new ItemStack(Blocks.obsidian));
@@ -240,7 +242,7 @@ public class RecipeRegistry {
doubleCompressedSolar = ThaumcraftApi.addArcaneCraftingRecipe("Compressed Solars", new ItemStack(BlockRegistry.emtSolars, 1, 1), CraftingAspects.compressedSolars, "XXX", "XXX", "XXX", 'X', new ItemStack(BlockRegistry.emtSolars, 1, 0));
electricScribingTools = ThaumcraftApi.addArcaneCraftingRecipe("Electric Scribing Tools", new ItemStack(ItemRegistry.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));
electricScribingTools = ThaumcraftApi.addArcaneCraftingRecipe("Electric Scribing Tools", RandomHelper.getChargedItem(ItemRegistry.electricScribingTools, 10), 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(ItemRegistry.itemEMTItems, 1, 14), CraftingAspects.thaumiumWing, "XYZ", "XYZ", "XYZ", 'X', new ItemStack(ItemRegistry.itemEMTItems, 1, 13), 'Y', new ItemStack(ItemRegistry.itemEMTItems, 1, 5), 'Z', IC2Items.getItem("plateiron"));
@@ -54,36 +54,36 @@ public class BlockEMTSolars extends BlockBaseContainer {
this.top[0] = ri.registerIcon(ModInformation.texturePath + ":solars/solartop");
this.top[1] = ri.registerIcon(ModInformation.texturePath + ":solars/doublesolartop");
this.top[2] = ri.registerIcon(ModInformation.texturePath + ":solars/triplesolartop");
this.top[3] = ri.registerIcon(ModInformation.texturePath + ":solars/water/solartop");
this.top[4] = ri.registerIcon(ModInformation.texturePath + ":solars/water/doublesolartop");
this.top[5] = ri.registerIcon(ModInformation.texturePath + ":solars/water/triplesolartop");
this.top[6] = ri.registerIcon(ModInformation.texturePath + ":solars/dark/solartop");
this.top[7] = ri.registerIcon(ModInformation.texturePath + ":solars/dark/doublesolartop");
this.top[8] = ri.registerIcon(ModInformation.texturePath + ":solars/dark/triplesolartop");
this.top[9] = ri.registerIcon(ModInformation.texturePath + ":solars/order/solartop");
this.top[10] = ri.registerIcon(ModInformation.texturePath + ":solars/order/doublesolartop");
this.top[11] = ri.registerIcon(ModInformation.texturePath + ":solars/order/triplesolartop");
this.top[12] = ri.registerIcon(ModInformation.texturePath + ":solars/fire/solartop");
this.top[13] = ri.registerIcon(ModInformation.texturePath + ":solars/fire/doublesolartop");
this.top[14] = ri.registerIcon(ModInformation.texturePath + ":solars/fire/triplesolartop");
this.top[15] = ri.registerIcon(ModInformation.texturePath + ":solars/air/solartop");
this.top[3] = ri.registerIcon(ModInformation.texturePath + ":solars/solartop");
this.top[4] = ri.registerIcon(ModInformation.texturePath + ":solars/doublesolartop");
this.top[5] = ri.registerIcon(ModInformation.texturePath + ":solars/triplesolartop");
this.top[6] = ri.registerIcon(ModInformation.texturePath + ":solars/solartop");
this.top[7] = ri.registerIcon(ModInformation.texturePath + ":solars/doublesolartop");
this.top[8] = ri.registerIcon(ModInformation.texturePath + ":solars/triplesolartop");
this.top[9] = ri.registerIcon(ModInformation.texturePath + ":solars/solartop");
this.top[10] = ri.registerIcon(ModInformation.texturePath + ":solars/doublesolartop");
this.top[11] = ri.registerIcon(ModInformation.texturePath + ":solars/triplesolartop");
this.top[12] = ri.registerIcon(ModInformation.texturePath + ":solars/solartop");
this.top[13] = ri.registerIcon(ModInformation.texturePath + ":solars/doublesolartop");
this.top[14] = ri.registerIcon(ModInformation.texturePath + ":solars/triplesolartop");
this.top[15] = ri.registerIcon(ModInformation.texturePath + ":solars/solartop");
this.bottom[0] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom");
this.bottom[1] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom");
this.bottom[2] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom");
this.bottom[3] = ri.registerIcon(ModInformation.texturePath + ":solars/water/waterbottom");
this.bottom[4] = ri.registerIcon(ModInformation.texturePath + ":solars/water/waterbottom");
this.bottom[5] = ri.registerIcon(ModInformation.texturePath + ":solars/water/waterbottom");
this.bottom[6] = ri.registerIcon(ModInformation.texturePath + ":solars/dark/darkbottom");
this.bottom[7] = ri.registerIcon(ModInformation.texturePath + ":solars/dark/darkbottom");
this.bottom[8] = ri.registerIcon(ModInformation.texturePath + ":solars/dark/darkbottom");
this.bottom[9] = ri.registerIcon(ModInformation.texturePath + ":solars/order/orderbottom");
this.bottom[10] = ri.registerIcon(ModInformation.texturePath + ":solars/order/orderbottom");
this.bottom[11] = ri.registerIcon(ModInformation.texturePath + ":solars/order/orderbottom");
this.bottom[12] = ri.registerIcon(ModInformation.texturePath + ":solars/fire/firebottom");
this.bottom[13] = ri.registerIcon(ModInformation.texturePath + ":solars/fire/firebottom");
this.bottom[14] = ri.registerIcon(ModInformation.texturePath + ":solars/fire/firebottom");
this.bottom[15] = ri.registerIcon(ModInformation.texturePath + ":solars/air/airbottom");
this.bottom[3] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom");
this.bottom[4] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom");
this.bottom[5] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom");
this.bottom[6] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom");
this.bottom[7] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom");
this.bottom[8] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom");
this.bottom[9] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom");
this.bottom[10] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom");
this.bottom[11] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom");
this.bottom[12] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom");
this.bottom[13] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom");
this.bottom[14] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom");
this.bottom[15] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom");
this.frontOff[0] = ri.registerIcon(ModInformation.texturePath + ":solars/side");
this.frontOff[1] = ri.registerIcon(ModInformation.texturePath + ":solars/side");
@@ -105,19 +105,19 @@ public class BlockEMTSolars extends BlockBaseContainer {
this.side[0] = ri.registerIcon(ModInformation.texturePath + ":solars/side");
this.side[1] = ri.registerIcon(ModInformation.texturePath + ":solars/side");
this.side[2] = ri.registerIcon(ModInformation.texturePath + ":solars/side");
this.side[3] = ri.registerIcon(ModInformation.texturePath + ":solars/water/waterside");
this.side[4] = ri.registerIcon(ModInformation.texturePath + ":solars/water/waterside");
this.side[5] = ri.registerIcon(ModInformation.texturePath + ":solars/water/waterside");
this.side[6] = ri.registerIcon(ModInformation.texturePath + ":solars/dark/darkside");
this.side[7] = ri.registerIcon(ModInformation.texturePath + ":solars/dark/darkside");
this.side[8] = ri.registerIcon(ModInformation.texturePath + ":solars/dark/darkside");
this.side[9] = ri.registerIcon(ModInformation.texturePath + ":solars/order/orderside");
this.side[10] = ri.registerIcon(ModInformation.texturePath + ":solars/order/orderside");
this.side[11] = ri.registerIcon(ModInformation.texturePath + ":solars/order/orderside");
this.side[12] = ri.registerIcon(ModInformation.texturePath + ":solars/fire/fireside");
this.side[13] = ri.registerIcon(ModInformation.texturePath + ":solars/fire/fireside");
this.side[14] = ri.registerIcon(ModInformation.texturePath + ":solars/fire/fireside");
this.side[15] = ri.registerIcon(ModInformation.texturePath + ":solars/air/airside");
this.side[3] = ri.registerIcon(ModInformation.texturePath + ":solars/side");
this.side[4] = ri.registerIcon(ModInformation.texturePath + ":solars/side");
this.side[5] = ri.registerIcon(ModInformation.texturePath + ":solars/side");
this.side[6] = ri.registerIcon(ModInformation.texturePath + ":solars/side");
this.side[7] = ri.registerIcon(ModInformation.texturePath + ":solars/side");
this.side[8] = ri.registerIcon(ModInformation.texturePath + ":solars/side");
this.side[9] = ri.registerIcon(ModInformation.texturePath + ":solars/side");
this.side[10] = ri.registerIcon(ModInformation.texturePath + ":solars/side");
this.side[11] = ri.registerIcon(ModInformation.texturePath + ":solars/side");
this.side[12] = ri.registerIcon(ModInformation.texturePath + ":solars/side");
this.side[13] = ri.registerIcon(ModInformation.texturePath + ":solars/side");
this.side[14] = ri.registerIcon(ModInformation.texturePath + ":solars/side");
this.side[15] = ri.registerIcon(ModInformation.texturePath + ":solars/side");
}
@SideOnly(Side.CLIENT)
@@ -40,17 +40,17 @@ public class BlockEMTSolars2 extends BlockBaseContainer {
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister ri) {
this.top[0] = ri.registerIcon(ModInformation.texturePath + ":solars/air/doublesolartop");
this.top[1] = ri.registerIcon(ModInformation.texturePath + ":solars/air/triplesolartop");
this.top[2] = ri.registerIcon(ModInformation.texturePath + ":solars/earth/solartop");
this.top[3] = ri.registerIcon(ModInformation.texturePath + ":solars/earth/doublesolartop");
this.top[4] = ri.registerIcon(ModInformation.texturePath + ":solars/earth/triplesolartop");
this.top[0] = ri.registerIcon(ModInformation.texturePath + ":solars/solartop");
this.top[1] = ri.registerIcon(ModInformation.texturePath + ":solars/solartop");
this.top[2] = ri.registerIcon(ModInformation.texturePath + ":solars/solartop");
this.top[3] = ri.registerIcon(ModInformation.texturePath + ":solars/doublesolartop");
this.top[4] = ri.registerIcon(ModInformation.texturePath + ":solars/triplesolartop");
this.bottom[0] = ri.registerIcon(ModInformation.texturePath + ":solars/air/airbottom");
this.bottom[1] = ri.registerIcon(ModInformation.texturePath + ":solars/air/airbottom");
this.bottom[2] = ri.registerIcon(ModInformation.texturePath + ":solars/earth/earthbottom");
this.bottom[3] = ri.registerIcon(ModInformation.texturePath + ":solars/earth/earthbottom");
this.bottom[4] = ri.registerIcon(ModInformation.texturePath + ":solars/earth/earthbottom");
this.bottom[0] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom");
this.bottom[1] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom");
this.bottom[2] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom");
this.bottom[3] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom");
this.bottom[4] = ri.registerIcon(ModInformation.texturePath + ":solars/bottom");
this.frontOff[0] = ri.registerIcon(ModInformation.texturePath + ":solars/air/airside");
this.frontOff[1] = ri.registerIcon(ModInformation.texturePath + ":solars/air/airside");
@@ -58,11 +58,11 @@ public class BlockEMTSolars2 extends BlockBaseContainer {
this.frontOff[3] = ri.registerIcon(ModInformation.texturePath + ":solars/earth/earthside");
this.frontOff[4] = ri.registerIcon(ModInformation.texturePath + ":solars/earth/earthside");
this.side[0] = ri.registerIcon(ModInformation.texturePath + ":solars/air/airside");
this.side[1] = ri.registerIcon(ModInformation.texturePath + ":solars/air/airside");
this.side[2] = ri.registerIcon(ModInformation.texturePath + ":solars/earth/earthside");
this.side[3] = ri.registerIcon(ModInformation.texturePath + ":solars/earth/earthside");
this.side[4] = ri.registerIcon(ModInformation.texturePath + ":solars/earth/earthside");
this.side[0] = ri.registerIcon(ModInformation.texturePath + ":solars/side");
this.side[1] = ri.registerIcon(ModInformation.texturePath + ":solars/side");
this.side[2] = ri.registerIcon(ModInformation.texturePath + ":solars/side");
this.side[3] = ri.registerIcon(ModInformation.texturePath + ":solars/side");
this.side[4] = ri.registerIcon(ModInformation.texturePath + ":solars/side");
}
@SideOnly(Side.CLIENT)
@@ -22,7 +22,7 @@ public class BlockRegistry {
public static Block emtSolars;
public static Block emtMachines;
public static Block emtSolars2;
public static Block essentiaGenerator;
//public static Block essentiaGenerator;
public static void registerBlocks() {
@@ -44,7 +44,7 @@ public class BlockRegistry {
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");
//essentiaGenerator = new BlockEssentiaGenerator().setBlockName(ModInformation.modid + ".essentiaGenerator");
//GameRegistry.registerBlock(essentiaGenerator, ItemBlockEssentiaGenerator.class, "Essentia Generator");
}
}
@@ -79,8 +79,6 @@ public class ItemRegistry {
public static ItemArmor.ArmorMaterial featherWingMaterial = EnumHelper.addArmorMaterial("FEATEHRWiNG", 1, new int[]{2, 2, 2, 2}, 6);
public static void registerItems() {
quantumArmor = new ItemEMTQuantum(InternalName.itemArmorQuantumChestplate, 1).setUnlocalizedName(ModInformation.modid + "quantum");
itemEMTItems = new ItemMaterials().setUnlocalizedName(ModInformation.modid + ".emtitems");
GameRegistry.registerItem(itemEMTItems, "EMTItems");
@@ -90,6 +88,8 @@ public class ItemRegistry {
onering = new ItemOneRing();
GameRegistry.registerItem(onering, "BaseBaubles");
quantumArmor = new ItemEMTQuantum(InternalName.itemArmorQuantumChestplate, 1).setUnlocalizedName(ModInformation.modid + ".quantum");
electricGoggles = new ItemElectricGoggles(ItemArmor.ArmorMaterial.IRON, 3, 0).setUnlocalizedName(ModInformation.modid + ".goggles.electric");
GameRegistry.registerItem(electricGoggles, "ElectricGogglesRevealing");
@@ -394,8 +394,8 @@ public class ItemEMTQuantum extends ItemArmorElectric {
@Override
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) {
list.add(String.valueOf((int)ElectricItem.manager.getCharge(stack)) + " EU");
if((stack.stackTagCompound.getString("useother")).equals("Jetpack")){
list.add(String.valueOf((int)ElectricItem.manager.getCharge(stack)) + "EU");
if((stack.stackTagCompound.getString("useother")).equals("Jetpack")){
list.add((stack.stackTagCompound.getInteger("jetpackCharge")) + " EU JETPACK");
}
if((stack.stackTagCompound.getString("useother")).equals("NW")){
@@ -29,7 +29,7 @@ public abstract class ItemBaseFocus extends ItemFocusBasic {
public ItemBaseFocus(String unlocName, String textureName) {
super();
setUnlocalizedName(ModInformation.modid + ".module." + unlocName);
setUnlocalizedName(ModInformation.modid + unlocName);
setCreativeTab(ElectroMagicTools.tabEMT);
setMaxDamage(1);
setNoRepair();
@@ -29,7 +29,7 @@ public class ItemChargeFocus extends ItemBaseFocus {
private static final AspectList visCost = new AspectList().add(Aspect.FIRE, 10).add(Aspect.WATER, 10).add(Aspect.AIR, 10).add(Aspect.EARTH, 10).add(Aspect.ORDER, 10).add(Aspect.ENTROPY, 10);
public ItemChargeFocus() {
super("ic2.focus.charge", "focus_charge");
super(".focus.charge", "focus_charge");
}
@Override
@@ -33,7 +33,7 @@ public class ItemChristmasFocus extends ItemBaseFocus {
private static final AspectList visCost = new AspectList().add(Aspect.ORDER, 500).add(Aspect.AIR, 500);
public ItemChristmasFocus() {
super("base.focus.christmas", "focus_christmas" );
super(".focus.christmas", "focus_christmas" );
}
@Override
@@ -27,7 +27,7 @@ public class ItemExplosionFocus extends ItemBaseFocus {
private static final AspectList visCost = new AspectList().add(Aspect.FIRE, 200).add(Aspect.ENTROPY, 200);
public ItemExplosionFocus() {
super("base.focus.explosion", "focus_explosion");
super(".focus.explosion", "focus_explosion");
}
@Override
@@ -32,7 +32,7 @@ public class ItemShieldFocus extends ItemBaseFocus {
private static final AspectList visCost = new AspectList().add(Aspect.ORDER, 10).add(Aspect.WATER, 10).add(Aspect.AIR, 10);
public ItemShieldFocus() {
super("base.focus.shield", "focus_shield");
super(".focus.shield", "focus_shield");
}
@Override
@@ -14,7 +14,7 @@ public class ItemWandChargingFocus extends ItemBaseFocus {
AspectList visCost = new AspectList().add(Aspect.FIRE, 10).add(Aspect.WATER, 10).add(Aspect.AIR, 10).add(Aspect.EARTH, 10).add(Aspect.ORDER, 10).add(Aspect.ENTROPY, 10);
public ItemWandChargingFocus() {
super("ic2.focus.charge.wand", "focus_wandCharge");
super(".focus.charge.wand", "focus_wandCharge");
}
@Override
@@ -13,7 +13,6 @@ public class ConfigHandler {
public static String CATEGORY_RESEARCH = "Research";
public static String CATEGORY_VALUES = "Numeric Values";
public static String CATEGORY_OUTPUTS = "Essentia Generator Outputs";
public static String CATEGORY_MODULES = "Modules";
public static int essentiaGeneratorsDelay;
public static int etherealProcessorBaseSpeed;
@@ -105,9 +104,6 @@ public class ConfigHandler {
public static boolean quantumWingsResearch;
public static boolean aerGeneratorResearch;
public static boolean enableIC2Module;
public static boolean enableTEModule;
public static void init(File file) {
config = new Configuration(file);
syncConfig();
@@ -119,7 +115,6 @@ public class ConfigHandler {
config.addCustomCategoryComment(CATEGORY_RESEARCH, "The only way to disable some researches. " + "Be careful, if you disable some researches, " + "all researches linked to it will be removed too. " + "Really, don't touch that unless you know exactly what you are doing.");
config.addCustomCategoryComment(CATEGORY_OUTPUTS, "Change outputs linked to different Essentias here");
config.addCustomCategoryComment(CATEGORY_RANDOM, "Options that don't fit into the other categories.");
config.addCustomCategoryComment(CATEGORY_MODULES, "Currently does nothing. Here for dev purposes.");
capesOn = config.get(CATEGORY_RANDOM, "Enable capes", true, "This config option is to enable or disable capes for people who have them. " + "Seriously, you shouldn't touch that unless you have another cape and " + "it conflicts with it.").getBoolean(capesOn);
toolsInBore = config.get(CATEGORY_RANDOM, "Tools for Arcane Bore", false, "This will augment the durablilty of the tools, and will also decrease the EU cost to 1. " + "The tools should have the same number of uses than before.").getBoolean(toolsInBore);
@@ -205,9 +200,6 @@ public class ConfigHandler {
quantumWingsResearch = config.get(CATEGORY_RESEARCH, "Quantum Wings", false).getBoolean(quantumWingsResearch);
aerGeneratorResearch = config.get(CATEGORY_RESEARCH, "Aer Generator", false).getBoolean(aerGeneratorResearch);
enableIC2Module = config.get(CATEGORY_MODULES, "IC2 Module", true).getBoolean(enableIC2Module);
enableTEModule = config.get(CATEGORY_MODULES, "TE Module", true).getBoolean(enableTEModule);
if (config.hasChanged()) {
config.save();
}
@@ -19,9 +19,7 @@ import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.monster.EntityCreeper;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraftforge.event.entity.item.ItemEvent;
import net.minecraftforge.event.entity.living.LivingDropsEvent;
import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent;
import thaumcraft.common.entities.monster.EntityTaintChicken;
import tombenpotter.emt.ElectroMagicTools;
import tombenpotter.emt.ModInformation;
@@ -69,9 +67,4 @@ public class EventHandlerEMT {
}
}
}
@SubscribeEvent
public void breaktool(PlayerDestroyItemEvent event){
event.entityPlayer.stopUsingItem();
}
}
@@ -1,5 +1,7 @@
package tombenpotter.emt.common.util;
import ic2.api.item.ElectricItem;
import tombenpotter.emt.common.items.ItemRegistry;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -43,5 +45,9 @@ public class RandomHelper {
return false;
}
public static ItemStack getChargedItem(Item item, int charge){
ItemStack stack = new ItemStack(item);
ElectricItem.manager.charge(stack, charge, charge, true, false);
return stack;
}
}
@@ -1,6 +1,7 @@
package tombenpotter.emt.common.util;
import tombenpotter.emt.EMTResearch;
import tombenpotter.emt.common.EMTResearch;
public class RegistryHandler {