Remove voidstone, does NOT break worlds
This commit is contained in:
parent
bc3fea299c
commit
161eb87246
4 changed files with 29 additions and 7 deletions
|
@ -396,7 +396,6 @@ public class ModItems
|
|||
OreUnifier.registerOre("dustTitanium", ItemDusts.getDustByName("titanium"));
|
||||
OreUnifier.registerOre("dustTungsten", ItemDusts.getDustByName("tungsten"));
|
||||
OreUnifier.registerOre("dustUvarovite", ItemDusts.getDustByName("uvarovite"));
|
||||
OreUnifier.registerOre("dustVoidstone", ItemDusts.getDustByName("voidstone"));
|
||||
OreUnifier.registerOre("dustYellowGarnet", ItemDusts.getDustByName("yellowGarnet"));
|
||||
OreUnifier.registerOre("dustZinc", ItemDusts.getDustByName("zinc"));
|
||||
OreUnifier.registerOre("dustOlivine", ItemDusts.getDustByName("olivine"));
|
||||
|
@ -463,7 +462,6 @@ public class ModItems
|
|||
OreUnifier.registerOre("dustTitanium", ItemDusts.getDustByName("titanium"));
|
||||
OreUnifier.registerOre("dustTungsten", ItemDusts.getDustByName("tungsten"));
|
||||
OreUnifier.registerOre("dustUvarovite", ItemDusts.getDustByName("uvarovite"));
|
||||
OreUnifier.registerOre("dustVoidstone", ItemDusts.getDustByName("voidstone"));
|
||||
OreUnifier.registerOre("dustYellowGarnet", ItemDusts.getDustByName("yellowGarnet"));
|
||||
OreUnifier.registerOre("dustZinc", ItemDusts.getDustByName("zinc"));
|
||||
OreUnifier.registerOre("dustOlivine", ItemDusts.getDustByName("olivine"));
|
||||
|
|
|
@ -233,8 +233,13 @@ public class ModRecipes
|
|||
|
||||
ScrapboxList.addItemStackToList(new ItemStack(ModBlocks.rubberSapling));
|
||||
|
||||
for (String i : ItemDusts.types)
|
||||
for (String i : ItemDusts.types){
|
||||
if(i.equals("%NULL%")){
|
||||
continue;
|
||||
}
|
||||
ScrapboxList.addItemStackToList(ItemDusts.getDustByName(i));
|
||||
}
|
||||
|
||||
|
||||
for (String i : ItemNuggets.types)
|
||||
ScrapboxList.addItemStackToList(ItemNuggets.getNuggetByName(i));
|
||||
|
@ -913,6 +918,9 @@ public class ModRecipes
|
|||
|
||||
for (String name : ItemDustsSmall.types)
|
||||
{
|
||||
if(name.equals("%NULL%")){
|
||||
continue;
|
||||
}
|
||||
GameRegistry.addShapelessRecipe(ItemDustsSmall.getSmallDustByName(name, 4), ItemDusts.getDustByName(name));
|
||||
GameRegistry.addShapelessRecipe(ItemDusts.getDustByName(name, 1), ItemDustsSmall.getSmallDustByName(name),
|
||||
ItemDustsSmall.getSmallDustByName(name), ItemDustsSmall.getSmallDustByName(name),
|
||||
|
|
|
@ -19,7 +19,7 @@ public class ItemDusts extends ItemTextureBase
|
|||
"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", "voidstone", "yellowGarnet", "zinc",
|
||||
"sulfur", "tin", "titanium", "tungsten", "uvarovite", "%NULL%", "yellowGarnet", "zinc",
|
||||
"olivine" };
|
||||
|
||||
public ItemDusts()
|
||||
|
@ -35,6 +35,9 @@ public class ItemDusts extends ItemTextureBase
|
|||
{
|
||||
if (types[i].equalsIgnoreCase(name))
|
||||
{
|
||||
if(types[i].equals("%NULL%")){
|
||||
throw new InvalidParameterException("The dust " + name + " could not be found.");
|
||||
}
|
||||
return new ItemStack(ModItems.dusts, count, i);
|
||||
}
|
||||
}
|
||||
|
@ -77,12 +80,17 @@ public class ItemDusts extends ItemTextureBase
|
|||
{
|
||||
for (int meta = 0; meta < types.length; ++meta)
|
||||
{
|
||||
list.add(new ItemStack(item, 1, meta));
|
||||
if(!types[meta].equals("%NULL%")){
|
||||
list.add(new ItemStack(item, 1, meta));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override public String getTextureName(int damage)
|
||||
{
|
||||
if(types[damage].equals("%NULL%")){
|
||||
damage = 0;
|
||||
}
|
||||
return ModInfo.MOD_ID + ":items/dust/" + types[damage] + "Dust";
|
||||
}
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@ public class ItemDustsSmall extends ItemTextureBase
|
|||
"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", "voidstone", "yellowGarnet", "zinc",
|
||||
"sulfur", "tin", "titanium", "tungsten", "uvarovite", "%NULL%", "yellowGarnet", "zinc",
|
||||
"olivine", "redstone", "glowstone" };
|
||||
|
||||
public ItemDustsSmall()
|
||||
|
@ -36,6 +36,9 @@ public class ItemDustsSmall extends ItemTextureBase
|
|||
{
|
||||
if (types[i].equalsIgnoreCase(name))
|
||||
{
|
||||
if(types[i].equals("%NULL%")){
|
||||
throw new InvalidParameterException("The small dust " + name + " could not be found.");
|
||||
}
|
||||
return new ItemStack(ModItems.smallDusts, count, i);
|
||||
}
|
||||
}
|
||||
|
@ -65,13 +68,18 @@ public class ItemDustsSmall extends ItemTextureBase
|
|||
{
|
||||
for (int meta = 0; meta < types.length; ++meta)
|
||||
{
|
||||
list.add(new ItemStack(item, 1, meta));
|
||||
if(!types[meta].equals("%NULL%")){
|
||||
list.add(new ItemStack(item, 1, meta));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getTextureName(int damage)
|
||||
{
|
||||
if(types[damage].equals("%NULL%")){
|
||||
damage = 0;
|
||||
}
|
||||
return ModInfo.MOD_ID + ":items/smallDust/small" + StringUtils.toFirstCapital(types[damage]) + "Dust";
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue