Remove META_PLACEHOLDER
This commit is contained in:
parent
f5c6b59ebd
commit
2910acc29c
11 changed files with 25 additions and 80 deletions
|
@ -40,10 +40,10 @@ public class ItemDusts extends ItemTR {
|
|||
"bauxite", "brass", "bronze", "calcite", "charcoal", "chrome", "cinnabar", "clay", "coal", "copper",
|
||||
"dark_ashes", "diamond", "electrum", "emerald", "ender_eye", "ender_pearl", "endstone", "flint", "galena",
|
||||
"gold", "grossular", "invar", "iron", "lazurite", "lead", "magnesium", "manganese", "marble", "netherrack",
|
||||
"nickel", "obsidian", "peridot", "phosphorous", "platinum", "pyrite", "pyrope", "red_garnet", ModItems.META_PLACEHOLDER,
|
||||
"nickel", "obsidian", "peridot", "phosphorous", "platinum", "pyrite", "pyrope", "red_garnet",
|
||||
"ruby", "saltpeter", "sapphire", "saw_dust", "silver", "sodalite", "spessartine", "sphalerite", "steel",
|
||||
"sulfur", "tin", "titanium", "tungsten", "uvarovite", ModItems.META_PLACEHOLDER, "yellow_garnet", "zinc",
|
||||
ModItems.META_PLACEHOLDER, "andesite", "diorite", "granite" };
|
||||
"sulfur", "tin", "titanium", "tungsten", "uvarovite", "yellow_garnet", "zinc",
|
||||
"andesite", "diorite", "granite" };
|
||||
|
||||
public ItemDusts() {
|
||||
setTranslationKey("techreborn.dust");
|
||||
|
@ -56,9 +56,6 @@ public class ItemDusts extends ItemTR {
|
|||
name = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, name);
|
||||
for (int i = 0; i < types.length; i++) {
|
||||
if (types[i].equalsIgnoreCase(name)) {
|
||||
if (types[i].equals(ModItems.META_PLACEHOLDER)) {
|
||||
throw new InvalidParameterException("The dust " + name + " could not be found.");
|
||||
}
|
||||
return new ItemStack(ModItems.DUSTS, count, i);
|
||||
}
|
||||
}
|
||||
|
@ -107,9 +104,7 @@ public class ItemDusts extends ItemTR {
|
|||
return;
|
||||
}
|
||||
for (int meta = 0; meta < types.length; ++meta) {
|
||||
if (!types[meta].equals(ModItems.META_PLACEHOLDER)) {
|
||||
list.add(new ItemStack(this, 1, meta));
|
||||
}
|
||||
list.add(new ItemStack(this, 1, meta));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -40,10 +40,10 @@ public class ItemDustsSmall extends ItemTR {
|
|||
"bauxite", "brass", "bronze", "calcite", "charcoal", "chrome", "cinnabar", "clay", "coal", "copper",
|
||||
"dark_ashes", "diamond", "electrum", "emerald", "ender_eye", "ender_pearl", "endstone", "flint", "galena",
|
||||
"gold", "grossular", "invar", "iron", "lazurite", "lead", "magnesium", "manganese", "marble", "netherrack",
|
||||
"nickel", "obsidian", "peridot", "phosphorous", "platinum", "pyrite", "pyrope", "red_garnet", ModItems.META_PLACEHOLDER,
|
||||
"nickel", "obsidian", "peridot", "phosphorous", "platinum", "pyrite", "pyrope", "red_garnet",
|
||||
"ruby", "saltpeter", "sapphire", "saw_dust", "silver", "sodalite", "spessartine", "sphalerite", "steel",
|
||||
"sulfur", "tin", "titanium", "tungsten", "uvarovite", ModItems.META_PLACEHOLDER, "yellow_garnet", "zinc",
|
||||
ModItems.META_PLACEHOLDER, "redstone", "glowstone", "andesite", "diorite", "granite" };
|
||||
"sulfur", "tin", "titanium", "tungsten", "uvarovite", "yellow_garnet", "zinc",
|
||||
"redstone", "glowstone", "andesite", "diorite", "granite" };
|
||||
|
||||
public ItemDustsSmall() {
|
||||
setTranslationKey("techreborn.dustsmall");
|
||||
|
@ -56,9 +56,6 @@ public class ItemDustsSmall extends ItemTR {
|
|||
name = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, name);
|
||||
for (int i = 0; i < types.length; i++) {
|
||||
if (types[i].equalsIgnoreCase(name)) {
|
||||
if (types[i].equals(ModItems.META_PLACEHOLDER)) {
|
||||
throw new InvalidParameterException("The small dust " + name + " could not be found.");
|
||||
}
|
||||
return new ItemStack(ModItems.SMALL_DUSTS, count, i);
|
||||
}
|
||||
}
|
||||
|
@ -87,9 +84,7 @@ public class ItemDustsSmall extends ItemTR {
|
|||
return;
|
||||
}
|
||||
for (int meta = 0; meta < types.length; ++meta) {
|
||||
if (!types[meta].equals(ModItems.META_PLACEHOLDER)) {
|
||||
list.add(new ItemStack(this, 1, meta));
|
||||
}
|
||||
list.add(new ItemStack(this, 1, meta));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -86,9 +86,7 @@ public class ItemIngots extends ItemTR {
|
|||
return;
|
||||
}
|
||||
for (int meta = 0; meta < types.length; ++meta) {
|
||||
if (!types[meta].equals(ModItems.META_PLACEHOLDER)) {
|
||||
list.add(new ItemStack(this, 1, meta));
|
||||
}
|
||||
list.add(new ItemStack(this, 1, meta));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -38,8 +38,7 @@ public class ItemNuggets extends ItemTR {
|
|||
|
||||
public static final String[] types = new String[] { "aluminum", "brass", "bronze", "chrome", "copper", "electrum",
|
||||
"invar", "iridium", "lead", "nickel", "platinum", "silver", "steel", "tin", "titanium", "tungsten",
|
||||
"hot_tungstensteel", "tungstensteel", "zinc", "refined_iron", ModItems.META_PLACEHOLDER, ModItems.META_PLACEHOLDER,
|
||||
ModItems.META_PLACEHOLDER, "iron", "diamond" };
|
||||
"hot_tungstensteel", "tungstensteel", "zinc", "refined_iron", "iron", "diamond" };
|
||||
|
||||
public ItemNuggets() {
|
||||
setCreativeTab(TechRebornCreativeTab.instance);
|
||||
|
@ -80,9 +79,7 @@ public class ItemNuggets extends ItemTR {
|
|||
return;
|
||||
}
|
||||
for (int meta = 0; meta < types.length; ++meta) {
|
||||
if (!types[meta].equals(ModItems.META_PLACEHOLDER)) {
|
||||
list.add(new ItemStack(this, 1, meta));
|
||||
}
|
||||
list.add(new ItemStack(this, 1, meta));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -41,7 +41,7 @@ public class ItemParts extends ItemTR {
|
|||
public static final String[] types = new String[] { "energy_flow_circuit", "data_control_circuit", "data_storage_circuit",
|
||||
"data_orb", "diamond_grinding_head", "diamond_saw_blade", "tungsten_grinding_head", "helium_coolant_simple",
|
||||
"helium_coolant_triple", "helium_coolant_six", "nak_coolant_simple", "nak_coolant_triple", "nak_coolant_six",
|
||||
"cupronickel_heating_coil", "nichrome_heating_coil", "kanthal_heating_coil", ModItems.META_PLACEHOLDER, "super_conductor",
|
||||
"cupronickel_heating_coil", "nichrome_heating_coil", "kanthal_heating_coil", "super_conductor",
|
||||
"thorium_cell", "double_thorium_cell", "quad_thorium_cell", "plutonium_cell", "double_plutonium_cell",
|
||||
"quad_plutonium_cell", "computer_monitor", "machine_parts", "neutron_reflector", "iridium_neutron_reflector",
|
||||
"thick_neutron_reflector", "electronic_circuit", "advanced_circuit", "sap", "rubber", "scrap",
|
||||
|
@ -100,9 +100,7 @@ public class ItemParts extends ItemTR {
|
|||
return;
|
||||
}
|
||||
for (int meta = 0; meta < ItemParts.types.length; ++meta) {
|
||||
if (!ItemParts.types[meta].equals(ModItems.META_PLACEHOLDER)) {
|
||||
list.add(new ItemStack(this, 1, meta));
|
||||
}
|
||||
list.add(new ItemStack(this, 1, meta));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -39,7 +39,7 @@ public class ItemPlates extends ItemTR {
|
|||
|
||||
//Vanilla plates or plates not from ingots or gems
|
||||
public static String[] types = new String[] {
|
||||
"iron", "gold", "carbon", "wood", "redstone", "diamond", "emerald", ModItems.META_PLACEHOLDER, "coal", "obsidian", "lazurite"
|
||||
"iron", "gold", "carbon", "wood", "redstone", "diamond", "emerald", "coal", "obsidian", "lazurite"
|
||||
};
|
||||
|
||||
public ItemPlates() {
|
||||
|
@ -53,9 +53,6 @@ public class ItemPlates extends ItemTR {
|
|||
name = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, name);
|
||||
for (int i = 0; i < types.length; i++) {
|
||||
if (types[i].equalsIgnoreCase(name)) {
|
||||
if (types[i].equals(ModItems.META_PLACEHOLDER)) {
|
||||
throw new InvalidParameterException("The plate " + name + " could not be found.");
|
||||
}
|
||||
return new ItemStack(ModItems.PLATES, count, i);
|
||||
}
|
||||
}
|
||||
|
@ -98,9 +95,7 @@ public class ItemPlates extends ItemTR {
|
|||
return;
|
||||
}
|
||||
for (int meta = 0; meta < types.length; ++meta) {
|
||||
if (!types[meta].equals(ModItems.META_PLACEHOLDER)) {
|
||||
list.add(new ItemStack(this, 1, meta));
|
||||
}
|
||||
list.add(new ItemStack(this, 1, meta));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue