From d3bb4008297275d2f2edb992601e1c6efda257b5 Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Tue, 6 Jun 2017 18:03:17 +1000 Subject: $ Fixed a handful of errors left from using Notepad. --- .../item/general/chassis/itemBoilerChassis.java | 84 +++++++++++++++++++++ .../item/general/chassis/itemBoilerFrameMeta.java | 71 ----------------- .../item/general/chassis/itemDehydratorCoil.java | 88 ++++++++++++++++++++++ .../general/chassis/itemDehydratorCoilMeta.java | 74 ------------------ .../general/chassis/itemDehydratorCoilWire.java | 88 ++++++++++++++++++++++ .../chassis/itemDehydratorCoilWireMeta.java | 76 ------------------- 6 files changed, 260 insertions(+), 221 deletions(-) create mode 100644 src/Java/gtPlusPlus/core/item/general/chassis/itemBoilerChassis.java delete mode 100644 src/Java/gtPlusPlus/core/item/general/chassis/itemBoilerFrameMeta.java create mode 100644 src/Java/gtPlusPlus/core/item/general/chassis/itemDehydratorCoil.java delete mode 100644 src/Java/gtPlusPlus/core/item/general/chassis/itemDehydratorCoilMeta.java create mode 100644 src/Java/gtPlusPlus/core/item/general/chassis/itemDehydratorCoilWire.java delete mode 100644 src/Java/gtPlusPlus/core/item/general/chassis/itemDehydratorCoilWireMeta.java (limited to 'src/Java/gtPlusPlus/core') diff --git a/src/Java/gtPlusPlus/core/item/general/chassis/itemBoilerChassis.java b/src/Java/gtPlusPlus/core/item/general/chassis/itemBoilerChassis.java new file mode 100644 index 0000000000..a0042dad85 --- /dev/null +++ b/src/Java/gtPlusPlus/core/item/general/chassis/itemBoilerChassis.java @@ -0,0 +1,84 @@ +package gtPlusPlus.core.item.general.chassis; +import java.util.List; + +import cpw.mods.fml.common.registry.GameRegistry; +import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.util.Utils; +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; + +public class itemBoilerChassis extends Item { + + public IIcon[] icons = new IIcon[1]; + + public itemBoilerChassis() { + super(); + this.setHasSubtypes(true); + String unlocalizedName = "itemBoilerChassis"; + this.setUnlocalizedName(unlocalizedName); + this.setCreativeTab(AddToCreativeTab.tabMisc); + GameRegistry.registerItem(this, unlocalizedName); + } + + @Override + public void registerIcons(IIconRegister reg) { + this.icons[0] = reg.registerIcon(CORE.MODID + ":" + "itemBoilerChassis"); + } + + @Override + public IIcon getIconFromDamage(int meta) { + return this.icons[0]; + } + + @Override + public void getSubItems(Item item, CreativeTabs tab, List list) { + for (int i = 0; i < 3; i ++) { + list.add(new ItemStack(item, 1, i)); + } + } + + @Override + public String getUnlocalizedName(ItemStack stack) { + return this.getUnlocalizedName() + "_" + stack.getItemDamage(); + } + + @Override + public String getItemStackDisplayName(final ItemStack tItem) { + String itemName = "Advanced Boiler Chassis"; + String suffixName = ""; + if (tItem.getItemDamage() == 0){ + suffixName = " [T1]"; + } + else if (tItem.getItemDamage() == 1){ + suffixName = " [T2]"; + } + else if (tItem.getItemDamage() == 2){ + suffixName = " [T3]"; + } + return (itemName+suffixName); + + } + + @Override //TODO + public int getColorFromItemStack(final ItemStack stack, int HEX_OxFFFFFF) { + int meta = stack.getItemDamage(); + if (meta == 0){ + HEX_OxFFFFFF = Utils.rgbtoHexValue(10,110,30); + } + else if (meta == 1){ + HEX_OxFFFFFF = Utils.rgbtoHexValue(150,180,35); + } + else if (meta == 2){ + HEX_OxFFFFFF = Utils.rgbtoHexValue(200,85,40); + } + else if (meta == 3){ + HEX_OxFFFFFF = Utils.rgbtoHexValue(255,100,50); + } + return HEX_OxFFFFFF; + } + +} \ No newline at end of file diff --git a/src/Java/gtPlusPlus/core/item/general/chassis/itemBoilerFrameMeta.java b/src/Java/gtPlusPlus/core/item/general/chassis/itemBoilerFrameMeta.java deleted file mode 100644 index 70691e0346..0000000000 --- a/src/Java/gtPlusPlus/core/item/general/chassis/itemBoilerFrameMeta.java +++ /dev/null @@ -1,71 +0,0 @@ -public class itemBoilerChassis extends Item { - - public IIcon[] icon = new IIcon[1]; - - public itemBoilerChassis() { - super(); - this.setHasSubtypes(true); - String unlocalizedName = "itemBoilerChassis"; - this.setUnlocalizedName(unlocalizedName); - this.setCreativeTab(AddToCreativeTab.tabMisc); - GameRegistry.registerItem(this, unlocalizedName); - } - - @Override - public void registerIcons(IIconRegister reg) { - this.icons[0] = reg.registerIcon(CORE.MODID + ":" + "itemBoilerChassis"); - } - - @Override - public IIcon getIconFromDamage(int meta) { - return this.icons[0]; - } - - @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { - for (int i = 0; i < 3; i ++) { - list.add(new ItemStack(item, 1, i)); - } - } - - @Override - public String getUnlocalizedName(ItemStack stack) { - return this.getUnlocalizedName() + "_" + stack.getItemDamage(); - } - - @Override - public String getItemStackDisplayName(final ItemStack tItem) { - String itemName = "Advanced Boiler Chassis"; - String suffixName = ""; - if (tItem.getItemDamage() == 0){ - suffixName = " [T1]"; - } - else if (tItem.getItemDamage() == 1){ - suffixName = " [T2]"; - } - else if (tItem.getItemDamage() == 2){ - suffixName = " [T3]"; - } - return (itemName+suffixName); - - } - - @Override //TODO - public int getColorFromItemStack(final ItemStack stack, int HEX_OxFFFFFF) { - int meta = stack.getItemDamage(); - if (meta == 0){ - HEX_OxFFFFFF = Utils.rgbToHex(10,110,30); - } - else if (meta == 1){ - HEX_OxFFFFFF = Utils.rgbToHex(150,180,35); - } - else if (meta == 2){ - HEX_OxFFFFFF = Utils.rgbToHex(200,85,40); - } - else if (meta == 3){ - HEX_OxFFFFFF = Utils.rgbToHex(255,100,50); - } - return HEX_OxFFFFFF; - } - -} \ No newline at end of file diff --git a/src/Java/gtPlusPlus/core/item/general/chassis/itemDehydratorCoil.java b/src/Java/gtPlusPlus/core/item/general/chassis/itemDehydratorCoil.java new file mode 100644 index 0000000000..bdb576c835 --- /dev/null +++ b/src/Java/gtPlusPlus/core/item/general/chassis/itemDehydratorCoil.java @@ -0,0 +1,88 @@ +package gtPlusPlus.core.item.general.chassis; + +import java.util.List; + +import cpw.mods.fml.common.registry.GameRegistry; +import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.util.Utils; +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; + +public class itemDehydratorCoil extends Item { + + public IIcon[] icons = new IIcon[1]; + + public itemDehydratorCoil() { + super(); + this.setHasSubtypes(true); + String unlocalizedName = "itemDehydratorCoil"; + this.setUnlocalizedName(unlocalizedName); + this.setCreativeTab(AddToCreativeTab.tabMisc); + GameRegistry.registerItem(this, unlocalizedName); + } + + @Override + public void registerIcons(IIconRegister reg) { + this.icons[0] = reg.registerIcon(CORE.MODID + ":" + "itemDehydratorCoil"); + } + + @Override + public IIcon getIconFromDamage(int meta) { + return this.icons[0]; + } + + @Override + public void getSubItems(Item item, CreativeTabs tab, List list) { + for (int i = 0; i < 4; i ++) { + list.add(new ItemStack(item, 1, i)); + } + } + + @Override + public String getUnlocalizedName(ItemStack stack) { + return this.getUnlocalizedName() + "_" + stack.getItemDamage(); + } + + @Override + public String getItemStackDisplayName(final ItemStack tItem) { + String itemName = "Dehydrator Coil"; + String suffixName = ""; + if (tItem.getItemDamage() == 0){ + suffixName = " [EV]"; + } + else if (tItem.getItemDamage() == 1){ + suffixName = " [IV]"; + } + else if (tItem.getItemDamage() == 2){ + suffixName = " [LuV]"; + } + else if (tItem.getItemDamage() == 3){ + suffixName = " [ZPM]"; + } + return (itemName+suffixName); + + } + + @Override + public int getColorFromItemStack(final ItemStack stack, int HEX_OxFFFFFF) { + int meta = stack.getItemDamage(); + if (meta == 0){ + HEX_OxFFFFFF = Utils.rgbtoHexValue(10,110,30); + } + else if (meta == 1){ + HEX_OxFFFFFF = Utils.rgbtoHexValue(150,180,35); + } + else if (meta == 2){ + HEX_OxFFFFFF = Utils.rgbtoHexValue(200,85,40); + } + else if (meta == 3){ + HEX_OxFFFFFF = Utils.rgbtoHexValue(255,100,50); + } + return HEX_OxFFFFFF; + } + +} \ No newline at end of file diff --git a/src/Java/gtPlusPlus/core/item/general/chassis/itemDehydratorCoilMeta.java b/src/Java/gtPlusPlus/core/item/general/chassis/itemDehydratorCoilMeta.java deleted file mode 100644 index a743604547..0000000000 --- a/src/Java/gtPlusPlus/core/item/general/chassis/itemDehydratorCoilMeta.java +++ /dev/null @@ -1,74 +0,0 @@ -public class itemDehydratorCoil extends Item { - - public IIcon[] icon = new IIcon[1]; - - public itemDehydratorCoil() { - super(); - this.setHasSubtypes(true); - String unlocalizedName = "itemDehydratorCoil"; - this.setUnlocalizedName(unlocalizedName); - this.setCreativeTab(AddToCreativeTab.tabMisc); - GameRegistry.registerItem(this, unlocalizedName); - } - - @Override - public void registerIcons(IIconRegister reg) { - this.icons[0] = reg.registerIcon(CORE.MODID + ":" + "itemDehydratorCoil"); - } - - @Override - public IIcon getIconFromDamage(int meta) { - return this.icons[0]; - } - - @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { - for (int i = 0; i < 4; i ++) { - list.add(new ItemStack(item, 1, i)); - } - } - - @Override - public String getUnlocalizedName(ItemStack stack) { - return this.getUnlocalizedName() + "_" + stack.getItemDamage(); - } - - @Override - public String getItemStackDisplayName(final ItemStack tItem) { - String itemName = "Dehydrator Coil"; - String suffixName = ""; - if (tItem.getItemDamage() == 0){ - suffixName = " [EV]"; - } - else if (tItem.getItemDamage() == 1){ - suffixName = " [IV]"; - } - else if (tItem.getItemDamage() == 2){ - suffixName = " [LuV]"; - } - else if (tItem.getItemDamage() == 3){ - suffixName = " [ZPM]"; - } - return (itemName+suffixName); - - } - - @Override - public int getColorFromItemStack(final ItemStack stack, int HEX_OxFFFFFF) { - int meta = stack.getItemDamage(); - if (meta == 0){ - HEX_OxFFFFFF = Utils.rgbToHex(10,110,30); - } - else if (meta == 1){ - HEX_OxFFFFFF = Utils.rgbToHex(150,180,35); - } - else if (meta == 2){ - HEX_OxFFFFFF = Utils.rgbToHex(200,85,40); - } - else if (meta == 3){ - HEX_OxFFFFFF = Utils.rgbToHex(255,100,50); - } - return HEX_OxFFFFFF; - } - -} \ No newline at end of file diff --git a/src/Java/gtPlusPlus/core/item/general/chassis/itemDehydratorCoilWire.java b/src/Java/gtPlusPlus/core/item/general/chassis/itemDehydratorCoilWire.java new file mode 100644 index 0000000000..ddaad617d4 --- /dev/null +++ b/src/Java/gtPlusPlus/core/item/general/chassis/itemDehydratorCoilWire.java @@ -0,0 +1,88 @@ +package gtPlusPlus.core.item.general.chassis; + +import java.util.List; + +import cpw.mods.fml.common.registry.GameRegistry; +import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.util.Utils; +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; + +public class itemDehydratorCoilWire extends Item { + + public IIcon[] icons = new IIcon[1]; + + public itemDehydratorCoilWire() { + super(); + this.setHasSubtypes(true); + String unlocalizedName = "itemDehydratorCoilWire"; + this.setUnlocalizedName(unlocalizedName); + this.setCreativeTab(AddToCreativeTab.tabMisc); + GameRegistry.registerItem(this, unlocalizedName); + } + + @Override + public void registerIcons(IIconRegister reg) { + this.icons[0] = reg.registerIcon(CORE.MODID + ":" + "itemDehydratorCoilWire"); + } + + @Override + public IIcon getIconFromDamage(int meta) { + return this.icons[0]; + } + + @Override + public void getSubItems(Item item, CreativeTabs tab, List list) { + for (int i = 0; i < 4; i ++) { + list.add(new ItemStack(item, 1, i)); + } + } + + @Override + public String getUnlocalizedName(ItemStack stack) { + return this.getUnlocalizedName() + "_" + stack.getItemDamage(); + } + + @Override + public String getItemStackDisplayName(final ItemStack tItem) { + String itemName = "Coil Wire"; + String suffixName = ""; + if (tItem.getItemDamage() == 0){ + suffixName = " [EV]"; + } + else if (tItem.getItemDamage() == 1){ + suffixName = " [IV]"; + } + else if (tItem.getItemDamage() == 2){ + suffixName = " [LuV]"; + } + else if (tItem.getItemDamage() == 3){ + suffixName = " [ZPM]"; + } + return (itemName+suffixName); + + } + + @Override + public int getColorFromItemStack(final ItemStack stack, int HEX_OxFFFFFF) { + int meta = stack.getItemDamage(); + if (meta == 0){ + HEX_OxFFFFFF = Utils.rgbtoHexValue(10,110,30); + } + else if (meta == 1){ + HEX_OxFFFFFF = Utils.rgbtoHexValue(150,180,35); + } + else if (meta == 2){ + HEX_OxFFFFFF = Utils.rgbtoHexValue(200,85,40); + } + else if (meta == 3){ + HEX_OxFFFFFF = Utils.rgbtoHexValue(255,100,50); + } + return HEX_OxFFFFFF; + } + +} \ No newline at end of file diff --git a/src/Java/gtPlusPlus/core/item/general/chassis/itemDehydratorCoilWireMeta.java b/src/Java/gtPlusPlus/core/item/general/chassis/itemDehydratorCoilWireMeta.java deleted file mode 100644 index 8a59421b56..0000000000 --- a/src/Java/gtPlusPlus/core/item/general/chassis/itemDehydratorCoilWireMeta.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.bedrockminer.tutorial.item; - -public class itemDehydratorCoilWire extends Item { - - public IIcon[] icon = new IIcon[1]; - - public itemDehydratorCoilWire() { - super(); - this.setHasSubtypes(true); - String unlocalizedName = "itemDehydratorCoilWire"; - this.setUnlocalizedName(unlocalizedName); - this.setCreativeTab(AddToCreativeTab.tabMisc); - GameRegistry.registerItem(this, unlocalizedName); - } - - @Override - public void registerIcons(IIconRegister reg) { - this.icons[0] = reg.registerIcon(CORE.MODID + ":" + "itemDehydratorCoilWire"); - } - - @Override - public IIcon getIconFromDamage(int meta) { - return this.icons[0]; - } - - @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { - for (int i = 0; i < 4; i ++) { - list.add(new ItemStack(item, 1, i)); - } - } - - @Override - public String getUnlocalizedName(ItemStack stack) { - return this.getUnlocalizedName() + "_" + stack.getItemDamage(); - } - - @Override - public String getItemStackDisplayName(final ItemStack tItem) { - String itemName = "Coil Wire"; - String suffixName = ""; - if (tItem.getItemDamage() == 0){ - suffixName = " [EV]"; - } - else if (tItem.getItemDamage() == 1){ - suffixName = " [IV]"; - } - else if (tItem.getItemDamage() == 2){ - suffixName = " [LuV]"; - } - else if (tItem.getItemDamage() == 3){ - suffixName = " [ZPM]"; - } - return (itemName+suffixName); - - } - - @Override - public int getColorFromItemStack(final ItemStack stack, int HEX_OxFFFFFF) { - int meta = stack.getItemDamage(); - if (meta == 0){ - HEX_OxFFFFFF = Utils.rgbToHex(10,110,30); - } - else if (meta == 1){ - HEX_OxFFFFFF = Utils.rgbToHex(150,180,35); - } - else if (meta == 2){ - HEX_OxFFFFFF = Utils.rgbToHex(200,85,40); - } - else if (meta == 3){ - HEX_OxFFFFFF = Utils.rgbToHex(255,100,50); - } - return HEX_OxFFFFFF; - } - -} \ No newline at end of file -- cgit