A couple of more things.

Some crafting for the drills mainly.
New OreDict material drills
This commit is contained in:
Tombenpotter committed 2014-10-01 22:40:46 +02:00
1 parent 954ab73fa9
commit 4ea1b059c0
10 files changed
+391 -117

No files matched your search

@@ -53,7 +53,6 @@ public class ElectroMagicTools {
public void preInit(FMLPreInitializationEvent event) {
ElectroMagicTools.logger.info(localize("console.EMT.preInit.begin"));
ElectroMagicTools.logger.info(localize("console.EMT.preInit.configRead"));
ConfigHandler.init(event.getSuggestedConfigurationFile());
FMLCommonHandler.instance().bus().register(new EventHandlerEMT());
RegistryHandler.registerIc2Registrys();
@@ -30,19 +30,24 @@ public class IC2ModuleBlockRegistry {
public static void registerBlocks() {
shield = new BlockShield().setBlockName(ModInformation.modid + ".shield");
portableNode = new BlockPortableNode().setBlockName(ModInformation.modid + ".portablenode");
emtSolars = new BlockEMTSolars().setBlockName(ModInformation.modid + ".emtsolars");
emtSolars2 = new BlockEMTSolars2().setBlockName(ModInformation.modid + ".emtsolars2");
emtMachines = new BlockEMTMachines().setBlockName(ModInformation.modid + ".emtmachines");
essentiaGens = new BlockEssentiaGenerators().setBlockName(ModInformation.modid + ".essentiaGens");
essentiaGenerator = new BlockEssentiaGenerator().setBlockName(ModInformation.modid + ".essentiaGenerator");
GameRegistry.registerBlock(shield, "ShieldBlock");
GameRegistry.registerBlock(shield, "Shield Block");
GameRegistry.registerBlock(portableNode, "Portable Node");
GameRegistry.registerBlock(emtSolars, ItemBlockEMTSolars.class, "EMT Solar Panels");
GameRegistry.registerBlock(emtSolars2, ItemBlockEMTSolars2.class, "EMT Solars 2");
GameRegistry.registerBlock(emtMachines, ItemBlockEMTMachines.class, "EMT Machines");
GameRegistry.registerBlock(essentiaGens, ItemBlockEssentiaGenerators.class, "Essentia Generators");
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");
}
}
@@ -15,19 +15,13 @@ 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.minecraft.item.ItemStack;
import net.minecraftforge.common.util.EnumHelper;
import thaumcraft.api.ThaumcraftApi;
import tombenpotter.emt.ModInformation;
import tombenpotter.emt.common.module.base.items.ItemEMTBaubles;
import tombenpotter.emt.common.module.base.items.ItemEMTItems;
import tombenpotter.emt.common.module.base.items.ItemFeatherWing;
import tombenpotter.emt.common.module.base.items.ItemThaumiumReinforcedWing;
import tombenpotter.emt.common.module.base.items.*;
import tombenpotter.emt.common.module.base.items.foci.ItemChristmasFocus;
import tombenpotter.emt.common.module.base.items.foci.ItemExplosionFocus;
import tombenpotter.emt.common.module.base.items.foci.ItemShieldFocus;
import tombenpotter.emt.common.module.base.items.ItemTaintedThorHammer;
import tombenpotter.emt.common.module.base.items.ItemThorHammer;
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;
@@ -89,71 +83,75 @@ public class IC2ModuleItemRegistry {
public static void registerItems() {
itemEMTItems = new ItemEMTItems().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 + ".electricgoggles");
GameRegistry.registerItem(electricGoggles, "ElectricGogglesRevealing");
nanoThaumicHelmet = new ItemNanoGoggles(ItemArmor.ArmorMaterial.DIAMOND, 3, 0).setUnlocalizedName(ModInformation.modid + ".nanothaumichelmet");
GameRegistry.registerItem(nanoThaumicHelmet, "NanosuitGogglesRevealing");
quantumThaumicHelmet = new ItemQuantumGoggles(ItemArmor.ArmorMaterial.DIAMOND, 3, 0).setUnlocalizedName(ModInformation.modid + ".quantumthaumichelmet");
GameRegistry.registerItem(quantumThaumicHelmet, "QuantumGogglesRevealing");
solarHelmetRevealing = new ItemSolarHelmetRevealing(ItemArmor.ArmorMaterial.DIAMOND, 3, 0).setUnlocalizedName(ModInformation.modid + ".solarhelmetrevealing");
GameRegistry.registerItem(solarHelmetRevealing, "SolarHelmetRevealing");
electricBootsTraveller = new ItemElectricBootsTraveller(3, 3).setUnlocalizedName(ModInformation.modid + ".electricboots");
GameRegistry.registerItem(electricBootsTraveller, "ElectricBootsTraveller");
nanoBootsTraveller = new ItemNanoBootsTraveller(3, 3).setUnlocalizedName(ModInformation.modid + ".nanobootstraveller");
GameRegistry.registerItem(nanoBootsTraveller, "NanoBootsTraveller");
quantumBootsTraveller = new ItemQuantumBootsTraveller(3, 3).setUnlocalizedName(ModInformation.modid + ".quantumbootstraveller");
GameRegistry.registerItem(quantumBootsTraveller, "QuantumBootsTraveller");
electricScribingTools = new ItemElectricScribingTools().setUnlocalizedName(ModInformation.modid + ".electricscribingtools");
GameRegistry.registerItem(electricScribingTools, "ElectricScribingTools");
featherWing = new ItemFeatherWing(featherWingMaterial, 7, 1).setUnlocalizedName(ModInformation.modid + ".featherwing");
GameRegistry.registerItem(featherWing, "FeatherWing");
thaumiumWing = new ItemThaumiumReinforcedWing(ThaumcraftApi.armorMatThaumium, 7, 1).setUnlocalizedName(ModInformation.modid + ".thaumiumwing");
GameRegistry.registerItem(thaumiumWing, "ThaumiumWing");
nanoWing = new ItemNanoWing(ItemArmor.ArmorMaterial.DIAMOND, 7, 1).setUnlocalizedName(ModInformation.modid + ".nanowing");
GameRegistry.registerItem(nanoWing, "NanosuitWing");
quantumWing = new ItemQuantumWing(ItemArmor.ArmorMaterial.DIAMOND, 7, 1).setUnlocalizedName(ModInformation.modid + ".quantumwing");
GameRegistry.registerItem(quantumWing, "QuantumWing");
taintedThorHammer = new ItemTaintedThorHammer().setUnlocalizedName(ModInformation.modid + ".taintedthorhammer");
GameRegistry.registerItem(taintedThorHammer, "TaintedMjolnir");
thorHammer = new ItemThorHammer().setUnlocalizedName(ModInformation.modid + ".hammerthor");
electricThorHammer = new ItemElectricThorHammer().setUnlocalizedName(ModInformation.modid + ".electricthorhammer");
thaumiumDrill = new ItemThaumiumDrill().setUnlocalizedName(ModInformation.modid + ".thaumiumdrill");
thaumiumChainsaw = new ItemThaumiumChainsaw().setUnlocalizedName(ModInformation.modid + ".thaumiumchainsaw");
diamondChainsaw = new ItemDiamondChainsaw().setUnlocalizedName(ModInformation.modid + ".diamondchainsaw");
ironOmnitool = new ItemOmnitoolIron().setUnlocalizedName(ModInformation.modid + ".ironomnitool");
thaumiumOmnitool = new ItemOmnitoolThaumium().setUnlocalizedName(ModInformation.modid + ".thaumiumomnitool");
diamondOmnitool = new ItemOmnitoolDiamond().setUnlocalizedName(ModInformation.modid + ".diamondomnitool");
streamChainsaw = new ItemStreamChainsaw().setUnlocalizedName(ModInformation.modid + ".streamchainsaw");
rockbreakerDrill = new ItemRockbreakerDrill().setUnlocalizedName(ModInformation.modid + ".rockbreakerdrill");
electricHoeGrowth = new ItemElectricHoeGrowth().setUnlocalizedName(ModInformation.modid + ".electrichoeofgrowth");
explosionFocus = new ItemExplosionFocus().setUnlocalizedName(ModInformation.modid + ".laserfocus");
christmasFocus = new ItemChristmasFocus().setUnlocalizedName(ModInformation.modid + ".christmasfocus");
shieldFocus = new ItemShieldFocus().setUnlocalizedName(ModInformation.modid + ".shieldfocus");
chargeFocus = new ItemChargeFocus().setUnlocalizedName(ModInformation.modid + ".chargefocus");
wandChargeFocus = new ItemWandChargingFocus().setUnlocalizedName(ModInformation.modid + ".wandchargefocus");
GameRegistry.registerItem(itemEMTItems, "EMT Items");
GameRegistry.registerItem(emtBauble, "EMT Baubles");
GameRegistry.registerItem(electricGoggles, "Electric Goggles of Revealing");
GameRegistry.registerItem(nanoThaumicHelmet, "Nanosuit Goggles of Revealing");
GameRegistry.registerItem(quantumThaumicHelmet, "Quantum Goggles of Revealing");
GameRegistry.registerItem(solarHelmetRevealing, "Quantum Solar Helmet of Revealing");
GameRegistry.registerItem(electricBootsTraveller, "Electric Boots of the Traveller");
GameRegistry.registerItem(nanoBootsTraveller, "Nano Boots of the Traveller");
GameRegistry.registerItem(quantumBootsTraveller, "Quantum Boots of the Traveller");
GameRegistry.registerItem(electricScribingTools, "Electric Scribing Tools");
GameRegistry.registerItem(featherWing, "Feather Wing");
GameRegistry.registerItem(thaumiumWing, "Thaumium Reinforced Wing");
GameRegistry.registerItem(nanoWing, "Nanosuit Wing");
GameRegistry.registerItem(quantumWing, "Quantum Wing");
GameRegistry.registerItem(taintedThorHammer, "Broken Relic of Mjolnir");
GameRegistry.registerItem(thorHammer, "Mjolnir");
GameRegistry.registerItem(electricThorHammer, "Supercharged Mjolnir");
GameRegistry.registerItem(thaumiumDrill, "Thaumium Drill");
GameRegistry.registerItem(thaumiumChainsaw, "Thaumium Chainsaw");
GameRegistry.registerItem(diamondChainsaw, "Diamond Chainsaw");
GameRegistry.registerItem(ironOmnitool, "Omnitool");
GameRegistry.registerItem(thaumiumOmnitool, "Thaumium Omnitool");
GameRegistry.registerItem(diamondOmnitool, "Diamond Omnitool");
GameRegistry.registerItem(streamChainsaw, "Chainsaw of the Stream");
GameRegistry.registerItem(rockbreakerDrill, "Drill of the Rockbreaker");
GameRegistry.registerItem(electricHoeGrowth, "Electric Hoe of Growth");
GameRegistry.registerItem(explosionFocus, "Wand Focus: Explosion");
GameRegistry.registerItem(christmasFocus, "Wand Focus: Kris-tmas");
GameRegistry.registerItem(shieldFocus, "Wand Focus: Shield");
GameRegistry.registerItem(chargeFocus, "Wand Focus: Charging");
GameRegistry.registerItem(wandChargeFocus, "Wand Focus: Wand Charging");
}
electricThorHammer = new ItemElectricThorHammer().setUnlocalizedName(ModInformation.modid + ".electricthorhammer");
GameRegistry.registerItem(electricThorHammer, "SuperchargedMjolnir");
public static ItemStack armorEuMaker = new ItemStack(emtBauble, 1, 0);
public static ItemStack inventoryEuMaker = new ItemStack(emtBauble, 1, 1);
public static ItemStack oneRing = new ItemStack(emtBauble, 1, 2);
thaumiumDrill = new ItemThaumiumDrill().setUnlocalizedName(ModInformation.modid + ".thaumiumdrill");
GameRegistry.registerItem(thaumiumDrill, "ThaumiumDrill");
diamondChainsaw = new ItemDiamondChainsaw().setUnlocalizedName(ModInformation.modid + ".diamondchainsaw");
GameRegistry.registerItem(diamondChainsaw, "DiamondChainsaw");
thaumiumChainsaw = new ItemThaumiumChainsaw().setUnlocalizedName(ModInformation.modid + ".thaumiumchainsaw");
GameRegistry.registerItem(thaumiumChainsaw, "ThaumiumChainsaw");
ironOmnitool = new ItemOmnitoolIron().setUnlocalizedName(ModInformation.modid + ".ironomnitool");
GameRegistry.registerItem(ironOmnitool, "Omnitool");
diamondOmnitool = new ItemOmnitoolDiamond().setUnlocalizedName(ModInformation.modid + ".diamondomnitool");
GameRegistry.registerItem(diamondOmnitool, "Diamond Omnitool");
thaumiumOmnitool = new ItemOmnitoolThaumium().setUnlocalizedName(ModInformation.modid + ".thaumiumomnitool");
GameRegistry.registerItem(thaumiumOmnitool, "ThaumiumOmnitool");
streamChainsaw = new ItemStreamChainsaw().setUnlocalizedName(ModInformation.modid + ".streamchainsaw");
GameRegistry.registerItem(streamChainsaw, "ChainsawStream");
rockbreakerDrill = new ItemRockbreakerDrill().setUnlocalizedName(ModInformation.modid + ".rockbreakerdrill");
GameRegistry.registerItem(rockbreakerDrill, "DrillRockbreaker");
electricHoeGrowth = new ItemElectricHoeGrowth().setUnlocalizedName(ModInformation.modid + ".electrichoeofgrowth");
GameRegistry.registerItem(electricHoeGrowth, "ElectricHoeGrowth");
explosionFocus = new ItemExplosionFocus().setUnlocalizedName(ModInformation.modid + ".laserfocus");
GameRegistry.registerItem(explosionFocus, "ExplosionFocus");
christmasFocus = new ItemChristmasFocus().setUnlocalizedName(ModInformation.modid + ".christmasfocus");
GameRegistry.registerItem(christmasFocus, "ChristmasFocus");
shieldFocus = new ItemShieldFocus().setUnlocalizedName(ModInformation.modid + ".shieldfocus");
GameRegistry.registerItem(shieldFocus, "ShieldFocus");
chargeFocus = new ItemChargeFocus().setUnlocalizedName(ModInformation.modid + ".chargefocus");
GameRegistry.registerItem(chargeFocus, "ChargingFocus");
wandChargeFocus = new ItemWandChargingFocus().setUnlocalizedName(ModInformation.modid + ".wandchargefocus");
GameRegistry.registerItem(wandChargeFocus, "WandChargingFocus");
}
}
@@ -4,7 +4,11 @@ import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.util.EnumHelper;
import net.minecraftforge.oredict.OreDictionary;
import tombenpotter.emt.ModInformation;
import tombenpotter.emt.common.module.vanilla.items.ItemCraftingComponent;
import tombenpotter.emt.common.module.vanilla.items.tools.ItemVanillaChainsaw;
import tombenpotter.emt.common.module.vanilla.items.tools.ItemVanillaDrill;
import tombenpotter.emt.common.module.vanilla.items.tools.ItemVanillaOmnitool;
@@ -16,43 +20,75 @@ public class VanillaItemsRegistry {
public static Item ironDrill;
public static Item goldenDrill;
public static Item diamondDrill;
public static Item copperDrill;
public static Item tinDrill;
public static Item leadDrill;
public static Item bronzeDrill;
public static Item woodenChainsaw;
public static Item stoneChainsaw;
public static Item ironChainsaw;
public static Item goldenChainsaw;
public static Item diamondChainsaw;
public static Item copperChainsaw;
public static Item tinChainsaw;
public static Item leadChainsaw;
public static Item bronzeChainsaw;
public static Item ironOmnitool;
public static Item goldenOmnitool;
public static Item diamondOmnitool;
public static Item copperOmnitool;
public static Item tinOmnitool;
public static Item leadOmnitool;
public static Item bronzeOmnitool;
public static Item craftingComponent;
public static Item.ToolMaterial copperMaterial = EnumHelper.addToolMaterial("copperToolMaterial", 2, 300, 6.0F, 2.0F, 14);
public static Item.ToolMaterial tinMaterial = EnumHelper.addToolMaterial("tinToolMatierial", 2, 200, 8.0F, 4F, 18);
public static Item.ToolMaterial leadMaterial = EnumHelper.addToolMaterial("leadToolMaterial", 2, 250, 7.0F, 3F, 15);
public static Item.ToolMaterial bronzeMaterial = EnumHelper.addToolMaterial("bronzeToolMaterial", 2, 350, 7.0F, 3.0F, 16);
public static void registerItems() {
woodenDrill = new ItemVanillaDrill(Item.ToolMaterial.WOOD, 75, ":woodendrill", Item.getItemFromBlock(Blocks.planks)).setUnlocalizedName(ModInformation.modid + ".woodenDrill");
GameRegistry.registerItem(woodenDrill, "woodenDrill");
stoneDrill = new ItemVanillaDrill(Item.ToolMaterial.STONE, 165, ":stonedrill", Item.getItemFromBlock(Blocks.cobblestone)).setUnlocalizedName(ModInformation.modid + ".stoneDrill");
GameRegistry.registerItem(stoneDrill, "stoneDrill");
ironDrill = new ItemVanillaDrill(Item.ToolMaterial.IRON, 315, ":irondrill", Items.iron_ingot).setUnlocalizedName(ModInformation.modid + ".ironDrill");
GameRegistry.registerItem(ironDrill, "ironDrill");
goldenDrill = new ItemVanillaDrill(Item.ToolMaterial.GOLD, 55, ":goldendrill", Items.gold_ingot).setUnlocalizedName(ModInformation.modid + ".goldenDrill");
GameRegistry.registerItem(goldenDrill, "goldenDrill");
diamondDrill = new ItemVanillaDrill(Item.ToolMaterial.EMERALD, 2015, ":diamonddrill", Items.diamond).setUnlocalizedName(ModInformation.modid + ".diamondDrill");
GameRegistry.registerItem(diamondDrill, "diamondDrill");
craftingComponent = new ItemCraftingComponent().setUnlocalizedName(ModInformation.modid + ".craftingComponent");
GameRegistry.registerItem(craftingComponent, "craftingComponents");
woodenChainsaw = new ItemVanillaChainsaw(Item.ToolMaterial.WOOD, 75, ":woodenchainsaw", Item.getItemFromBlock(Blocks.planks)).setUnlocalizedName(ModInformation.modid + ".woodenChainsaw");
woodenDrill = new ItemVanillaDrill(Item.ToolMaterial.WOOD, 75, ":woodenDrill", new ItemStack(Item.getItemFromBlock(Blocks.planks))).setUnlocalizedName(ModInformation.modid + ".woodenDrill");
GameRegistry.registerItem(woodenDrill, "woodenDrill");
stoneDrill = new ItemVanillaDrill(Item.ToolMaterial.STONE, 165, ":stoneDrill", new ItemStack(Item.getItemFromBlock(Blocks.cobblestone))).setUnlocalizedName(ModInformation.modid + ".stoneDrill");
GameRegistry.registerItem(stoneDrill, "stoneDrill");
ironDrill = new ItemVanillaDrill(Item.ToolMaterial.IRON, 400, ":ironDrill", new ItemStack(Items.iron_ingot)).setUnlocalizedName(ModInformation.modid + ".ironDrill");
GameRegistry.registerItem(ironDrill, "ironDrill");
goldenDrill = new ItemVanillaDrill(Item.ToolMaterial.GOLD, 55, ":goldenDrill", new ItemStack(Items.gold_ingot)).setUnlocalizedName(ModInformation.modid + ".goldenDrill");
GameRegistry.registerItem(goldenDrill, "goldenDrill");
diamondDrill = new ItemVanillaDrill(Item.ToolMaterial.EMERALD, 2015, ":diamondDrill", new ItemStack(Items.diamond)).setUnlocalizedName(ModInformation.modid + ".diamondDrill");
GameRegistry.registerItem(diamondDrill, "diamondDrill");
copperDrill = new ItemVanillaDrill(copperMaterial, 450, ":copperDrill", OreDictionary.getOres("ingotCopper").get(0)).setUnlocalizedName(ModInformation.modid + ".copperDrill");
GameRegistry.registerItem(copperDrill, "copperDrill");
tinDrill = new ItemVanillaDrill(tinMaterial, 350, ":tinDrill", OreDictionary.getOres("ingotTin").get(0)).setUnlocalizedName(ModInformation.modid + ".tinDrill");
GameRegistry.registerItem(tinDrill, "tinDrill");
leadDrill = new ItemVanillaDrill(leadMaterial, 400, ":leadDrill", OreDictionary.getOres("ingotLead").get(0)).setUnlocalizedName(ModInformation.modid + ".leadDrill");
GameRegistry.registerItem(leadDrill, "leadDrill");
bronzeDrill = new ItemVanillaDrill(bronzeMaterial, 650, ":bronzeDrill", OreDictionary.getOres("ingotBronze").get(0)).setUnlocalizedName(ModInformation.modid + ".bronzeDrill");
GameRegistry.registerItem(bronzeDrill, "bronzeDrill");
woodenChainsaw = new ItemVanillaChainsaw(Item.ToolMaterial.WOOD, 75, ":woodenChainsaw", Item.getItemFromBlock(Blocks.planks)).setUnlocalizedName(ModInformation.modid + ".woodenChainsaw");
GameRegistry.registerItem(woodenChainsaw, "woodenChainsaw");
stoneChainsaw = new ItemVanillaChainsaw(Item.ToolMaterial.STONE, 165, ":stonechainsaw", Item.getItemFromBlock(Blocks.cobblestone)).setUnlocalizedName(ModInformation.modid + ".stoneChainsaw");
stoneChainsaw = new ItemVanillaChainsaw(Item.ToolMaterial.STONE, 165, ":stoneChainsaw", Item.getItemFromBlock(Blocks.cobblestone)).setUnlocalizedName(ModInformation.modid + ".stoneChainsaw");
GameRegistry.registerItem(stoneChainsaw, "stoneChainsaw");
ironChainsaw = new ItemVanillaChainsaw(Item.ToolMaterial.IRON, 315, ":ironchainsaw", Items.iron_ingot, 3F).setUnlocalizedName(ModInformation.modid + ".ironChainsaw");
ironChainsaw = new ItemVanillaChainsaw(Item.ToolMaterial.IRON, 315, ":ironChainsaw", Items.iron_ingot, 3F).setUnlocalizedName(ModInformation.modid + ".ironChainsaw");
GameRegistry.registerItem(ironChainsaw, "ironChainsaw");
goldenChainsaw = new ItemVanillaChainsaw(Item.ToolMaterial.GOLD, 55, ":goldenchainsaw", Items.gold_ingot).setUnlocalizedName(ModInformation.modid + ".goldenChainsaw");
goldenChainsaw = new ItemVanillaChainsaw(Item.ToolMaterial.GOLD, 55, ":goldenChainsaw", Items.gold_ingot).setUnlocalizedName(ModInformation.modid + ".goldenChainsaw");
GameRegistry.registerItem(goldenChainsaw, "goldenChainsaw");
diamondChainsaw = new ItemVanillaChainsaw(Item.ToolMaterial.EMERALD, 2015, ":diamondchainsaw", Items.diamond, 6F).setUnlocalizedName(ModInformation.modid + ".diamondChainsaw");
diamondChainsaw = new ItemVanillaChainsaw(Item.ToolMaterial.EMERALD, 2015, ":diamondChainsaw", Items.diamond, 6F).setUnlocalizedName(ModInformation.modid + ".diamondChainsaw");
GameRegistry.registerItem(diamondChainsaw, "diamondChainsaw");
ironOmnitool = new ItemVanillaOmnitool(Item.ToolMaterial.IRON, 500, ":ironomnitool", Items.iron_ingot).setUnlocalizedName(ModInformation.modid + ".ironOmnitool");
ironOmnitool = new ItemVanillaOmnitool(Item.ToolMaterial.IRON, 500, ":ironOmnitool", Items.iron_ingot).setUnlocalizedName(ModInformation.modid + ".ironOmnitool");
GameRegistry.registerItem(ironOmnitool, "ironOmnitool");
goldenOmnitool = new ItemVanillaOmnitool(Item.ToolMaterial.GOLD, 100, ":goldenomnitool", Items.gold_ingot).setUnlocalizedName(ModInformation.modid + ".goldenOmnitool");
goldenOmnitool = new ItemVanillaOmnitool(Item.ToolMaterial.GOLD, 100, ":goldenOmnitool", Items.gold_ingot).setUnlocalizedName(ModInformation.modid + ".goldenOmnitool");
GameRegistry.registerItem(goldenOmnitool, "goldenOmnitool");
diamondOmnitool = new ItemVanillaOmnitool(Item.ToolMaterial.EMERALD, 3900, ":diamondomnitool", Items.diamond).setUnlocalizedName(ModInformation.modid + ".diamondOmnitool");
diamondOmnitool = new ItemVanillaOmnitool(Item.ToolMaterial.EMERALD, 3900, ":diamondOmnitool", Items.diamond).setUnlocalizedName(ModInformation.modid + ".diamondOmnitool");
GameRegistry.registerItem(diamondOmnitool, "diamondOmnitool");
}
}
@@ -0,0 +1,43 @@
package tombenpotter.emt.common.module.vanilla;
import net.minecraft.item.ItemStack;
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.craftingComponent, 1, 0);
public static ItemStack stoneDrillTop = new ItemStack(VanillaItemsRegistry.craftingComponent, 1, 1);
public static ItemStack ironDrillTop = new ItemStack(VanillaItemsRegistry.craftingComponent, 1, 2);
public static ItemStack goldenDrillTop = new ItemStack(VanillaItemsRegistry.craftingComponent, 1, 3);
public static ItemStack diamondDrillTop = new ItemStack(VanillaItemsRegistry.craftingComponent, 1, 4);
public static ItemStack copperDrillTop = new ItemStack(VanillaItemsRegistry.craftingComponent, 1, 5);
public static ItemStack tinDrillTop = new ItemStack(VanillaItemsRegistry.craftingComponent, 1, 6);
public static ItemStack leadDrillTop = new ItemStack(VanillaItemsRegistry.craftingComponent, 1, 7);
public static ItemStack bronzeDrillTop = new ItemStack(VanillaItemsRegistry.craftingComponent, 1, 8);
}
@@ -1,8 +1,80 @@
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 void registerRecipes() {
public static IRecipe woodenDrill, stoneDrill, ironDrill, goldenDrill, diamondDrill, copperDrill, tinDrill, leadDrill, bronzeDrill;
public static IRecipe woodenChainsaw, stoneChainsaw, ironChainsaw, goldenChainsaw, diamondChainsaw;
public static IRecipe ironOmnitool, goldenOmnitool, diamondOmnitool;
public static IRecipe woodenTop, stoneTop, ironTop, goldenTop, diamondTop, copperTop, tinTop, leadTop, bronzeTop;
public static void registerRecipes() {
addMiscRecipes();
addDrillTopRecipes();
addDrillRecipes();
addChainsawRecipes();
addChainsawRecipes();
}
public static void addMiscRecipes() {
}
public static void addDrillTopRecipes() {
woodenTop = drillTopRecipe(VanillaItemstacks.woodenDrillTop, "plankWood");
stoneTop = drillTopRecipe(VanillaItemstacks.stoneDrillTop, "stone");
ironTop = drillTopRecipe(VanillaItemstacks.ironDrillTop, "ingotIron");
goldenTop = drillTopRecipe(VanillaItemstacks.goldenDrillTop, "ingotGold");
diamondTop = drillTopRecipe(VanillaItemstacks.diamondDrillTop, "gemDiamond");
copperTop = drillTopRecipe(VanillaItemstacks.copperDrillTop, "ingotCopper");
tinTop = drillTopRecipe(VanillaItemstacks.tinDrillTop, "ingotTin");
leadTop = drillTopRecipe(VanillaItemstacks.leadDrillTop, "ingotLead");
bronzeTop = drillTopRecipe(VanillaItemstacks.bronzeDrillTop, "ingotBronze");
}
public static void addChainsawTopRecipes() {
}
public static void addDrillRecipes() {
woodenDrill = drillRecipe(VanillaItemstacks.woodenDrill, VanillaItemstacks.woodenDrillTop, "plankWood", "stickWood");
stoneDrill = drillRecipe(VanillaItemstacks.stoneDrill, VanillaItemstacks.stoneDrillTop, "stone", "cobblestone");
ironDrill = drillRecipe(VanillaItemstacks.ironDrill, VanillaItemstacks.ironDrillTop, "ingotIron", new ItemStack(Items.leather));
goldenDrill = drillRecipe(VanillaItemstacks.goldenDrill, VanillaItemstacks.goldenDrillTop, "ingotGold", new ItemStack(Blocks.obsidian));
diamondDrill = drillRecipe(VanillaItemstacks.diamondDrill, VanillaItemstacks.diamondDrillTop, "gemDiamond", "ingotGold");
copperDrill = drillRecipe(VanillaItemstacks.copperDrill, VanillaItemstacks.copperDrillTop, "ingotCopper", "ingotTin");
tinDrill = drillRecipe(VanillaItemstacks.tinDrill, VanillaItemstacks.tinDrillTop, "ingotTin", "ingotGold");
leadDrill = drillRecipe(VanillaItemstacks.leadDrill, VanillaItemstacks.leadDrillTop, "ingotLead", "ingotIron");
bronzeDrill = drillRecipe(VanillaItemstacks.bronzeDrill, VanillaItemstacks.bronzeDrillTop, "ingotBronze", new ItemStack(Blocks.obsidian));
}
public static void addChainsawRecipes() {
}
public static IRecipe drillRecipe(ItemStack output, ItemStack X, String Y, ItemStack Z) {
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 drillRecipe(ItemStack output, ItemStack X, String Y, String 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) {
for (int i = 0; i < OreDictionary.getOres(X).size(); i++) {
return GameRegistry.addShapedRecipe(output, " X ", "XXX", 'X', OreDictionary.getOres(X).get(i));
}
return null;
}
}
@@ -1,16 +0,0 @@
package tombenpotter.emt.common.module.vanilla.items;
import net.minecraft.item.Item;
import net.minecraft.util.IIcon;
import tombenpotter.emt.ElectroMagicTools;
public class ItemCrafting extends Item {
public IIcon[] icon = new IIcon[500];
public ItemCrafting() {
this.setMaxDamage(0);
this.setHasSubtypes(true);
this.setCreativeTab(ElectroMagicTools.tabEMT);
}
}
@@ -0,0 +1,144 @@
package tombenpotter.emt.common.module.vanilla.items;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import tombenpotter.emt.ElectroMagicTools;
import tombenpotter.emt.ModInformation;
import java.util.List;
public class ItemCraftingComponent extends Item {
public IIcon[] icon = new IIcon[500];
public final String drillTop = "DrillTop";
public final String chainsawTop = "ChainsawTop";
public ItemCraftingComponent() {
this.setMaxDamage(0);
this.setHasSubtypes(true);
this.setCreativeTab(ElectroMagicTools.tabEMT);
}
@Override
public String getUnlocalizedName(ItemStack itemstack) {
String name = "";
switch (itemstack.getItemDamage()) {
default:
name = "nothing";
break;
case 0: {
name = "wooden" + drillTop;
break;
}
case 1: {
name = "stone" + drillTop;
break;
}
case 2: {
name = "iron" + drillTop;
break;
}
case 3: {
name = "golden" + drillTop;
break;
}
case 4: {
name = "diamond" + drillTop;
break;
}
case 5: {
name = "copper" + drillTop;
break;
}
case 6: {
name = "tin" + drillTop;
break;
}
case 7: {
name = "lead" + drillTop;
break;
}
case 8: {
name = "tin" + drillTop;
break;
}
case 9: {
name = "wooden" + chainsawTop;
break;
}
case 10: {
name = "stone" + chainsawTop;
break;
}
case 11: {
name = "iron" + chainsawTop;
break;
}
case 12: {
name = "golden" + chainsawTop;
break;
}
case 13: {
name = "diamond" + chainsawTop;
break;
}
case 14: {
name = "copper" + chainsawTop;
break;
}
case 15: {
name = "tin" + chainsawTop;
break;
}
case 16: {
name = "lead" + chainsawTop;
break;
}
case 17: {
name = "tin" + chainsawTop;
break;
}
}
return getUnlocalizedName() + "." + name;
}
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister ri) {
this.icon[0] = ri.registerIcon(ModInformation.texturePath + ":wooden" + drillTop);
this.icon[1] = ri.registerIcon(ModInformation.texturePath + ":stone" + drillTop);
this.icon[2] = ri.registerIcon(ModInformation.texturePath + ":iron" + drillTop);
this.icon[3] = ri.registerIcon(ModInformation.texturePath + ":golden" + drillTop);
this.icon[4] = ri.registerIcon(ModInformation.texturePath + ":diamond" + drillTop);
this.icon[5] = ri.registerIcon(ModInformation.texturePath + ":copper" + drillTop);
this.icon[6] = ri.registerIcon(ModInformation.texturePath + ":tin" + drillTop);
this.icon[7] = ri.registerIcon(ModInformation.texturePath + ":lead" + drillTop);
this.icon[8] = ri.registerIcon(ModInformation.texturePath + ":bronze" + drillTop);
this.icon[9] = ri.registerIcon(ModInformation.texturePath + ":wooden" + chainsawTop);
this.icon[10] = ri.registerIcon(ModInformation.texturePath + ":stone" + chainsawTop);
this.icon[11] = ri.registerIcon(ModInformation.texturePath + ":iron" + chainsawTop);
this.icon[12] = ri.registerIcon(ModInformation.texturePath + ":golden" + chainsawTop);
this.icon[13] = ri.registerIcon(ModInformation.texturePath + ":diamond" + chainsawTop);
this.icon[14] = ri.registerIcon(ModInformation.texturePath + ":copper" + chainsawTop);
this.icon[15] = ri.registerIcon(ModInformation.texturePath + ":tin" + chainsawTop);
this.icon[16] = ri.registerIcon(ModInformation.texturePath + ":lead" + chainsawTop);
this.icon[17] = ri.registerIcon(ModInformation.texturePath + ":bronze" + chainsawTop);
}
@SideOnly(Side.CLIENT)
public IIcon getIconFromDamage(int meta) {
return this.icon[meta];
}
@SideOnly(Side.CLIENT)
public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List list) {
for (int i = 0; i <= 32; i++) {
list.add(new ItemStack(this, 1, i));
}
}
}
@@ -8,19 +8,11 @@ import tombenpotter.emt.common.util.IRefillable;
public class ItemVanillaDrill extends ItemBaseDrill implements IRefillable {
public Item repairMaterial;
public int repairMeta;
public ItemStack repairMaterial;
public ItemVanillaDrill(ToolMaterial material, int maxDamage, String textureName, Item repairMaterial) {
public ItemVanillaDrill(ToolMaterial material, int maxDamage, String textureName, ItemStack repairMaterial) {
super(material, maxDamage, textureName);
this.repairMaterial = repairMaterial;
this.repairMeta = 0;
}
public ItemVanillaDrill(ToolMaterial material, int maxDamage, String textureName, Item repairMaterial, int repairMeta) {
super(material, maxDamage, textureName);
this.repairMaterial = repairMaterial;
this.repairMeta = repairMeta;
}
@Override
@@ -30,7 +22,7 @@ public class ItemVanillaDrill extends ItemBaseDrill implements IRefillable {
@Override
public boolean getIsRepairable(ItemStack stack1, ItemStack stack2) {
return (stack2.getItem() == repairMaterial && stack2.getItemDamage() == repairMeta) ? true : super.getIsRepairable(stack1, stack2);
return stack2.isItemEqual(repairMaterial) ? true : super.getIsRepairable(stack1, stack2);
}
@Override
@@ -6,8 +6,9 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.DamageSource;
import tombenpotter.emt.common.module.base.items.tools.ItemBaseOmnitool;
import tombenpotter.emt.common.util.IRefillable;
public class ItemVanillaOmnitool extends ItemBaseOmnitool {
public class ItemVanillaOmnitool extends ItemBaseOmnitool implements IRefillable{
public Item repairMaterial;
public int repairMeta;