Remove Red Rock, implement new vanilla stones

This commit is contained in:
Yulife 2016-05-22 16:53:15 +02:00
parent d94e5156cc
commit ab74f1c077
4 changed files with 16 additions and 11 deletions

3
.gitignore vendored
View file

@ -19,4 +19,5 @@ changelog.txt
*.launch *.launch
*.project *.project
*.classpath *.classpath
.idea/* .idea/*
java_pid2412.hprof

View file

@ -340,6 +340,7 @@ public class ModItems
OreUnifier.registerOre("dustAlmandine", ItemDusts.getDustByName("almandine")); OreUnifier.registerOre("dustAlmandine", ItemDusts.getDustByName("almandine"));
OreUnifier.registerOre("dustAluminum", ItemDusts.getDustByName("aluminum")); OreUnifier.registerOre("dustAluminum", ItemDusts.getDustByName("aluminum"));
OreUnifier.registerOre("dustAluminium", ItemDusts.getDustByName("aluminum")); OreUnifier.registerOre("dustAluminium", ItemDusts.getDustByName("aluminum"));
OreUnifier.registerOre("dustAndesite", ItemDusts.getDustByName("andesite"));
OreUnifier.registerOre("dustAndradite", ItemDusts.getDustByName("andradite")); OreUnifier.registerOre("dustAndradite", ItemDusts.getDustByName("andradite"));
OreUnifier.registerOre("dustAsh", ItemDusts.getDustByName("ashes")); OreUnifier.registerOre("dustAsh", ItemDusts.getDustByName("ashes"));
OreUnifier.registerOre("dustBasalt", ItemDusts.getDustByName("basalt")); OreUnifier.registerOre("dustBasalt", ItemDusts.getDustByName("basalt"));
@ -355,6 +356,7 @@ public class ModItems
OreUnifier.registerOre("dustCopper", ItemDusts.getDustByName("copper")); OreUnifier.registerOre("dustCopper", ItemDusts.getDustByName("copper"));
OreUnifier.registerOre("dustDarkAsh", ItemDusts.getDustByName("darkAshes")); OreUnifier.registerOre("dustDarkAsh", ItemDusts.getDustByName("darkAshes"));
OreUnifier.registerOre("dustDiamond", ItemDusts.getDustByName("diamond")); OreUnifier.registerOre("dustDiamond", ItemDusts.getDustByName("diamond"));
OreUnifier.registerOre("dustDiorite", ItemDusts.getDustByName("diorite"));
OreUnifier.registerOre("dustElectrum", ItemDusts.getDustByName("electrum")); OreUnifier.registerOre("dustElectrum", ItemDusts.getDustByName("electrum"));
OreUnifier.registerOre("dustEmerald", ItemDusts.getDustByName("emerald")); OreUnifier.registerOre("dustEmerald", ItemDusts.getDustByName("emerald"));
OreUnifier.registerOre("dustEnderEye", ItemDusts.getDustByName("enderEye")); OreUnifier.registerOre("dustEnderEye", ItemDusts.getDustByName("enderEye"));
@ -363,6 +365,7 @@ public class ModItems
OreUnifier.registerOre("dustFlint", ItemDusts.getDustByName("flint")); OreUnifier.registerOre("dustFlint", ItemDusts.getDustByName("flint"));
OreUnifier.registerOre("dustGalena", ItemDusts.getDustByName("galena")); OreUnifier.registerOre("dustGalena", ItemDusts.getDustByName("galena"));
OreUnifier.registerOre("dustGold", ItemDusts.getDustByName("gold")); OreUnifier.registerOre("dustGold", ItemDusts.getDustByName("gold"));
OreUnifier.registerOre("dustGranite", ItemDusts.getDustByName("granite"));
OreUnifier.registerOre("dustGrossular", ItemDusts.getDustByName("grossular")); OreUnifier.registerOre("dustGrossular", ItemDusts.getDustByName("grossular"));
OreUnifier.registerOre("dustInvar", ItemDusts.getDustByName("invar")); OreUnifier.registerOre("dustInvar", ItemDusts.getDustByName("invar"));
OreUnifier.registerOre("dustIron", ItemDusts.getDustByName("iron")); OreUnifier.registerOre("dustIron", ItemDusts.getDustByName("iron"));
@ -381,7 +384,6 @@ public class ModItems
OreUnifier.registerOre("dustPyrite", ItemDusts.getDustByName("pyrite")); OreUnifier.registerOre("dustPyrite", ItemDusts.getDustByName("pyrite"));
OreUnifier.registerOre("dustPyrope", ItemDusts.getDustByName("pyrope")); OreUnifier.registerOre("dustPyrope", ItemDusts.getDustByName("pyrope"));
OreUnifier.registerOre("dustRedGarnet", ItemDusts.getDustByName("redGarnet")); OreUnifier.registerOre("dustRedGarnet", ItemDusts.getDustByName("redGarnet"));
OreUnifier.registerOre("dustRedrock", ItemDusts.getDustByName("redrock"));
OreUnifier.registerOre("dustRuby", ItemDusts.getDustByName("ruby")); OreUnifier.registerOre("dustRuby", ItemDusts.getDustByName("ruby"));
OreUnifier.registerOre("dustSaltpeter", ItemDusts.getDustByName("saltpeter")); OreUnifier.registerOre("dustSaltpeter", ItemDusts.getDustByName("saltpeter"));
OreUnifier.registerOre("dustSapphire", ItemDusts.getDustByName("sapphire")); OreUnifier.registerOre("dustSapphire", ItemDusts.getDustByName("sapphire"));
@ -406,6 +408,7 @@ public class ModItems
OreUnifier.registerOre("dustAlmandine", ItemDusts.getDustByName("almandine")); OreUnifier.registerOre("dustAlmandine", ItemDusts.getDustByName("almandine"));
OreUnifier.registerOre("dustAluminum", ItemDusts.getDustByName("aluminum")); OreUnifier.registerOre("dustAluminum", ItemDusts.getDustByName("aluminum"));
OreUnifier.registerOre("dustAluminium", ItemDusts.getDustByName("aluminum")); OreUnifier.registerOre("dustAluminium", ItemDusts.getDustByName("aluminum"));
OreUnifier.registerOre("dustAndesite", ItemDusts.getDustByName("andesite"));
OreUnifier.registerOre("dustAndradite", ItemDusts.getDustByName("andradite")); OreUnifier.registerOre("dustAndradite", ItemDusts.getDustByName("andradite"));
OreUnifier.registerOre("dustAsh", ItemDusts.getDustByName("ashes")); OreUnifier.registerOre("dustAsh", ItemDusts.getDustByName("ashes"));
OreUnifier.registerOre("dustBasalt", ItemDusts.getDustByName("basalt")); OreUnifier.registerOre("dustBasalt", ItemDusts.getDustByName("basalt"));
@ -421,6 +424,7 @@ public class ModItems
OreUnifier.registerOre("dustCopper", ItemDusts.getDustByName("copper")); OreUnifier.registerOre("dustCopper", ItemDusts.getDustByName("copper"));
OreUnifier.registerOre("dustDarkAsh", ItemDusts.getDustByName("darkAshes")); OreUnifier.registerOre("dustDarkAsh", ItemDusts.getDustByName("darkAshes"));
OreUnifier.registerOre("dustDiamond", ItemDusts.getDustByName("diamond")); OreUnifier.registerOre("dustDiamond", ItemDusts.getDustByName("diamond"));
OreUnifier.registerOre("dustDiorite", ItemDusts.getDustByName("diorite"));
OreUnifier.registerOre("dustElectrum", ItemDusts.getDustByName("electrum")); OreUnifier.registerOre("dustElectrum", ItemDusts.getDustByName("electrum"));
OreUnifier.registerOre("dustEmerald", ItemDusts.getDustByName("emerald")); OreUnifier.registerOre("dustEmerald", ItemDusts.getDustByName("emerald"));
OreUnifier.registerOre("dustEnderEye", ItemDusts.getDustByName("enderEye")); OreUnifier.registerOre("dustEnderEye", ItemDusts.getDustByName("enderEye"));
@ -429,6 +433,7 @@ public class ModItems
OreUnifier.registerOre("dustFlint", ItemDusts.getDustByName("flint")); OreUnifier.registerOre("dustFlint", ItemDusts.getDustByName("flint"));
OreUnifier.registerOre("dustGalena", ItemDusts.getDustByName("galena")); OreUnifier.registerOre("dustGalena", ItemDusts.getDustByName("galena"));
OreUnifier.registerOre("dustGold", ItemDusts.getDustByName("gold")); OreUnifier.registerOre("dustGold", ItemDusts.getDustByName("gold"));
OreUnifier.registerOre("dustGranite", ItemDusts.getDustByName("granite"));
OreUnifier.registerOre("dustGrossular", ItemDusts.getDustByName("grossular")); OreUnifier.registerOre("dustGrossular", ItemDusts.getDustByName("grossular"));
OreUnifier.registerOre("dustInvar", ItemDusts.getDustByName("invar")); OreUnifier.registerOre("dustInvar", ItemDusts.getDustByName("invar"));
OreUnifier.registerOre("dustIron", ItemDusts.getDustByName("iron")); OreUnifier.registerOre("dustIron", ItemDusts.getDustByName("iron"));
@ -447,7 +452,6 @@ public class ModItems
OreUnifier.registerOre("dustPyrite", ItemDusts.getDustByName("pyrite")); OreUnifier.registerOre("dustPyrite", ItemDusts.getDustByName("pyrite"));
OreUnifier.registerOre("dustPyrope", ItemDusts.getDustByName("pyrope")); OreUnifier.registerOre("dustPyrope", ItemDusts.getDustByName("pyrope"));
OreUnifier.registerOre("dustRedGarnet", ItemDusts.getDustByName("redGarnet")); OreUnifier.registerOre("dustRedGarnet", ItemDusts.getDustByName("redGarnet"));
OreUnifier.registerOre("dustRedrock", ItemDusts.getDustByName("redrock"));
OreUnifier.registerOre("dustRuby", ItemDusts.getDustByName("ruby")); OreUnifier.registerOre("dustRuby", ItemDusts.getDustByName("ruby"));
OreUnifier.registerOre("dustSaltpeter", ItemDusts.getDustByName("saltpeter")); OreUnifier.registerOre("dustSaltpeter", ItemDusts.getDustByName("saltpeter"));
OreUnifier.registerOre("dustSapphire", ItemDusts.getDustByName("sapphire")); OreUnifier.registerOre("dustSapphire", ItemDusts.getDustByName("sapphire"));

View file

@ -13,11 +13,11 @@ import java.util.List;
public class ItemDusts extends ItemTextureBase public class ItemDusts extends ItemTextureBase
{ {
public static final String[] types = new String[] { "almandine", "aluminum", "andradite", "ashes", "basalt", public static final String[] types = new String[] { "almandine", "aluminum", "andradite", "andesite", "ashes", "basalt",
"bauxite", "brass", "bronze", "calcite", "charcoal", "chrome", "cinnabar", "clay", "coal", "copper", "bauxite", "brass", "bronze", "calcite", "charcoal", "chrome", "cinnabar", "clay", "coal", "copper",
"darkAshes", "diamond", "electrum", "emerald", "enderEye", "enderPearl", "endstone", "flint", "galena", "darkAshes", "diamond", "diorite", "electrum", "emerald", "enderEye", "enderPearl", "endstone", "flint", "galena",
"gold", "grossular", "invar", "iron", "lazurite", "lead", "magnesium", "manganese", "marble", "netherrack", "gold", "granite", "grossular", "invar", "iron", "lazurite", "lead", "magnesium", "manganese", "marble", "netherrack",
"nickel", "obsidian", "peridot", "phosphorous", "platinum", "pyrite", "pyrope", "redGarnet", "redrock", "nickel", "obsidian", "peridot", "phosphorous", "platinum", "pyrite", "pyrope", "redGarnet", "%NULL%",
"ruby", "saltpeter", "sapphire", "sawDust", "silver", "sodalite", "spessartine", "sphalerite", "steel", "ruby", "saltpeter", "sapphire", "sawDust", "silver", "sodalite", "spessartine", "sphalerite", "steel",
"sulfur", "tin", "titanium", "tungsten", "uvarovite", "%NULL%", "yellowGarnet", "zinc", "sulfur", "tin", "titanium", "tungsten", "uvarovite", "%NULL%", "yellowGarnet", "zinc",
"olivine" }; "olivine" };

View file

@ -14,11 +14,11 @@ import java.util.List;
public class ItemDustsSmall extends ItemTextureBase public class ItemDustsSmall extends ItemTextureBase
{ {
public static final String[] types = new String[] { "almandine", "aluminum", "andradite", "ashes", "basalt", public static final String[] types = new String[] { "almandine", "aluminum", "andradite", "andesite", "ashes", "basalt",
"bauxite", "brass", "bronze", "calcite", "charcoal", "chrome", "cinnabar", "clay", "coal", "copper", "bauxite", "brass", "bronze", "calcite", "charcoal", "chrome", "cinnabar", "clay", "coal", "copper",
"darkAshes", "diamond", "electrum", "emerald", "enderEye", "enderPearl", "endstone", "flint", "galena", "darkAshes", "diamond", "diorite", "electrum", "emerald", "enderEye", "enderPearl", "endstone", "flint", "galena",
"gold", "grossular", "invar", "iron", "lazurite", "lead", "magnesium", "manganese", "marble", "netherrack", "gold", "granite", "grossular", "invar", "iron", "lazurite", "lead", "magnesium", "manganese", "marble", "netherrack",
"nickel", "obsidian", "peridot", "phosphorous", "platinum", "pyrite", "pyrope", "redGarnet", "redrock", "nickel", "obsidian", "peridot", "phosphorous", "platinum", "pyrite", "pyrope", "redGarnet", "%NULL%",
"ruby", "saltpeter", "sapphire", "sawDust", "silver", "sodalite", "spessartine", "sphalerite", "steel", "ruby", "saltpeter", "sapphire", "sawDust", "silver", "sodalite", "spessartine", "sphalerite", "steel",
"sulfur", "tin", "titanium", "tungsten", "uvarovite", "%NULL%", "yellowGarnet", "zinc", "sulfur", "tin", "titanium", "tungsten", "uvarovite", "%NULL%", "yellowGarnet", "zinc",
"olivine", "redstone", "glowstone" }; "olivine", "redstone", "glowstone" };