From 623067fa7aa7048fea7671c264a2c038e28042b2 Mon Sep 17 00:00:00 2001 From: DerOli82 Date: Tue, 11 Aug 2015 09:09:12 +0200 Subject: [PATCH] Added generator-settings defautl config --- fwg/config/ConfigFWG.java | 10 ++++++++++ fwg/generatortype/GeneratorType.java | 15 +++++++++++++++ fwg/gui/GuiGeneratorSettings.java | 3 ++- fwg/world/WorldTypeFWG.java | 3 ++- 4 files changed, 29 insertions(+), 2 deletions(-) diff --git a/fwg/config/ConfigFWG.java b/fwg/config/ConfigFWG.java index 50fdc1f..5662b65 100644 --- a/fwg/config/ConfigFWG.java +++ b/fwg/config/ConfigFWG.java @@ -1,12 +1,14 @@ package fwg.config; import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import fwg.generatortype.GeneratorType; import net.minecraftforge.common.config.Configuration; public class ConfigFWG { public static Configuration config; public static int[] biomeIDs = new int[3]; + public static String defaultGen; public static void init(FMLPreInitializationEvent event) { @@ -24,6 +26,14 @@ public static void init(FMLPreInitializationEvent event) biomeIDs[0] = config.get("Biome IDs", "Default 1", 185).getInt(); biomeIDs[1] = config.get("Biome IDs", "Default 2", 186).getInt(); biomeIDs[2] = config.get("Biome IDs", "Default Snow", 187).getInt(); + + defaultGen = config.get( "Generator", "default-setting", "SKYDIM#1" ).getString(); + + //if setting doesn't exists set to default + if( GeneratorType.exists( defaultGen ) == false ) + { + defaultGen = "SKYDIM#1"; + } } catch (Exception e) { diff --git a/fwg/generatortype/GeneratorType.java b/fwg/generatortype/GeneratorType.java index 3ab98b5..d349358 100644 --- a/fwg/generatortype/GeneratorType.java +++ b/fwg/generatortype/GeneratorType.java @@ -1,6 +1,7 @@ package fwg.generatortype; import fwg.biomes.BiomeList; +import fwg.data.DecodeGeneratorString; import fwg.gui.GuiGeneratorSettings; import net.minecraft.util.Vec3; import net.minecraft.world.World; @@ -113,4 +114,18 @@ public static int trySetting(int pos, int max) } return 0; } + + public static boolean exists( String gen ) + { + DecodeGeneratorString.decode( gen ); + + if( ( currentGenerator != null ) && ( currentSettings != null ) ) + { + return true; + } + else + { + return false; + } + } } diff --git a/fwg/gui/GuiGeneratorSettings.java b/fwg/gui/GuiGeneratorSettings.java index 153029a..5859cf3 100644 --- a/fwg/gui/GuiGeneratorSettings.java +++ b/fwg/gui/GuiGeneratorSettings.java @@ -2,6 +2,7 @@ import java.util.ArrayList; +import fwg.config.ConfigFWG; import fwg.data.DecodeGeneratorString; import fwg.generatortype.GeneratorType; import net.minecraft.client.gui.GuiButton; @@ -270,7 +271,7 @@ public String createString() } else { - return "SKYDIM#1"; + return ConfigFWG.defaultGen; } } } \ No newline at end of file diff --git a/fwg/world/WorldTypeFWG.java b/fwg/world/WorldTypeFWG.java index 4f79c27..e4c95df 100644 --- a/fwg/world/WorldTypeFWG.java +++ b/fwg/world/WorldTypeFWG.java @@ -3,6 +3,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import fwg.biomes.BiomeList; +import fwg.config.ConfigFWG; import fwg.data.DecodeGeneratorString; import fwg.generatortype.GeneratorType; import fwg.gui.GuiGeneratorSettings; @@ -33,7 +34,7 @@ public WorldChunkManager getChunkManager(World world) } else { - DecodeGeneratorString.decode("SKYDIM#1"); + DecodeGeneratorString.decode( ConfigFWG.defaultGen ); } return GeneratorType.currentGenerator.getServerWorldChunkManager(world); }