diff options
Diffstat (limited to 'src/main/java')
3 files changed, 9 insertions, 12 deletions
diff --git a/src/main/java/com/sosnitzka/taiga/TAIGAConfiguration.java b/src/main/java/com/sosnitzka/taiga/TAIGAConfiguration.java index e5bb638..568b080 100644 --- a/src/main/java/com/sosnitzka/taiga/TAIGAConfiguration.java +++ b/src/main/java/com/sosnitzka/taiga/TAIGAConfiguration.java @@ -110,16 +110,13 @@ public class TAIGAConfiguration { final int PALLADIUM_DEFAULT = 10; final int ABYSSUM_DEFAULT = 4; - final boolean FALSE = false; - final boolean TRUE = true; - - Property ironSwitch = config.get(CATEGORY_NAME_GENERAL, "Extra Iron Switch", FALSE); - ironSwitch.setComment("Switch ore on/off"); + Property ironSwitch = config.get(CATEGORY_NAME_GENERAL, "Additional Iron", false); + ironSwitch.setComment("Switch additional ore on/off"); ironSwitch.setLanguageKey("gui.taiga_configuration.gen_iron"); - Property endSwitch = config.get(CATEGORY_NAME_GENERAL, "Extra Endstone Switch", TRUE); - endSwitch.setComment("Switch extra End on/off"); + Property endSwitch = config.get(CATEGORY_NAME_GENERAL, "Additional Endstone", true); + endSwitch.setComment("Switch additional endstone on/off"); endSwitch.setLanguageKey("gui.taiga_configuration.gen_end"); /* @@ -202,8 +199,8 @@ public class TAIGAConfiguration { if (readFieldsFromConfig) { - ironGen = ironSwitch.getBoolean(FALSE); - endGen = endSwitch.getBoolean(TRUE); + ironGen = ironSwitch.getBoolean(false); + endGen = endSwitch.getBoolean(true); IRON_VAL = ironValueProp.getInt(IRON_DEFAULT); if (IRON_VAL > RESFAC_MAX_VALUE || IRON_VAL < RESFAC_MIN_VALUE) { IRON_VAL = IRON_DEFAULT; @@ -275,6 +272,7 @@ public class TAIGAConfiguration { } ironSwitch.set(ironGen); + endSwitch.set(endGen); ironValueProp.set(IRON_VAL); tiberiumValueProp.set(TIBERIUM_VAL); prometheumValueProp.set(PROMETHEUM_VAL); diff --git a/src/main/java/com/sosnitzka/taiga/TAIGAGuiFactory.java b/src/main/java/com/sosnitzka/taiga/TAIGAGuiFactory.java index 2e41236..080e4ce 100644 --- a/src/main/java/com/sosnitzka/taiga/TAIGAGuiFactory.java +++ b/src/main/java/com/sosnitzka/taiga/TAIGAGuiFactory.java @@ -43,8 +43,8 @@ public class TAIGAGuiFactory implements IModGuiFactory { private static List<IConfigElement> getConfigElements() { List<IConfigElement> list = new ArrayList<IConfigElement>(); - list.add(new DummyConfigElement.DummyCategoryElement("Basics configuration", "gui.taiga_configuration.ctgy.general", CategoryEntryGeneral.class)); - list.add(new DummyConfigElement.DummyCategoryElement("Specific ore generation", "gui.taiga_configuration.ctgy.oregen", CategoryEntryOreGen.class)); + list.add(new DummyConfigElement.DummyCategoryElement("Basic configuration", "gui.taiga_configuration.ctgy.general", CategoryEntryGeneral.class)); + list.add(new DummyConfigElement.DummyCategoryElement("Ore specific settings", "gui.taiga_configuration.ctgy.oregen", CategoryEntryOreGen.class)); return list; } diff --git a/src/main/java/com/sosnitzka/taiga/world/WorldGen.java b/src/main/java/com/sosnitzka/taiga/world/WorldGen.java index 4a10999..65779d6 100644 --- a/src/main/java/com/sosnitzka/taiga/world/WorldGen.java +++ b/src/main/java/com/sosnitzka/taiga/world/WorldGen.java @@ -23,7 +23,6 @@ public class WorldGen implements IWorldGenerator { Generator.generateOre(Blocks.NETHERRACK.getDefaultState(), prometheumOre.getDefaultState(), random, x, z, world, PROMETHEUM_VAL, 0, 128, 2, 4); Generator.generateOre(Blocks.NETHERRACK.getDefaultState(), valyriumOre.getDefaultState(), random, x, z, world, VALYRIUM_VAL, 0, 32, 2, 4); Generator.generateOre(newArrayList(Blocks.LAVA.getDefaultState(), Blocks.FLOWING_LAVA.getDefaultState()), osramOre.getDefaultState(), random, x, z, world, OSRAM_VAL, 0, 64, 15); - } private void world(Random random, int x, int z, World world) { |