Merge pull request #767 from Team-RTG/dev

Merge dev into master (1.7.10-1.0).

build.properties

@@ -4,10 +4,10 @@
 mod_id=RTG
 mod_name=Realistic Terrain Generation
 mod_desc=Adds a new world type which generates realistic terrain for Overworld biomes.
-mod_version=1.0-snapshot-2
+mod_version=1.0
 mc_version=1.7.10
 mod_url=https://github.com/Team-RTG/Realistic-Terrain-Generation
-mod_author="WhichOnesPink"
+mod_author="Team RTG"
 mod_creds=Forked from RWG by ted80. OpenSimplex Noise by KdotJPG.
 mod_logo=assets/rtg/logo.png
 mcf_version=10.13.4.1558
@@ -25,6 +25,7 @@ mod_deps=after:abyssalcraft@[1.9.1.2,);\
           after:Growthcraft|Bamboo@[1.7.10-2.5.0,);\
           after:Highlands@[2.2.3,);\
           after:ICMod@[1.5.0,);\
+          after:mod_IDT;\
           after:lom@[1.7.10-3.2.0,);\
           after:Railcraft@[9.7.0.0,);\
           after:RidiculousWorld@[0.1,);\

etc/config/RTG/biomes/industrialtechnologies.cfg

@@ -0,0 +1,170 @@
+# Configuration file
+
+biome {
+
+    idt {
+
+        ebonyforest {
+            #  [default: true]
+            B:"Allow Villages"=true
+
+            #  [default: false]
+            B:"Allow Volcanoes"=false
+
+            # This setting controls the size of caves.
+            # HIGHER values = BIGGER caves & MORE lag. (14 = vanilla cave density)
+            # Set to -1 to use global setting. Set to 0 to disable caves for this biome.
+            #  [range: -1 ~ 40, default: -1]
+            I:"Cave Density"=-1
+
+            # This setting controls the number of caves that generate.
+            # LOWER values = MORE caves & MORE lag. (6 = vanilla cave frequency)
+            # Set to -1 to use global setting. Set to 0 to disable caves for this biome.
+            #  [range: -1 ~ 40, default: -1]
+            I:"Cave Frequency"=-1
+
+            #  [default: true]
+            B:"RTG Decoration: Logs"=true
+
+            #  [default: ]
+            S:"RTG Surface: Filler Block"=
+
+            #  [default: ]
+            S:"RTG Surface: Filler Block Meta"=
+
+            #  [default: ]
+            S:"RTG Surface: Top Block"=
+
+            #  [default: ]
+            S:"RTG Surface: Top Block Meta"=
+
+            # This setting controls the number of ravines that generate.
+            # LOWER values = MORE ravines & MORE lag. (50 = vanilla ravine frequency)
+            # Set to -1 to use global setting. Set to 0 to disable ravines for this biome.
+            #  [range: -1 ~ 100, default: -1]
+            I:"Ravine Frequency"=-1
+
+            #  [default: true]
+            B:"Use RTG Decorations"=true
+
+            #  [default: true]
+            B:"Use RTG Surfaces"=true
+
+            # 1/x chance that a volcano will generate if this biome has volcanoes enabled.
+            # 1 = Always generate if possible; 2 = 50% chance; 4 = 25% chance
+            # Set to -1 to use global setting. Set to 0 to disable volcanoes for this biome.
+            #  [range: -1 ~ 2147483647, default: -1]
+            I:"Volcano Chance"=-1
+        }
+
+        silkwoodforest {
+            #  [default: true]
+            B:"Allow Villages"=true
+
+            #  [default: false]
+            B:"Allow Volcanoes"=false
+
+            # This setting controls the size of caves.
+            # HIGHER values = BIGGER caves & MORE lag. (14 = vanilla cave density)
+            # Set to -1 to use global setting. Set to 0 to disable caves for this biome.
+            #  [range: -1 ~ 40, default: -1]
+            I:"Cave Density"=-1
+
+            # This setting controls the number of caves that generate.
+            # LOWER values = MORE caves & MORE lag. (6 = vanilla cave frequency)
+            # Set to -1 to use global setting. Set to 0 to disable caves for this biome.
+            #  [range: -1 ~ 40, default: -1]
+            I:"Cave Frequency"=-1
+
+            #  [default: true]
+            B:"RTG Decoration: Logs"=true
+
+            #  [default: ]
+            S:"RTG Surface: Filler Block"=
+
+            #  [default: ]
+            S:"RTG Surface: Filler Block Meta"=
+
+            #  [default: ]
+            S:"RTG Surface: Top Block"=
+
+            #  [default: ]
+            S:"RTG Surface: Top Block Meta"=
+
+            # This setting controls the number of ravines that generate.
+            # LOWER values = MORE ravines & MORE lag. (50 = vanilla ravine frequency)
+            # Set to -1 to use global setting. Set to 0 to disable ravines for this biome.
+            #  [range: -1 ~ 100, default: -1]
+            I:"Ravine Frequency"=-1
+
+            #  [default: true]
+            B:"Use RTG Decorations"=true
+
+            #  [default: true]
+            B:"Use RTG Surfaces"=true
+
+            # 1/x chance that a volcano will generate if this biome has volcanoes enabled.
+            # 1 = Always generate if possible; 2 = 50% chance; 4 = 25% chance
+            # Set to -1 to use global setting. Set to 0 to disable volcanoes for this biome.
+            #  [range: -1 ~ 2147483647, default: -1]
+            I:"Volcano Chance"=-1
+        }
+
+        willowforest {
+            #  [default: true]
+            B:"Allow Villages"=true
+
+            #  [default: false]
+            B:"Allow Volcanoes"=false
+
+            # This setting controls the size of caves.
+            # HIGHER values = BIGGER caves & MORE lag. (14 = vanilla cave density)
+            # Set to -1 to use global setting. Set to 0 to disable caves for this biome.
+            #  [range: -1 ~ 40, default: -1]
+            I:"Cave Density"=-1
+
+            # This setting controls the number of caves that generate.
+            # LOWER values = MORE caves & MORE lag. (6 = vanilla cave frequency)
+            # Set to -1 to use global setting. Set to 0 to disable caves for this biome.
+            #  [range: -1 ~ 40, default: -1]
+            I:"Cave Frequency"=-1
+
+            #  [default: true]
+            B:"RTG Decoration: Logs"=true
+
+            #  [default: ]
+            S:"RTG Surface: Filler Block"=
+
+            #  [default: ]
+            S:"RTG Surface: Filler Block Meta"=
+
+            #  [default: ]
+            S:"RTG Surface: Top Block"=
+
+            #  [default: ]
+            S:"RTG Surface: Top Block Meta"=
+
+            # This setting controls the number of ravines that generate.
+            # LOWER values = MORE ravines & MORE lag. (50 = vanilla ravine frequency)
+            # Set to -1 to use global setting. Set to 0 to disable ravines for this biome.
+            #  [range: -1 ~ 100, default: -1]
+            I:"Ravine Frequency"=-1
+
+            #  [default: true]
+            B:"Use RTG Decorations"=true
+
+            #  [default: true]
+            B:"Use RTG Surfaces"=true
+
+            # 1/x chance that a volcano will generate if this biome has volcanoes enabled.
+            # 1 = Always generate if possible; 2 = 50% chance; 4 = 25% chance
+            # Set to -1 to use global setting. Set to 0 to disable volcanoes for this biome.
+            #  [range: -1 ~ 2147483647, default: -1]
+            I:"Volcano Chance"=-1
+        }
+
+    }
+
+}
+
+

