diff --git a/src/main/scala/resonantinduction/core/CoreContent.scala b/src/main/scala/resonantinduction/core/CoreContent.scala index 03e317a35..187bc7182 100644 --- a/src/main/scala/resonantinduction/core/CoreContent.scala +++ b/src/main/scala/resonantinduction/core/CoreContent.scala @@ -67,12 +67,6 @@ object CoreContent extends ContentHolder @ExplicitContentName val bucketMolten = new ItemOreResourceBucket(true) - /* - val itemBiomass = contentRegistry.createItem(classOf[ItemBiomass]) - val itemDevStaff = contentRegistry.createItem(classOf[ItemDevStaff]) - val itemFlour = contentRegistry.createItem(classOf[ItemFlour]) - */ - manager.setTab(ResonantTab).setPrefix(Reference.prefix) /** diff --git a/src/main/scala/resonantinduction/core/items/ItemBakingTrayWithBread.java b/src/main/scala/resonantinduction/core/items/ItemBakingTrayWithBread.java deleted file mode 100644 index a05caeb1a..000000000 --- a/src/main/scala/resonantinduction/core/items/ItemBakingTrayWithBread.java +++ /dev/null @@ -1,28 +0,0 @@ -/*package resonantinduction.core.items; - -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import resonantinduction.core.Reference; -import resonantinduction.core.ResonantInduction; - -/*public class ItemBakingTrayWithBread extends Item{ - - public ItemBakingTrayWithBread(int par1) { - super(par1); - this.setCreativeTab(CreativeTabs.tabFood); - this.setTextureName(Reference.DOMAIN + ":itemBakingTrayWithBread"); - this.setUnlocalizedName("itemBakingTrayWithBread"); - } - - public ItemStack getContainerItemStack(ItemStack itemStack) - { - return new ItemStack(ResonantInduction.itemFlour,1,2); - } - - public boolean hasContainerItem() - { - return true; - } - -}*/ diff --git a/src/main/scala/resonantinduction/core/items/ItemDevStaff.java b/src/main/scala/resonantinduction/core/items/ItemDevStaff.java deleted file mode 100644 index 013c9cb20..000000000 --- a/src/main/scala/resonantinduction/core/items/ItemDevStaff.java +++ /dev/null @@ -1,15 +0,0 @@ -package resonantinduction.core.items; - -import net.minecraft.item.Item; - -/** Place holder item with no internal function. Used in junction with event handler to interact with - * debug objects. - * - * @author Darkguardsamn */ -public class ItemDevStaff extends Item -{ - public ItemDevStaff(int id) - { - super(id); - } -} diff --git a/src/main/scala/resonantinduction/core/items/ItemFlour.java b/src/main/scala/resonantinduction/core/items/ItemFlour.java deleted file mode 100644 index 8f0baaaf8..000000000 --- a/src/main/scala/resonantinduction/core/items/ItemFlour.java +++ /dev/null @@ -1,95 +0,0 @@ -package resonantinduction.core.items; - -import java.util.List; - -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 resonantinduction.core.Reference; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -/** - * Derp - * - * @author Zerotheliger - * - */ - - -public class ItemFlour extends Item { - - @SideOnly(Side.CLIENT) - IIcon doughIcon; - - /*@SideOnly(Side.CLIENT) - IIcon bakingtrayIcon; - - @SideOnly(Side.CLIENT) - IIcon bakingtraywithdoughIcon;*/ - - - public ItemFlour(int par1) { - super(par1); - this.setHasSubtypes(true); - } - - @Override - public IIcon getIconFromDamage(int meta) { - switch (meta) { - case 1: - return doughIcon; - - /*case 2: - return bakingtrayIcon; - - case 3: - return bakingtraywithdoughIcon;*/ - - default: - return super.getIconFromDamage(meta); - - } - - } - - @Override - public void registerIcons(IIconRegister iconRegister) { - super.registerIcons(iconRegister); - this.doughIcon = iconRegister.registerIcon(Reference.PREFIX + "dough"); - /*this.bakingtrayIcon = iconRegister.registerIcon(Reference.PREFIX + "bakingtray"); - this.bakingtraywithdoughIcon = iconRegister.registerIcon(Reference.PREFIX + "bakingtraywithdough");*/ - - - - } - - public String getUnlocalizedName(ItemStack par1ItemStack) { - switch (par1ItemStack.getItemDamage()) { - - case 1: - return "item.dough"; - /*case 2: - return "item.bakingtray"; - case 3: - return "item.bakingtraywithdough";*/ - - - default: - return super.getUnlocalizedName(); - - } - } - - @Override - public void getSubItems(int par1, CreativeTabs tab, List items) { - super.getSubItems(par1, tab, items); - items.add(new ItemStack(par1, 1, 1)); - /*items.add(new ItemStack(par1, 1, 2)); - items.add(new ItemStack(par1, 1, 3));*/ - - } - - } diff --git a/src/main/scala/resonantinduction/core/resource/ItemBiomass.java b/src/main/scala/resonantinduction/core/resource/ItemBiomass.java deleted file mode 100644 index b00dfcd1a..000000000 --- a/src/main/scala/resonantinduction/core/resource/ItemBiomass.java +++ /dev/null @@ -1,24 +0,0 @@ -package resonantinduction.core.resource; - -import net.minecraft.client.renderer.texture.IIconRegister; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import resonant.lib.prefab.item.ItemTooltip; - -/** Bio mass item used as a crafting part and fuel - * - * @author Darkguardsman */ -public class ItemBiomass extends ItemTooltip -{ - public ItemBiomass(int id) - { - super(id); - } - - @SideOnly(Side.CLIENT) - @Override - public void registerIcons(IIconRegister iconRegister) - { - this.itemIcon = iconRegister.registerIcon(this.getUnlocalizedName().replace("item.", "")); - } -}