diff --git a/src/main/java/techreborn/config/ConfigTechReborn.java b/src/main/java/techreborn/config/ConfigTechReborn.java index d8afafe08..a8b7488b0 100644 --- a/src/main/java/techreborn/config/ConfigTechReborn.java +++ b/src/main/java/techreborn/config/ConfigTechReborn.java @@ -13,22 +13,53 @@ public class ConfigTechReborn { // WORLDGEN public static boolean GalenaOreTrue; + public static int GalenaOreRare; + public static boolean IridiumOreTrue; + public static int IridiumOreRare; + public static boolean RubyOreTrue; + public static int RubyOreRare; + public static boolean SapphireOreTrue; + public static int SapphireOreRare; + public static boolean BauxiteOreTrue; + public static int BauxiteOreRare; + public static boolean CopperOreTrue; + public static int CopperOreRare; + public static boolean TinOreTrue; + public static int TinOreRare; + public static boolean LeadOreTrue; + public static int LeadOreRare; + public static boolean SilverOreTrue; + public static int SilverOreRare; public static boolean PyriteOreTrue; + public static int PyriteOreRare; + public static boolean CinnabarOreTrue; + public static int CinnabarOreRare; + public static boolean SphaleriteOreTrue; + public static int SphaleriteOreRare; + public static boolean TungstenOreTrue; + public static int TungstenOreRare; + public static boolean SheldoniteOreTrue; + public static int SheldoniteOreRare; + public static boolean OlivineOreTrue; + public static int OlivineOreRare; + public static boolean SodaliteOreTrue; + public static int SodaliteOreRare; + // Power public static int ThermalGenertaorOutput; @@ -223,6 +254,148 @@ public class ConfigTechReborn { StatCollector .translateToLocal("config.techreborn.allow.sodaliteOre.tooltip")) .getBoolean(true); + GalenaOreRare = config + .get(CATEGORY_WORLD, + StatCollector + .translateToLocal("config.techreborn.galenaOre.rare"), + 8, + StatCollector + .translateToLocal("config.techreborn.galenaOre.rare.tooltip")) + .getInt(); + IridiumOreRare = config + .get(CATEGORY_WORLD, + StatCollector + .translateToLocal("config.techreborn.iridiumOre.rare"), + 1, + StatCollector + .translateToLocal("config.techreborn.iridiumOre.rare.tooltip")) + .getInt(); + + RubyOreRare = config + .get(CATEGORY_WORLD, + StatCollector + .translateToLocal("config.techreborn.rubyOre.rare"), + 6, + StatCollector + .translateToLocal("config.techreborn.rubyOre.rare.tooltip")) + .getInt(); + + SapphireOreRare = config + .get(CATEGORY_WORLD, + StatCollector + .translateToLocal("config.techreborn.sapphireOre.rare"), + 6, + StatCollector + .translateToLocal("config.techreborn.sapphireOre.rare.tooltip")) + .getInt(); + + BauxiteOreRare = config + .get(CATEGORY_WORLD, + StatCollector + .translateToLocal("config.techreborn.bauxiteOre.rare"), + 6, + StatCollector + .translateToLocal("config.techreborn.bauxiteOre.rare.tooltip")) + .getInt(); + + PyriteOreRare = config + .get(CATEGORY_WORLD, + StatCollector + .translateToLocal("config.techreborn.pyriteOre.rare"), + 6, + StatCollector + .translateToLocal("config.techreborn.pyriteOre.rare.tooltip")) + .getInt(); + + CinnabarOreRare = config + .get(CATEGORY_WORLD, + StatCollector + .translateToLocal("config.techreborn.cinnabarOre.rare"), + 6, + StatCollector + .translateToLocal("config.techreborn.cinnabarOre.rare.tooltip")) + .getInt(); + + SphaleriteOreRare = config + .get(CATEGORY_WORLD, + StatCollector + .translateToLocal("config.techreborn.sphaleriteOre.rare"), + 6, + StatCollector + .translateToLocal("config.techreborn.sphaleriteOre.rare.tooltip")) + .getInt(); + + TungstenOreRare = config + .get(CATEGORY_WORLD, + StatCollector + .translateToLocal("config.techreborn.tungstenOre.rare"), + 6, + StatCollector + .translateToLocal("config.techreborn.tungstenOre.rare.tooltip")) + .getInt(); + + SheldoniteOreRare = config + .get(CATEGORY_WORLD, + StatCollector + .translateToLocal("config.techreborn.sheldoniteOre.rare"), + 6, + StatCollector + .translateToLocal("config.techreborn.sheldoniteOre.rare.tooltip")) + .getInt(); + + OlivineOreRare = config + .get(CATEGORY_WORLD, + StatCollector + .translateToLocal("config.techreborn.olivineOre.rare"), + 6, + StatCollector + .translateToLocal("config.techreborn.olivineOre.rare.tooltip")) + .getInt(); + + SodaliteOreRare = config + .get(CATEGORY_WORLD, + StatCollector + .translateToLocal("config.techreborn.sodaliteOre.rare"), + 6, + StatCollector + .translateToLocal("config.techreborn.sodaliteOre.rare.tooltip")) + .getInt(); + + CopperOreRare = config + .get(CATEGORY_WORLD, + StatCollector + .translateToLocal("config.techreborn.copperOre.rare"), + 6, + StatCollector + .translateToLocal("config.techreborn.copperOre.rare.tooltip")) + .getInt(); + + TinOreRare = config + .get(CATEGORY_WORLD, + StatCollector + .translateToLocal("config.techreborn.tinOre.rare"), + 6, + StatCollector + .translateToLocal("config.techreborn.tinOre.rare.tooltip")) + .getInt(); + + LeadOreRare = config + .get(CATEGORY_WORLD, + StatCollector + .translateToLocal("config.techreborn.leadOre.rare"), + 6, + StatCollector + .translateToLocal("config.techreborn.leadOre.rare.tooltip")) + .getInt(); + + SilverOreRare = config + .get(CATEGORY_WORLD, + StatCollector + .translateToLocal("config.techreborn.silverOre.rare"), + 6, + StatCollector + .translateToLocal("config.techreborn.silverOre.rare.tooltip")) + .getInt(); // Power ThermalGenertaorOutput = config diff --git a/src/main/java/techreborn/items/ItemDusts.java b/src/main/java/techreborn/items/ItemDusts.java index c8763b48f..7de3d6416 100644 --- a/src/main/java/techreborn/items/ItemDusts.java +++ b/src/main/java/techreborn/items/ItemDusts.java @@ -12,7 +12,7 @@ import techreborn.client.TechRebornCreativeTabMisc; public class ItemDusts extends ItemTR { public static final String[] types = new String[] - { "Almandine", "Aluminium", "Andradite", "Ashes", "Basalt", "Bauxite", + { "Almandine", "Aluminium", "Andradite", "Ashes", "Basalt", "Bauxite", "Brass", "Bronze", "Calcite", "Charcoal", "Chrome", "Cinnabar", "Clay", "Coal", "Copper", "DarkAshes", "Diamond", "Electrum", "Emerald", "EnderEye", "EnderPearl", "Endstone", "Flint", "Gold", diff --git a/src/main/java/techreborn/proxies/ClientProxy.java b/src/main/java/techreborn/proxies/ClientProxy.java index 098e9caa9..af08336cf 100644 --- a/src/main/java/techreborn/proxies/ClientProxy.java +++ b/src/main/java/techreborn/proxies/ClientProxy.java @@ -6,7 +6,8 @@ import techreborn.client.IconSupplier; public class ClientProxy extends CommonProxy { @Override - public void init() { + public void init() + { super.init(); MinecraftForge.EVENT_BUS.register(new IconSupplier()); } diff --git a/src/main/java/techreborn/proxies/CommonProxy.java b/src/main/java/techreborn/proxies/CommonProxy.java index b0aab902d..cc583bc42 100644 --- a/src/main/java/techreborn/proxies/CommonProxy.java +++ b/src/main/java/techreborn/proxies/CommonProxy.java @@ -2,7 +2,8 @@ package techreborn.proxies; public class CommonProxy { - public void init(){ + public void init() + { } diff --git a/src/main/java/techreborn/world/TROreGen.java b/src/main/java/techreborn/world/TROreGen.java index 6f46a0022..ce7ad6a57 100644 --- a/src/main/java/techreborn/world/TROreGen.java +++ b/src/main/java/techreborn/world/TROreGen.java @@ -34,29 +34,27 @@ public class TROreGen implements IWorldGenerator { public TROreGen() { // World - oreGalena = new WorldGenMinable(ModBlocks.ore, 0, 8, Blocks.stone); - oreIridium = new WorldGenMinable(ModBlocks.ore, 1, 2, Blocks.stone); - oreRuby = new WorldGenMinable(ModBlocks.ore, 2, 8, Blocks.stone); - oreSapphire = new WorldGenMinable(ModBlocks.ore, 3, 8, Blocks.stone); - oreBauxite = new WorldGenMinable(ModBlocks.ore, 4, 8, Blocks.stone); - oreCopper = new WorldGenMinable(ModBlocks.ore, 12, 8, Blocks.stone); - oreTin = new WorldGenMinable(ModBlocks.ore, 13, 8, Blocks.stone); - oreLead = new WorldGenMinable(ModBlocks.ore, 14, 8, Blocks.stone); - oreSilver = new WorldGenMinable(ModBlocks.ore, 15, 8, Blocks.stone); + oreGalena = new WorldGenMinable(ModBlocks.ore, 0, ConfigTechReborn.GalenaOreRare, Blocks.stone); + oreIridium = new WorldGenMinable(ModBlocks.ore, 1, ConfigTechReborn.IridiumOreRare, Blocks.stone); + 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); + oreLead = new WorldGenMinable(ModBlocks.ore, 14, ConfigTechReborn.LeadOreRare, Blocks.stone); + oreSilver = new WorldGenMinable(ModBlocks.ore, 15, ConfigTechReborn.SilverOreRare, Blocks.stone); // Nether - orePyrite = new WorldGenMinable(ModBlocks.ore, 5, 8, Blocks.netherrack); - oreCinnabar = new WorldGenMinable(ModBlocks.ore, 6, 8, - Blocks.netherrack); - oreSphalerite = new WorldGenMinable(ModBlocks.ore, 7, 8, - Blocks.netherrack); + orePyrite = new WorldGenMinable(ModBlocks.ore, 5, ConfigTechReborn.PyriteOreRare, Blocks.netherrack); + oreCinnabar = new WorldGenMinable(ModBlocks.ore, 6, ConfigTechReborn.CinnabarOreRare, Blocks.netherrack); + oreSphalerite = new WorldGenMinable(ModBlocks.ore, 7, ConfigTechReborn.SphaleriteOreRare, Blocks.netherrack); + // End - oreTungston = new WorldGenMinable(ModBlocks.ore, 8, 8, Blocks.end_stone); - oreSheldonite = new WorldGenMinable(ModBlocks.ore, 9, 8, - Blocks.end_stone); - oreOlivine = new WorldGenMinable(ModBlocks.ore, 10, 8, Blocks.end_stone); - oreSodalite = new WorldGenMinable(ModBlocks.ore, 11, 8, - Blocks.end_stone); + 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); + oreSodalite = new WorldGenMinable(ModBlocks.ore, 11, ConfigTechReborn.SodaliteOreRare, Blocks.end_stone); + LogHelper.info("WorldGen Loaded"); }