diff --git a/common/crazypants/enderio/EnderIO.java b/common/crazypants/enderio/EnderIO.java index 4c8f8a29..08b1c9bf 100644 --- a/common/crazypants/enderio/EnderIO.java +++ b/common/crazypants/enderio/EnderIO.java @@ -45,10 +45,12 @@ import crazypants.enderio.machine.power.BlockCapacitorBank; import crazypants.enderio.machine.reservoir.BlockReservoir; import crazypants.enderio.machine.solar.BlockSolarPanel; import crazypants.enderio.material.BlockFusedQuartz; +import crazypants.enderio.material.BlockMachineChassi; import crazypants.enderio.material.ItemAlloy; import crazypants.enderio.material.ItemCapacitor; import crazypants.enderio.material.ItemFusedQuartzFrame; import crazypants.enderio.material.ItemIndustrialBinder; +import crazypants.enderio.material.ItemRedstoneInductor; import crazypants.enderio.material.ItemYetaWrench; import crazypants.enderio.material.MaterialRecipes; @@ -70,6 +72,8 @@ public class EnderIO { public static ItemAlloy itemAlloy; public static BlockFusedQuartz blockFusedQuartz; public static ItemFusedQuartzFrame itemFusedQuartzFrame; + public static ItemRedstoneInductor itemRedstoneInductor; + public static BlockMachineChassi blockMachineChassi; // Enderface public static BlockEnderIO blockEnderIo; @@ -126,6 +130,8 @@ public class EnderIO { itemAlloy = ItemAlloy.create(); blockFusedQuartz = BlockFusedQuartz.create(); itemFusedQuartzFrame = ItemFusedQuartzFrame.create(); + itemRedstoneInductor = ItemRedstoneInductor.create(); + blockMachineChassi = BlockMachineChassi.create(); blockEnderIo = BlockEnderIO.create(); itemEnderface = ItemEnderface.create(); diff --git a/common/crazypants/enderio/ModObject.java b/common/crazypants/enderio/ModObject.java index 32278179..af2d958f 100644 --- a/common/crazypants/enderio/ModObject.java +++ b/common/crazypants/enderio/ModObject.java @@ -25,7 +25,9 @@ public enum ModObject { itemIndustrialBinder(++Config.IID, CATEGORY_ITEM, "Industrial Binder"), itemBasicCapacitor(++Config.IID, CATEGORY_ITEM, "Basic Capacitor"), itemAlloy(++Config.IID, CATEGORY_ITEM, "Alloy"), + itemRedstoneInductor(++Config.IID, CATEGORY_BLOCK, "Redstone Inductor"), blockFusedQuartz(++Config.BID, CATEGORY_BLOCK, "Fused Quartz"), + blockMachineChassi(++Config.BID, CATEGORY_BLOCK, "Machine Chassi"), // Stirling Gen blockStirlingGenerator(++Config.BID, CATEGORY_BLOCK, "Stirling Generator"), diff --git a/common/crazypants/enderio/material/BlockMachineChassi.java b/common/crazypants/enderio/material/BlockMachineChassi.java new file mode 100644 index 00000000..26654f9d --- /dev/null +++ b/common/crazypants/enderio/material/BlockMachineChassi.java @@ -0,0 +1,38 @@ +package crazypants.enderio.material; + +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.item.ItemBlock; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.common.registry.LanguageRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIOTab; +import crazypants.enderio.ModObject; + +public class BlockMachineChassi extends ItemBlock { + + public static BlockMachineChassi create() { + BlockMachineChassi result = new BlockMachineChassi(); + result.init(); + return result; + } + + protected BlockMachineChassi() { + super(ModObject.blockMachineChassi.id); + setCreativeTab(EnderIOTab.tabEnderIO); + setUnlocalizedName(ModObject.blockMachineChassi.unlocalisedName); + setMaxStackSize(64); + } + + protected void init() { + LanguageRegistry.addName(this, ModObject.blockMachineChassi.name); + GameRegistry.registerItem(this, ModObject.blockMachineChassi.unlocalisedName); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IconRegister iconRegister) { + itemIcon = iconRegister.registerIcon("enderio:machineChassi"); + } + +} diff --git a/common/crazypants/enderio/material/ItemRedstoneInductor.java b/common/crazypants/enderio/material/ItemRedstoneInductor.java new file mode 100644 index 00000000..fffde0fd --- /dev/null +++ b/common/crazypants/enderio/material/ItemRedstoneInductor.java @@ -0,0 +1,38 @@ +package crazypants.enderio.material; + +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.item.Item; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.common.registry.LanguageRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIOTab; +import crazypants.enderio.ModObject; + +public class ItemRedstoneInductor extends Item { + + public static ItemRedstoneInductor create() { + ItemRedstoneInductor result = new ItemRedstoneInductor(); + result.init(); + return result; + } + + protected ItemRedstoneInductor() { + super(ModObject.itemRedstoneInductor.id); + setCreativeTab(EnderIOTab.tabEnderIO); + setUnlocalizedName(ModObject.itemRedstoneInductor.unlocalisedName); + setMaxStackSize(64); + } + + protected void init() { + LanguageRegistry.addName(this, ModObject.itemRedstoneInductor.name); + GameRegistry.registerItem(this, ModObject.itemRedstoneInductor.unlocalisedName); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IconRegister iconRegister) { + itemIcon = iconRegister.registerIcon("enderio:redstoneInductor"); + } + +}