Swapped Tin and Copper ore for Tetrahedrite and Cassiterite

This commit is contained in:
Tntrololol 2015-05-07 17:18:11 -05:00
parent e01058fca6
commit 87dcd49174
3 changed files with 26 additions and 26 deletions

View file

@ -20,8 +20,8 @@ public class BlockOre extends Block {
public static final String[] types = new String[]
{ "Galena", "Iridium", "Ruby", "Sapphire", "Bauxite", "Pyrite", "Cinnabar",
"Sphalerite", "Tungston", "Sheldonite", "Olivine", "Sodalite",
"Copper", "Tin", "Lead", "Silver" };
"Sphalerite", "Tungston", "Sheldonite", "Peridot", "Sodalite",
"Tetrahedrite", "Cassiterite", "Lead", "Silver" };
private IIcon[] textures;

View file

@ -28,11 +28,11 @@ public class ConfigTechReborn {
public static boolean BauxiteOreTrue;
public static int BauxiteOreRare;
public static boolean CopperOreTrue;
public static int CopperOreRare;
public static boolean TetrahedriteOreTrue;
public static int TetrahedriteOreRare;
public static boolean TinOreTrue;
public static int TinOreRare;
public static boolean CassiteriteOreTrue;
public static int CassiteriteOreRare;
public static boolean LeadOreTrue;
public static int LeadOreRare;
@ -55,8 +55,8 @@ public class ConfigTechReborn {
public static boolean SheldoniteOreTrue;
public static int SheldoniteOreRare;
public static boolean OlivineOreTrue;
public static int OlivineOreRare;
public static boolean PeridotOreTrue;
public static int PeridotOreRare;
public static boolean SodaliteOreTrue;
public static int SodaliteOreRare;
@ -209,7 +209,7 @@ public class ConfigTechReborn {
StatCollector
.translateToLocal("config.techreborn.allow.bauxiteOre.tooltip"))
.getBoolean(true);
CopperOreTrue = config
TetrahedriteOreTrue = config
.get(CATEGORY_WORLD,
StatCollector
.translateToLocal("config.techreborn.allow.copperOre"),
@ -217,7 +217,7 @@ public class ConfigTechReborn {
StatCollector
.translateToLocal("config.techreborn.allow.copperOre.tooltip"))
.getBoolean(true);
TinOreTrue = config
CassiteriteOreTrue = config
.get(CATEGORY_WORLD,
StatCollector
.translateToLocal("config.techreborn.allow.tinOre"),
@ -281,7 +281,7 @@ public class ConfigTechReborn {
StatCollector
.translateToLocal("config.techreborn.allow.sheldoniteOre.tooltip"))
.getBoolean(true);
OlivineOreTrue = config
PeridotOreTrue = config
.get(CATEGORY_WORLD,
StatCollector
.translateToLocal("config.techreborn.allow.olivineOre"),
@ -386,7 +386,7 @@ public class ConfigTechReborn {
.translateToLocal("config.techreborn.sheldoniteOre.rare.tooltip"))
.getInt();
OlivineOreRare = config
PeridotOreRare = config
.get(CATEGORY_WORLD,
StatCollector
.translateToLocal("config.techreborn.olivineOre.rare"),
@ -404,7 +404,7 @@ public class ConfigTechReborn {
.translateToLocal("config.techreborn.sodaliteOre.rare.tooltip"))
.getInt();
CopperOreRare = config
TetrahedriteOreRare = config
.get(CATEGORY_WORLD,
StatCollector
.translateToLocal("config.techreborn.copperOre.rare"),
@ -413,7 +413,7 @@ public class ConfigTechReborn {
.translateToLocal("config.techreborn.copperOre.rare.tooltip"))
.getInt();
TinOreRare = config
CassiteriteOreRare = config
.get(CATEGORY_WORLD,
StatCollector
.translateToLocal("config.techreborn.tinOre.rare"),

View file

@ -24,10 +24,10 @@ public class TROreGen implements IWorldGenerator {
WorldGenMinable oreSphalerite;
WorldGenMinable oreTungston;
WorldGenMinable oreSheldonite;
WorldGenMinable oreOlivine;
WorldGenMinable orePeridot;
WorldGenMinable oreSodalite;
WorldGenMinable oreCopper;
WorldGenMinable oreTin;
WorldGenMinable oreTetrahedrite;
WorldGenMinable oreCassiterite;
WorldGenMinable oreLead;
WorldGenMinable oreSilver;
@ -39,8 +39,8 @@ public class TROreGen implements IWorldGenerator {
oreRuby = new WorldGenMinable(ModBlocks.ore, 2, ConfigTechReborn.RubyOreRare, Blocks.stone);
oreSapphire = new WorldGenMinable(ModBlocks.ore, 3, ConfigTechReborn.SapphireOreRare, Blocks.stone);
oreBauxite = new WorldGenMinable(ModBlocks.ore, 4, ConfigTechReborn.BauxiteOreRare, Blocks.stone);
oreCopper = new WorldGenMinable(ModBlocks.ore, 12, ConfigTechReborn.CopperOreRare, Blocks.stone);
oreTin = new WorldGenMinable(ModBlocks.ore, 13, ConfigTechReborn.TinOreRare, Blocks.stone);
oreTetrahedrite = new WorldGenMinable(ModBlocks.ore, 12, ConfigTechReborn.TetrahedriteOreRare, Blocks.stone);
oreCassiterite = new WorldGenMinable(ModBlocks.ore, 13, ConfigTechReborn.CassiteriteOreRare, Blocks.stone);
oreLead = new WorldGenMinable(ModBlocks.ore, 14, ConfigTechReborn.LeadOreRare, Blocks.stone);
oreSilver = new WorldGenMinable(ModBlocks.ore, 15, ConfigTechReborn.SilverOreRare, Blocks.stone);
@ -52,7 +52,7 @@ public class TROreGen implements IWorldGenerator {
// End
oreTungston = new WorldGenMinable(ModBlocks.ore, 8, ConfigTechReborn.TungstenOreRare, Blocks.end_stone);
oreSheldonite = new WorldGenMinable(ModBlocks.ore, 9, ConfigTechReborn.SheldoniteOreRare, Blocks.end_stone);
oreOlivine = new WorldGenMinable(ModBlocks.ore, 10, ConfigTechReborn.OlivineOreRare, Blocks.end_stone);
orePeridot = new WorldGenMinable(ModBlocks.ore, 10, ConfigTechReborn.PeridotOreRare, Blocks.end_stone);
oreSodalite = new WorldGenMinable(ModBlocks.ore, 11, ConfigTechReborn.SodaliteOreRare, Blocks.end_stone);
LogHelper.info("WorldGen Loaded");
@ -138,24 +138,24 @@ public class TROreGen implements IWorldGenerator {
oreBauxite.generate(world, random, xPos, yPos, zPos);
}
}
if (config.CopperOreTrue)
if (config.TetrahedriteOreTrue)
{
for (int i = 0; i <= 16; i++)
{
xPos = xChunk + random.nextInt(16);
yPos = 60 + random.nextInt(60 - 20);
zPos = zChunk + random.nextInt(16);
oreCopper.generate(world, random, xPos, yPos, zPos);
oreTetrahedrite.generate(world, random, xPos, yPos, zPos);
}
}
if (config.TinOreTrue)
if (config.CassiteriteOreTrue)
{
for (int i = 0; i <= 16; i++)
{
xPos = xChunk + random.nextInt(16);
yPos = 60 + random.nextInt(60 - 20);
zPos = zChunk + random.nextInt(16);
oreTin.generate(world, random, xPos, yPos, zPos);
oreCassiterite.generate(world, random, xPos, yPos, zPos);
}
}
if (config.LeadOreTrue)
@ -238,14 +238,14 @@ public class TROreGen implements IWorldGenerator {
oreSheldonite.generate(world, random, xPos, yPos, zPos);
}
}
if (config.OlivineOreTrue)
if (config.PeridotOreTrue)
{
for (int i = 0; i <= 16; i++)
{
xPos = xChunk + random.nextInt(16);
yPos = 60 + random.nextInt(60 - 20);
zPos = zChunk + random.nextInt(16);
oreOlivine.generate(world, random, xPos, yPos, zPos);
orePeridot.generate(world, random, xPos, yPos, zPos);
}
}
if (config.SodaliteOreTrue)