etc/config/RTG/biomes/vanilla.cfg

@@ -1426,6 +1426,18 @@ biome {
             #  [range: -1 ~ 40, default: -1]
             I:"Cave Frequency"=-1
 
+            # 1/x chance that packed ice spikes/lakes will generate when they normally would.
+            # 1 = Always generate if possible; 2 = 50% chance; 4 = 25% chance
+            # Set to 0 to disable ice spikes.
+            #  [range: 0 ~ 2147483647, default: 3]
+            I:"Packed Ice Spike/Lake Chance"=3
+
+            #  [default: true]
+            B:"RTG Decoration: Ice Shrubs"=true
+
+            #  [default: true]
+            B:"RTG Decoration: Ice Trees"=true
+
             #  [default: ]
             S:"RTG Surface: Filler Block"=
 

etc/config/RTG/rtg.cfg

@@ -24,12 +24,6 @@ biomes {
     #  [default: true]
     B:"Enable RTG Biome Surfaces"=true
 
-    # If you enter a biome ID here, the whole world will consist of only that biome (and rivers). Set to -1 to generate the world normally.
-    # Vanilla biome IDs can be found here: http://goo.gl/WqlAfV
-    # For modded biome IDs, use NEI and go [Options] > [Tools] > [Data Dumps] > Biomes > [Dump], and then refer to the 'biome.csv' file which can be found in your '/.minecraft/dumps' folder.
-    #  [range: -1 ~ 255, default: -1]
-    I:"Generate only this biome ID"=-1
-
     # If RTG tries to generate an unsupported biome or a biome that has an ID conflict, it will generate this biome instead.
     # If set to -1, RTG will crash instead of generating the patch biome. You might want to do this if you're making a mod pack
     # and want to make sure all biomes are generating correctly.
@@ -79,9 +73,6 @@ debugging {
     # WARNING: This should only be enabled if you know what you're doing.
     #  [default: false]
     B:"Enable Debugging"=false
-
-    #  [default: false]
-    B:"Show Debug Info in F3 Screen"=false
 }
 
 
@@ -104,6 +95,19 @@ dungeons {
 }
 
 
+"flowing liquids" {
+    # 1/x chance that a lava stream will generate on the side of a hill or mountain.
+    # 0 = Never generate; 1 = Always generate if possible; 2 = 50% chance; 4 = 25% chance
+    #  [range: 0 ~ 2147483647, default: 200]
+    I:"Flowing Lava Chance"=200
+
+    # 1/x chance that a water stream will generate on the side of a hill or mountain.
+    # 0 = Never generate; 1 = Always generate if possible; 2 = 50% chance; 4 = 25% chance
+    #  [range: 0 ~ 2147483647, default: 200]
+    I:"Flowing Water Chance"=200
+}
+
+
 "lakes (surface)" {
     # 1 = Always generate if possible; 2 = 50% chance; 4 = 25% chance
     #  [range: 1 ~ 100, default: 10]

src/main/java/rtg/RTG.java

@@ -6,9 +6,7 @@
 import rtg.api.event.BiomeConfigEvent;
 import rtg.config.BiomeConfigManager;
 import rtg.config.ConfigManager;
-import rtg.debug.DebugHandler;
 import rtg.event.EventManagerRTG;
-import rtg.proxy.CommonProxy;
 import rtg.reference.ModInfo;
 import rtg.util.RealisticBiomePresenceTester;
 import rtg.world.WorldTypeRTG;
@@ -24,6 +22,7 @@
 import rtg.world.biome.realistic.growthcraft.RealisticBiomeGCBase;
 import rtg.world.biome.realistic.highlands.RealisticBiomeHLBase;
 import rtg.world.biome.realistic.icmod.RealisticBiomeICBase;
+import rtg.world.biome.realistic.idt.RealisticBiomeIDTBase;
 import rtg.world.biome.realistic.lotsomobs.RealisticBiomeLOMBase;
 import rtg.world.biome.realistic.ridiculousworld.RealisticBiomeRWBase;
 import rtg.world.biome.realistic.thaumcraft.RealisticBiomeTCBase;
@@ -33,12 +32,10 @@
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.Mod.EventHandler;
 import cpw.mods.fml.common.Mod.Instance;
-import cpw.mods.fml.common.SidedProxy;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.event.FMLServerStoppedEvent;
-import cpw.mods.fml.relauncher.Side;
 
 //@Mod(modid = "RTG", name = "Realistic Terrain Generaton", version = "0.8.0d", dependencies = "required-after:Forge@[10.13.4.1448,)", acceptableRemoteVersions = "*")
 @Mod(modid = ModInfo.MOD_ID, name = ModInfo.MOD_NAME, version = ModInfo.MOD_VERSION, dependencies = "required-after:Forge@[" + ModInfo.FORGE_DEP + ",)" + ModInfo.MOD_DEPS, acceptableRemoteVersions = "*")
@@ -49,9 +46,6 @@ public class RTG {
     public static String configPath;
     public static WorldTypeRTG worldtype;
     public static EventManagerRTG eventMgr;
-
-    @SidedProxy(serverSide = ModInfo.PROXY_COMMON, clientSide = ModInfo.PROXY_CLIENT)
-    public static CommonProxy proxy;
 
     private ConfigManager configManager = new ConfigManager();
 
@@ -83,11 +77,9 @@ public void fmlLifeCycleEvent(FMLPreInitializationEvent event)
     }
 
     @EventHandler
-    public void fmlLifeCycleEvent(FMLInitializationEvent event) 
+    public void fmlLifeCycleEvent(FMLInitializationEvent event)
     {
-        if (event.getSide() == Side.CLIENT) {
-            MinecraftForge.EVENT_BUS.register(new DebugHandler());
-        }
+
     }
 
     @EventHandler
@@ -113,6 +105,7 @@ public void fmlLifeCycle(FMLPostInitializationEvent event)
         RealisticBiomeTOFUBase.addBiomes();
         RealisticBiomeFNBase.addBiomes();
         RealisticBiomeICBase.addBiomes();
+        RealisticBiomeIDTBase.addBiomes();
 
         RealisticBiomePresenceTester.doBiomeCheck();
     }

src/main/java/rtg/api/biome/idt/config/BiomeConfigIDT.java

@@ -0,0 +1,23 @@
+package rtg.api.biome.idt.config;
+
+import rtg.api.biome.BiomeConfig;
+
+
+public class BiomeConfigIDT
+{
+
+	public static BiomeConfig biomeConfigIDTEbonyForest;
+	public static BiomeConfig biomeConfigIDTSilkwoodForest;
+	public static BiomeConfig biomeConfigIDTWillowForest;
+
+    public static BiomeConfig[] getBiomeConfigs()
+    {
+        BiomeConfig[] biomeConfigs = new BiomeConfig[]{
+    		biomeConfigIDTEbonyForest,
+    		biomeConfigIDTSilkwoodForest,
+    		biomeConfigIDTWillowForest
+        };
+
+        return biomeConfigs;
+    }
+}

src/main/java/rtg/api/biome/idt/config/BiomeConfigIDTBase.java

@@ -0,0 +1,12 @@
+package rtg.api.biome.idt.config;
+
+import rtg.api.biome.BiomeConfig;
+
+public class BiomeConfigIDTBase extends BiomeConfig
+{
+
+    public BiomeConfigIDTBase(String biomeSlug)
+    {
+        super("idt", biomeSlug);
+    }
+}

src/main/java/rtg/api/biome/idt/config/BiomeConfigIDTEbonyForest.java

@@ -0,0 +1,18 @@
+package rtg.api.biome.idt.config;
+
+import rtg.api.biome.BiomeConfigProperty;
+import rtg.api.biome.BiomeConfigProperty.Type;
+
+
+public class BiomeConfigIDTEbonyForest extends BiomeConfigIDTBase
+{
+    public static final String decorationLogsId = "decorationLogs";
+    public static final String decorationLogsName = "RTG Decoration: Logs";
+
+    public BiomeConfigIDTEbonyForest()
+    {
+        super("ebonyforest");
+
+        this.addProperty(new BiomeConfigProperty(decorationLogsId, Type.BOOLEAN, decorationLogsName, "", true));
+    }
+}

src/main/java/rtg/api/biome/idt/config/BiomeConfigIDTSilkwoodForest.java

@@ -0,0 +1,18 @@
+package rtg.api.biome.idt.config;
+
+import rtg.api.biome.BiomeConfigProperty;
+import rtg.api.biome.BiomeConfigProperty.Type;
+
+
+public class BiomeConfigIDTSilkwoodForest extends BiomeConfigIDTBase
+{
+    public static final String decorationLogsId = "decorationLogs";
+    public static final String decorationLogsName = "RTG Decoration: Logs";
+
+    public BiomeConfigIDTSilkwoodForest()
+    {
+        super("silkwoodforest");
+
+        this.addProperty(new BiomeConfigProperty(decorationLogsId, Type.BOOLEAN, decorationLogsName, "", true));
+    }
+}