Remove lots of useless stuff (will break existing worlds)

This commit is contained in:
Prospector 2016-04-29 21:21:28 -07:00
parent ab1a2910dd
commit 994d12a850
136 changed files with 1462 additions and 1551 deletions

View file

@ -1,8 +1,5 @@
package techreborn.items;
import java.security.InvalidParameterException;
import java.util.List;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
@ -11,53 +8,64 @@ import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.init.ModItems;
import techreborn.lib.ModInfo;
public class ItemDusts extends ItemTextureBase {
public static final String[] types = new String[] { "almandine", "aluminumBrass", "aluminum", "alumite",
"andradite", "antimony", "ardite", "ashes", "basalt", "bauxite", "biotite", "brass", "bronze", "cadmium",
"calcite", "charcoal", "chrome", "cinnabar", "clay", "coal", "cobalt", "copper", "cupronickel", "darkAshes",
"darkIron", "diamond", "electrum", "emerald", "enderEye", "enderPearl", "endstone", "flint", "galena",
"gold", "graphite", "grossular", "indium", "invar", "iridium", "iron", "kanthal", "lapis", "lazurite",
"lead", "limestone", "lodestone", "magnesium", "magnetite", "manganese", "manyullyn", "marble", "mithril",
"netherrack", "nichrome", "nickel", "obsidian", "osmium", "peridot", "phosphorous", "platinum",
"potassiumFeldspar", "pyrite", "pyrope", "redGarnet", "redrock", "ruby", "saltpeter", "sapphire", "sawDust",
"silicon", "silver", "sodalite", "spessartine", "sphalerite", "steel", "sulfur", "tellurium", "teslatite",
"tetrahedrite", "tin", "titanium", "tungsten", "uvarovite", "vinteum", "voidstone", "yellowGarnet", "zinc",
import java.security.InvalidParameterException;
import java.util.List;
public class ItemDusts extends ItemTextureBase
{
public static final String[] types = new String[] { "almandine", "aluminum", "andradite", "ashes", "basalt",
"bauxite", "brass", "bronze", "calcite", "charcoal", "chrome", "cinnabar", "clay", "coal", "copper",
"darkAshes", "diamond", "electrum", "emerald", "enderEye", "enderPearl", "endstone", "flint", "galena",
"gold", "grossular", "invar", "iron", "lazurite", "lead", "magnesium", "manganese", "marble", "netherrack",
"nickel", "obsidian", "peridot", "phosphorous", "platinum", "pyrite", "pyrope", "redGarnet", "redrock",
"ruby", "saltpeter", "sapphire", "sawDust", "silver", "sodalite", "spessartine", "sphalerite", "steel",
"sulfur", "tin", "titanium", "tungsten", "uvarovite", "vinteum", "voidstone", "yellowGarnet", "zinc",
"olivine" };
public ItemDusts() {
public ItemDusts()
{
setUnlocalizedName("techreborn.dust");
setHasSubtypes(true);
setCreativeTab(TechRebornCreativeTabMisc.instance);
}
public static ItemStack getDustByName(String name, int count) {
for (int i = 0; i < types.length; i++) {
if (types[i].equalsIgnoreCase(name)) {
public static ItemStack getDustByName(String name, int count)
{
for (int i = 0; i < types.length; i++)
{
if (types[i].equalsIgnoreCase(name))
{
return new ItemStack(ModItems.dusts, count, i);
}
}
if (name.equalsIgnoreCase("glowstone")) {
if (name.equalsIgnoreCase("glowstone"))
{
return new ItemStack(Items.glowstone_dust, count);
}
if (name.equalsIgnoreCase("redstone")) {
if (name.equalsIgnoreCase("redstone"))
{
return new ItemStack(Items.redstone, count);
}
if (name.equalsIgnoreCase("gunpowder")) {
if (name.equalsIgnoreCase("gunpowder"))
{
return new ItemStack(Items.gunpowder, count);
}
throw new InvalidParameterException("The dust " + name + " could not be found.");
}
public static ItemStack getDustByName(String name) {
public static ItemStack getDustByName(String name)
{
return getDustByName(name, 1);
}
@Override
// gets Unlocalized Name depending on meta data
public String getUnlocalizedName(ItemStack itemStack) {
public String getUnlocalizedName(ItemStack itemStack)
{
int meta = itemStack.getItemDamage();
if (meta < 0 || meta >= types.length) {
if (meta < 0 || meta >= types.length)
{
meta = 0;
}
@ -65,19 +73,21 @@ public class ItemDusts extends ItemTextureBase {
}
// Adds Dusts SubItems To Creative Tab
public void getSubItems(Item item, CreativeTabs creativeTabs, List list) {
for (int meta = 0; meta < types.length; ++meta) {
public void getSubItems(Item item, CreativeTabs creativeTabs, List list)
{
for (int meta = 0; meta < types.length; ++meta)
{
list.add(new ItemStack(item, 1, meta));
}
}
@Override
public String getTextureName(int damage) {
@Override public String getTextureName(int damage)
{
return ModInfo.MOD_ID + ":items/dust/" + types[damage] + "Dust";
}
@Override
public int getMaxMeta() {
@Override public int getMaxMeta()
{
return types.length;
}

View file

@ -1,8 +1,5 @@
package techreborn.items;
import java.security.InvalidParameterException;
import java.util.List;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@ -10,20 +7,20 @@ import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.init.ModItems;
import techreborn.lib.ModInfo;
import java.security.InvalidParameterException;
import java.util.List;
public class ItemDustsSmall extends ItemTextureBase
{
public static final String[] types = new String[] { "Almandine", "AluminumBrass", "Aluminum", "Alumite",
"Andradite", "Antimony", "Ardite", "Ashes", "Basalt", "Bauxite", "Biotite", "Brass", "Bronze", "Cadmium",
"Calcite", "Charcoal", "Chrome", "Cinnabar", "Clay", "Coal", "Cobalt", "Copper", "Cupronickel", "DarkAshes",
"DarkIron", "Diamond", "Electrum", "Emerald", "EnderEye", "EnderPearl", "Endstone", "Flint", "Glowstone",
"Gold", "Graphite", "Grossular", "Gunpowder", "Indium", "Invar", "Iridium", "Iron", "Kanthal", "Lapis",
"Lazurite", "Lead", "Limestone", "Lodestone", "Magnesium", "Magnetite", "Manganese", "Manyullyn", "Marble",
"Mithril", "Netherrack", "Nichrome", "Nickel", "Obsidian", "Osmium", "Peridot", "Phosphorous", "Platinum",
"PotassiumFeldspar", "Pyrite", "Pyrope", "RedGarnet", "Redrock", "Redstone", "Ruby", "Saltpeter",
"Sapphire", "Silicon", "Silver", "Sodalite", "Spessartine", "Sphalerite", "Steel", "Sulfur", "Tellurium",
"Teslatite", "Tetrahedrite", "Tin", "Titanium", "Tungsten", "Uvarovite", "Vinteum", "Voidstone",
"YellowGarnet", "Zinc", "Galena", "Olivine" };
public static final String[] types = new String[] { "almandine", "aluminum", "andradite", "ashes", "basalt",
"bauxite", "brass", "bronze", "calcite", "charcoal", "chrome", "cinnabar", "clay", "coal", "copper",
"darkAshes", "diamond", "electrum", "emerald", "enderEye", "enderPearl", "endstone", "flint", "galena",
"gold", "grossular", "invar", "iron", "lazurite", "lead", "magnesium", "manganese", "marble", "netherrack",
"nickel", "obsidian", "peridot", "phosphorous", "platinum", "pyrite", "pyrope", "redGarnet", "redrock",
"ruby", "saltpeter", "sapphire", "sawDust", "silver", "sodalite", "spessartine", "sphalerite", "steel",
"sulfur", "tin", "titanium", "tungsten", "uvarovite", "vinteum", "voidstone", "yellowGarnet", "zinc",
"olivine", "redstone", "glowstone" };
public ItemDustsSmall()
{

View file

@ -1,8 +1,5 @@
package techreborn.items;
import java.security.InvalidParameterException;
import java.util.List;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@ -10,12 +7,15 @@ import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.init.ModItems;
import techreborn.lib.ModInfo;
import java.security.InvalidParameterException;
import java.util.List;
public class ItemIngots extends ItemTextureBase
{
public static final String[] types = new String[] { "aluminum", "antimony", "batteryAlloy", "redAlloy", "blueAlloy",
"brass", "bronze", "cadmium", "chrome", "copper", "cupronickel", "electrum", "indium", "invar", "iridium",
"kanthal", "lead", "lodestone", "magnalium", "nichrome", "nickel", "osmium", "platinum", "silver", "steel",
"tellurium", "tin", "titanium", "tungsten", "hotTungstensteel", "tungstensteel", "zinc", "refinedIron" };
public static final String[] types = new String[] { "aluminum", "brass", "bronze", "chrome", "copper", "electrum",
"invar", "iridium", "lead", "nickel", "platinum", "silver", "steel", "tin", "titanium", "tungsten",
"hotTungstensteel", "tungstensteel", "zinc", "refinedIron", "advancedAlloy", "mixedmetalingot",
"iridiumAlloyIngot" };
public ItemIngots()
{
@ -63,14 +63,12 @@ public class ItemIngots extends ItemTextureBase
}
}
@Override
public String getTextureName(int damage)
@Override public String getTextureName(int damage)
{
return ModInfo.MOD_ID + ":items/ingot/" + types[damage] + "Ingot";
}
@Override
public int getMaxMeta()
@Override public int getMaxMeta()
{
return types.length;
}

View file

@ -1,10 +1,25 @@
package techreborn.items;
import net.minecraft.item.Item;
import me.modmuss50.jsonDestroyer.api.ITexturedItem;
import techreborn.client.TechRebornCreativeTabMisc;
/**
* Created by modmuss50 on 19/02/2016.
*/
public class ItemMissingRecipe extends Item
public class ItemMissingRecipe extends ItemTextureBase implements ITexturedItem
{
public ItemMissingRecipe()
{
setCreativeTab(TechRebornCreativeTabMisc.instance);
setUnlocalizedName("techreborn.missingrecipe");
}
@Override
public String getTextureName(int damage)
{
return "techreborn:items/misc/missing_recipe";
}
@Override
public int getMaxMeta()
{
return 1;
}
}

View file

@ -1,8 +1,5 @@
package techreborn.items;
import java.security.InvalidParameterException;
import java.util.List;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@ -10,12 +7,16 @@ import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.init.ModItems;
import techreborn.lib.ModInfo;
import java.security.InvalidParameterException;
import java.util.List;
public class ItemNuggets extends ItemTextureBase
{
public static final String[] types = new String[] { "aluminum", "antimony", "brass", "bronze", "chrome", "copper",
"electrum", "invar", "iridium", "iron", "lead", "nickel", "osmium", "platinum", "silver", "steel", "tin",
"titanium", "tungsten", "zinc" };
public static final String[] types = new String[] { "aluminum", "brass", "bronze", "chrome", "copper", "electrum",
"invar", "iridium", "lead", "nickel", "platinum", "silver", "steel", "tin", "titanium", "tungsten",
"hotTungstensteel", "tungstensteel", "zinc", "refinedIron", "advancedAlloy", "mixedmetalingot",
"iridiumAlloyIngot", "iron", "diamond" };
public ItemNuggets()
{
@ -63,14 +64,12 @@ public class ItemNuggets extends ItemTextureBase
}
}
@Override
public String getTextureName(int damage)
@Override public String getTextureName(int damage)
{
return ModInfo.MOD_ID + ":items/nuggets/" + types[damage] + "Nugget";
}
@Override
public int getMaxMeta()
@Override public int getMaxMeta()
{
return types.length;
}

View file

@ -1,8 +1,5 @@
package techreborn.items;
import java.security.InvalidParameterException;
import java.util.List;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
@ -14,43 +11,51 @@ import techreborn.client.TechRebornCreativeTab;
import techreborn.init.ModItems;
import techreborn.lib.ModInfo;
public class ItemParts extends ItemTextureBase {
public static final String[] types = new String[] { "advancedCircuitParts", "basicCircuitBoard",
"advancedCircuitBoard", "processorCircuitBoard", "energyFlowCircuit", "dataControlCircuit", "dataOrb",
"dataStorageCircuit", "diamondGrindingHead", "diamondSawBlade", "tungstenGrindingHead",
"heliumCoolantSimple", "HeliumCoolantTriple", "HeliumCoolantSix", "NaKCoolantSimple", "NaKCoolantTriple",
"NaKCoolantSix", "cupronickelHeatingCoil", "nichromeHeatingCoil", "kanthalHeatingCoil", "laserFocus",
"ductTape", "lazuriteChunk", "iridiumAlloyIngot", "rockCutterBlade", "superConductor", "thoriumCell",
"doubleThoriumCell", "quadThoriumCell", "plutoniumCell", "doublePlutoniumCell", "quadPlutoniumCell",
"destructoPack", "iridiumNeutronReflector", "massHoleDevice", "computerMonitor", "machineParts",
"thickNeutronReflector", "neutronReflector", "electronicCircuit", "advancedCircuit", "rubberSap", "rubber",
"scrap", "pump", "teleporter", "advancedAlloy", "mixedmetalingot", "carbonmesh", "carbonfiber", "dogecoin",
"CoolantSimple", "CoolantTriple", "CoolantSix" };
import java.security.InvalidParameterException;
import java.util.List;
public ItemParts() {
public class ItemParts extends ItemTextureBase
{
public static final String[] types = new String[] { "energyFlowCircuit", "dataControlCircuit", "dataStorageCircuit",
"dataOrb", "diamondGrindingHead", "diamondSawBlade", "wolframiumGrindingHead", "heliumCoolantSimple",
"heliumCoolantTriple", "heliumCoolantSix", "NaKCoolantSimple", "NaKCoolantTriple", "NaKCoolantSix",
"cupronickelHeatingCoil", "nichromeHeatingCoil", "kanthalHeatingCoil", "lazuriteChunk", "superConductor",
"thoriumCell", "doubleThoriumCell", "quadThoriumCell", "plutoniumCell", "doublePlutoniumCell",
"quadPlutoniumCell", "computerMonitor", "machineParts", "neutronReflector", "iridiumNeutronReflector",
"thickNeutronReflector", "electronicCircuit", "advancedCircuit", "rubberSap", "rubber", "scrap",
"carbonmesh", "carbonfiber", "coolantSimple", "coolantTriple", "coolantSix" };
public ItemParts()
{
setCreativeTab(TechRebornCreativeTab.instance);
setHasSubtypes(true);
setUnlocalizedName("techreborn.part");
}
public static ItemStack getPartByName(String name, int count) {
for (int i = 0; i < types.length; i++) {
if (types[i].equalsIgnoreCase(name)) {
public static ItemStack getPartByName(String name, int count)
{
for (int i = 0; i < types.length; i++)
{
if (types[i].equalsIgnoreCase(name))
{
return new ItemStack(ModItems.parts, count, i);
}
}
throw new InvalidParameterException("The part " + name + " could not be found.");
}
public static ItemStack getPartByName(String name) {
public static ItemStack getPartByName(String name)
{
return getPartByName(name, 1);
}
@Override
// gets Unlocalized Name depending on meta data
public String getUnlocalizedName(ItemStack itemStack) {
public String getUnlocalizedName(ItemStack itemStack)
{
int meta = itemStack.getItemDamage();
if (meta < 0 || meta >= types.length) {
if (meta < 0 || meta >= types.length)
{
meta = 0;
}
@ -58,14 +63,18 @@ public class ItemParts extends ItemTextureBase {
}
// Adds Dusts SubItems To Creative Tab
public void getSubItems(Item item, CreativeTabs creativeTabs, List list) {
for (int meta = 0; meta < types.length; ++meta) {
public void getSubItems(Item item, CreativeTabs creativeTabs, List list)
{
for (int meta = 0; meta < types.length; ++meta)
{
list.add(new ItemStack(item, 1, meta));
}
}
public ItemStack onItemRightClick(ItemStack itemStack, World world, EntityPlayer player) {
switch (itemStack.getItemDamage()) {
public ItemStack onItemRightClick(ItemStack itemStack, World world, EntityPlayer player)
{
switch (itemStack.getItemDamage())
{
case 37: // Destructo pack
player.openGui(Core.INSTANCE, GuiHandler.destructoPackID, world, (int) player.posX, (int) player.posY,
(int) player.posY);
@ -74,13 +83,13 @@ public class ItemParts extends ItemTextureBase {
return itemStack;
}
@Override
public String getTextureName(int damage) {
@Override public String getTextureName(int damage)
{
return ModInfo.MOD_ID + ":items/part/" + types[damage];
}
@Override
public int getMaxMeta() {
@Override public int getMaxMeta()
{
return types.length;
}
}

View file

@ -1,8 +1,5 @@
package techreborn.items;
import java.security.InvalidParameterException;
import java.util.List;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@ -10,14 +7,16 @@ import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.init.ModItems;
import techreborn.lib.ModInfo;
import java.security.InvalidParameterException;
import java.util.List;
public class ItemPlates extends ItemTextureBase
{
public static final String[] types = new String[] { "aluminum", "batteryAlloy", "brass", "bronze", "carbon",
"chrome", "coal", "copper", "diamond", "electrum", "emerald", "gold", "invar", "iridium", "iron", "lapis",
"lead", "magnalium", "nickel", "obsidian", "osmium", "peridot", "platinum", "redGarnet", "redstone", "ruby",
"sapphire", "silicon", "silver", "steel", "teslatite", "tin", "titanium", "tungsten", "tungstensteel",
"yellowGarnet", "zinc" };
public static final String[] types = new String[] { "aluminum", "brass", "bronze", "chrome", "copper", "electrum",
"invar", "iridium", "iron", "gold", "lead", "nickel", "platinum", "silver", "steel", "tin", "titanium",
"tungsten", "hotTungstensteel", "tungstensteel", "zinc", "refinedIron", "carbon", "wood", "magnalium",
"silicon", "ruby", "sapphire", "peridot", "redGarnet", "yellowGarnet", "redstone", "diamond", "emerald", "lapis", "coal", "obsidian" };
public ItemPlates()
{
@ -65,14 +64,12 @@ public class ItemPlates extends ItemTextureBase
}
}
@Override
public String getTextureName(int damage)
@Override public String getTextureName(int damage)
{
return ModInfo.MOD_ID + ":items/plate/" + types[damage] + "Plate";
}
@Override
public int getMaxMeta()
@Override public int getMaxMeta()
{
return types.length;
}

View file

@ -1,78 +0,0 @@
package techreborn.items;
import java.security.InvalidParameterException;
import java.util.List;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.init.ModItems;
import techreborn.lib.ModInfo;
public class ItemPurifiedCrushedOre extends ItemTextureBase
{
public static final String[] types = new String[] { "Aluminum", "Ardite", "Bauxite", "Cadmium", "Cinnabar",
"Cobalt", "DarkIron", "Indium", "Iridium", "Nickel", "Osmium", "Platinum", "Pyrite", "Sphalerite",
"Tetrahedrite", "Tungsten", "Galena" };
public ItemPurifiedCrushedOre()
{
setCreativeTab(TechRebornCreativeTabMisc.instance);
setHasSubtypes(true);
setUnlocalizedName("techreborn.purifiedcrushedore");
}
public static ItemStack getPurifiedCrushedOreByName(String name, int count)
{
for (int i = 0; i < types.length; i++)
{
if (types[i].equalsIgnoreCase(name))
{
return new ItemStack(ModItems.purifiedCrushedOre, count, i);
}
}
throw new InvalidParameterException("The crushed ore " + name + " could not be found.");
}
public static ItemStack getPurifiedCrushedOreByName(String name)
{
return getPurifiedCrushedOreByName(name, 1);
}
@Override
// gets Unlocalized Name depending on meta data
public String getUnlocalizedName(ItemStack itemStack)
{
int meta = itemStack.getItemDamage();
if (meta < 0 || meta >= types.length)
{
meta = 0;
}
return super.getUnlocalizedName() + "." + types[meta];
}
// Adds Dusts SubItems To Creative Tab
public void getSubItems(Item item, CreativeTabs creativeTabs, List list)
{
for (int meta = 0; meta < types.length; ++meta)
{
list.add(new ItemStack(item, 1, meta));
}
}
@Override
public String getTextureName(int damage)
{
return ModInfo.MOD_ID + ":items/purifiedCrushedOre/purifiedCrushed" + types[damage] + "Ore";
}
@Override
public int getMaxMeta()
{
return types.length;
}
}