Merge pull request #1355 from DaDodger/patch-1

Update pt_BR.lang

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,79 @@
+--------------------------------------------------------------------------------
+
+
+
+**BEFORE SUBMITTING!**
+
+You must ensure the following before reporting an issue with the mod.
+For feature requests, you may delete this template and create your own.
+
+
+
+
+--------------------------------------------------------------------------------
+
+- [ ] Biomes O' Plenty is updated to the latest available version.
+- [ ] This issue occurs with Minecraft 1.12. 
+
+
+**We *DO NOT* support Minecraft versions 1.7.10, 1.8.9, 1.9.4, 1.10.2, 1.11 or anything below that!**  
+
+**YOUR ISSUE WILL AUTOMATICALLY BE CLOSED IF IT IS PERTAINING TO THOSE VERSIONS!**
+
+--------------------------------------------------------------------------------
+
+- [ ] Forge is updated to the latest available version.
+
+- [ ] This issue occurs *WITHOUT* Optifine, Sponge or similar mods installed.
+
+**Mods such as Optifine and Sponge interfere with the normal functioning of the game by modifying its code.**
+
+**We do not support these mods in any way as they can introduce bugs which would not normally be present with**
+**only Forge installed.**
+
+--------------------------------------------------------------------------------
+
+- [ ] This issue can be reproduced with ONLY Biomes O' Plenty and any other affected mods.
+
+- [ ] All other mods which appear to be involved are updated to their latest versions.
+
+- [ ] I have included any relevant logs and screenshots below.
+
+**If this is a compatibility issue with another mod, you *MUST* test with *ONLY* Biomes O' Plenty and that specific mod.**
+
+**Logs containing masses of mods are extremely unhelpful, and it is unlikely that your issue will be addressed.**
+
+--------------------------------------------------------------------------------
+
+- [ ] This issue does not occur in a modpack. 
+
+**Issues with modpacks should be reported to the modpack author(s). As noted above, mod compatibility issues must**
+**occur with the latest versions of both Biomes O' Plenty and the affected mod.** 
+
+**The issue *MUST* be tested with *ONLY* Biomes O' Plenty and the affected mod.**
+
+--------------------------------------------------------------------------------
+
+*Once you have read and verified the above, you may delete all text up to this point.*
+
+#### Issue Description:
+
+
+
+#### Steps to reproduce:
+
+1. 
+2. 
+3. 
+
+#### Additional Information:
+
+- fml-client-latest.log or fml-server-latest.log:
+- Screenshots:
+
+____
+#### Affected Versions (Exact numbers, do *NOT* use "latest"):
+
+- Biomes O' Plenty: 
+- Minecraft: 
+- Forge: 

.github/ISSUE_TEMPLATE/1-standalone-bug.md

@@ -1,27 +0,0 @@
----
-name: 1.16.3 Standalone Bug
-about: For bugs that occur with Biomes O' Plenty for 1.16.3.  We do not support older versions!
-title: ''
-labels: bug-minor
-assignees: ''
-
----
-
-## Bug Report
-
-[ Lines between [ ] (square brackets) should be removed before posting. ]</br>
-
-### What's the issue you encountered?
-
-[ Describe the issue in detail and what you were doing beforehand. ]</br>
-
-### How can the issue be reproduced?
-
-[ Include a detailed step by step process for recreating your issue with only Biomes O' Plenty installed. ]</br>
-
-### Logs
-
-[ Please include any relevant logs here. This can be done by dragging and dropping your log files into the issue. ]</br>
-
-### Mod Version
-[ Please put the version of the mod you were using here. ]</br>

.github/ISSUE_TEMPLATE/2-standalone-crash.md

@@ -1,23 +0,0 @@
----
-name: 1.16.3 Standalone Crash
-about: For crashes that occur with Biomes O' Plenty for 1.16.3.  We do not support older versions!
-title: ''
-labels: crash
-assignees: ''
-
----
-
-## Bug Report
-
-[ Lines between [ ] (square brackets) should be removed before posting. ]</br>
-
-### How can the crash be reproduced?
-
-[ Include a detailed step by step process for recreating your crash with only Biomes O' Plenty installed. ]</br>
-
-### Crash Report and Logs
-
-[ Please include your crash report and logs here. This can be done by dragging and dropping your log files and crash report files into the issue. ]</br>
-
-### Mod Version
-[ Please put the version of the mod you were using here. ]</br>

.github/ISSUE_TEMPLATE/3-feature-request.md

@@ -1,20 +0,0 @@
----
-name: 1.16.3 Feature Request
-about: Feature requests for Biomes O' Plenty for 1.16.3.  We do not support older versions!
-title: ''
-labels: feature
-assignees: ''
-
----
-
-## Feature Request
-
-[ Lines between [ ] (square brackets) should be removed before posting. ]</br>
-
-### What feature are you suggesting?
-
-[ Provide an overview of the feature being suggested. ]</br>
-
-### Why should it be added?
-
-[ Describe the benefits of implementing this feature. ]</br>

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Glitchfiend Discord
-    url: https://discord.gg/GyyzU6T
-    about: Please ask general questions here instead of opening issues for them.

.gitignore

@@ -4,7 +4,6 @@
 /Mixin/
 /repo/
 /run/
-/logs/
 .idea/*
 /.gradle/
 /.settings/
@@ -19,10 +18,3 @@
 *.ipr
 *.iws
 
-*.launch
-mappings/.gradle/
-#mappings/mcp/
-mappings/build/
-mappings/*.csv
-mappings/.project
-mappings/last_updated.json

Jenkinsfile

@@ -1,60 +0,0 @@
-@Library('forge-shared-library')_
-
-pipeline {
-    options {
-        disableConcurrentBuilds()
-    }
-    agent {
-        docker {
-            image 'gradle:jdk8'
-            args '-v forgegc:/home/gradle/.gradle/'
-        }
-    }
-    environment {
-        GRADLE_ARGS = '--no-daemon --console=plain' // No daemon for now as FG3 kinda derps. //'-Dorg.gradle.daemon.idletimeout=5000'
-        JENKINS_HEAD = 'https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png'
-    }
-
-    stages {
-        stage('fetch') {
-            steps {
-                checkout scm
-            }
-        }
-        stage('setup') {
-            steps {
-                withGradle {
-                    sh './gradlew ${GRADLE_ARGS} --refresh-dependencies'
-                }
-                script {
-                    env.MYVERSION = sh(returnStdout: true, script: './gradlew :properties -q | grep "^version:" | awk \'{print $2}\'').trim()
-                }
-            }
-        }
-        stage('changelog') {
-            when {
-                not {
-                    changeRequest()
-                }
-            }
-            steps {
-                writeChangelog(currentBuild, "build/BiomesOPlenty-${env.MYVERSION}-changelog.txt")
-            }
-        }
-        stage('publish') {
-            when {
-                not {
-                    changeRequest()
-                }
-            }
-            environment {
-                CURSE_API_KEY = credentials('curse-api-key')
-            }
-            steps {
-                withGradle {
-                    sh './gradlew ${GRADLE_ARGS} :uploadArchives curseforge -PcurseApiKey=${CURSE_API_KEY}'
-                }
-            }
-        }
-    }
-}

README.md

@@ -1,17 +1,21 @@
-<p align="center"><img src="https://i.imgur.com/HQ2opH6.png"></p>
+<p align="center"><img src="http://i.imgur.com/uP9GBEb.png"></p>
 
-<p align="center"><img src="https://i.imgur.com/CYxKg5M.png"></p>
-
-<p align="center">https://discord.gg/GyyzU6T</p>
-
-**Biomes O' Plenty** is a **Minecraft mod** that adds **over 50 new biomes** to the Overworld, Nether, and End. From Lavender Fields to Redwood Forests and many more, all of our biomes are decorated with a variety of **new trees, flowers, and plants!**
+**Biomes O' Plenty** is a **Minecraft mod** that adds **over 50 new biomes** to the overworld and Nether. From coral reefs to bamboo forests, all of our biomes are decorated with a slew of **new plants, trees, flowers, and more!**
 
 -----------------
 
-**Note:** To use the mod on a **server**, you must set the **level-type** setting in your server's config file to **biomesoplenty**
+**Note:** To use the mod on a **server**, you must set the **level-type** setting in your server's config file to **BIOMESOP**
+
+If you want to **disable or add certain world generation features** in certain biomes, check out our guide for creating **biome configuration files**: https://github.com/Glitchfiend/BiomesOPlenty/wiki/Configuring-Biomes
 
 -----------------
 
  [<img src="http://i.creativecommons.org/l/by-nc-nd/3.0/88x31.png">](http://creativecommons.org/licenses/by-nc-nd/4.0/deed.en_US)
 
-Biomes O' Plenty is licensed under a [Creative Commons Attribution-NonCommercial-NoDerivs 4.0 Unported License](http://creativecommons.org/licenses/by-nc-nd/4.0/deed.en_US).
+Biomes O' Plenty is licensed under a [Creative Commons Attribution-NonCommercial-NoDerivs 4.0 Unported License](http://creativecommons.org/licenses/by-nc-nd/4.0/deed.en_US).
+
+-----------------
+
+We've partnered with **CreeperHost**, and have our very own **promo code** that you can use when ordering a server of your own!
+
+<p align="center"><img src="http://i.imgur.com/rjmyjrV.png"></p>

build.gradle

@@ -1,72 +1,101 @@
 buildscript {
     repositories {
-        mavenLocal()
-        maven { url = 'https://files.minecraftforge.net/maven' }
         jcenter()
-        mavenCentral()
+        maven {
+            name = "forge"
+            url = "http://files.minecraftforge.net/maven"
+        }
     }
     dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true
+        classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
     }
 }
 
 plugins {
-    id "com.matthewprenger.cursegradle" version "1.4.0"
+    id "com.matthewprenger.cursegradle" version "1.0.9"
 }
 
-apply plugin: 'net.minecraftforge.gradle'
-apply plugin: 'eclipse'
-apply plugin: 'idea'
+apply plugin: 'net.minecraftforge.gradle.forge'
 apply plugin: 'maven'
 
-repositories { mavenLocal() }
+// define the properties file
+ext.configFile = file "build.properties"
+
+configFile.withReader {
+    // read config.  it shall from now on be referenced as simply config or as project.config
+    def prop = new Properties()
+    prop.load(it)
+    project.ext.config = new ConfigSlurper().parse prop
+}
 
 group = "com.github.glitchfiend.biomesoplenty"
+// why set the version twice?
+version = config.mod_version
 archivesBaseName = "BiomesOPlenty"
 
-def getGitHash = {
-    def stdout = new ByteArrayOutputStream()
-    exec {
-        commandLine 'git', 'rev-parse', '--short', 'HEAD'
-        standardOutput = stdout
-    }
-    return stdout.toString().trim()
-}
-
-version = "${minecraft_version}-${mod_version}.${System.getenv().BUILD_NUMBER}"
+// add some stuff to the version
+version = "${config.minecraft_version}-${config.mod_version}.${System.getenv().BUILD_NUMBER}"
+// set this for the version.properties file, or was this broken on purpose?
+config.build_number = (System.getenv().BUILD_NUMBER) ? System.getenv().BUILD_NUMBER : ""
 
 minecraft {
-    mappings channel: 'official', version: minecraft_version
-
-    accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
-
-    runs {
-        client = {
-            workingDirectory = project.file("run").canonicalPath
-            source sourceSets.main
-        }
-        server = {
-            workingDirectory = project.file("run").canonicalPath
-            source sourceSets.main
-        }
-    }
+    version = config.minecraft_version + "-" + config.forge_version // grab latest forge
+    useDepAts = true
+    mappings = project.config.mappings_version
+    //gradle complains if this isn't set when setting up/using IDEA workspace
+    runDir = "run"
+    //set a full version string with appended build number to be used in mod registration
+    def buildnum = (config.build_number!="") ? '.' + config.build_number : ""
+    replace '@MOD_VERSION@', config.mod_version + buildnum
+    replace '1.0.0.0', config.forge_version
+    replaceIn 'BiomesOPlenty.java'
 }
 
-processResources {
-    from (sourceSets.main.resources.srcDirs) {
-        include 'META-INF/mods.toml'
-        expand 'version': project.version
-    }
+def commonManifest = {
+    attributes 'FMLAT': 'biomesoplenty_at.cfg'
 }
 
 jar {
+    manifest commonManifest
     classifier = 'universal'
 }
 
-dependencies {
-    minecraft 'net.minecraftforge:forge:' + minecraft_version + '-' + forge_version
+processResources {
+    from(sourceSets.main.resources.srcDirs) {
+        include '**/*.info'
+        include '**/*.properties'
+
+        // replaces
+        expand ([
+            'modid': project.archivesBaseName,
+            'mod_version': project.config.mod_version,
+            'minecraft_version': project.config.minecraft_version,
+            'build_number': project.config.build_number
+        ])
+    }
+
+    from(sourceSets.main.resources.srcDirs) {
+        exclude '**/*.info'
+        exclude '**/*.properties'
+    }
 }
 
+
+import groovy.io.FileType
+
+task changelog(type: JenkinsChangelog) {
+    def buildNumber = "${System.getenv().BUILD_NUMBER}"
+
+    serverRoot = 'http://ci.jenkins.minecraftforge.net/'
+    jobName = 'BiomesOPlenty'
+    authName = 'console_script'
+    authPassword = 'dc6d48ca20a474beeac280a9a16a926e'
+    targetBuild = buildNumber.toString()
+    output = 'build/libs/' + project.getName() + '-' + project.version + '-changelog.txt'
+}
+
+tasks.build.dependsOn('changelog')
+
 task sourcesJar(type: Jar) {
     from sourceSets.main.allJava
     from (sourceSets.main.output) {
@@ -78,6 +107,8 @@ task sourcesJar(type: Jar) {
 
 task deobfJar(type: Jar) {
     from sourceSets.main.output
+
+    manifest commonManifest
     classifier = 'deobf'
 }
 
@@ -93,49 +124,57 @@ task apiJar(type: Jar) {
     classifier = 'api'
 }
 
-def changelog_file = rootProject.file("build/BiomesOPlenty-${version}-changelog.txt")
+task listOutputs << {
+    //This is needed by the Groovy Postbuild to append labels for each build used in the changelog.
+    println "Output files:"
+    println "--------------------"
+    def list = []
 
-curseforge {
-    if (project.hasProperty('curseApiKey')) {
-        apiKey = project.getProperty('curseApiKey')
-        project {
-            id = '220318'
-
-            if (changelog_file.exists()) {
-                changelog = changelog_file
-            }
-
-            releaseType = 'beta'
-
-            mainArtifact(jar) {
-                displayName = "Biomes O' Plenty ${version}"
-            }
-            addArtifact sourcesJar
-            addArtifact deobfJar
-            addArtifact apiJar
+    def dir = new File("build/libs/")
+    
+    if (dir.exists()) {
+        dir.eachFileRecurse (FileType.FILES) { file ->
+            //Add each file to the list
+            list << file
+        }
+    
+        //Print the names of all of the output files
+        list.each {
+            println it.getName()
         }
     }
+    println "--------------------"
 }
 
+tasks.build.finalizedBy('listOutputs')
+
 artifacts {
-    if (changelog_file.exists()) {
-        archives changelog_file
-    }
-    archives jar
+    archives changelog.output
     archives sourcesJar
     archives deobfJar
-    archives apiJar
+	archives apiJar
+}
+
+curseforge {
+    apiKey = "$System.env.curse_api_key"
+    project {
+        id = '220318'
+        changelog = file('build/libs/' + project.getName() + '-' + project.version + '-changelog.txt')
+        releaseType = 'beta'
+    }
 }
 
 uploadArchives {
     repositories {
         mavenDeployer {
-			if (project.hasProperty('forgeMavenPassword')) {
+			if (project.hasProperty('forgeMavenPassword'))
+			{
 				repository(url: "https://files.minecraftforge.net/maven/manage/upload") {
 					authentication(userName: project.getProperty('forgeMavenUsername'), password: project.getProperty('forgeMavenPassword'))
 				}
 			}
-			else {
+			else
+			{
 				// local repo folder. Might wanna juset use  gradle install   if you wanans end it to maven-local
 				repository(url: 'file://localhost/' + project.file('repo').getAbsolutePath())
 			}
@@ -175,11 +214,21 @@ uploadArchives {
                             name 'Adubbz'
                             roles { role 'developer' }
                         }
+                        developer {
+                            id 'Amnet'
+                            name 'Amnet'
+                            roles { role 'developer' }
+                        }
                         developer {
                             id 'Forstride'
                             name 'Forstride'
                             roles { role 'developer' }
                         }
+                        developer {
+                            id 'ted80'
+                            name 'ted80'
+                            roles { role 'developer' }
+                        }
                     }
                 }
             }

build.properties

@@ -0,0 +1,4 @@
+minecraft_version=1.12.2
+forge_version=14.23.5.2768
+mod_version=7.1.0
+mappings_version=snapshot_nodoc_20171031

gradle.properties

@@ -1,12 +0,0 @@
-# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
-# This is required to provide enough memory for the Minecraft decompilation process.
-org.gradle.jvmargs=-Xmx3G
-org.gradle.daemon=false
-
-mod_version=13.1.0
-
-minecraft_version=1.16.5
-minecraft_version_toml=16
-forge_version=36.1.0
-forge_version_toml=36
-forge_group=net.minecraftforge

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
+#Thu Nov 17 11:57:30 EST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-bin.zip

gradlew

@@ -6,6 +6,42 @@
 ##
 ##############################################################################
 
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
 # Attempt to set APP_HOME
 # Resolve links: $0 may be a link
 PRG="$0"
@@ -24,46 +60,6 @@ cd "`dirname \"$PRG\"`/" >/dev/null
 APP_HOME="`pwd -P`"
 cd "$SAVED" >/dev/null
 
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn () {
-    echo "$*"
-}
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
-esac
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -89,7 +85,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -154,19 +150,11 @@ if $cygwin ; then
     esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
 }
-APP_ARGS=$(save "$@")
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
-exec "$JAVACMD" "$@"
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

src/api/java/vazkii/botania/api/item/IHornHarvestable.java

@@ -0,0 +1,65 @@
+/**
+ * This class was created by <Vazkii>. It's distributed as
+ * part of the Botania Mod. Get the Source Code in github:
+ * https://github.com/Vazkii/Botania
+ * 
+ * Botania is Open Source and distributed under the
+ * Botania License: http://botaniamod.net/license.php
+ * 
+ * File Created @ [Oct 24, 2015, 11:16:00 PM (GMT)]
+ */
+package vazkii.botania.api.item;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+
+/**
+ * A Block that implements this can be uprooted by the various horns in Botania.
+ */
+public interface IHornHarvestable {
+
+	/**
+	 * Returns true if this block can be uprooted.
+	 * Note that the stack param can be null if it's a drum breaking it.
+	 */
+    boolean canHornHarvest(World world, BlockPos pos, ItemStack stack, EnumHornType hornType);
+
+	/**
+	 * Returns true if harvestByHorn() should be called. If false it just uses the normal
+	 * block breaking method.
+	 * Note that the stack param can be null if it's a drum breaking it.
+	 */
+    boolean hasSpecialHornHarvest(World world, BlockPos pos, ItemStack stack, EnumHornType hornType);
+
+	/**
+	 * Called to harvest by a horn.
+	 * Note that the stack param can be null if it's a drum breaking it.
+	 */
+    void harvestByHorn(World world, BlockPos pos, ItemStack stack, EnumHornType hornType);
+
+	enum EnumHornType {
+
+		/**
+		 * Horn of the Wild, for grass and crops
+		 */
+		WILD,
+
+		/**
+		 * Horn of the Canopy, for leaves
+		 */
+		CANOPY,
+
+		/**
+		 * Horn of the Covering, for snow
+		 */
+		COVERING;
+
+		public static EnumHornType getTypeForMeta(int meta) {
+			EnumHornType[] values = EnumHornType.values();
+			return values[Math.min(values.length - 1, meta)];
+		}
+
+	}
+
+}

src/main/java/biomesoplenty/api/biome/BOPBiomes.java

@@ -1,104 +1,160 @@
 /*******************************************************************************
- * Copyright 2014-2019, the Biomes O' Plenty Team
- *
+ * Copyright 2015-2016, the Biomes O' Plenty Team
+ * 
  * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
- *
+ * 
  * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
  ******************************************************************************/
+
 package biomesoplenty.api.biome;
 
-import biomesoplenty.core.BiomesOPlenty;
-import net.minecraft.util.RegistryKey;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.registry.Registry;
+import java.util.List;
+
+import com.google.common.base.Optional;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Lists;
+
+import net.minecraft.world.WorldType;
 import net.minecraft.world.biome.Biome;
 
 public class BOPBiomes
 {
-    public static RegistryKey<Biome> alps = register("alps");
-    public static RegistryKey<Biome> alps_foothills = register("alps_foothills");
-    public static RegistryKey<Biome> bamboo_blossom_grove = register("bamboo_blossom_grove");
-    public static RegistryKey<Biome> bayou = register("bayou");
-    public static RegistryKey<Biome> bayou_mangrove = register("bayou_mangrove");
-    public static RegistryKey<Biome> burnt_forest = register("burnt_forest");
-    public static RegistryKey<Biome> cherry_blossom_grove = register("cherry_blossom_grove");
-    public static RegistryKey<Biome> cold_desert = register("cold_desert");
-    public static RegistryKey<Biome> coniferous_forest = register("coniferous_forest");
-    public static RegistryKey<Biome> coniferous_lakes = register("coniferous_lakes");
-    public static RegistryKey<Biome> dead_forest = register("dead_forest");
-    public static RegistryKey<Biome> deep_bayou = register("deep_bayou");
-    public static RegistryKey<Biome> dense_marsh = register("dense_marsh");
-    public static RegistryKey<Biome> dense_woodland = register("dense_woodland");
-    public static RegistryKey<Biome> dryland = register("dryland");
-    public static RegistryKey<Biome> dry_boneyard = register("dry_boneyard");
-    public static RegistryKey<Biome> fir_clearing = register("fir_clearing");
-    public static RegistryKey<Biome> flower_meadow = register("flower_meadow");
-    public static RegistryKey<Biome> fungal_field = register("fungal_field");
-    public static RegistryKey<Biome> fungal_jungle = register("fungal_jungle");
-    public static RegistryKey<Biome> golden_prairie = register("golden_prairie");
-    public static RegistryKey<Biome> grassland = register("grassland");
-    public static RegistryKey<Biome> grassland_clover_patch = register("grassland_clover_patch");
-    public static RegistryKey<Biome> gravel_beach = register("gravel_beach");
-    public static RegistryKey<Biome> grove = register("grove");
-    public static RegistryKey<Biome> grove_clearing = register("grove_clearing");
-    public static RegistryKey<Biome> grove_lakes = register("grove_lakes");
-    public static RegistryKey<Biome> highland = register("highland");
-    public static RegistryKey<Biome> highland_crag = register("highland_crag");
-    public static RegistryKey<Biome> highland_moor = register("highland_moor");
-    public static RegistryKey<Biome> jade_cliffs = register("jade_cliffs");
-    public static RegistryKey<Biome> lavender_field = register("lavender_field");
-    public static RegistryKey<Biome> lavender_forest = register("lavender_forest");
-    public static RegistryKey<Biome> lush_desert = register("lush_desert");
-    public static RegistryKey<Biome> lush_savanna = register("lush_savanna");
-    public static RegistryKey<Biome> marsh = register("marsh");
-    public static RegistryKey<Biome> meadow = register("meadow");
-    public static RegistryKey<Biome> meadow_forest = register("meadow_forest");
-    public static RegistryKey<Biome> muskeg = register("muskeg");
-    public static RegistryKey<Biome> mystic_grove = register("mystic_grove");
-    public static RegistryKey<Biome> mystic_plains = register("mystic_plains");
-    public static RegistryKey<Biome> ominous_woods = register("ominous_woods");
-    public static RegistryKey<Biome> ominous_mire = register("ominous_mire");
-    public static RegistryKey<Biome> orchard = register("orchard");
-    public static RegistryKey<Biome> origin_valley = register("origin_valley");
-    public static RegistryKey<Biome> prairie = register("prairie");
-    public static RegistryKey<Biome> rainbow_hills = register("rainbow_hills");
-    public static RegistryKey<Biome> rainforest = register("rainforest");
-    public static RegistryKey<Biome> rainforest_cliffs = register("rainforest_cliffs");
-    public static RegistryKey<Biome> rainforest_floodplain = register("rainforest_floodplain");
-    public static RegistryKey<Biome> redwood_forest = register("redwood_forest");
-    public static RegistryKey<Biome> redwood_forest_edge = register("redwood_forest_edge");
-    public static RegistryKey<Biome> redwood_hills = register("redwood_hills");
-    public static RegistryKey<Biome> scrubland = register("scrubland");
-    public static RegistryKey<Biome> seasonal_forest = register("seasonal_forest");
-    public static RegistryKey<Biome> seasonal_orchard = register("seasonal_orchard");
-    public static RegistryKey<Biome> seasonal_pumpkin_patch = register("seasonal_pumpkin_patch");
-    public static RegistryKey<Biome> shroomy_wetland = register("shroomy_wetland");
-    public static RegistryKey<Biome> shrubland = register("shrubland");
-    public static RegistryKey<Biome> shrubland_hills = register("shrubland_hills");
-    public static RegistryKey<Biome> snowy_coniferous_forest = register("snowy_coniferous_forest");
-    public static RegistryKey<Biome> snowy_fir_clearing = register("snowy_fir_clearing");
-    public static RegistryKey<Biome> snowy_maple_forest = register("snowy_maple_forest");
-    public static RegistryKey<Biome> tall_dead_forest = register("tall_dead_forest");
-    public static RegistryKey<Biome> tropic_beach = register("tropic_beach");
-    public static RegistryKey<Biome> tropics = register("tropics");
-    public static RegistryKey<Biome> tundra = register("tundra");
-    public static RegistryKey<Biome> tundra_basin = register("tundra_basin");
-    public static RegistryKey<Biome> tundra_bog = register("tundra_bog");
-    public static RegistryKey<Biome> volcanic_plains = register("volcanic_plains");
-    public static RegistryKey<Biome> volcano = register("volcano");
-    public static RegistryKey<Biome> wasteland = register("wasteland");
-    public static RegistryKey<Biome> wetland = register("wetland");
-    public static RegistryKey<Biome> wetland_forest = register("wetland_forest");
-    public static RegistryKey<Biome> wooded_scrubland = register("wooded_scrubland");
-    public static RegistryKey<Biome> woodland = register("woodland");
+    public static final IBiomeRegistry REG_INSTANCE = createRegistry();
+    
+    /**A list of world types where BoP biome decoration does not occur**/
+    public static List<WorldType> excludedDecoratedWorldTypes = Lists.newArrayList();
+    
+    // normal biomes which have weights
+    public static Optional<Biome> alps = Optional.absent();
+    public static Optional<Biome> bayou = Optional.absent();
+    public static Optional<Biome> bog = Optional.absent();
+    public static Optional<Biome> boreal_forest = Optional.absent();
+    public static Optional<Biome> brushland = Optional.absent();
+    public static Optional<Biome> chaparral = Optional.absent();
+    public static Optional<Biome> cherry_blossom_grove = Optional.absent();
+    public static Optional<Biome> cold_desert = Optional.absent();
+    public static Optional<Biome> coniferous_forest = Optional.absent();
+    public static Optional<Biome> crag = Optional.absent();
+    public static Optional<Biome> dead_forest = Optional.absent();
+    public static Optional<Biome> dead_swamp = Optional.absent();
+    public static Optional<Biome> fen = Optional.absent();
+    public static Optional<Biome> floodplains = Optional.absent();
+    public static Optional<Biome> grassland = Optional.absent();    
+    public static Optional<Biome> grove = Optional.absent();
+    public static Optional<Biome> highland = Optional.absent();
+    public static Optional<Biome> lake = Optional.absent();
+    public static Optional<Biome> lavender_fields = Optional.absent();
+    public static Optional<Biome> lush_swamp = Optional.absent();
+    public static Optional<Biome> maple_woods = Optional.absent();
+    public static Optional<Biome> marsh = Optional.absent();
+    public static Optional<Biome> meadow = Optional.absent();
+    public static Optional<Biome> mystic_grove = Optional.absent();
+    public static Optional<Biome> ominous_woods = Optional.absent();
+    public static Optional<Biome> orchard = Optional.absent();
+    public static Optional<Biome> outback = Optional.absent();
+    public static Optional<Biome> overgrown_cliffs = Optional.absent();
+    public static Optional<Biome> prairie = Optional.absent();
+    public static Optional<Biome> rainforest = Optional.absent();
+    public static Optional<Biome> redwood_forest = Optional.absent();
+    public static Optional<Biome> seasonal_forest = Optional.absent();
+    public static Optional<Biome> scrubland = Optional.absent();
+    public static Optional<Biome> shield = Optional.absent();
+    public static Optional<Biome> shrubland = Optional.absent();
+    public static Optional<Biome> snowy_coniferous_forest = Optional.absent();
+    public static Optional<Biome> snowy_forest = Optional.absent();
+    public static Optional<Biome> steppe = Optional.absent();
+    public static Optional<Biome> temperate_rainforest = Optional.absent();
+    public static Optional<Biome> tropical_rainforest = Optional.absent();
+    public static Optional<Biome> tundra = Optional.absent();
+    public static Optional<Biome> wasteland = Optional.absent();
+    public static Optional<Biome> wetland = Optional.absent();
+    public static Optional<Biome> woodland = Optional.absent();
+    public static Optional<Biome> xeric_shrubland = Optional.absent();
+    
+    // edge-biomes, sub-biomes and mutated-biomes
+    public static Optional<Biome> alps_foothills = Optional.absent();
+    public static Optional<Biome> redwood_forest_edge = Optional.absent();
+    
+    public static Optional<Biome> cold_tundra = Optional.absent();
+    public static Optional<Biome> dead_plains = Optional.absent();
+    public static Optional<Biome> flower_meadow = Optional.absent();
+    public static Optional<Biome> highland_moor = Optional.absent();
+    public static Optional<Biome> mire = Optional.absent();
+    public static Optional<Biome> oasis = Optional.absent();
+    public static Optional<Biome> pasture = Optional.absent();
+    
+    public static Optional<Biome> coral_reef = Optional.absent();
+    public static Optional<Biome> kelp_forest = Optional.absent();
+    
+    public static Optional<Biome> origin_island = Optional.absent();
+    public static Optional<Biome> tropical_island = Optional.absent();
+    public static Optional<Biome> volcanic_island = Optional.absent();
+    
+    //public static Optional<Biome> mangrove = Optional.absent();
+    public static Optional<Biome> gravel_beach = Optional.absent();
+    public static Optional<Biome> white_beach = Optional.absent();
+    public static Optional<Biome> origin_beach = Optional.absent();
 
-    public static RegistryKey<Biome> crystalline_chasm = register("crystalline_chasm");
-    public static RegistryKey<Biome> undergrowth = register("undergrowth");
-    public static RegistryKey<Biome> visceral_heap = register("visceral_heap");
-    public static RegistryKey<Biome> withered_abyss = register("withered_abyss");
+    // nether biomes
+    public static Optional<Biome> corrupted_sands = Optional.absent();
+    public static Optional<Biome> fungi_forest = Optional.absent();
+    public static Optional<Biome> phantasmagoric_inferno = Optional.absent();
+    public static Optional<Biome> undergarden = Optional.absent();
+    public static Optional<Biome> visceral_heap = Optional.absent();
 
-    private static RegistryKey<Biome> register(String name)
+    //Biome extensions
+    public static IExtendedBiome end_extension;
+    public static IExtendedBiome mushroom_island_extension;
+    public static IExtendedBiome plains_extension;
+    public static IExtendedBiome flower_forest_extension;
+    public static IExtendedBiome forest_extension;
+    public static IExtendedBiome forest_hills_extension;
+    public static IExtendedBiome jungle_extension;
+    public static IExtendedBiome jungle_hills_extension;
+    public static IExtendedBiome desert_extension;
+    public static IExtendedBiome desert_hills_extension;
+    public static IExtendedBiome taiga_extension;
+    public static IExtendedBiome taiga_hills_extension;
+    public static IExtendedBiome mesa_extension;
+    public static IExtendedBiome mesa_plateau_extension;
+    public static IExtendedBiome ice_plains_extension;
+    public static IExtendedBiome ice_mountains_extension;
+    public static IExtendedBiome extreme_hills_extension;
+    public static IExtendedBiome extreme_hills_plus_extension;
+    public static IExtendedBiome swampland_extension;
+    public static IExtendedBiome birch_forest_extension;
+    public static IExtendedBiome birch_forest_hills_extension;
+    public static IExtendedBiome roofed_forest_extension;
+    public static IExtendedBiome savanna_extension;
+    public static IExtendedBiome savanna_plateau_extension;
+    public static IExtendedBiome ocean_extension;
+    public static IExtendedBiome cold_taiga_extension;
+    public static IExtendedBiome cold_taiga_hills_extension;
+    public static IExtendedBiome mega_taiga_extension;
+    public static IExtendedBiome mega_taiga_hills_extension;
+    public static IExtendedBiome hell_extension;
+    public static IExtendedBiome beach_extension;
+    
+    private static IBiomeRegistry createRegistry()
     {
-        return RegistryKey.create(Registry.BIOME_REGISTRY, new ResourceLocation(BiomesOPlenty.MOD_ID, name));
+        IBiomeRegistry instance = null;
+        
+        try 
+        {
+            instance = (IBiomeRegistry)Class.forName("biomesoplenty.common.init.ModBiomes").newInstance();
+        } 
+        catch (Exception e) 
+        {
+            e.printStackTrace();
+        }
+        
+        return instance;
+    }
+    
+    public interface IBiomeRegistry
+    {
+        IExtendedBiome registerBiome(IExtendedBiome biome, String idName);
+        IExtendedBiome getExtendedBiome(Biome biome);
+        ImmutableSet<Biome> getPresentBiomes();
     }
 }

src/main/java/biomesoplenty/api/biome/BiomeOwner.java

@@ -0,0 +1,14 @@
+/*******************************************************************************
+ * Copyright 2014-2016, the Biomes O' Plenty Team
+ * 
+ * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
+ * 
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
+ ******************************************************************************/
+
+package biomesoplenty.api.biome;
+
+public enum BiomeOwner
+{
+    BIOMESOPLENTY, OTHER
+}

src/main/java/biomesoplenty/api/biome/IExtendedBiome.java

@@ -0,0 +1,39 @@
+/*******************************************************************************
+ * Copyright 2014-2016, the Biomes O' Plenty Team
+ * 
+ * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
+ * 
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
+ ******************************************************************************/
+
+package biomesoplenty.api.biome;
+
+import java.util.Map;
+
+import biomesoplenty.api.config.IBOPWorldSettings;
+import biomesoplenty.api.config.IConfigObj;
+import biomesoplenty.api.enums.BOPClimates;
+import biomesoplenty.api.generation.GeneratorStage;
+import biomesoplenty.api.generation.IGenerationManager;
+import biomesoplenty.api.generation.IGenerator;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.world.biome.Biome;
+
+public interface IExtendedBiome
+{
+    void applySettings(IBOPWorldSettings settings);
+    void configure(IConfigObj conf);
+    
+    BiomeOwner getBiomeOwner();
+    void addGenerator(String name, GeneratorStage stage, IGenerator generator);
+    IGenerationManager getGenerationManager();
+    Map<BOPClimates, Integer> getWeightMap();
+    void clearWeights();
+    void addWeight(BOPClimates climate, int weight);
+    
+    ResourceLocation getBeachLocation();
+    
+    /**Get the base biome associated with this extension**/
+    Biome getBaseBiome();
+    ResourceLocation getResourceLocation();
+}

src/main/java/biomesoplenty/api/block/BOPBlocks.java

@@ -1,346 +1,119 @@
 /*******************************************************************************
- * Copyright 2014-2019, the Biomes O' Plenty Team
- *
+ * Copyright 2014-2016, the Biomes O' Plenty Team
+ * 
  * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
- *
+ * 
  * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
  ******************************************************************************/
+
 package biomesoplenty.api.block;
 
 import net.minecraft.block.Block;
+import net.minecraftforge.fluids.Fluid;
 
 public class BOPBlocks
 {
+    public static Block grass;
+    public static Block dirt;
+    public static Block grass_path;
+    public static Block farmland_0;
+    public static Block farmland_1;
+    
     public static Block white_sand;
     public static Block white_sandstone;
-    public static Block cut_white_sandstone;
-    public static Block cut_white_sandstone_slab;
-    public static Block chiseled_white_sandstone;
-    public static Block smooth_white_sandstone;
-    public static Block smooth_white_sandstone_slab;
-    public static Block smooth_white_sandstone_stairs;
-    public static Block white_sandstone_slab;
     public static Block white_sandstone_stairs;
-    public static Block white_sandstone_wall;
-
-    public static Block orange_sand;
-    public static Block orange_sandstone;
-    public static Block cut_orange_sandstone;
-    public static Block cut_orange_sandstone_slab;
-    public static Block chiseled_orange_sandstone;
-    public static Block smooth_orange_sandstone;
-    public static Block smooth_orange_sandstone_slab;
-    public static Block smooth_orange_sandstone_stairs;
-    public static Block orange_sandstone_slab;
-    public static Block orange_sandstone_stairs;
-    public static Block orange_sandstone_wall;
-
-    public static Block black_sand;
-    public static Block black_sandstone;
-    public static Block cut_black_sandstone;
-    public static Block cut_black_sandstone_slab;
-    public static Block chiseled_black_sandstone;
-    public static Block smooth_black_sandstone;
-    public static Block smooth_black_sandstone_slab;
-    public static Block smooth_black_sandstone_stairs;
-    public static Block black_sandstone_slab;
-    public static Block black_sandstone_stairs;
-    public static Block black_sandstone_wall;
-    
     public static Block mud;
-    public static Block mud_bricks;
-    public static Block mud_brick_slab;
+    public static Block mud_brick_block;
     public static Block mud_brick_stairs;
-    public static Block mud_brick_wall;
-
-    public static Block origin_grass_block;
-    public static Block dried_salt;
+    public static Block other_slab;
+    public static Block double_other_slab;
+    
+    public static Block dried_sand;
+    public static Block ash_block;
     public static Block flesh;
-    public static Block nether_crystal_block;
-    public static Block nether_crystal;
+    
+    public static Block blue_fire;
+    
+    public static Block log_0;
+    public static Block log_1;
+    public static Block log_2;
+    public static Block leaves_0;
+    public static Block leaves_1;
+    public static Block leaves_2;
+    public static Block leaves_3;
+    public static Block leaves_4;
+    public static Block sapling_0;
+    public static Block sapling_1;
+    public static Block sapling_2;
 
-    public static Block toadstool_block;
-    public static Block glowshroom_block;
-    
-    public static Block origin_sapling;
-    public static Block origin_leaves;
-    public static Block flowering_oak_sapling;
-    public static Block flowering_oak_leaves;
-    public static Block rainbow_birch_sapling;
-    public static Block rainbow_birch_leaves;
-    public static Block yellow_autumn_sapling;
-    public static Block yellow_autumn_leaves;
-    public static Block orange_autumn_sapling;
-    public static Block orange_autumn_leaves;
-    public static Block maple_sapling;
-    public static Block maple_leaves;
-    
-    public static Block fir_sapling;
-    public static Block fir_leaves;
-    public static Block fir_log;
-    public static Block stripped_fir_log;
-    public static Block fir_wood;
-    public static Block stripped_fir_wood;
-    public static Block fir_planks;
-    public static Block fir_slab;
-    public static Block fir_stairs;
-    public static Block fir_fence;
-    public static Block fir_fence_gate;
-    public static Block fir_door;
-    public static Block fir_trapdoor;
-    public static Block fir_pressure_plate;
-    public static Block fir_button;
-    public static Block fir_sign;
-    public static Block fir_wall_sign;
-    
-    public static Block redwood_sapling;
-    public static Block redwood_leaves;
-    public static Block redwood_log;
-    public static Block stripped_redwood_log;
-    public static Block redwood_wood;
-    public static Block stripped_redwood_wood;
-    public static Block redwood_planks;
-    public static Block redwood_slab;
-    public static Block redwood_stairs;
-    public static Block redwood_fence;
-    public static Block redwood_fence_gate;
-    public static Block redwood_door;
-    public static Block redwood_trapdoor;
-    public static Block redwood_pressure_plate;
-    public static Block redwood_button;
-    public static Block redwood_sign;
-    public static Block redwood_wall_sign;
-    
-    public static Block white_cherry_sapling;
-    public static Block white_cherry_leaves;
-    public static Block pink_cherry_sapling;
-    public static Block pink_cherry_leaves;
-    public static Block cherry_log;
-    public static Block stripped_cherry_log;
-    public static Block cherry_wood;
-    public static Block stripped_cherry_wood;
-    public static Block cherry_planks;
-    public static Block cherry_slab;
+    public static Block planks_0;
+    public static Block wood_slab_0;
+    public static Block wood_slab_1;
+    public static Block double_wood_slab_0;
+    public static Block double_wood_slab_1;
     public static Block cherry_stairs;
-    public static Block cherry_fence;
-    public static Block cherry_fence_gate;
-    public static Block cherry_door;
-    public static Block cherry_trapdoor;
-    public static Block cherry_pressure_plate;
-    public static Block cherry_button;
-    public static Block cherry_sign;
-    public static Block cherry_wall_sign;
-    
-    public static Block mahogany_sapling;
-    public static Block mahogany_leaves;
-    public static Block mahogany_log;
-    public static Block stripped_mahogany_log;
-    public static Block mahogany_wood;
-    public static Block stripped_mahogany_wood;
-    public static Block mahogany_planks;
-    public static Block mahogany_slab;
-    public static Block mahogany_stairs;
-    public static Block mahogany_fence;
-    public static Block mahogany_fence_gate;
-    public static Block mahogany_door;
-    public static Block mahogany_trapdoor;
-    public static Block mahogany_pressure_plate;
-    public static Block mahogany_button;
-    public static Block mahogany_sign;
-    public static Block mahogany_wall_sign;
-    
-    public static Block jacaranda_sapling;
-    public static Block jacaranda_leaves;
-    public static Block jacaranda_log;
-    public static Block stripped_jacaranda_log;
-    public static Block jacaranda_wood;
-    public static Block stripped_jacaranda_wood;
-    public static Block jacaranda_planks;
-    public static Block jacaranda_slab;
-    public static Block jacaranda_stairs;
-    public static Block jacaranda_fence;
-    public static Block jacaranda_fence_gate;
-    public static Block jacaranda_door;
-    public static Block jacaranda_trapdoor;
-    public static Block jacaranda_pressure_plate;
-    public static Block jacaranda_button;
-    public static Block jacaranda_sign;
-    public static Block jacaranda_wall_sign;
-    
-    public static Block palm_sapling;
-    public static Block palm_leaves;
-    public static Block palm_log;
-    public static Block stripped_palm_log;
-    public static Block palm_wood;
-    public static Block stripped_palm_wood;
-    public static Block palm_planks;
-    public static Block palm_slab;
-    public static Block palm_stairs;
-    public static Block palm_fence;
-    public static Block palm_fence_gate;
-    public static Block palm_door;
-    public static Block palm_trapdoor;
-    public static Block palm_pressure_plate;
-    public static Block palm_button;
-    public static Block palm_sign;
-    public static Block palm_wall_sign;
-    
-    public static Block willow_sapling;
-    public static Block willow_leaves;
-    public static Block willow_log;
-    public static Block stripped_willow_log;
-    public static Block willow_wood;
-    public static Block stripped_willow_wood;
-    public static Block willow_planks;
-    public static Block willow_slab;
-    public static Block willow_stairs;
-    public static Block willow_fence;
-    public static Block willow_fence_gate;
-    public static Block willow_door;
-    public static Block willow_trapdoor;
-    public static Block willow_pressure_plate;
-    public static Block willow_button;
-    public static Block willow_sign;
-    public static Block willow_wall_sign;
-    
-    public static Block dead_sapling;
-    public static Block dead_leaves;
-    public static Block dead_log;
-    public static Block stripped_dead_log;
-    public static Block dead_wood;
-    public static Block stripped_dead_wood;
-    public static Block dead_planks;
-    public static Block dead_slab;
-    public static Block dead_stairs;
-    public static Block dead_fence;
-    public static Block dead_fence_gate;
-    public static Block dead_door;
-    public static Block dead_trapdoor;
-    public static Block dead_pressure_plate;
-    public static Block dead_button;
-    public static Block dead_sign;
-    public static Block dead_wall_sign;
-    
-    public static Block magic_sapling;
-    public static Block magic_leaves;
-    public static Block magic_log;
-    public static Block stripped_magic_log;
-    public static Block magic_wood;
-    public static Block stripped_magic_wood;
-    public static Block magic_planks;
-    public static Block magic_slab;
-    public static Block magic_stairs;
-    public static Block magic_fence;
-    public static Block magic_fence_gate;
-    public static Block magic_door;
-    public static Block magic_trapdoor;
-    public static Block magic_pressure_plate;
-    public static Block magic_button;
-    public static Block magic_sign;
-    public static Block magic_wall_sign;
-    
-    public static Block umbran_sapling;
-    public static Block umbran_leaves;
-    public static Block umbran_log;
-    public static Block stripped_umbran_log;
-    public static Block umbran_wood;
-    public static Block stripped_umbran_wood;
-    public static Block umbran_planks;
-    public static Block umbran_slab;
     public static Block umbran_stairs;
-    public static Block umbran_fence;
-    public static Block umbran_fence_gate;
-    public static Block umbran_door;
-    public static Block umbran_trapdoor;
-    public static Block umbran_pressure_plate;
-    public static Block umbran_button;
-    public static Block umbran_sign;
-    public static Block umbran_wall_sign;
-    
-    public static Block hellbark_sapling;
-    public static Block hellbark_leaves;
-    public static Block hellbark_log;
-    public static Block stripped_hellbark_log;
-    public static Block hellbark_wood;
-    public static Block stripped_hellbark_wood;
-    public static Block hellbark_planks;
-    public static Block hellbark_slab;
+    public static Block fir_stairs;
+    public static Block ethereal_stairs;
+    public static Block magic_stairs;
+    public static Block palm_stairs;
+    public static Block redwood_stairs;
+    public static Block willow_stairs;
     public static Block hellbark_stairs;
+    public static Block jacaranda_stairs;
+    public static Block mahogany_stairs;
+    public static Block cherry_fence;
+    public static Block umbran_fence;
+    public static Block fir_fence;
+    public static Block ethereal_fence;
+    public static Block magic_fence;
+    public static Block palm_fence;
+    public static Block redwood_fence;
+    public static Block willow_fence;
     public static Block hellbark_fence;
+    public static Block jacaranda_fence;
+    public static Block mahogany_fence;
+    public static Block cherry_fence_gate;
+    public static Block umbran_fence_gate;
+    public static Block fir_fence_gate;
+    public static Block ethereal_fence_gate;
+    public static Block magic_fence_gate;
+    public static Block palm_fence_gate;
+    public static Block redwood_fence_gate;
+    public static Block willow_fence_gate;
     public static Block hellbark_fence_gate;
+    public static Block jacaranda_fence_gate;
+    public static Block mahogany_fence_gate;
+    public static Block cherry_door;
+    public static Block umbran_door;
+    public static Block fir_door;
+    public static Block ethereal_door;
+    public static Block magic_door;
+    public static Block palm_door;
+    public static Block redwood_door;
+    public static Block willow_door;
     public static Block hellbark_door;
-    public static Block hellbark_trapdoor;
-    public static Block hellbark_pressure_plate;
-    public static Block hellbark_button;
-    public static Block hellbark_sign;
-    public static Block hellbark_wall_sign;
+    public static Block jacaranda_door;
+    public static Block mahogany_door;
     
-    public static Block rose;
-    public static Block violet;
-    public static Block lavender;
-    public static Block wildflower;
-    public static Block orange_cosmos;
-    public static Block pink_daffodil;
-    public static Block pink_hibiscus;
-    public static Block glowflower;
-    public static Block wilted_lily;
-    public static Block burning_blossom;
-
-    public static Block blue_hydrangea;
-    public static Block goldenrod;
+    public static Block coral;
+    public static Block seaweed;
     
+    public static Block ivy;
     public static Block willow_vine;
-    public static Block spanish_moss;
-    public static Block spanish_moss_plant;
-
-    public static Block sprout;
-    public static Block bush;
-    public static Block clover;
-    public static Block huge_clover_petal;
-    public static Block dune_grass;
-    public static Block desert_grass;
-    public static Block dead_grass;
-    public static Block cattail;
-    public static Block barley;
-    public static Block reed;
-    public static Block watergrass;
-    public static Block mangrove_root;
-    public static Block dead_branch;
-    public static Block bramble;
-
-    public static Block toadstool;
-    public static Block glowshroom;
-
-    public static Block potted_origin_sapling;
-    public static Block potted_flowering_oak_sapling;
-    public static Block potted_rainbow_birch_sapling;
-    public static Block potted_yellow_autumn_sapling;
-    public static Block potted_orange_autumn_sapling;
-    public static Block potted_maple_sapling;
-    public static Block potted_fir_sapling;
-    public static Block potted_redwood_sapling;
-    public static Block potted_white_cherry_sapling;
-    public static Block potted_pink_cherry_sapling;
-    public static Block potted_mahogany_sapling;
-    public static Block potted_jacaranda_sapling;
-    public static Block potted_palm_sapling;
-    public static Block potted_willow_sapling;
-    public static Block potted_dead_sapling;
-    public static Block potted_magic_sapling;
-    public static Block potted_umbran_sapling;
-    public static Block potted_hellbark_sapling;
-    public static Block potted_rose;
-    public static Block potted_violet;
-    public static Block potted_lavender;
-    public static Block potted_wildflower;
-    public static Block potted_orange_cosmos;
-    public static Block potted_pink_daffodil;
-    public static Block potted_pink_hibiscus;
-    public static Block potted_glowflower;
-    public static Block potted_wilted_lily;
-    public static Block potted_burning_blossom;
-    public static Block potted_sprout;
-    public static Block potted_clover;
-    public static Block potted_toadstool;
-    public static Block potted_glowshroom;
+    
+    public static Block foliage_0;
+    public static Block plant_0;
+    public static Block double_plant;
+    public static Block flower_0;
+    
+    public static Block flat_plant;
+    public static Block mushroom;
+    
+    public static Block bramble_plant;
+    
+    public static Block blood;
+    public static Fluid blood_fluid;
+    public static Block hot_spring_water;
+    public static Fluid hot_spring_water_fluid;
 }

src/main/java/biomesoplenty/api/block/BlockQueries.java

@@ -0,0 +1,47 @@
+/*******************************************************************************
+ * Copyright 2014-2016, the Biomes O' Plenty Team
+ * 
+ * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
+ * 
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
+ ******************************************************************************/
+
+package biomesoplenty.api.block;
+
+public class BlockQueries
+{
+    public static IBlockPosQuery anything;
+    public static IBlockPosQuery nothing;
+    public static IBlockPosQuery hasWater;
+    public static IBlockPosQuery airAbove;
+    public static IBlockPosQuery airBelow;
+    public static IBlockPosQuery waterCovered;
+    public static IBlockPosQuery breakable;
+    public static IBlockPosQuery air;
+    public static IBlockPosQuery airOrLeaves;
+    public static IBlockPosQuery surfaceBlocks;
+    public static IBlockPosQuery groundBlocks;
+    public static IBlockPosQuery solid;
+    public static IBlockPosQuery replaceable;
+    
+    public static IBlockPosQuery fertile;
+    public static IBlockPosQuery fertileOrNetherrack;
+    public static IBlockPosQuery fertileOrSand;
+    public static IBlockPosQuery sustainsCave;
+    public static IBlockPosQuery sustainsNether;
+    public static IBlockPosQuery endish;
+    public static IBlockPosQuery hellish;
+    public static IBlockPosQuery litFertile;
+    public static IBlockPosQuery litBeach;
+    public static IBlockPosQuery litFertileWaterside;
+    public static IBlockPosQuery litSand;
+    public static IBlockPosQuery litDry;
+    public static IBlockPosQuery litDryWaterside;
+    public static IBlockPosQuery litFertileOrDry;
+    public static IBlockPosQuery darkFertile;
+    public static IBlockPosQuery spectralMoss;
+    public static IBlockPosQuery fertileSeaBed;
+    public static IBlockPosQuery underwater;
+    public static IBlockPosQuery suitableForReed;
+    public static IBlockPosQuery rootsCanDigThrough;
+}

src/main/java/biomesoplenty/api/block/IBlockPosQuery.java

@@ -0,0 +1,17 @@
+/*******************************************************************************
+ * Copyright 2016, the Biomes O' Plenty Team
+ * 
+ * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
+ * 
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
+ ******************************************************************************/
+package biomesoplenty.api.block;
+
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+
+// for queries on a particular block position in the world
+public interface IBlockPosQuery
+{
+    boolean matches(World world, BlockPos pos);
+}

src/main/java/biomesoplenty/api/config/IBOPWorldSettings.java

@@ -0,0 +1,17 @@
+/*******************************************************************************
+ * Copyright 2016, the Biomes O' Plenty Team
+ * 
+ * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
+ * 
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
+ ******************************************************************************/
+package biomesoplenty.api.config;
+
+public interface IBOPWorldSettings
+{
+    boolean isEnabled(GeneratorType type);
+    
+    enum GeneratorType
+    {
+    }
+}

src/main/java/biomesoplenty/api/config/IConfigObj.java

@@ -0,0 +1,79 @@
+/*******************************************************************************
+ * Copyright 2016, the Biomes O' Plenty Team
+ * 
+ * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
+ * 
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
+ ******************************************************************************/
+package biomesoplenty.api.config;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+import biomesoplenty.api.block.IBlockPosQuery;
+import com.google.gson.JsonElement;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.util.ResourceLocation;
+
+public interface IConfigObj
+{
+    JsonElement serializeDefaults();
+    void addMessage(String message);
+    void addMessage(String extraPrefix, String message);
+    List<String> flushMessages();
+    boolean isEmpty();
+    boolean has(String name);
+    Set<String> getKeys();
+    
+    IConfigObj getObject(String name);
+    ArrayList<IConfigObj> getObjectArray(String name);
+    IConfigObj getObject(String name, boolean warnIfMissing);
+    ArrayList<IConfigObj> getObjectArray(String name, boolean warnIfMissing);
+    
+    // Use the methods below when you want to obtain a value from a config file, if it is present, but you have a default value to use if it isn't
+    // No warning messages will be logged using these methods if the value is missing
+    Boolean getBool(String name, Boolean defaultVal);
+    String getString(String name, String defaultVal);
+    Integer getInt(String name, Integer defaultVal);
+    Float getFloat(String name, Float defaultVal);
+    IBlockState getBlockState(String name, IBlockState defaultVal);
+    IBlockPosQuery getBlockPosQuery(String name, IBlockPosQuery defaultVal);
+    ResourceLocation getResourceLocation(String name, ResourceLocation defaultVal);
+    <E extends Enum> E getEnum(String name, E defaultVal, Class<E> clazz);
+    
+    // Use the methods below when you want to obtain a value from a config file which SHOULD be present
+    // If the value is missing, a warning message is logged, and null is returned
+    Boolean getBool(String name);
+    String getString(String name);
+    Integer getInt(String name);
+    Float getFloat(String name);
+    IBlockState getBlockState(String name);
+    IBlockPosQuery getBlockPosQuery(String name);
+    ResourceLocation getResourceLocation(String name);
+    <E extends Enum> E getEnum(String name, Class<E> clazz);
+
+    // Use the methods below when you want to obtain an array of values from a config file, if it is present, but you have a default value to use if it isn't
+    // No warning messages will be logged using these methods if the value is missing
+    ArrayList<Boolean> getBoolArray(String name, ArrayList<Boolean> defaultVal);
+    ArrayList<String> getStringArray(String name, ArrayList<String> defaultVal);
+    ArrayList<Integer> getIntArray(String name, ArrayList<Integer> defaultVal);
+    ArrayList<Float> getFloatArray(String name, ArrayList<Float> defaultVal);
+    ArrayList<IBlockState> getBlockStateArray(String name, ArrayList<IBlockState> defaultVal);
+    ArrayList<IBlockPosQuery> getBlockPosQueryArray(String name, ArrayList<IBlockPosQuery> defaultVal);
+    ArrayList<ResourceLocation> getResourceLocationArray(String name, ArrayList<ResourceLocation> defaultVal);
+    <E extends Enum> ArrayList<E> getEnumArray(String name, ArrayList<E> defaultVal, Class<E> clazz);
+
+    // Use the methods below when you want to obtain an array of values from a config file which SHOULD be present
+    // If the value is missing, a warning message is logged, and null is returned
+    ArrayList<Boolean> getBoolArray(String name);
+    ArrayList<String> getStringArray(String name);
+    ArrayList<Integer> getIntArray(String name);
+    ArrayList<Float> getFloatArray(String name);
+    ArrayList<IBlockState> getBlockStateArray(String name);
+    ArrayList<IBlockPosQuery> getBlockPosQueryArray(String name);
+    ArrayList<ResourceLocation> getResourceLocationArray(String name);
+    <E extends Enum> ArrayList<E> getEnumArray(String name, Class<E> clazz);
+
+    
+}

src/main/java/biomesoplenty/api/entity/BOPEntities.java

@@ -1,16 +0,0 @@
-/*******************************************************************************
- * Copyright 2014-2019, the Biomes O' Plenty Team
- *
- * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
- *
- * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
- ******************************************************************************/
-package biomesoplenty.api.entity;
-
-import net.minecraft.entity.EntityType;
-import net.minecraft.entity.item.BoatEntity;
-
-public class BOPEntities
-{
-    public static EntityType<? extends BoatEntity> boat_bop;
-}

src/main/java/biomesoplenty/api/enums/BOPClimates.java

@@ -1,38 +1,20 @@
-/*******************************************************************************
- * Copyright 2014-2019, the Biomes O' Plenty Team
- *
- * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
- *
- * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
- ******************************************************************************/
 package biomesoplenty.api.enums;
 
-import biomesoplenty.api.biome.BOPBiomes;
-import biomesoplenty.common.util.biome.BiomeUtil;
-import biomesoplenty.init.ModBiomes;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
-import net.minecraft.util.RegistryKey;
-import net.minecraft.world.biome.Biome;
-import net.minecraft.world.biome.Biomes;
-import net.minecraft.world.gen.INoiseRandom;
-import net.minecraftforge.common.BiomeManager;
-import net.minecraftforge.common.BiomeManager.BiomeType;
-
 import java.util.ArrayList;
 import java.util.Iterator;
-import java.util.Set;
-import java.util.stream.Collectors;
 
-public enum BOPClimates
-{
-    ICE_CAP (BiomeType.ICY),
+import biomesoplenty.api.generation.BOPGenLayer;
+import net.minecraft.init.Biomes;
+import net.minecraft.world.biome.Biome;
+import net.minecraftforge.common.BiomeManager.BiomeType;
+
+public enum BOPClimates {
+
+    COLD_DESERT (BiomeType.ICY),
     TUNDRA (BiomeType.ICY),
-    WET_BOREAL (BiomeType.COOL),
-    DRY_BOREAL (BiomeType.COOL),
-    WET_TEMPERATE (BiomeType.COOL),
+    BOREAL (BiomeType.COOL),
+    COLD_SWAMP (BiomeType.COOL),
+    WET_TEMPERATE (BiomeType.WARM),
     DRY_TEMPERATE (BiomeType.WARM),
     COOL_TEMPERATE (BiomeType.COOL),
     WARM_TEMPERATE (BiomeType.WARM),
@@ -41,51 +23,34 @@ public enum BOPClimates
     MEDITERRANEAN (BiomeType.WARM),
     SAVANNA (BiomeType.DESERT),
     HOT_DESERT (BiomeType.DESERT),
-    WASTELAND (null),
-    NETHER (null);
-
+    WASTELAND (BiomeType.DESERT),
+    HELL (null);
+    
     public final BiomeType biomeType;
     private int totalBiomesWeight;
-    private int totalIslandBiomesWeight;
-
-    private ArrayList<WeightedBiomeEntry> landBiomes = Lists.newArrayList();
-    private ArrayList<WeightedBiomeEntry> islandBiomes = Lists.newArrayList();
 
+    private ArrayList<WeightedBiomeEntry> landBiomes = new ArrayList<WeightedBiomeEntry>();
+    
     BOPClimates(BiomeType biomeType)
     {
         this.biomeType = biomeType;
     }
-
-    public BOPClimates addBiome(int weight, RegistryKey<Biome> biome)
+    
+    public BOPClimates addBiome(int weight, Biome biome)
     {
         return this.addBiome(new WeightedBiomeEntry(weight, biome));
     }
-
+    
     public BOPClimates addBiome(WeightedBiomeEntry biomeEntry)
     {
         this.totalBiomesWeight += biomeEntry.weight;
         this.landBiomes.add(biomeEntry);
         return this;
     }
-
-    public BOPClimates addIslandBiome(int weight, RegistryKey<Biome> biome)
+    
+    public Biome getRandomBiome(BOPGenLayer layer)
     {
-        return this.addIslandBiome(new WeightedBiomeEntry(weight, biome));
-    }
-
-    public BOPClimates addIslandBiome(WeightedBiomeEntry biomeEntry)
-    {
-        this.totalIslandBiomesWeight += biomeEntry.weight;
-        this.islandBiomes.add(biomeEntry);
-        return this;
-    }
-
-    public RegistryKey<Biome> getRandomBiome(INoiseRandom context, RegistryKey<Biome> fallback)
-    {
-        if (this.totalBiomesWeight == 0)
-            return fallback;
-
-        int weight = context.nextRandom(this.totalBiomesWeight);
+        int weight = layer.nextInt(this.totalBiomesWeight);
         Iterator<WeightedBiomeEntry> iterator = this.landBiomes.iterator();
         WeightedBiomeEntry item;
         do
@@ -96,64 +61,53 @@ public enum BOPClimates
         while (weight >= 0);
         return item.biome;
     }
-
-    public RegistryKey<Biome> getRandomIslandBiome(INoiseRandom context, RegistryKey<Biome> fallback)
-    {
-        if (this.totalIslandBiomesWeight == 0)
-            return fallback;
-
-        int weight = context.nextRandom(this.totalIslandBiomesWeight);
-        Iterator<WeightedBiomeEntry> iterator = this.islandBiomes.iterator();
-        WeightedBiomeEntry item;
-        do
-        {
-            item = iterator.next();
-            weight -= item.weight;
-        }
-        while (weight >= 0);
-        return item.biome;
-    }
-
-    public RegistryKey<Biome> getRandomOceanBiome(INoiseRandom context, boolean deep)
+    
+    public Biome getRandomOceanBiome(BOPGenLayer layer, boolean deep)
     {
         return (deep ? Biomes.DEEP_OCEAN : Biomes.OCEAN);
     }
 
-    public ImmutableList<WeightedBiomeEntry> getLandBiomes()
+    static
     {
-        return this.landBiomes.isEmpty() ? ImmutableList.of(this.getDefaultWeightedBiomeEntry()) : ImmutableList.copyOf(this.landBiomes);
+        // set up vanilla biomes
+        
+        BOPClimates.COLD_DESERT.addBiome(10, Biomes.ICE_PLAINS);
+        BOPClimates.TUNDRA.addBiome(10, Biomes.COLD_TAIGA).addBiome(5, Biomes.EXTREME_HILLS);
+        BOPClimates.BOREAL.addBiome(7, Biomes.REDWOOD_TAIGA).addBiome(5, Biomes.EXTREME_HILLS).addBiome(15, Biomes.TAIGA);
+        BOPClimates.COLD_SWAMP.addBiome(10, Biomes.SWAMPLAND);
+        BOPClimates.WET_TEMPERATE.addBiome(3, Biomes.ROOFED_FOREST).addBiome(7, Biomes.FOREST);
+        BOPClimates.DRY_TEMPERATE.addBiome(5, Biomes.PLAINS);
+        BOPClimates.COOL_TEMPERATE.addBiome(7, Biomes.ROOFED_FOREST).addBiome(7, Biomes.FOREST).addBiome(10, Biomes.BIRCH_FOREST);
+        BOPClimates.WARM_TEMPERATE.addBiome(7, Biomes.PLAINS);
+        BOPClimates.SUBTROPICAL.addBiome(5, Biomes.OCEAN);
+        BOPClimates.TROPICAL.addBiome(15, Biomes.JUNGLE);
+        BOPClimates.MEDITERRANEAN.addBiome(5, Biomes.PLAINS);
+        BOPClimates.SAVANNA.addBiome(20, Biomes.SAVANNA);
+        BOPClimates.HOT_DESERT.addBiome(30, Biomes.DESERT).addBiome(15, Biomes.MESA_CLEAR_ROCK);
+        BOPClimates.WASTELAND.addBiome(1, Biomes.DESERT);
+        BOPClimates.HELL.addBiome(30, Biomes.HELL);
     }
-
-    public ImmutableList<WeightedBiomeEntry> getIslandBiomes()
-    {
-        return this.islandBiomes.isEmpty() ? ImmutableList.of(this.getDefaultWeightedBiomeEntry()) : ImmutableList.copyOf(this.islandBiomes);
-    }
-
-    private WeightedBiomeEntry getDefaultWeightedBiomeEntry()
-    {
-        return new WeightedBiomeEntry(100, Biomes.OCEAN);
-    }
-
+    
     private static BOPClimates[] values = BOPClimates.values();
-
+    
     public static BOPClimates lookup(int i) {return values[i];}
-
+    
     // map temperature and rainfall to climates
     // temperature values from 0 (cold) to 8 (hot) and rainfall values from 0 (wet) to 11 (dry), index is (temperatureValue * 12) + rainfallValue
     // we will contrive to make any combination equally likely, so the overall rarity of each climate is in proportion to the number of times it appears in the array
-    private static final BOPClimates[] climateMapping = new BOPClimates[]
-    {
-        TUNDRA,		    TUNDRA,			ICE_CAP,		ICE_CAP,		ICE_CAP,		ICE_CAP,		ICE_CAP,		ICE_CAP,		ICE_CAP,		ICE_CAP,		TUNDRA,			TUNDRA,
-    	WET_BOREAL,		WET_BOREAL,		TUNDRA,			TUNDRA,			TUNDRA,			TUNDRA,			TUNDRA,			TUNDRA,			TUNDRA,			TUNDRA,			DRY_BOREAL,		DRY_BOREAL,
-        WET_BOREAL,	    WET_BOREAL,		WET_BOREAL,		WET_BOREAL,		WET_BOREAL,		WET_BOREAL,		DRY_BOREAL,		DRY_BOREAL,		DRY_BOREAL,		DRY_BOREAL,		DRY_BOREAL,		DRY_BOREAL,
-    	WET_TEMPERATE,	WET_TEMPERATE,	WET_TEMPERATE,	COOL_TEMPERATE,	COOL_TEMPERATE,	COOL_TEMPERATE,	COOL_TEMPERATE,	COOL_TEMPERATE,	COOL_TEMPERATE,	DRY_TEMPERATE,	DRY_TEMPERATE,	DRY_TEMPERATE,
-    	WET_TEMPERATE,	WET_TEMPERATE,	WET_TEMPERATE,	COOL_TEMPERATE,	COOL_TEMPERATE,	COOL_TEMPERATE,	COOL_TEMPERATE,	COOL_TEMPERATE,	COOL_TEMPERATE,	DRY_TEMPERATE,	DRY_TEMPERATE,	DRY_TEMPERATE,
-    	SUBTROPICAL,	SUBTROPICAL,	WET_TEMPERATE,	WARM_TEMPERATE, WARM_TEMPERATE,	WARM_TEMPERATE,	WARM_TEMPERATE,	WARM_TEMPERATE,	WARM_TEMPERATE,	DRY_TEMPERATE,	SAVANNA,		SAVANNA,
-        SUBTROPICAL,	SUBTROPICAL,	SUBTROPICAL,	WARM_TEMPERATE,	WARM_TEMPERATE,	WARM_TEMPERATE,	WARM_TEMPERATE,	WARM_TEMPERATE,	WARM_TEMPERATE,	SAVANNA,		SAVANNA,		SAVANNA,
-    	TROPICAL,		TROPICAL,		SUBTROPICAL,	SUBTROPICAL,	MEDITERRANEAN,	MEDITERRANEAN,	MEDITERRANEAN,	MEDITERRANEAN,	SAVANNA,		SAVANNA,		HOT_DESERT,		HOT_DESERT,
-    	TROPICAL,		TROPICAL,		SUBTROPICAL,	SUBTROPICAL,	MEDITERRANEAN,	MEDITERRANEAN,	MEDITERRANEAN,	MEDITERRANEAN,	SAVANNA,		SAVANNA,		HOT_DESERT,		HOT_DESERT
+    private static final BOPClimates[] climateMapping = new BOPClimates[] {
+    //  0               1               2               3               4               5               6               7               8               9               10              11
+        TUNDRA,        	TUNDRA,        	TUNDRA,        	COLD_DESERT,    COLD_DESERT,    COLD_DESERT,    COLD_DESERT,    COLD_DESERT,    COLD_DESERT,    COLD_DESERT,    COLD_DESERT,  	COLD_DESERT,    // 0
+        BOREAL,			BOREAL,			BOREAL,			TUNDRA,			TUNDRA,			TUNDRA,			TUNDRA,			TUNDRA,			TUNDRA,			TUNDRA,			TUNDRA,			TUNDRA,			// 1
+        COLD_SWAMP,		COLD_SWAMP,		COLD_SWAMP,		BOREAL,			BOREAL,			BOREAL,			BOREAL,			BOREAL,			BOREAL,			BOREAL,			BOREAL,			BOREAL,			// 2
+        COLD_SWAMP,		COLD_SWAMP,		COLD_SWAMP,		COOL_TEMPERATE,	COOL_TEMPERATE,	COOL_TEMPERATE,	COOL_TEMPERATE,	COOL_TEMPERATE,	COOL_TEMPERATE,	DRY_TEMPERATE,	DRY_TEMPERATE,	DRY_TEMPERATE,	// 3
+        WET_TEMPERATE,	WET_TEMPERATE,	WET_TEMPERATE,	COOL_TEMPERATE,	COOL_TEMPERATE,	COOL_TEMPERATE,	COOL_TEMPERATE,	COOL_TEMPERATE,	COOL_TEMPERATE,	DRY_TEMPERATE,	DRY_TEMPERATE,	DRY_TEMPERATE,	// 4
+        SUBTROPICAL,	SUBTROPICAL,	WET_TEMPERATE,	WARM_TEMPERATE,	WARM_TEMPERATE,	WARM_TEMPERATE,	WARM_TEMPERATE,	WARM_TEMPERATE,	WARM_TEMPERATE,	WARM_TEMPERATE,	SAVANNA,		SAVANNA,		// 5
+        TROPICAL,		SUBTROPICAL,	SUBTROPICAL,	WET_TEMPERATE,	WARM_TEMPERATE,	WARM_TEMPERATE,	WARM_TEMPERATE,	WARM_TEMPERATE,	MEDITERRANEAN,	SAVANNA,		SAVANNA,		HOT_DESERT,		// 6
+        TROPICAL,		TROPICAL,		SUBTROPICAL,	SUBTROPICAL,	WET_TEMPERATE,	MEDITERRANEAN,	MEDITERRANEAN,	MEDITERRANEAN,	SAVANNA,		HOT_DESERT,		HOT_DESERT,		HOT_DESERT,		// 7
+        TROPICAL,		TROPICAL,		TROPICAL,		SUBTROPICAL,	WET_TEMPERATE,	MEDITERRANEAN,	MEDITERRANEAN,	SAVANNA,		HOT_DESERT,		HOT_DESERT,		WASTELAND,		WASTELAND		// 8
     };
-
+    
     public static int[] getClimateMappingInts()
     {
         // 9 temperature values, 12 rainfall values, 12 * 9 = 108
@@ -164,38 +118,19 @@ public enum BOPClimates
         }
         return out;
     }
-
-    public static ImmutableSet<RegistryKey<Biome>> getOverworldBiomes()
-    {
-        Set<RegistryKey<Biome>> set = Sets.newHashSet();
-
-        for (BOPClimates climate : BOPClimates.values())
-        {
-            if (climate == BOPClimates.NETHER)
-            {
-                continue;
-            }
-
-            set.addAll(climate.getLandBiomes().stream().map(weightedBiomeEntry -> weightedBiomeEntry.biome).collect(Collectors.toSet()));
-            set.addAll(climate.getIslandBiomes().stream().map(weightedBiomeEntry -> weightedBiomeEntry.biome).collect(Collectors.toSet()));
-        }
-
-        ModBiomes.subBiomes.values().forEach(weightedSubBiome -> set.add(weightedSubBiome.biome));
-        return ImmutableSet.copyOf(set);
-    }
-
+    
     public static class WeightedBiomeEntry
     {
         public final int weight;
-        public final RegistryKey<Biome> biome;
-
-        public WeightedBiomeEntry(int weight, RegistryKey<Biome> biome)
+        public final Biome biome;
+        
+        public WeightedBiomeEntry(int weight, Biome biome)
         {
             this.weight = weight;
             this.biome = biome;
         }
     }
-
+    
     // for debugging purposes
     public static void printWeights()
     {
@@ -203,7 +138,7 @@ public enum BOPClimates
         {
             for (WeightedBiomeEntry entry : climate.landBiomes)
             {
-                System.out.println(climate.name()+" "+entry.biome.location()+" "+entry.weight);
+                System.out.println(climate.name()+" "+entry.biome.getBiomeName()+" "+entry.weight);
             }
         }
     }

src/main/java/biomesoplenty/api/enums/BOPFlowers.java

@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright 2014-2016, the Biomes O' Plenty Team
+ * 
+ * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
+ * 
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
+ ******************************************************************************/
+
+package biomesoplenty.api.enums;
+
+import net.minecraft.util.IStringSerializable;
+
+public enum BOPFlowers implements IStringSerializable, IPagedVariants
+{
+	ROSE, BLUE_HYDRANGEA, VIOLET, LAVENDER, GOLDENROD, WILDFLOWER, ORANGE_COSMOS, PINK_DAFFODIL, PINK_HIBISCUS, GLOWFLOWER, DEATHBLOOM, WILTED_LILY, BURNING_BLOSSOM;
+	
+    @Override
+    public String getName() {
+        return this.name().toLowerCase();
+    }
+    @Override
+    public String toString()
+    {
+        return this.getName();
+    }
+    
+}

src/main/java/biomesoplenty/api/enums/BOPFoliage.java

@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright 2014-2016, the Biomes O' Plenty Team
+ * 
+ * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
+ * 
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
+ ******************************************************************************/
+
+package biomesoplenty.api.enums;
+
+import net.minecraft.util.IStringSerializable;
+
+public enum BOPFoliage implements IStringSerializable, IPagedVariants
+{
+	SHORTGRASS, BUSH, BERRYBUSH, BARLEY, DUNEGRASS, DESERTGRASS, DEADGRASS, DEVILWEED, SPECTRALFERN;
+	
+    @Override
+    public String getName() {
+        return this.name().toLowerCase();
+    }
+    @Override
+    public String toString()
+    {
+        return this.getName();
+    }
+}

src/main/java/biomesoplenty/api/enums/BOPPlants.java

@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright 2014-2016, the Biomes O' Plenty Team
+ * 
+ * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
+ * 
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
+ ******************************************************************************/
+
+package biomesoplenty.api.enums;
+
+import net.minecraft.util.IStringSerializable;
+
+public enum BOPPlants implements IStringSerializable, IPagedVariants
+{
+	THORN, TINYCACTUS, CATTAIL, ROOT, REED, WATERGRASS;
+	
+    @Override
+    public String getName() {
+        return this.name().toLowerCase();
+    }
+    @Override
+    public String toString()
+    {
+        return this.getName();
+    }
+}

src/main/java/biomesoplenty/api/enums/BOPTrees.java

@@ -0,0 +1,39 @@
+/*******************************************************************************
+ * Copyright 2014-2016, the Biomes O' Plenty Team
+ * 
+ * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
+ * 
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
+ ******************************************************************************/
+
+package biomesoplenty.api.enums;
+
+import com.google.common.base.Predicate;
+
+import net.minecraft.util.IStringSerializable;
+
+public enum BOPTrees implements IStringSerializable, IPagedVariants
+{
+	ORIGIN, FLOWERING, ORANGE_AUTUMN, YELLOW_AUTUMN, FIR, REDWOOD, WHITE_CHERRY, PINK_CHERRY, MAPLE, MAHOGANY, JACARANDA, PALM, WILLOW, DEAD, MAGIC, UMBRAN, HELLBARK, ETHEREAL;
+    
+    @Override
+    public String getName() {
+        return this.name().toLowerCase();
+    }
+    @Override
+    public String toString()
+    {
+        return this.getName();
+    }
+    
+    public boolean hasSapling()
+    {
+        return true;
+    }
+    
+    public static Predicate withSaplings = new Predicate<BOPTrees>()
+    {
+        @Override
+        public boolean apply(BOPTrees tree) {return tree.hasSapling();}
+    };
+}

src/main/java/biomesoplenty/api/enums/BOPWoods.java

@@ -0,0 +1,47 @@
+/*******************************************************************************
+ * Copyright 2014-2016, the Biomes O' Plenty Team
+ * 
+ * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
+ * 
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
+ ******************************************************************************/
+
+package biomesoplenty.api.enums;
+
+import com.google.common.base.Predicate;
+
+import net.minecraft.util.IStringSerializable;
+
+public enum BOPWoods implements IStringSerializable, IPagedVariants
+{
+	FIR, REDWOOD, CHERRY, MAHOGANY, JACARANDA, PALM, WILLOW, DEAD, MAGIC, UMBRAN, HELLBARK, ETHEREAL;
+    
+    @Override
+    public String getName() {
+        return this.name().toLowerCase();
+    }
+    @Override
+    public String toString()
+    {
+        return this.getName();
+    }
+    public boolean hasPlanks()
+    {
+        switch (this) {
+            case DEAD:
+                return false;
+            default:
+                return true;
+        }
+    }
+    public boolean canMakeCharcoal()
+    {
+        return true;
+    }
+    
+    public static Predicate withPlanks = new Predicate<BOPWoods>()
+    {
+        @Override
+        public boolean apply(BOPWoods wood) {return wood.hasPlanks();}
+    };
+}

src/main/java/biomesoplenty/api/enums/IPagedVariants.java

@@ -0,0 +1,5 @@
+package biomesoplenty.api.enums;
+
+public interface IPagedVariants {
+
+}

src/main/java/biomesoplenty/api/generation/BOPGenLayer.java

@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright 2015-2016, the Biomes O' Plenty Team
+ * 
+ * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
+ * 
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
+ ******************************************************************************/
+
+package biomesoplenty.api.generation;
+import net.minecraft.world.gen.layer.GenLayer;
+
+public abstract class BOPGenLayer extends GenLayer
+{
+    public BOPGenLayer(long seed) {
+        super(seed);
+    }
+
+    // make nextInt public
+    @Override
+    public int nextInt(int a)
+    {
+        return super.nextInt(a);
+    }
+}

src/main/java/biomesoplenty/api/generation/BOPGeneratorBase.java

@@ -0,0 +1,98 @@
+/*******************************************************************************
+ * Copyright 2015-2016, the Biomes O' Plenty Team
+ * 
+ * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
+ * 
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
+ ******************************************************************************/
+
+package biomesoplenty.api.generation;
+
+import java.util.Random;
+
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.MathHelper;
+import net.minecraft.world.World;
+import net.minecraft.world.gen.feature.WorldGenerator;
+
+public abstract class BOPGeneratorBase extends WorldGenerator implements IGenerator
+{ 
+    protected final String identifier;
+    protected String name;
+    protected GeneratorStage stage;
+    protected float amountPerChunk;
+    
+    protected BOPGeneratorBase(float amountPerChunk)
+    {
+        this.identifier = Generators.registry.getIdentifier(this.getClass());
+        
+        if (this.identifier == null)
+        {
+            throw new RuntimeException("The identifier for " + this.getClass().getCanonicalName() + " cannot be null!");
+        }
+        
+        this.amountPerChunk = amountPerChunk;
+    }
+    
+    
+    protected static abstract class InnerBuilder<T extends InnerBuilder<T, G>, G extends BOPGeneratorBase>
+    {
+        protected T self() {return (T)this;}
+        protected float amountPerChunk;
+        public T amountPerChunk(float amountPerChunk) {this.amountPerChunk = amountPerChunk; return this.self();}
+        public abstract G create();
+    }
+    
+    
+    @Override
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    @Override
+    public void setStage(GeneratorStage stage)
+    {
+        this.stage = stage;
+    }
+
+    @Override
+    public String getName()
+    {
+        return this.name;
+    }
+
+    @Override
+    public GeneratorStage getStage()
+    {
+        return this.stage;
+    }
+    
+    @Override
+    public final String getIdentifier()
+    {
+        return this.identifier;
+    }
+    
+    public abstract BlockPos getScatterY(World world, Random random, int x, int z);
+    
+    public int getAmountToScatter(Random random)
+    {
+        int amount = MathHelper.floor(this.amountPerChunk);
+        float remainder = this.amountPerChunk - amount;
+        if (random.nextFloat() < remainder) {amount++;}
+        return amount;
+    }
+    
+    @Override
+    public void scatter(World world, Random random, BlockPos pos)
+    {
+        int amount = this.getAmountToScatter(random);        
+        for (int i = 0; i < amount; i++)
+        {
+            int x = pos.getX() + random.nextInt(16) + 8;
+            int z = pos.getZ() + random.nextInt(16) + 8;
+            generate(world, random, this.getScatterY(world, random, x, z));
+        }
+    }
+}

src/main/java/biomesoplenty/api/generation/GeneratorStage.java

@@ -0,0 +1,110 @@
+/*******************************************************************************
+ * Copyright 2015-2016, the Biomes O' Plenty Team
+ * 
+ * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
+ * 
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
+ ******************************************************************************/
+
+package biomesoplenty.api.generation;
+
+import java.util.EnumMap;
+
+import com.google.common.collect.Maps;
+import com.google.gson.annotations.SerializedName;
+
+import net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate;
+
+public enum GeneratorStage
+{
+    @SerializedName("pre")
+    PRE(null), 
+    @SerializedName("big_shroom")
+    BIG_SHROOM(Decorate.EventType.BIG_SHROOM), 
+    @SerializedName("cactus")
+    CACTUS(Decorate.EventType.CACTUS), 
+    @SerializedName("clay")
+    CLAY(Decorate.EventType.CLAY), 
+    @SerializedName("dead_bush")
+    DEAD_BUSH(Decorate.EventType.DEAD_BUSH), 
+    @SerializedName("desert_well")
+    DESERT_WELL(Decorate.EventType.DESERT_WELL), 
+    @SerializedName("lilypad")
+    LILYPAD(Decorate.EventType.LILYPAD), 
+    @SerializedName("flowers")
+    FLOWERS(Decorate.EventType.FLOWERS), 
+    @SerializedName("fossil")
+    FOSSIL(Decorate.EventType.FOSSIL), 
+    @SerializedName("grass")
+    GRASS(Decorate.EventType.GRASS), 
+    @SerializedName("ice")
+    ICE(Decorate.EventType.ICE), 
+    @SerializedName("lake_water")
+    LAKE_WATER(Decorate.EventType.LAKE_WATER), 
+    @SerializedName("lake_lava")
+    LAKE_LAVA(Decorate.EventType.LAKE_LAVA), 
+    @SerializedName("pumpkin")
+    PUMPKIN(Decorate.EventType.PUMPKIN), 
+    @SerializedName("reed")
+    REED(Decorate.EventType.REED), 
+    @SerializedName("rock")
+    ROCK(Decorate.EventType.ROCK), 
+    @SerializedName("sand")
+    SAND(Decorate.EventType.SAND), 
+    @SerializedName("sand_pass_2")
+    SAND_PASS2(Decorate.EventType.SAND_PASS2), 
+    @SerializedName("shroom")
+    SHROOM(Decorate.EventType.SHROOM), 
+    @SerializedName("tree")
+    TREE(Decorate.EventType.TREE), 
+    @SerializedName("post")
+    POST(null),
+    @SerializedName("parent")
+    PARENT(null),
+    @SerializedName("ore_pre")
+    ORE_PRE(null),
+    @SerializedName("ore_post")
+    ORE_POST(null);
+    
+    private Decorate.EventType decorateType;
+    
+    GeneratorStage(Decorate.EventType decorateType)
+    {
+        this.decorateType = decorateType;
+    }
+    
+    public Decorate.EventType getDecorateType()
+    {
+        return this.decorateType;
+    }
+    
+    private static final EnumMap<Decorate.EventType, GeneratorStage> decorateTypeMapper = Maps.newEnumMap(Decorate.EventType.class);
+    static
+    {
+        decorateTypeMapper.put(Decorate.EventType.BIG_SHROOM, BIG_SHROOM);
+        decorateTypeMapper.put(Decorate.EventType.CACTUS, CACTUS);
+        decorateTypeMapper.put(Decorate.EventType.CLAY, CLAY);
+        decorateTypeMapper.put(Decorate.EventType.DEAD_BUSH, DEAD_BUSH);
+        decorateTypeMapper.put(Decorate.EventType.DESERT_WELL, DESERT_WELL);
+        decorateTypeMapper.put(Decorate.EventType.LILYPAD, LILYPAD);
+        decorateTypeMapper.put(Decorate.EventType.FLOWERS, FLOWERS);
+        decorateTypeMapper.put(Decorate.EventType.FOSSIL, FOSSIL);
+        decorateTypeMapper.put(Decorate.EventType.GRASS, GRASS);
+        decorateTypeMapper.put(Decorate.EventType.ICE, ICE);
+        decorateTypeMapper.put(Decorate.EventType.LAKE_WATER, LAKE_WATER);
+        decorateTypeMapper.put(Decorate.EventType.LAKE_LAVA, LAKE_LAVA);
+        decorateTypeMapper.put(Decorate.EventType.PUMPKIN, PUMPKIN);
+        decorateTypeMapper.put(Decorate.EventType.REED, REED);
+        decorateTypeMapper.put(Decorate.EventType.ROCK, ROCK);
+        decorateTypeMapper.put(Decorate.EventType.SAND, SAND);
+        decorateTypeMapper.put(Decorate.EventType.SAND_PASS2, SAND_PASS2);
+        decorateTypeMapper.put(Decorate.EventType.SHROOM, SHROOM);
+        decorateTypeMapper.put(Decorate.EventType.TREE, TREE);
+    }
+    
+    public static GeneratorStage mapDecorateType(Decorate.EventType decorateType)
+    {
+        //Somewhat of a hack, requires the ordering of our enum to be the same as the decorate event
+    	return decorateType != Decorate.EventType.CUSTOM ? decorateTypeMapper.get(decorateType) : null;
+    }
+}

src/main/java/biomesoplenty/api/generation/Generators.java

@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright 2016, the Biomes O' Plenty Team
+ * 
+ * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
+ * 
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
+ ******************************************************************************/
+package biomesoplenty.api.generation;
+
+import net.minecraft.world.gen.layer.GenLayer;
+
+public class Generators
+{
+    public static IGeneratorRegistry registry;
+    
+    public static GenLayer biomeGenLayer;
+    public static GenLayer biomeIndexLayer;
+}

src/main/java/biomesoplenty/api/generation/IGenerationManager.java

@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright 2016, the Biomes O' Plenty Team
+ * 
+ * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
+ * 
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
+ ******************************************************************************/
+package biomesoplenty.api.generation;
+
+import com.google.common.collect.ImmutableCollection;
+
+import biomesoplenty.api.config.IConfigObj;
+
+public interface IGenerationManager
+{
+    void addGenerator(String name, GeneratorStage stage, IGenerator generator);
+    ImmutableCollection<IGenerator> getGeneratorsForStage(GeneratorStage stage);
+    void removeGenerator(String name);
+    IGenerator getGenerator(String name);
+    void configure(IConfigObj conf);
+}

src/main/java/biomesoplenty/api/generation/IGenerator.java

@@ -0,0 +1,40 @@
+/*******************************************************************************
+ * Copyright 2014-2016, the Biomes O' Plenty Team
+ * 
+ * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
+ * 
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
+ ******************************************************************************/
+
+package biomesoplenty.api.generation;
+
+import java.util.Random;
+
+import biomesoplenty.api.config.IConfigObj;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+
+public interface IGenerator
+{
+    void scatter(World world, Random random, BlockPos pos);
+    boolean generate(World world, Random random, BlockPos pos);
+    
+    void setStage(GeneratorStage stage);
+    void setName(String name);
+    
+    /**
+     * A unique name used to classify the purpose of a generator. For example, emeralds and ruby use the
+     * same generator (and thus, have the same identifier) but have differing names.
+     */
+    String getName();
+    /**The identifier for this generator should be consistent across all instances of the same type*/
+    String getIdentifier();
+    GeneratorStage getStage();
+    
+    interface IGeneratorBuilder<T extends IGenerator>
+    {
+        T create();
+    }
+    
+    void configure(IConfigObj conf);
+}

src/main/java/biomesoplenty/api/generation/IGeneratorRegistry.java

@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright 2016, the Biomes O' Plenty Team
+ * 
+ * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
+ * 
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
+ ******************************************************************************/
+package biomesoplenty.api.generation;
+
+import biomesoplenty.api.config.IConfigObj;
+
+public interface IGeneratorRegistry
+{
+    <T extends IGenerator> void registerGenerator(String identifier, Class<T> generatorClass, IGenerator.IGeneratorBuilder<T> builder);
+    String getIdentifier(Class<? extends IGenerator> generatorClass);
+    Class<? extends IGenerator> getGeneratorClass(String identifier);
+    IGenerator.IGeneratorBuilder<?> getGeneratorBuilder(String identifier);
+    boolean generatorExists(String identifier);
+    IGenerator createGenerator(IConfigObj conf);
+}

src/main/java/biomesoplenty/api/item/BOPItems.java

@@ -1,32 +1,56 @@
 /*******************************************************************************
- * Copyright 2014-2019, the Biomes O' Plenty Team
+ * Copyright 2014-2016, the Biomes O' Plenty Team
  * 
  * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
  * 
  * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
  ******************************************************************************/
+
 package biomesoplenty.api.item;
 
 import net.minecraft.item.Item;
 
-public class BOPItems 
+public class BOPItems
 {
-    public static Item bop_icon;
-
-    public static Item mud_ball;
+	public static Item bop_icon;
+	
+    public static Item berries;
+    public static Item peach;
+    public static Item persimmon;
+    public static Item pear;
+    
+    public static Item fleshchunk;
+    public static Item mudball;
+    public static Item ash;
     public static Item mud_brick;
-
-    public static Item fir_boat;
-    public static Item redwood_boat;
-    public static Item cherry_boat;
-    public static Item mahogany_boat;
-    public static Item jacaranda_boat;
-    public static Item palm_boat;
-    public static Item willow_boat;
-    public static Item dead_boat;
-    public static Item magic_boat;
-    public static Item umbran_boat;
-    public static Item hellbark_boat;
-
-    public static Item music_disc_wanderer;
+    public static Item other_slab;
+    
+    public static Item boat_cherry;
+    public static Item boat_umbran;
+    public static Item boat_fir;
+    public static Item boat_ethereal;
+    public static Item boat_magic;
+    public static Item boat_palm;
+    public static Item boat_redwood;
+    public static Item boat_willow;
+    public static Item boat_hellbark;
+    public static Item boat_jacaranda;
+    public static Item boat_mahogany;
+    
+    public static Item cherry_door;
+    public static Item umbran_door;
+    public static Item fir_door;
+    public static Item ethereal_door;
+    public static Item magic_door;
+    public static Item palm_door;
+    public static Item redwood_door;
+    public static Item willow_door;
+    public static Item hellbark_door;
+    public static Item jacaranda_door;
+    public static Item mahogany_door;
+    
+    public static Item wood_slab_0;
+    public static Item wood_slab_1;
+    
+    public static Item record_wanderer;
 }

src/main/java/biomesoplenty/api/particle/BOPParticleTypes.java

@@ -1,13 +1,6 @@
-/*******************************************************************************
- * Copyright 2014-2019, the Biomes O' Plenty Team
- *
- * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
- *
- * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
- ******************************************************************************/
 package biomesoplenty.api.particle;
 
 public enum BOPParticleTypes
 {
-    MUD
-}
+    MUD, PLAYER_TRAIL, CURSE
+}

src/main/java/biomesoplenty/api/potion/BOPPotions.java

@@ -0,0 +1,16 @@
+/*******************************************************************************
+ * Copyright 2014-2016, the Biomes O' Plenty Team
+ * 
+ * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
+ * 
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
+ ******************************************************************************/
+
+package biomesoplenty.api.potion;
+
+import net.minecraft.potion.Potion;
+
+public class BOPPotions
+{
+    public static Potion curse;
+}

src/main/java/biomesoplenty/api/sound/BOPSounds.java

@@ -1,15 +1,15 @@
 /*******************************************************************************
- * Copyright 2014-2019, the Biomes O' Plenty Team
- *
+ * Copyright 2016, the Biomes O' Plenty Team
+ * 
  * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
- *
+ * 
  * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
  ******************************************************************************/
 package biomesoplenty.api.sound;
 
 import net.minecraft.util.SoundEvent;
 
-public class BOPSounds
+public class BOPSounds 
 {
-	public static SoundEvent music_disc_wanderer;
+    public static SoundEvent records_wanderer;
 }

src/main/java/biomesoplenty/client/BOPClassicPack.java

@@ -1,141 +0,0 @@
-/**Copied from Twilight Forest and modified with permission**/
-
-package biomesoplenty.client;
-
-import biomesoplenty.core.BiomesOPlenty;
-import com.google.common.base.Joiner;
-import net.minecraft.resources.ResourcePack;
-import net.minecraft.resources.ResourcePackFileNotFoundException;
-import net.minecraft.resources.ResourcePackType;
-import net.minecraft.resources.data.IMetadataSectionSerializer;
-import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
-import net.minecraftforge.fml.loading.moddiscovery.ModFile;
-
-import javax.annotation.Nullable;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.StandardOpenOption;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Set;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-
-@OnlyIn(Dist.CLIENT)
-public class BOPClassicPack extends ResourcePack
-{
-    private final ModFile modFile;
-    private static final String subDir = "classic/";
-
-    public BOPClassicPack(ModFile modFile)
-    {
-        super(modFile.getFilePath().toFile());
-        this.modFile = modFile;
-    }
-
-    @Override
-    public Set<String> getNamespaces(ResourcePackType type)
-    {
-        try
-        {
-            Path root = modFile.getLocator().findPath(modFile, subDir + type.getDirectory()).toAbsolutePath();
-            return Files.walk(root,1).map(path -> root.relativize(path.toAbsolutePath())).filter(path -> path.getNameCount() > 0).map(p->p.toString().replaceAll("/$","")).filter(s -> !s.isEmpty()).collect(Collectors.toSet());
-        }
-        catch (Throwable t)
-        {
-            BiomesOPlenty.logger.error("BOPClassicPack failed to collect resource namespaces!", t);
-            return Collections.emptySet();
-        }
-    }
-
-    @Override
-    protected InputStream getResource(String location) throws IOException
-    {
-        final Path path = modFile.getLocator().findPath(modFile, subDir + location);
-
-        if (!Files.exists(path))
-        {
-            BiomesOPlenty.logger.error("File does not exist!");
-            throw new ResourcePackFileNotFoundException(path.toFile(), location);
-        }
-
-        return Files.newInputStream(path, StandardOpenOption.READ);
-    }
-
-    @Override
-    protected boolean hasResource(String resourcePath)
-    {
-        return Files.exists(modFile.getLocator().findPath(modFile, subDir + resourcePath));
-    }
-
-    @Override
-    public Collection<ResourceLocation> getResources(ResourcePackType type, String namespaceIn, String pathIn, int maxDepthIn, Predicate<String> filterIn)
-    {
-        try
-        {
-            Path root = modFile.getLocator().findPath(modFile, subDir + type.getDirectory()).toAbsolutePath();
-            Path inputPath = root.getFileSystem().getPath(pathIn);
-
-            return Files.walk(root).map(path -> root.relativize(path.toAbsolutePath())).filter(path -> path.getNameCount() > 1 && path.getNameCount() - 1 <= maxDepthIn).filter(path -> !path.toString().endsWith(".mcmeta")).filter(path -> path.subpath(1, path.getNameCount()).startsWith(inputPath)).filter(path -> filterIn.test(path.getFileName().toString())).map(path -> new ResourceLocation(path.getName(0).toString(), Joiner.on('/').join(path.subpath(1, Math.min(maxDepthIn, path.getNameCount()))))).collect(Collectors.toList());
-        }
-        catch (IOException e)
-        {
-            return Collections.emptyList();
-        }
-    }
-
-    @Override
-    public void close() { }
-
-    @Override
-    public String getName()
-    {
-        return "BOP Programmer Art";
-    }
-
-    @Nullable
-    @Override
-    public <T> T getMetadataSection(IMetadataSectionSerializer<T> serializer) throws IOException
-    {
-        InputStream inputStream = getResource("pack.mcmeta");
-        Throwable throwable = null;
-        T resourceMetaData;
-
-        try
-        {
-            resourceMetaData = getMetadataFromStream(serializer, inputStream);
-        }
-        catch (Throwable t)
-        {
-            throwable = t;
-            throw t;
-        }
-        finally
-        {
-            if (inputStream != null)
-            {
-                if (throwable != null)
-                {
-                    try
-                    {
-                        inputStream.close();
-                    }
-                    catch (Throwable t)
-                    {
-                        throwable.addSuppressed(t);
-                    }
-                }
-                else
-                {
-                    inputStream.close();
-                }
-            }
-        }
-
-        return resourceMetaData;
-    }
-}

src/main/java/biomesoplenty/client/gui/GuiBOPConfigureWorld.java

@@ -0,0 +1,581 @@
+package biomesoplenty.client.gui;
+
+import java.io.IOException;
+
+import com.google.common.base.Predicate;
+import com.google.common.primitives.Floats;
+
+import biomesoplenty.common.world.BOPWorldSettings;
+import biomesoplenty.common.world.BOPWorldSettings.BiomeSize;
+import biomesoplenty.common.world.BOPWorldSettings.LandMassScheme;
+import biomesoplenty.common.world.BOPWorldSettings.RainfallVariationScheme;
+import biomesoplenty.common.world.BOPWorldSettings.TemperatureVariationScheme;
+import net.minecraft.client.gui.Gui;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiCreateWorld;
+import net.minecraft.client.gui.GuiListButton;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.gui.GuiSlider;
+import net.minecraft.client.gui.GuiTextField;
+import net.minecraft.client.renderer.BufferBuilder;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
+import net.minecraft.client.resources.I18n;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
+@SideOnly(Side.CLIENT)
+public class GuiBOPConfigureWorld extends GuiScreen implements GuiSlider.FormatHelper, GuiBOPPageList.GuiResponder
+{
+    private GuiCreateWorld parentScreen;
+    
+    protected String screenTitle = "Customize World Settings";
+    protected String pageInfo = "Page 1 of 3";
+    protected String page0Title = "Basic Settings";
+    protected String[] pageNames;
+    
+    private GuiBOPPageManager pageManager;
+    
+    //Navigation buttons, required on all pages
+    private GuiButton doneButton;
+    private GuiButton defaultsButton;
+    private GuiButton prevButton;
+    private GuiButton nextButton;
+    private GuiButton yesButton;
+    private GuiButton noButton;
+    
+    private int modalAction = 0;
+    private boolean field_175340_C = false;
+    private Predicate validFloatPredicate = new Predicate()
+    {
+        public boolean tryParseValidFloat(String p_178956_1_)
+        {
+            Float f = Floats.tryParse(p_178956_1_);
+            return p_178956_1_.length() == 0 || f != null && Floats.isFinite(f.floatValue()) && f.floatValue() >= 0.0F;
+        }
+        @Override
+        public boolean apply(Object p_apply_1_)
+        {
+            return this.tryParseValidFloat((String)p_apply_1_);
+        }
+    };
+    
+    private BOPWorldSettings settings;
+    
+
+    public GuiBOPConfigureWorld(GuiScreen parentScreen, String settingsStringIn)
+    {
+        this.parentScreen = (GuiCreateWorld)parentScreen;
+        
+        if (settingsStringIn.isEmpty())
+        {        
+            this.settings = new BOPWorldSettings();
+        } else {
+            this.settings = new BOPWorldSettings(settingsStringIn);
+        }
+    }
+
+    private enum Actions
+    {
+        PREVIOUS (301),
+        NEXT (302),
+        DEFAULTS (303),
+        DONE (304),
+        YES (305),
+        NO (306);
+        
+        private int id;
+        
+        Actions(int id)
+        {
+            this.id = id;      
+        }
+        public int getId()
+        {
+            return this.id;
+        }
+        
+        public static Actions fromId(int id)
+        {
+            for (Actions action : Actions.values())
+            {
+                if (action.id == id)
+                {
+                    return action;
+                }
+            }
+            return null;
+        }
+    }
+
+    @Override
+    public void initGui()
+    {
+        this.screenTitle = I18n.format("options.customizeTitle");
+        
+        this.buttonList.clear();
+        this.buttonList.add(this.prevButton = new GuiButton(Actions.PREVIOUS.getId(), 20, 5, 80, 20, I18n.format("createWorld.customize.custom.prev")));
+        this.buttonList.add(this.nextButton = new GuiButton(Actions.NEXT.getId(), this.width - 100, 5, 80, 20, I18n.format("createWorld.customize.custom.next")));
+        this.buttonList.add(this.defaultsButton = new GuiButton(Actions.DEFAULTS.getId(), this.width / 2 - 187, this.height - 27, 90, 20, I18n.format("createWorld.customize.custom.defaults")));
+        this.buttonList.add(this.doneButton = new GuiButton(Actions.DONE.getId(), this.width / 2 + 98, this.height - 27, 90, 20, I18n.format("gui.done")));
+       
+        this.yesButton = new GuiButton(Actions.YES.getId(), this.width / 2 - 55, 160, 50, 20, I18n.format("gui.yes"));
+        this.yesButton.visible = false;
+        this.buttonList.add(this.yesButton);
+        
+        this.noButton = new GuiButton(Actions.NO.getId(), this.width / 2 + 5, 160, 50, 20, I18n.format("gui.no"));
+        this.noButton.visible = false;
+        this.buttonList.add(this.noButton);
+        
+        this.setupPages();
+        
+    }
+
+    @Override
+    public void handleMouseInput() throws IOException
+    {
+        super.handleMouseInput();
+        this.pageManager.getActivePage().handleMouseInput();
+    }
+    
+    @Override
+    protected void mouseClicked(int mouseX, int mouseY, int mouseButton) throws IOException
+    {
+        super.mouseClicked(mouseX, mouseY, mouseButton);
+
+        if (this.modalAction == 0 && !this.field_175340_C)
+        {
+            this.pageManager.getActivePage().mouseClicked(mouseX, mouseY, mouseButton);
+        }
+    }
+
+    @Override
+    protected void mouseReleased(int mouseX, int mouseY, int state)
+    {
+        super.mouseReleased(mouseX, mouseY, state);
+
+        if (this.field_175340_C)
+        {
+            this.field_175340_C = false;
+        }
+        else if (this.modalAction == 0)
+        {
+            this.pageManager.getActivePage().mouseReleased(mouseX, mouseY, state);
+        }
+    }
+
+    
+    private enum GuiEntries
+    {
+        TEMP_SCHEME (101),
+        AMPLITUDE (104),
+        BIOME_SIZE (105),
+        LAND_SCHEME (106),
+        RAIN_SCHEME (107),
+        MAIN_NOISE_SCALE_X (127),
+        MAIN_NOISE_SCALE_Y (128),
+        MAIN_NOISE_SCALE_Z (129),
+        COORDINATE_SCALE (130),
+        HEIGHT_SCALE (131),
+        UPPER_LIMIT_SCALE (132),
+        LOWER_LIMIT_SCALE (133);
+
+        private int id;
+        
+        GuiEntries(int id)
+        {
+            this.id = id;      
+        }
+        public int getId()
+        {
+            return this.id;
+        }
+        
+        public static GuiEntries fromId(int id)
+        {
+            for (GuiEntries entry : GuiEntries.values())
+            {
+                if (entry.id == id)
+                {
+                    return entry;
+                }
+            }
+            return null;
+        }
+    }
+    
+    
+    private void setupPages()
+    {
+        this.pageNames = new String[3];
+        
+        this.pageNames[0] = "World Settings";
+        GuiBOPPageList.GuiFieldEntry[] page0Fields = new GuiBOPPageList.GuiFieldEntry[] {
+            new GuiBOPPageList.GuiEnumButtonEntry<BiomeSize>(GuiEntries.BIOME_SIZE.getId(), "Biome Size: %s", true, this.settings.biomeSize),
+            new GuiBOPPageList.GuiEnumButtonEntry<LandMassScheme>(GuiEntries.LAND_SCHEME.getId(), "Land Mass: %s", true, this.settings.landScheme),
+            new GuiBOPPageList.GuiEnumButtonEntry<TemperatureVariationScheme>(GuiEntries.TEMP_SCHEME.getId(), "Temperature: %s", true, this.settings.tempScheme),
+            new GuiBOPPageList.GuiEnumButtonEntry<RainfallVariationScheme>(GuiEntries.RAIN_SCHEME.getId(), "Rainfall: %s", true, this.settings.rainScheme),
+            new GuiBOPPageList.GuiSlideEntry(GuiEntries.AMPLITUDE.getId(), "Amplitude", true, this, 0.2F, 3.0F, this.settings.amplitude),
+            new GuiBOPPageList.GuiSlideEntry(GuiEntries.MAIN_NOISE_SCALE_X.getId(), "Main Noise Scale X", true, this, 1.0F, 5000.0F, this.settings.mainNoiseScaleX),
+            new GuiBOPPageList.GuiSlideEntry(GuiEntries.MAIN_NOISE_SCALE_Y.getId(), "Main Noise Scale Y", true, this, 1.0F, 5000.0F, this.settings.mainNoiseScaleY),
+            new GuiBOPPageList.GuiSlideEntry(GuiEntries.MAIN_NOISE_SCALE_Z.getId(), "Main Noise Scale Z", true, this, 1.0F, 5000.0F, this.settings.mainNoiseScaleZ),
+            new GuiBOPPageList.GuiSlideEntry(GuiEntries.COORDINATE_SCALE.getId(), "Coordinate Scale", true, this, 1.0F, 6000.0F, this.settings.coordinateScale),
+            new GuiBOPPageList.GuiSlideEntry(GuiEntries.HEIGHT_SCALE.getId(), "Height Scale", true, this, 1.0F, 6000.0F, this.settings.heightScale),
+            new GuiBOPPageList.GuiSlideEntry(GuiEntries.UPPER_LIMIT_SCALE.getId(), "Upper Limit Scale", true, this, 1.0F, 5000.0F, this.settings.upperLimitScale),
+            new GuiBOPPageList.GuiSlideEntry(GuiEntries.LOWER_LIMIT_SCALE.getId(), "Lower Limit Scale", true, this, 1.0F, 5000.0F, this.settings.lowerLimitScale),
+        };
+        
+        this.pageManager = new GuiBOPPageManager(createTableForFields(page0Fields));
+        this.pageManager.setup();
+        
+        this.showNewPage();
+    }
+    
+    private GuiBOPPageTable[] createTableForFields(GuiBOPPageList.GuiFieldEntry[]... fieldGroup)
+    {
+        GuiBOPPageTable[] output = new GuiBOPPageTable[fieldGroup.length];
+        
+        for (int i = 0; i < fieldGroup.length; i++)
+        {
+            GuiBOPPageList.GuiFieldEntry[] fields = fieldGroup[i];
+            output[i] = new GuiBOPPageTable(this.width, this.height, 32, this.height - 32, 25, i, this, fields);
+        }
+        
+        return output;
+    }
+
+    public String serialize()
+    {
+        return this.settings.toString().replace("\n", "");
+    }
+    
+
+
+    @Override
+    public String getText(int id, String name, float value)
+    {
+        return name + ": " + this.stringFormatFloat(id, value);
+    }
+
+    private String stringFormatFloat(int fieldId, float value)
+    {
+        GuiEntries entry = GuiEntries.fromId(fieldId);
+        if (entry == null) {return "";}
+        
+        switch (entry)
+        {
+            case AMPLITUDE:
+            case MAIN_NOISE_SCALE_X:
+            case MAIN_NOISE_SCALE_Y:
+            case MAIN_NOISE_SCALE_Z:
+            case COORDINATE_SCALE:
+            case HEIGHT_SCALE:
+            case UPPER_LIMIT_SCALE:
+            case LOWER_LIMIT_SCALE:
+                return String.format("%5.3f", Float.valueOf(value));
+            default:
+                return "";
+        }
+    }
+    
+    
+    
+
+    @Override
+    public void handleEnumSelection(int fieldId, int ordinal)
+    {
+        GuiEntries entry = GuiEntries.fromId(fieldId);
+        if (entry == null) {return;}
+        
+        switch (entry)
+        {
+            case LAND_SCHEME:
+                LandMassScheme[] land_values = LandMassScheme.values();
+                this.settings.landScheme = land_values[ordinal % land_values.length];
+                break;
+            case TEMP_SCHEME:
+                TemperatureVariationScheme[] temp_values = TemperatureVariationScheme.values();
+                this.settings.tempScheme = temp_values[ordinal % temp_values.length];
+                break;
+            case RAIN_SCHEME:
+                RainfallVariationScheme[] rain_values = RainfallVariationScheme.values();
+                this.settings.rainScheme = rain_values[ordinal % rain_values.length];
+                break;
+            case BIOME_SIZE:
+                BiomeSize[] size_values = BiomeSize.values();
+                this.settings.biomeSize = size_values[ordinal % size_values.length];
+                break;
+            default:
+                break;
+        }
+        
+        System.out.println("settings currently: "+this.settings.toJson());
+
+    }
+
+    @Override    
+    public void handleBooleanSelection(int fieldId, boolean value)
+    {
+        GuiEntries entry = GuiEntries.fromId(fieldId);
+        if (entry == null) {return;}
+        
+        System.out.println("settings currently: "+this.settings.toJson());
+
+    }
+
+
+    @Override
+    public void handleFloatSelection(int fieldId, float value)
+    {
+        GuiEntries entry = GuiEntries.fromId(fieldId);
+        if (entry == null) {return;}
+        
+        switch (entry)
+        {
+            case AMPLITUDE:
+                this.settings.amplitude = value;
+                break;
+            case MAIN_NOISE_SCALE_X:
+                this.settings.mainNoiseScaleX = value;
+                break;
+            case MAIN_NOISE_SCALE_Y:
+                this.settings.mainNoiseScaleY = value;
+                break;
+            case MAIN_NOISE_SCALE_Z:
+                this.settings.mainNoiseScaleZ = value;
+                break;
+            case COORDINATE_SCALE:
+                this.settings.coordinateScale = value;
+                break;
+            case HEIGHT_SCALE:
+                this.settings.heightScale = value;
+                break;
+            case UPPER_LIMIT_SCALE:
+                this.settings.upperLimitScale = value;
+                break;
+            case LOWER_LIMIT_SCALE:
+                this.settings.lowerLimitScale = value;
+                break;
+            default:
+                break;
+        }
+        
+        System.out.println("settings currently: "+this.settings.toJson());
+
+    }
+    
+
+    @Override
+    public void handleStringSelection(int fieldId, String value)
+    {
+    }
+    
+    
+    @Override
+    public void handleIntSelection(int fieldId, int value)
+    {
+    }
+    
+    
+    // These 3 are the original functions required by GuiPageButtonList.GuiResponder - just pass off to the better named functions
+    @Override
+    public void setEntryValue(int fieldId, String value) {this.handleStringSelection(fieldId, value);}
+    @Override
+    public void setEntryValue(int fieldId, float value) {this.handleFloatSelection(fieldId, value);}
+    @Override 
+    public void setEntryValue(int fieldId, boolean value) {this.handleBooleanSelection(fieldId, value);}
+    
+
+    
+    @Override
+    protected void actionPerformed(GuiButton button) throws IOException
+    {
+        if (button.enabled)
+        {
+            Actions action = Actions.fromId(button.id);
+            if (action == null) {return;}
+            switch (action)
+            {
+                case DONE:
+                    this.parentScreen.chunkProviderSettingsJson = this.settings.toJson();
+                    System.out.println("settings sent to world screen "+this.parentScreen.chunkProviderSettingsJson);
+                    this.mc.displayGuiScreen(this.parentScreen);
+                    break;
+                    
+                case PREVIOUS:
+                    this.pageManager.gotToPrevPage(); // prev page
+                    this.showNewPage();
+                    break;
+                    
+                case NEXT:
+                    this.pageManager.goToNextPage(); // next page
+                    this.showNewPage();
+                    break;
+                    
+                case DEFAULTS:
+                    this.confirmSetDefaults(button.id);
+                    break;
+                    
+                case YES:
+                    this.handleModalClose();
+                    break;
+                    
+                case NO:
+                    this.modalAction = 0;
+                    this.handleModalClose();
+            }
+        }
+    }
+
+    
+    private void doSetDefaults()
+    {
+        this.settings.setDefault();
+        this.setupPages();
+    }
+
+    private void confirmSetDefaults(int actionId)
+    {
+        this.modalAction = actionId;
+        this.showModal(true);
+    }
+
+    private void handleModalClose() throws IOException
+    {
+        Actions action = Actions.fromId(this.modalAction);
+        if (action != null) {
+            switch (action)
+            {
+                case DONE:
+                    this.actionPerformed((GuiListButton)this.pageManager.getActivePage().getGui(300));
+                    break;
+                case DEFAULTS:
+                    this.doSetDefaults();
+                    break;
+                default:
+                    break;
+            }
+        }
+        this.modalAction = 0;
+        this.field_175340_C = true;
+        this.showModal(false);
+    }
+
+    private void showModal(boolean flag)
+    {
+        this.yesButton.visible = flag;
+        this.noButton.visible = flag;
+        this.doneButton.enabled = !flag;
+        this.prevButton.enabled = !flag;
+        this.nextButton.enabled = !flag;
+        this.defaultsButton.enabled = !flag;
+    }
+
+    private void showNewPage()
+    {
+        this.prevButton.enabled = this.pageManager.getActivePage().pageNumber != 0;
+        this.nextButton.enabled = this.pageManager.getActivePage().pageNumber != this.pageManager.getNumPages() - 1;
+        this.pageInfo = I18n.format("book.pageIndicator", Integer.valueOf(this.pageManager.getActivePage().pageNumber + 1), Integer.valueOf(this.pageManager.getNumPages()));
+        this.page0Title = this.pageNames[this.pageManager.getActivePage().pageNumber];
+    }
+
+    @Override
+    protected void keyTyped(char typedChar, int keyCode) throws IOException
+    {
+        super.keyTyped(typedChar, keyCode);
+
+        if (this.modalAction == 0)
+        {
+            switch (keyCode)
+            {
+                case 200:
+                    this.func_175327_a(1.0F);
+                    break;
+                case 208:
+                    this.func_175327_a(-1.0F);
+                    break;
+                default:
+                    this.pageManager.getActivePage().keyTyped(typedChar, keyCode);
+            }
+        }
+    }
+
+    private void func_175327_a(float p_175327_1_)
+    {
+        Gui gui = this.pageManager.getActivePage().getFocusedGuiElement();
+
+        if (gui instanceof GuiTextField)
+        {
+            float f1 = p_175327_1_;
+
+            if (GuiScreen.isShiftKeyDown())
+            {
+                f1 = p_175327_1_ * 0.1F;
+
+                if (GuiScreen.isCtrlKeyDown())
+                {
+                    f1 *= 0.1F;
+                }
+            }
+            else if (GuiScreen.isCtrlKeyDown())
+            {
+                f1 = p_175327_1_ * 10.0F;
+
+                if (GuiScreen.isAltKeyDown())
+                {
+                    f1 *= 10.0F;
+                }
+            }
+
+            GuiTextField guitextfield = (GuiTextField)gui;
+            Float f2 = Floats.tryParse(guitextfield.getText());
+
+            if (f2 != null)
+            {
+                f2 = Float.valueOf(f2.floatValue() + f1);
+                int i = guitextfield.getId();
+                String s = this.stringFormatFloat(guitextfield.getId(), f2.floatValue());
+                guitextfield.setText(s);
+                this.setEntryValue(i, s);
+            }
+        }
+    }
+
+    @Override
+    public void drawScreen(int mouseX, int mouseY, float partialTicks)
+    {
+        this.drawDefaultBackground();
+        this.pageManager.getActivePage().drawScreen(mouseX, mouseY, partialTicks);
+        this.drawCenteredString(this.fontRenderer, this.screenTitle, this.width / 2, 2, 16777215);
+        this.drawCenteredString(this.fontRenderer, this.pageInfo, this.width / 2, 12, 16777215);
+        this.drawCenteredString(this.fontRenderer, this.page0Title, this.width / 2, 22, 16777215);
+        super.drawScreen(mouseX, mouseY, partialTicks);
+
+        if (this.modalAction != 0)
+        {
+            drawRect(0, 0, this.width, this.height, Integer.MIN_VALUE);
+            this.drawHorizontalLine(this.width / 2 - 91, this.width / 2 + 90, 99, -2039584);
+            this.drawHorizontalLine(this.width / 2 - 91, this.width / 2 + 90, 185, -6250336);
+            this.drawVerticalLine(this.width / 2 - 91, 99, 185, -2039584);
+            this.drawVerticalLine(this.width / 2 + 90, 99, 185, -6250336);
+            GlStateManager.disableLighting();
+            GlStateManager.disableFog();
+            Tessellator tessellator = Tessellator.getInstance();
+            BufferBuilder bufferBuilder = tessellator.getBuffer();
+            this.mc.getTextureManager().bindTexture(OPTIONS_BACKGROUND);
+            GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+            bufferBuilder.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
+            bufferBuilder.pos((double)(this.width / 2 - 90), 185.0D, 0.0D).tex(0.0D, 2.65625D).color(64, 64, 64, 64).endVertex();
+            bufferBuilder.pos((double)(this.width / 2 + 90), 185.0D, 0.0D).tex(5.625D, 2.65625D).color(64, 64, 64, 64).endVertex();
+            bufferBuilder.pos((double)(this.width / 2 + 90), 100.0D, 0.0D).tex(5.625D, 0.0D).color(64, 64, 64, 64).endVertex();
+            bufferBuilder.pos((double)(this.width / 2 - 90), 100.0D, 0.0D).tex(0.0D, 0.0D).color(64, 64, 64, 64).endVertex();
+            tessellator.draw();
+            this.drawCenteredString(this.fontRenderer, I18n.format("createWorld.customize.custom.confirmTitle"), this.width / 2, 105, 16777215);
+            this.drawCenteredString(this.fontRenderer, I18n.format("createWorld.customize.custom.confirm1"), this.width / 2, 125, 16777215);
+            this.drawCenteredString(this.fontRenderer, I18n.format("createWorld.customize.custom.confirm2"), this.width / 2, 135, 16777215);
+            this.yesButton.drawButton(this.mc, mouseX, mouseY, partialTicks);
+            this.noButton.drawButton(this.mc, mouseX, mouseY, partialTicks);
+        }
+    }
+}

src/main/java/biomesoplenty/client/gui/GuiBOPFactory.java

@@ -0,0 +1,53 @@
+package biomesoplenty.client.gui;
+
+import biomesoplenty.common.config.GameplayConfigurationHandler;
+import biomesoplenty.common.remote.TrailManager;
+import biomesoplenty.common.util.entity.PlayerUtil;
+import biomesoplenty.core.BiomesOPlenty;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.util.text.translation.I18n;
+import net.minecraftforge.common.config.ConfigElement;
+import net.minecraftforge.fml.client.DefaultGuiFactory;
+import net.minecraftforge.fml.client.config.DummyConfigElement.DummyCategoryElement;
+import net.minecraftforge.fml.client.config.GuiConfig;
+import net.minecraftforge.fml.client.config.IConfigElement;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static biomesoplenty.common.config.GameplayConfigurationHandler.CONVENIENCE_SETTINGS;
+import static biomesoplenty.common.config.MiscConfigurationHandler.*;
+
+public class GuiBOPFactory extends DefaultGuiFactory
+{
+    public GuiBOPFactory()
+    {
+        super(BiomesOPlenty.MOD_ID, BiomesOPlenty.MOD_NAME);
+    }
+
+    @Override
+    public GuiScreen createConfigGui(GuiScreen parentScreen)
+    {
+        return new GuiConfig(parentScreen, getConfigElements(), modid, false, false, title);
+    }
+
+    private static List<IConfigElement> getConfigElements()
+    {
+        List<IConfigElement> list = new ArrayList<IConfigElement>();
+
+        List<IConfigElement> convenience_settings = new ConfigElement(GameplayConfigurationHandler.config.getCategory(CONVENIENCE_SETTINGS.toLowerCase())).getChildElements();
+        List<IConfigElement> gui_settings = new ConfigElement(config.getCategory(GUI_SETTINGS.toLowerCase())).getChildElements();
+        List<IConfigElement> texture_settings = new ConfigElement(config.getCategory(VISUAL_SETTINGS.toLowerCase())).getChildElements();
+        List<IConfigElement> trail_settings = new ConfigElement(config.getCategory(TRAIL_SETTINGS.toLowerCase())).getChildElements();
+
+        list.add(new DummyCategoryElement(I18n.translateToLocal("config.category.convenienceSettings.title"), "config.category.convenienceSettings", convenience_settings));
+        list.add(new DummyCategoryElement(I18n.translateToLocal("config.category.guiSettings.title"), "config.category.guiSettings", gui_settings));
+        list.add(new DummyCategoryElement(I18n.translateToLocal("config.category.textureSettings.title"), "config.category.textureSettings", texture_settings));
+        if (TrailManager.trailsMap.containsKey(PlayerUtil.getClientPlayerUUID()))
+        {
+            list.add(new DummyCategoryElement(I18n.translateToLocal("config.category.trailSettings.title"), "config.category.trailSettings", trail_settings));
+        }
+
+        return list;
+    }
+}

src/main/java/biomesoplenty/client/gui/GuiBOPPageBiomes.java

@@ -0,0 +1,15 @@
+/*******************************************************************************
+ * Copyright 2014-2016, the Biomes O' Plenty Team
+ * 
+ * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
+ * 
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
+ ******************************************************************************/
+
+package biomesoplenty.client.gui;
+
+public class GuiBOPPageBiomes //extends GuiBOPPageDelegate
+{
+    //Subclass implementing GuiListExtended.IGuiListEntry 
+    //Icon, label
+}

src/main/java/biomesoplenty/client/gui/GuiBOPPageDelegate.java

@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright 2014-2016, the Biomes O' Plenty Team
+ * 
+ * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
+ * 
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
+ ******************************************************************************/
+
+package biomesoplenty.client.gui;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.Gui;
+import net.minecraft.client.gui.GuiSlot;
+
+public abstract class GuiBOPPageDelegate extends GuiSlot
+{
+    public final int pageNumber;
+    
+    public GuiBOPPageDelegate(int width, int height, int top, int bottom, int slotHeight, int pageNumber)
+    {
+        super(Minecraft.getMinecraft(), width, height, top, bottom, slotHeight);
+        
+        this.pageNumber = pageNumber;
+    }
+    
+    public abstract void setup();
+    
+
+    public abstract void setVisible(boolean isVisible);
+    
+    public void mouseClicked(int mouseX, int mouseY, int mouseEvent) {}
+    public void mouseReleased(int mouseX, int mouseY, int state) {}
+    public void keyTyped(char typedChar, int keyCode) {}
+    public Gui getFocusedGuiElement() { return null; }
+    public Gui getGui(int fieldId) { return null; }
+}

src/main/java/biomesoplenty/client/gui/GuiBOPPageList.java

@@ -0,0 +1,383 @@
+/*******************************************************************************
+ * Copyright 2014-2016, the Biomes O' Plenty Team
+ * 
+ * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
+ * 
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
+ ******************************************************************************/
+
+package biomesoplenty.client.gui;
+
+import com.google.common.base.MoreObjects;
+import com.google.common.base.Objects;
+import com.google.common.base.Predicate;
+import com.google.common.base.Predicates;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.Gui;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiLabel;
+import net.minecraft.client.gui.GuiListExtended;
+import net.minecraft.client.gui.GuiPageButtonList;
+import net.minecraft.client.gui.GuiSlider;
+import net.minecraft.client.gui.GuiTextField;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
+public abstract class GuiBOPPageList extends GuiBOPPageDelegate
+{
+    public GuiBOPPageList(int width, int height, int top, int bottom, int slotHeight, int pageNumber)
+    {
+        super(width, height, top, bottom, slotHeight, pageNumber);
+    }
+
+    @Override
+    protected void elementClicked(int slotIndex, boolean isDoubleClick, int mouseX, int mouseY) {}
+
+    @Override
+    protected boolean isSelected(int slotIndex)
+    {
+        return false;
+    }
+
+    @Override
+    protected void drawBackground() {}
+
+    @Override
+    protected void drawSlot(int entryID, int p_180791_2_, int p_180791_3_, int p_180791_4_, int mouseXIn, int mouseYIn, float partialTicks)
+    {
+        this.getListEntry(entryID).drawEntry(entryID, p_180791_2_, p_180791_3_, this.getListWidth(), p_180791_4_, mouseXIn, mouseYIn, this.getSlotIndexFromScreenCoords(mouseXIn, mouseYIn) == entryID, partialTicks);
+    }
+
+    // updateItemPos
+    @Override
+    protected void updateItemPos(int p_178040_1_, int p_178040_2_, int p_178040_3_, float partialTicks)
+    {
+        this.getListEntry(p_178040_1_).updatePosition(p_178040_1_, p_178040_2_, p_178040_3_, partialTicks);
+    }
+
+    @Override
+    public void mouseClicked(int mouseX, int mouseY, int mouseEvent)
+    {
+        if (this.isMouseYWithinSlotBounds(mouseY))
+        {
+            int l = this.getSlotIndexFromScreenCoords(mouseX, mouseY);
+
+            if (l >= 0)
+            {
+                int i1 = this.left + this.width / 2 - this.getListWidth() / 2 + 2;
+                int j1 = this.top + 4 - this.getAmountScrolled() + l * this.slotHeight + this.headerPadding;
+                int k1 = mouseX - i1;
+                int l1 = mouseY - j1;
+
+                if (this.getListEntry(l).mousePressed(l, mouseX, mouseY, mouseEvent, k1, l1))
+                {
+                    this.setEnabled(false);
+                }
+            }
+        }
+    }
+
+    @Override
+    public void mouseReleased(int mouseX, int mouseY, int state)
+    {
+        for (int l = 0; l < this.getSize(); ++l)
+        {
+            int i1 = this.left + this.width / 2 - this.getListWidth() / 2 + 2;
+            int j1 = this.top + 4 - this.getAmountScrolled() + l * this.slotHeight + this.headerPadding;
+            int k1 = mouseX - i1;
+            int l1 = mouseY - j1;
+            this.getListEntry(l).mouseReleased(l, mouseX, mouseY, state, k1, l1);
+        }
+
+        this.setEnabled(true);
+    }
+
+    public abstract GuiListExtended.IGuiListEntry getListEntry(int rowNum);
+    
+    @SideOnly(Side.CLIENT)
+    public static class GuiSlideEntry extends GuiBOPPageList.GuiFieldEntry
+    {
+        private final GuiSlider.FormatHelper formatHelper;
+        private final float min;
+        private final float max;
+        private final float value;
+    
+        public GuiSlideEntry(int fieldId, String labelText, boolean isVisible, GuiSlider.FormatHelper formatHelper, float min, float max, float value)
+        {
+            super(fieldId, labelText, isVisible);
+            this.formatHelper = formatHelper;
+            this.min = min;
+            this.max = max;
+            this.value = value;
+        }
+    
+        public GuiSlider.FormatHelper getFormatHelper()
+        {
+            return this.formatHelper;
+        }
+    
+        public float getMin()
+        {
+            return this.min;
+        }
+    
+        public float getMax()
+        {
+            return this.max;
+        }
+    
+        public float getValue()
+        {
+            return this.value;
+        }
+    }
+
+    @SideOnly(Side.CLIENT)
+    public interface GuiResponder extends GuiPageButtonList.GuiResponder
+    {
+        void handleEnumSelection(int fieldId, int ordinal);
+    
+        void handleBooleanSelection(int fieldId, boolean value);
+    
+        void handleFloatSelection(int fieldId, float value);
+    
+        void handleStringSelection(int fieldId, String value);
+    
+        void handleIntSelection(int fieldId, int value);   
+    
+    }
+
+    @SideOnly(Side.CLIENT)
+    public static class GuiFieldEntry
+    {
+        private final int fieldID;
+        private final String labelText;
+        private final boolean isVisible;
+    
+        public GuiFieldEntry(int fieldId, String labelText, boolean isVisible)
+        {
+            this.fieldID = fieldId;
+            this.labelText = labelText;
+            this.isVisible = isVisible;
+        }
+    
+        public int getFieldId()
+        {
+            return this.fieldID;
+        }
+    
+        public String getLabelText()
+        {
+            return this.labelText;
+        }
+    
+        public boolean isVisible()
+        {
+            return this.isVisible;
+        }
+    }
+
+    @SideOnly(Side.CLIENT)
+    public static class GuiLabelEntry extends GuiFieldEntry
+    {
+        public GuiLabelEntry(int fieldId, String labelText, boolean isVisible)
+        {
+            super(fieldId, labelText, isVisible);
+        }
+    }
+
+    @SideOnly(Side.CLIENT)
+    public static class GuiRowEntry implements GuiListExtended.IGuiListEntry
+    {
+        private final Minecraft minecraft = Minecraft.getMinecraft();
+        private final Gui guiLeft;
+        private final Gui guiRight;
+        Gui focusedGui;
+    
+        public GuiRowEntry(Gui guiLeft, Gui guiRight)
+        {
+            this.guiLeft = guiLeft;
+            this.guiRight = guiRight;
+        }
+    
+        public Gui getGuiLeft()
+        {
+            return this.guiLeft;
+        }
+    
+        public Gui getGuiRight()
+        {
+            return this.guiRight;
+        }
+
+        @Override
+        public void drawEntry(int slotIndex, int x, int y, int listWidth, int slotHeight, int mouseX, int mouseY, boolean isVisible, float partialTicks)
+        {
+            this.drawGui(this.guiLeft, y, mouseX, mouseY, false, partialTicks);
+            this.drawGui(this.guiRight, y, mouseX, mouseY, false, partialTicks);
+        }
+    
+        private void drawGui(Gui gui, int y, int mouseX, int mouseY, boolean isVisible, float partialTicks)
+        {
+            if (gui != null)
+            {
+                if (gui instanceof GuiButton)
+                {
+                    this.drawGuiButton((GuiButton)gui, y, mouseX, mouseY, isVisible, partialTicks);
+                }
+                else if (gui instanceof GuiTextField)
+                {
+                    this.drawGuiTextField((GuiTextField)gui, y, isVisible);
+                }
+                else if (gui instanceof GuiLabel)
+                {
+                    this.drawGuiLabel((GuiLabel)gui, y, mouseX, mouseY, isVisible);
+                }
+            }
+        }
+    
+        private void drawGuiButton(GuiButton guiButton, int y, int mouseX, int mouseY, boolean isVisible, float partialTicks)
+        {
+            guiButton.y = y;
+    
+            if (!isVisible)
+            {
+                guiButton.drawButton(this.minecraft, mouseX, mouseY, partialTicks);
+            }
+        }
+    
+        private void drawGuiTextField(GuiTextField guiTextField, int y, boolean isVisible)
+        {
+            guiTextField.y = y;
+    
+            if (!isVisible)
+            {
+                guiTextField.drawTextBox();
+            }
+        }
+    
+        private void drawGuiLabel(GuiLabel guiLabel, int y, int mouseX, int mouseY, boolean isVisible)
+        {
+            guiLabel.y = y;
+    
+            if (!isVisible)
+            {
+                guiLabel.drawLabel(this.minecraft, mouseX, mouseY);
+            }
+        }
+
+        // setSelected
+        public void updatePosition(int p_178011_1_, int p_178011_2_, int p_178011_3_, float partialTicks)
+        {
+            this.drawGui(this.guiLeft, p_178011_3_, 0, 0, true, partialTicks);
+            this.drawGui(this.guiRight, p_178011_3_, 0, 0, true, partialTicks);
+        }
+    
+    
+        @Override
+        public boolean mousePressed(int slotIndex, int x, int y, int mouseEvent, int relativeX, int relativeY)
+        {
+            return this.doMousePressed(this.guiLeft, x, y, mouseEvent) || this.doMousePressed(this.guiRight, x, y, mouseEvent);
+        }
+    
+        private boolean doMousePressed(Gui gui, int x, int y, int mouseEvent)
+        {
+            if (gui == null)
+            {
+                return false;
+            }
+            else if (gui instanceof GuiButton)
+            {
+                if (((GuiButton)gui).mousePressed(this.minecraft, x, y))
+                {
+                    this.focusedGui = gui;
+                    return true;
+                }
+                else
+                {
+                    return false;
+                }
+            }
+            else if (gui instanceof GuiTextField)
+            {
+                ((GuiTextField)gui).mouseClicked(x, y, mouseEvent);
+    
+                if (((GuiTextField)gui).isFocused())
+                {
+                    this.focusedGui = gui;
+                }
+                return false;
+            }
+            return false;
+        }
+    
+    
+        @Override
+        public void mouseReleased(int slotIndex, int x, int y, int mouseEvent, int relativeX, int relativeY)
+        {
+            this.doMouseReleased(this.guiLeft, x, y);
+            this.doMouseReleased(this.guiRight, x, y);
+        }
+    
+        public void doMouseReleased(Gui gui, int x, int y)
+        {
+            if (gui != null && (gui instanceof GuiButton))
+            {
+                ((GuiButton)gui).mouseReleased(x, y);
+            }
+        }
+    
+    }
+
+    @SideOnly(Side.CLIENT)
+    public static class GuiEnumButtonEntry<T extends Enum> extends GuiFieldEntry
+    {
+        private final T value;
+    
+        public GuiEnumButtonEntry(int fieldId, String textLabel, boolean isVisible, T value)
+        {
+            super(fieldId, textLabel, isVisible);
+            this.value = value;
+        }
+    
+        public T getValue()
+        {
+            return this.value;
+        }
+    }
+
+    @SideOnly(Side.CLIENT)
+    public static class GuiButtonEntry extends GuiFieldEntry
+    {
+        private final boolean value;
+    
+        public GuiButtonEntry(int fieldId, String textLabel, boolean isVisible, boolean value)
+        {
+            super(fieldId, textLabel, isVisible);
+            this.value = value;
+        }
+    
+        public boolean getValue()
+        {
+            return this.value;
+        }
+    }
+
+    @SideOnly(Side.CLIENT)
+    public static class EditBoxEntry extends GuiFieldEntry
+    {
+        private final Predicate validator;
+    
+        public EditBoxEntry(int fieldId, String labelText, boolean isVisible, Predicate validator)
+        {
+            super(fieldId, labelText, isVisible);
+            this.validator = MoreObjects.firstNonNull(validator, Predicates.alwaysTrue());
+        }
+    
+        public Predicate getValidator()
+        {
+            return this.validator;
+        }
+    }
+}

src/main/java/biomesoplenty/client/gui/GuiBOPPageManager.java

@@ -0,0 +1,61 @@
+package biomesoplenty.client.gui;
+
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
+@SideOnly(Side.CLIENT)
+public class GuiBOPPageManager
+{
+    private GuiBOPPageDelegate[] pages;
+    private GuiBOPPageDelegate activePage;
+
+    public GuiBOPPageManager(GuiBOPPageDelegate ... pages)
+    {
+        this.pages = pages;
+        this.activePage = pages[0];
+    }
+    
+    public void setup()
+    {
+        for (GuiBOPPageDelegate page : pages)
+        {
+            page.setup();
+        }
+    }
+    
+    public GuiBOPPageDelegate getActivePage()
+    {
+        return this.activePage;
+    }
+
+    public int getNumPages()
+    {
+        return this.pages.length;
+    }
+
+    public void gotToPrevPage()
+    {
+        if (this.activePage.pageNumber > 0)
+        {
+            int newPageNumber = this.activePage.pageNumber - 1;
+            GuiBOPPageDelegate newPage = this.pages[newPageNumber];
+            
+            this.activePage.setVisible(false);
+            newPage.setVisible(true);
+            this.activePage = newPage;
+        }
+    }
+
+    public void goToNextPage()
+    {
+        if (this.activePage.pageNumber < this.pages.length - 1)
+        {
+            int newPageNumber = this.activePage.pageNumber + 1;
+            GuiBOPPageDelegate newPage = this.pages[newPageNumber];
+            
+            this.activePage.setVisible(false);
+            newPage.setVisible(true);
+            this.activePage = newPage;
+        }
+    }
+}

src/main/java/biomesoplenty/client/gui/GuiBOPPageTable.java

@@ -0,0 +1,370 @@
+/*******************************************************************************
+ * Copyright 2014-2016, the Biomes O' Plenty Team
+ * 
+ * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
+ * 
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
+ ******************************************************************************/
+
+package biomesoplenty.client.gui;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.lwjgl.input.Mouse;
+
+import net.minecraft.client.gui.Gui;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiLabel;
+import net.minecraft.client.gui.GuiListButton;
+import net.minecraft.client.gui.GuiListExtended;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.gui.GuiSlider;
+import net.minecraft.client.gui.GuiTextField;
+
+public class GuiBOPPageTable extends GuiBOPPageList
+{
+    private final List<GuiBOPPageList.GuiRowEntry> allRows = new ArrayList<GuiBOPPageList.GuiRowEntry>();
+    private final Map<Integer, Gui> fieldIdToGuiMap = new HashMap<Integer, Gui>();
+    private final List<GuiTextField> allTextFieldGuis = new ArrayList<GuiTextField>();
+    private final GuiBOPPageList.GuiFieldEntry[] fields;
+    private GuiBOPPageList.GuiResponder responder;
+    private Gui focusedGui;
+    
+    public GuiBOPPageTable(int width, int height, int top, int bottom, int slotHeight, int pageNumber, GuiBOPPageList.GuiResponder responder, GuiBOPPageList.GuiFieldEntry... fields)
+    {
+        super(width, height, top, bottom, slotHeight, pageNumber);
+
+        this.responder = responder;
+        this.fields = fields;
+    }
+    
+    @Override
+    public void setVisible(boolean isVisible)
+    {
+        if (isVisible)
+        {
+            for (GuiBOPPageList.GuiFieldEntry field : this.fields)
+            {
+                if (field != null)
+                {
+                    Gui gui = this.fieldIdToGuiMap.get(field.getFieldId());
+                    this.setVisible(gui, true);
+                }
+            }
+        }
+        else
+        {
+            for (GuiBOPPageList.GuiFieldEntry field : this.fields)
+            {
+                if (field != null)
+                {
+                    Gui gui = this.fieldIdToGuiMap.get(field.getFieldId());
+                    this.setVisible(gui, false);
+                }
+            }
+        }
+    }
+    
+    private void setVisible(Gui gui, boolean isVisible)
+    {
+        if (gui instanceof GuiButton)
+        {
+            ((GuiButton)gui).visible = isVisible;
+        }
+        else if (gui instanceof GuiTextField)
+        {
+            ((GuiTextField)gui).setVisible(isVisible);
+        }
+        else if (gui instanceof GuiLabel)
+        {
+            ((GuiLabel)gui).visible = isVisible;
+        }
+    }
+    
+    @Override
+    public void setup()
+    {
+        // go through the fields in twos (so they go in 2 columns)
+        for (int k = 0; k < fields.length; k += 2)
+        {
+            GuiBOPPageList.GuiFieldEntry fieldLeft = fields[k];
+            GuiBOPPageList.GuiFieldEntry fieldRight = k < fields.length - 1 ? fields[k + 1] : null;
+
+            Gui guiLeft = this.createGui(fieldLeft, 0, fieldRight == null);
+            Gui guiRight = this.createGui(fieldRight, 160, fieldLeft == null);
+
+            GuiBOPPageList.GuiRowEntry row = new GuiBOPPageList.GuiRowEntry(guiLeft, guiRight);
+            this.allRows.add(row);
+
+            if (fieldLeft != null && guiLeft != null)
+            {
+                this.fieldIdToGuiMap.put(fieldLeft.getFieldId(), guiLeft);
+
+                if (guiLeft instanceof GuiTextField)
+                {
+                    this.allTextFieldGuis.add((GuiTextField)guiLeft);
+                }
+            }
+
+            if (fieldRight != null && guiRight != null)
+            {
+                this.fieldIdToGuiMap.put(fieldRight.getFieldId(), guiRight);
+
+                if (guiRight instanceof GuiTextField)
+                {
+                    this.allTextFieldGuis.add((GuiTextField)guiRight);
+                }
+            }
+        }
+        
+        this.resetRows();
+    }
+    
+    private void resetRows()
+    {
+        this.allRows.clear();
+
+        for (int i = 0; i < this.fields.length; i += 2)
+        {
+            GuiBOPPageList.GuiFieldEntry guilistentryLeft = this.fields[i];
+            GuiBOPPageList.GuiFieldEntry guilistentryRight = i < this.fields.length - 1 ? this.fields[i + 1] : null;
+            Gui guiLeft = this.fieldIdToGuiMap.get(guilistentryLeft.getFieldId());
+            Gui guiRight = guilistentryRight != null ? this.fieldIdToGuiMap.get(guilistentryRight.getFieldId()) : null;
+            GuiBOPPageList.GuiRowEntry guientry = new GuiBOPPageList.GuiRowEntry(guiLeft, guiRight);
+            this.allRows.add(guientry);
+        }
+    }
+    
+    @Override
+    public Gui getFocusedGuiElement()
+    {
+        return this.focusedGui;
+    }
+    
+    @Override
+    public Gui getGui(int fieldId)
+    {
+        return this.fieldIdToGuiMap.get(fieldId);
+    }
+    
+
+    
+    private Gui createGui(GuiBOPPageList.GuiFieldEntry field, int xOffset, boolean hasNoNeighbor)
+    {
+        if (field instanceof GuiBOPPageList.GuiSlideEntry)
+        {
+            return this.createSlider(this.width / 2 - 155 + xOffset, 0, (GuiSlideEntry)field);
+        }
+        else if (field instanceof GuiBOPPageList.GuiButtonEntry)
+        {
+            return this.createListButton(this.width / 2 - 155 + xOffset, 0, (GuiButtonEntry)field);
+        }
+        else if (field instanceof GuiBOPPageList.EditBoxEntry)
+        {
+            return this.createTextField(this.width / 2 - 155 + xOffset, 0, (EditBoxEntry)field);
+        }
+        else if (field instanceof GuiBOPPageList.GuiLabelEntry)
+        {
+            return this.createLabel(this.width / 2 - 155 + xOffset, 0, (GuiLabelEntry)field, hasNoNeighbor);
+        }
+        else if (field instanceof GuiBOPPageList.GuiEnumButtonEntry)
+        {
+            return this.createEnumButton(this.width / 2 - 155 + xOffset, 0, (GuiEnumButtonEntry)field);
+        }
+        else
+        {
+            return  null;
+        }
+    }
+    
+    //Mouse clicked
+    
+    private GuiSlider createSlider(int xPosition, int yPosition, GuiBOPPageList.GuiSlideEntry field)
+    {
+        GuiSlider guislider = new GuiSlider(this.responder, field.getFieldId(), xPosition, yPosition, field.getLabelText(), field.getMin(), field.getMax(), field.getValue(), field.getFormatHelper());
+        guislider.visible = field.isVisible();
+        return guislider;
+    }
+
+    private GuiListButton createListButton(int xPosition, int yPosition, GuiBOPPageList.GuiButtonEntry field)
+    {
+        GuiListButton guilistbutton = new GuiListButton(this.responder, field.getFieldId(), xPosition, yPosition, field.getLabelText(), field.getValue());
+        guilistbutton.visible = field.isVisible();
+        return guilistbutton;
+    }
+    
+    private GuiEnumButton createEnumButton(int xPosition, int yPosition, GuiBOPPageList.GuiEnumButtonEntry field)
+    {
+        GuiEnumButton guienumbutton = new GuiEnumButton(this.responder, field.getFieldId(), xPosition, yPosition, field.getLabelText(), field.getValue());
+        guienumbutton.visible = field.isVisible();
+        return guienumbutton;
+    }
+
+    private GuiTextField createTextField(int xPosition, int yPosition, GuiBOPPageList.EditBoxEntry field)
+    {
+        GuiTextField guitextfield = new GuiTextField(field.getFieldId(), this.mc.fontRenderer, xPosition, yPosition, 150, 20);
+        guitextfield.setText(field.getLabelText());
+        guitextfield.setGuiResponder(this.responder);
+        guitextfield.setVisible(field.isVisible());
+        guitextfield.setValidator(field.getValidator());
+        return guitextfield;
+    }
+
+    private GuiLabel createLabel(int xPosition, int yPosition, GuiBOPPageList.GuiLabelEntry field, boolean hasNoNeighbor)
+    {
+        GuiLabel guilabel;
+
+        if (hasNoNeighbor)
+        {
+            guilabel = new GuiLabel(this.mc.fontRenderer, field.getFieldId(), xPosition, yPosition, this.width - xPosition * 2, 20, -1);
+        }
+        else
+        {
+            guilabel = new GuiLabel(this.mc.fontRenderer, field.getFieldId(), xPosition, yPosition, 150, 20, -1);
+        }
+
+        guilabel.visible = field.isVisible();
+        guilabel.addLine(field.getLabelText());
+        guilabel.setCentered();
+        return guilabel;
+    }
+
+    @Override
+    public void keyTyped(char typedChar, int keyCode)
+    {
+        if (this.focusedGui instanceof GuiTextField)
+        {
+            GuiTextField guitextfield = (GuiTextField)this.focusedGui;
+            int j;
+
+            //Check if aren't we are pasting text
+            if (!GuiScreen.isKeyComboCtrlV(keyCode))
+            {
+                if (keyCode == 15) //Tab is pressed
+                {
+                    guitextfield.setFocused(false);
+                    int focusedGuiIndex = this.allTextFieldGuis.indexOf(this.focusedGui);
+
+                    if (GuiScreen.isShiftKeyDown())
+                    {
+                        if (focusedGuiIndex == 0) //Jump back to the end of the list when at the start
+                        {
+                            focusedGuiIndex = this.allTextFieldGuis.size() - 1;
+                        }
+                        else
+                        {
+                            --focusedGuiIndex; //Cycle backwards through the text fields
+                        }
+                    }
+                    else if (focusedGuiIndex == this.allTextFieldGuis.size() - 1) //Jump back to the start of the list when at the end
+                    {
+                        focusedGuiIndex = 0;
+                    }
+                    else
+                    {
+                        ++focusedGuiIndex; //Cycle forwards through the text fields
+                    }
+
+                    this.focusedGui = this.allTextFieldGuis.get(focusedGuiIndex);
+                    guitextfield = (GuiTextField)this.focusedGui;
+                    guitextfield.setFocused(true);
+                    int k1 = guitextfield.y + this.slotHeight;
+                    j = guitextfield.y;
+
+                    if (k1 > this.bottom)
+                    {
+                        this.amountScrolled += (float)(k1 - this.bottom);
+                    }
+                    else if (j < this.top)
+                    {
+                        this.amountScrolled = (float)j;
+                    }
+                }
+                else
+                {
+                    guitextfield.textboxKeyTyped(typedChar, keyCode);
+                }
+            }
+            else
+            {
+                String s = GuiScreen.getClipboardString();
+                String[] astring = s.split(";");
+                j = this.allTextFieldGuis.indexOf(this.focusedGui);
+                int k = j;
+                String[] astring1 = astring;
+                int l = astring.length;
+
+                for (int i1 = 0; i1 < l; ++i1)
+                {
+                    String s1 = astring1[i1];
+                    this.allTextFieldGuis.get(k).setText(s1);
+
+                    if (k == this.allTextFieldGuis.size() - 1)
+                    {
+                        k = 0;
+                    }
+                    else
+                    {
+                        ++k;
+                    }
+
+                    if (k == j)
+                    {
+                        break;
+                    }
+                }
+            }
+        }
+    }
+    
+    public GuiBOPPageList.GuiRowEntry getRow(int rowNum)
+    {
+        return this.allRows.get(rowNum);
+    }
+
+    @Override
+    public int getSize()
+    {
+        return this.allRows.size();
+    }
+
+    @Override
+    public int getListWidth()
+    {
+        return 400;
+    }
+
+    @Override
+    protected int getScrollBarX()
+    {
+        return super.getScrollBarX() + 32;
+    }
+
+    @Override
+    public GuiListExtended.IGuiListEntry getListEntry(int rowNum)
+    {
+        return this.getRow(rowNum);
+    }
+
+    @Override
+    public void mouseClicked(int mouseX, int mouseY, int mouseButton)
+    {
+        super.mouseClicked(mouseX, mouseY, Mouse.getEventButton());
+        int l = this.getSlotIndexFromScreenCoords(mouseX, mouseY);
+
+        if (l >= 0)
+        {
+            GuiBOPPageTable.GuiRowEntry row = this.getRow(l);
+
+            if (this.focusedGui != row.focusedGui && this.focusedGui != null && this.focusedGui instanceof GuiTextField)
+            {
+                ((GuiTextField)this.focusedGui).setFocused(false);
+            }
+
+            this.focusedGui = row.focusedGui;
+        }
+    }
+}

src/main/java/biomesoplenty/client/gui/GuiEnumButton.java

@@ -0,0 +1,54 @@
+package biomesoplenty.client.gui;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.resources.I18n;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
+@SideOnly(Side.CLIENT)
+public class GuiEnumButton<T extends Enum> extends GuiButton
+{
+    private T value;
+    private String localizationStr;
+    private final GuiBOPPageList.GuiResponder guiResponder;
+
+    public GuiEnumButton(GuiBOPPageList.GuiResponder responder, int fieldId, int x, int y, String localizationStr, T initialValue)
+    {
+        super(fieldId, x, y, 150, 20, "");
+        this.localizationStr = localizationStr;
+        this.value = initialValue;
+        this.displayString = this.buildDisplayString();
+        this.guiResponder = responder;
+    }
+
+    private String buildDisplayString()
+    {
+        return I18n.format(this.localizationStr, this.value.toString());
+    }
+
+    public void setValue(T value)
+    {
+        this.value = value;
+        this.displayString = this.buildDisplayString();
+        this.guiResponder.handleEnumSelection(this.id, value.ordinal());
+    }
+
+    @Override
+    public boolean mousePressed(Minecraft mc, int mouseX, int mouseY)
+    {
+        if (super.mousePressed(mc, mouseX, mouseY))
+        {
+            Object[] values = this.value.getClass().getEnumConstants();
+            int len = values.length;
+            this.value = (T)(values[(this.value.ordinal() + 1) % len]);
+            this.displayString = this.buildDisplayString();
+            this.guiResponder.handleEnumSelection(this.id, this.value.ordinal());
+            return true;
+        }
+        else
+        {
+            return false;
+        }
+    }
+}

src/main/java/biomesoplenty/client/handler/GuiEventHandler.java

@@ -1,54 +0,0 @@
-package biomesoplenty.client.handler;
-
-import biomesoplenty.init.ModBiomes;
-import biomesoplenty.init.ModConfig;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.screen.*;
-import net.minecraft.util.text.TranslationTextComponent;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
-import net.minecraftforge.client.event.GuiOpenEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.common.Mod;
-
-import java.util.Optional;
-
-@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.FORGE)
-public class GuiEventHandler
-{
-    @OnlyIn(Dist.CLIENT)
-    @SubscribeEvent
-    public static void onGuiOpened(GuiOpenEvent event)
-    {
-        Screen gui = event.getGui();
-        Minecraft mc = Minecraft.getInstance();
-        Screen prevScreen = mc.screen;
-
-        // Default to the bop worldtype
-        if (ModConfig.ClientConfig.useWorldType.get() && gui instanceof CreateWorldScreen && prevScreen instanceof WorldSelectionScreen)
-        {
-            WorldOptionsScreen optionsScreen = ((CreateWorldScreen)gui).worldGenSettingsComponent;
-            optionsScreen.preset = Optional.of(findBopBiomeGeneratorTypeScreen());
-            optionsScreen.settings = optionsScreen.preset.get().create(optionsScreen.registryHolder, optionsScreen.settings.seed(), optionsScreen.settings.generateFeatures(), optionsScreen.settings.generateBonusChest());
-        }
-    }
-
-    private static BiomeGeneratorTypeScreens findBopBiomeGeneratorTypeScreen()
-    {
-        for (BiomeGeneratorTypeScreens screen : BiomeGeneratorTypeScreens.PRESETS)
-        {
-            // Skip screens that don't use a TranslationTextComponent because definitely they're not ours
-            if (!(screen.description instanceof TranslationTextComponent))
-                continue;
-
-            TranslationTextComponent desc = (TranslationTextComponent)screen.description;
-
-            if (desc.getKey().equals("generator.minecraft.biomesoplenty"))
-            {
-                return screen;
-            }
-        }
-
-        throw new RuntimeException("Failed to locate biomesoplenty biome generator type screen!");
-    }
-}

src/main/java/biomesoplenty/client/particle/EntityCurseFX.java

@@ -0,0 +1,130 @@
+/*******************************************************************************
+ * Copyright 2014-2016, the Biomes O' Plenty Team
+ * 
+ * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
+ * 
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
+ ******************************************************************************/
+
+package biomesoplenty.client.particle;
+
+import biomesoplenty.core.ClientProxy;
+import net.minecraft.client.particle.Particle;
+import net.minecraft.client.renderer.BufferBuilder;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.math.MathHelper;
+import net.minecraft.world.World;
+import net.minecraftforge.fml.client.FMLClientHandler;
+
+public class EntityCurseFX extends Particle
+{
+	private float defaultParticleScale;
+    
+    public EntityCurseFX(World world, double xCoordIn, double yCoordIn, double zCoordIn, double motionXIn, double motionYIn, double motionZIn)
+    {
+        this(world, xCoordIn, yCoordIn, zCoordIn, motionXIn, motionYIn, motionZIn, 1.0F);
+    }
+    
+    public EntityCurseFX(World world, double xCoordIn, double yCoordIn, double zCoordIn, double motionXIn, double motionYIn, double motionZIn, float par14)
+    {
+        super(world, xCoordIn, yCoordIn, zCoordIn, 0.0D, 0.0D, 0.0D);
+        
+        this.particleTextureIndexX = 7;
+        this.particleTextureIndexY = 5;
+        
+        this.motionX *= 0.10000000149011612D;
+        this.motionY *= 0.10000000149011612D;
+        this.motionZ *= 0.10000000149011612D;
+        this.motionX += motionXIn;
+        this.motionY += motionYIn;
+        this.motionZ += motionZIn;
+        this.particleScale = 1.0F;
+        this.defaultParticleScale = this.particleScale;
+        this.particleMaxAge = (int)((8.0D / (Math.random() * 0.8D + 0.2D)) * 8);
+        this.particleMaxAge = (int)((float)this.particleMaxAge * par14);
+        this.particleAge = world.rand.nextInt(3);
+        this.particleAlpha = 1.0F;
+        this.particleGravity = 0.02F;
+        this.canCollide = false;
+    }
+    
+    @Override
+    public int getFXLayer()
+    {
+        return 2;
+    }
+    
+    @Override
+    public void renderParticle(BufferBuilder buffer, Entity entity, float partialTicks, float rotX, float rotXZ, float rotZ, float rotYZ, float rotXY)
+    {
+        // EffectRenderer will by default bind the vanilla particles texture, override with our own
+        FMLClientHandler.instance().getClient().renderEngine.bindTexture(ClientProxy.particleTexturesLocation);
+
+        float scaleMultiplier = ((float)this.particleAge + partialTicks) / (float)this.particleMaxAge * 32.0F;
+        scaleMultiplier = MathHelper.clamp(scaleMultiplier, 0.0F, 1.0F);
+        this.particleScale = this.defaultParticleScale * scaleMultiplier;
+        
+        GlStateManager.depthMask(false);
+        GlStateManager.enableBlend();
+        GlStateManager.blendFunc(770, 1);
+
+        super.renderParticle(buffer, entity, partialTicks, rotX, rotXZ, rotZ, rotYZ, rotXY);
+
+        GlStateManager.disableBlend();
+        GlStateManager.depthMask(true);
+    }
+    
+    @Override
+    public int getBrightnessForRender(float p_189214_1_)
+    {
+        float f = (float)this.particleMaxAge - (((float)this.particleAge + p_189214_1_) / (float)this.particleMaxAge);
+        f = MathHelper.clamp(f, 0.0F, 1.0F);
+        int i = super.getBrightnessForRender(p_189214_1_);
+        int j = i & 255;
+        int k = i >> 16 & 255;
+        j = j + (int)(f * 15.0F * 16.0F);
+
+        if (j > 240)
+        {
+            j = 240;
+        }
+
+        return j | k << 16;
+    }
+    
+    @Override
+    public void onUpdate()
+    {
+        prevPosX = posX;
+        prevPosY = posY;
+        prevPosZ = posZ;
+
+        particleAge += 2;
+        
+        if (particleAge >= particleMaxAge)
+        {
+            this.setExpired();
+        }
+
+        this.particleTextureIndexX = 7 - this.particleAge * 8 / this.particleMaxAge;
+        this.move(motionX, motionY, motionZ);
+
+        if (posY == prevPosY)
+        {
+            motionX *= 1.1D;
+            motionZ *= 1.1D;
+        }
+
+        motionX *= 0.9599999785423279D;
+        motionY *= 0.9599999785423279D;
+        motionZ *= 0.9599999785423279D;
+
+        if (onGround)
+        {
+            motionX *= 0.699999988079071D;
+            motionZ *= 0.699999988079071D;
+        }
+    }
+    
+}

src/main/java/biomesoplenty/client/particle/EntityTrailFX.java

@@ -0,0 +1,80 @@
+/*******************************************************************************
+ * Copyright 2014-2016, the Biomes O' Plenty Team
+ * 
+ * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
+ * 
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
+ ******************************************************************************/
+
+package biomesoplenty.client.particle;
+
+import net.minecraft.client.particle.Particle;
+import net.minecraft.client.renderer.BufferBuilder;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.world.World;
+import net.minecraftforge.fml.client.FMLClientHandler;
+
+public class EntityTrailFX extends Particle
+{
+	private ResourceLocation trailResource;
+    /**The index of the flower to be spawned, values are 0-3*/
+	private int particleIndex;
+	private double startY;
+	
+	public EntityTrailFX(World world, double x, double y, double z, String trailName) 
+	{
+		super(world, x, y, z);
+		
+		this.trailResource = new ResourceLocation("biomesoplenty:textures/particles/" + trailName + ".png");
+        this.motionX = this.motionY = this.motionZ = 0.0D; //Trail particles should not move
+		this.particleMaxAge = 550;
+		this.particleIndex = this.rand.nextInt(4); //Choose a random index on creation
+		this.startY = y; //Where y coordinate where this particle has started (before it moves downwards with time)
+	}
+    
+    @Override
+    public void renderParticle(BufferBuilder builder, Entity entity, float partialTicks, float rotX, float rotXZ, float rotZ, float rotYZ, float rotXY)
+    {
+        // EffectRenderer will by default bind the vanilla particles texture, override with our own
+        FMLClientHandler.instance().getClient().renderEngine.bindTexture(this.trailResource);
+        
+        //The overall maxU and maxV of the particle sheet is 1.0 (representing 16px)
+        float minU = (particleIndex % 2) * 0.5F; //Particles on the left side are 0, right are 0.5
+        float maxU = minU + 0.5F; //Each flower is 8px wide (half of the overall sheet)
+        
+        float minV = (particleIndex / 2) * 0.5F; //Uses integer rounding errors (0 and 1 = 0, 2 and 3 = 1)
+        float maxV = minV + 0.5F; //Each flower is 8px high (half of the overall sheet)
+        
+        //Vanilla particle rendering
+        float alpha = 1.0F - Math.min(1.0F, 2.0F * this.particleAge / this.particleMaxAge);
+        float width = 0.15F;
+        float x = (float)(prevPosX + (posX - prevPosX) - interpPosX);
+        float y = (float)(prevPosY + (posY - prevPosY) - interpPosY);
+        float z = (float)(prevPosZ + (posZ - prevPosZ) - interpPosZ);
+
+        int i = this.getBrightnessForRender(partialTicks);
+        int j = i >> 16 & 65535;
+        int k = i & 65535;
+
+        builder.pos(x - width, y, z + width).tex(minU, maxV).color(this.particleRed, this.particleGreen, this.particleBlue, alpha).lightmap(j, k).endVertex();
+        builder.pos(x + width, y, z + width).tex(minU, minV).color(this.particleRed, this.particleGreen, this.particleBlue, alpha).lightmap(j, k).endVertex();
+        builder.pos(x + width, y, z - width).tex(maxU, minV).color(this.particleRed, this.particleGreen, this.particleBlue, alpha).lightmap(j, k).endVertex();
+        builder.pos(x - width, y, z - width).tex(maxU, maxV).color(this.particleRed, this.particleGreen, this.particleBlue, alpha).lightmap(j, k).endVertex();
+    }
+
+    @Override
+    public int getFXLayer()
+    {
+        return 2;
+    }
+    
+    @Override
+    public void onUpdate()
+    {
+        super.onUpdate();
+        
+        this.posY = this.startY - 0.01 * ((float)this.particleAge / (float)this.particleMaxAge);
+        this.prevPosY = this.posY;
+    }
+}

src/main/java/biomesoplenty/client/renderer/BoatRendererBOP.java

@@ -1,78 +0,0 @@
-package biomesoplenty.client.renderer;
-
-import biomesoplenty.common.entity.item.BoatEntityBOP;
-import com.mojang.blaze3d.matrix.MatrixStack;
-import com.mojang.blaze3d.vertex.IVertexBuilder;
-import net.minecraft.client.renderer.IRenderTypeBuffer;
-import net.minecraft.client.renderer.RenderType;
-import net.minecraft.client.renderer.entity.EntityRenderer;
-import net.minecraft.client.renderer.entity.EntityRendererManager;
-import net.minecraft.client.renderer.entity.model.BoatModel;
-import net.minecraft.client.renderer.texture.OverlayTexture;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.math.MathHelper;
-import net.minecraft.util.math.vector.Quaternion;
-import net.minecraft.util.math.vector.Vector3f;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
-
-import static biomesoplenty.core.BiomesOPlenty.MOD_ID;
-
-@OnlyIn(Dist.CLIENT)
-public class BoatRendererBOP extends EntityRenderer<BoatEntityBOP> {
-    protected final BoatModel model = new BoatModel();
-
-    public BoatRendererBOP(EntityRendererManager renderer) {
-        super(renderer);
-        this.shadowRadius = 0.8f;
-    }
-
-    @Override
-    public void render(BoatEntityBOP entity, float entityYaw, float partialTicks, MatrixStack matrixStack, IRenderTypeBuffer renderTypeBuffer, int light) {
-        matrixStack.pushPose();
-        matrixStack.translate(0d, 0.375d, 0d);
-        matrixStack.mulPose(Vector3f.YP.rotationDegrees(180f - entityYaw));
-        float f = (float) entity.getHurtTime() - partialTicks;
-        float f1 = entity.getDamage() - partialTicks;
-        if (f1 < 0f) {
-            f1 = 0f;
-        }
-        if (f > 0f) {
-            matrixStack.mulPose(Vector3f.XP.rotationDegrees(MathHelper.sin(f) * f * f1 / 10f * (float) entity.getHurtDir()));
-        }
-        float f2 = entity.getBubbleAngle(partialTicks);
-        if (!MathHelper.equal(f2, 0f)) {
-            matrixStack.mulPose(new Quaternion(new Vector3f(1f, 0f, 1f), entity.getBubbleAngle(partialTicks), true));
-        }
-        matrixStack.scale(-1f, -1f, 1f);
-        matrixStack.mulPose(Vector3f.YP.rotationDegrees(90.0F));
-        this.model.setupAnim(entity, partialTicks, 0f, -0.1f, 0f, 0f);
-        IVertexBuilder ivertexbuilder = renderTypeBuffer.getBuffer(this.model.renderType(this.getTextureLocation(entity)));
-        this.model.renderToBuffer(matrixStack, ivertexbuilder, light, OverlayTexture.NO_OVERLAY, 1f, 1f, 1f, 1f);
-        if (!entity.isUnderWater()) {
-            IVertexBuilder ivertexbuilder1 = renderTypeBuffer.getBuffer(RenderType.waterMask());
-            this.model.waterPatch().render(matrixStack, ivertexbuilder1, light, OverlayTexture.NO_OVERLAY);
-        }
-        matrixStack.popPose();
-        super.render(entity, entityYaw, partialTicks, matrixStack, renderTypeBuffer, light);
-    }
-
-    @Override
-    public ResourceLocation getTextureLocation(BoatEntityBOP entity) {
-        return BOAT_TEXTURE_LOCATIONS[entity.getModel().ordinal()];
-    }
-
-    private static final ResourceLocation[] BOAT_TEXTURE_LOCATIONS = new ResourceLocation[] {
-            new ResourceLocation(MOD_ID, "textures/entity/boat/fir.png"),
-            new ResourceLocation(MOD_ID, "textures/entity/boat/redwood.png"),
-            new ResourceLocation(MOD_ID, "textures/entity/boat/cherry.png"),
-            new ResourceLocation(MOD_ID, "textures/entity/boat/mahogany.png"),
-            new ResourceLocation(MOD_ID, "textures/entity/boat/jacaranda.png"),
-            new ResourceLocation(MOD_ID, "textures/entity/boat/palm.png"),
-            new ResourceLocation(MOD_ID, "textures/entity/boat/willow.png"),
-            new ResourceLocation(MOD_ID, "textures/entity/boat/dead.png"),
-            new ResourceLocation(MOD_ID, "textures/entity/boat/magic.png"),
-            new ResourceLocation(MOD_ID, "textures/entity/boat/umbran.png"),
-            new ResourceLocation(MOD_ID, "textures/entity/boat/hellbark.png")
-    };
-}

src/main/java/biomesoplenty/client/util/ModelUtils.java

@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * Copyright 2014-2016, the Biomes O' Plenty Team
+ * 
+ * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
+ * 
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
+ ******************************************************************************/
+
+package biomesoplenty.client.util;
+
+import com.google.common.base.Function;
+
+import net.minecraft.client.renderer.block.model.IBakedModel;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
+import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.client.model.IModel;
+
+public class ModelUtils
+{
+    public static IBakedModel[] generateModelsForTextures(IModel model, TextureAtlasSprite[] textures) 
+    {
+        IBakedModel[] output = new IBakedModel[textures.length];
+        
+        for (int i = 0; i < output.length; i++)
+        {
+            final TextureAtlasSprite texture = textures[i];
+
+            //Defines how TextureAtlasSprites are obtained whilst baking
+            Function<ResourceLocation, TextureAtlasSprite> textureGetter = new Function<ResourceLocation, TextureAtlasSprite>()
+            {
+                public TextureAtlasSprite apply(ResourceLocation location)
+                {
+                    return texture;
+                }
+            };
+            
+            output[i] = model.bake(model.getDefaultState(), DefaultVertexFormats.ITEM, textureGetter);
+        }
+        
+        return output;
+    }
+}

src/main/java/biomesoplenty/client/util/TextureUtils.java

@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright 2014-2016, the Biomes O' Plenty Team
+ * 
+ * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
+ * 
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
+ ******************************************************************************/
+
+package biomesoplenty.client.util;
+
+import net.minecraft.util.ResourceLocation;
+
+public class TextureUtils
+{
+    public static final String TEXTURES_BASE_PATH = "textures";
+    
+    public static ResourceLocation completeResourceLocation(ResourceLocation location, int mode)
+    {
+        return mode == 0 ? new ResourceLocation(location.getResourceDomain(), String.format("%s/%s%s", TEXTURES_BASE_PATH, location.getResourcePath(), ".png")) : new ResourceLocation(location.getResourceDomain(), String.format("%s/mipmaps/%s.%d%s", TEXTURES_BASE_PATH, location.getResourcePath(), Integer.valueOf(mode), ".png"));
+    }
+}

src/main/java/biomesoplenty/common/biome/BOPBiome.java

@@ -0,0 +1,319 @@
+/*******************************************************************************
+ * Copyright 2014-2017, the Biomes O' Plenty Team
+ *
+ * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
+ *
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
+ ******************************************************************************/
+package biomesoplenty.common.biome;
+
+import biomesoplenty.api.biome.BiomeOwner;
+import biomesoplenty.api.biome.IExtendedBiome;
+import biomesoplenty.api.config.IBOPWorldSettings;
+import biomesoplenty.api.config.IConfigObj;
+import biomesoplenty.api.enums.BOPClimates;
+import biomesoplenty.api.generation.GeneratorStage;
+import biomesoplenty.api.generation.IGenerator;
+import biomesoplenty.common.init.ModBiomes;
+import biomesoplenty.common.world.GenerationManager;
+import biomesoplenty.core.BiomesOPlenty;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.EnumCreatureType;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.biome.Biome;
+import net.minecraftforge.fml.common.registry.ForgeRegistries;
+
+import java.util.*;
+
+public abstract class BOPBiome extends Biome implements IExtendedBiome
+{
+    protected GenerationManager generationManager = new GenerationManager();
+    protected Map<BOPClimates, Integer> weightMap = new HashMap<BOPClimates, Integer>();
+
+    // defaults
+
+    // -1 indicates the defaults as set by Vanilla will be used for the below fields
+    public int skyColor = -1;
+    public int fogColor = -1;
+
+    /** 1.0 is the lowest possible amount of fog. 0.0 is the greatest.*/
+    public float fogDensity = 1.0F;
+
+    public final ResourceLocation location;
+    public IConfigObj conf;
+
+    private BOPBiome(ResourceLocation idLoc, PropsBuilder defaultBuilder, IConfigObj conf)
+    {
+        super(configureBiomeProps(idLoc, defaultBuilder, conf));
+
+        this.location = idLoc;
+        this.conf = conf;
+
+        this.decorator.treesPerChunk = -999;
+        this.decorator.flowersPerChunk = -999;
+        this.decorator.grassPerChunk = -999;
+        this.decorator.gravelPatchesPerChunk = -999;
+        this.decorator.sandPatchesPerChunk = -999;
+        //this.theBiomeDecorator.generateLakes = false;
+    }
+
+    protected BOPBiome(String idName, PropsBuilder defaultBuilder)
+    {
+        this(new ResourceLocation(BiomesOPlenty.MOD_ID, idName), defaultBuilder, ModBiomes.readConfigFile(idName));
+    }
+
+    public static BOPBiome.BiomeProps configureBiomeProps(ResourceLocation idLoc, BOPBiome.PropsBuilder defaultBuilder, IConfigObj conf)
+    {
+        // If there isn't a valid config file, don't use it to configure the biome
+        if (conf.isEmpty())
+            return defaultBuilder.build();
+
+        defaultBuilder.withTemperature(conf.getFloat("temperature", defaultBuilder.temperature));
+        defaultBuilder.withRainfall(conf.getFloat("rainfall", defaultBuilder.rainfall));
+        defaultBuilder.withWaterColor(conf.getInt("waterColor", defaultBuilder.waterColor));
+
+        Boolean enableRain = conf.getBool("enableRain", defaultBuilder.enableRain);
+        if (enableRain != null && !enableRain) defaultBuilder.withRainDisabled();
+
+        Boolean enableSnow = conf.getBool("enableSnow", defaultBuilder.enableSnow);
+        if (enableSnow != null && enableSnow) defaultBuilder.withSnowEnabled();
+
+        defaultBuilder.withBaseBiome(conf.getString("baseBiome", defaultBuilder.baseBiomeRegName));
+        defaultBuilder.withGuiColour(conf.getInt("guiColour", defaultBuilder.guiColour));
+
+        return defaultBuilder.build();
+    }
+
+    @Override
+    public void applySettings(IBOPWorldSettings settings) {}
+
+    @Override
+    public void configure(IConfigObj conf)
+    {
+        this.topBlock = conf.getBlockState("topBlock", this.topBlock);
+        this.fillerBlock = conf.getBlockState("fillerBlock", this.fillerBlock);
+
+        this.skyColor = conf.getInt("skyColor", this.skyColor);
+        this.fogColor = conf.getInt("fogColor", this.fogColor);
+        this.fogDensity = conf.getFloat("fogDensity", this.fogDensity);
+
+        // Allow weights to be overridden
+        IConfigObj confWeights = conf.getObject("weights");
+        for (BOPClimates climate : BOPClimates.values())
+        {
+            Integer weight = confWeights.getInt(climate.name().toLowerCase(), this.weightMap.get(climate));
+            if (weight == null) {continue;}
+            if (weight.intValue() < 1)
+            {
+                this.weightMap.remove(climate);
+            }
+            else
+            {
+                this.weightMap.put(climate, weight);
+            }
+        }
+
+        // Allow generators to be configured
+        IConfigObj confGenerators = conf.getObject("generators");
+        this.generationManager.configure(confGenerators);
+
+        // Allow spawnable entites to be configured
+        ArrayList<IConfigObj> confEntities = conf.getObjectArray("entities");
+        if (confEntities != null)
+        {
+            for (IConfigObj confEntity : confEntities)
+            {
+                String entityName = confEntity.getString("name");
+                EnumCreatureType creatureType = confEntity.getEnum("creatureType", EnumCreatureType.class);
+                if (entityName == null || creatureType == null) {continue;}
+
+                // Look for an entity class matching this name
+                // case insensitive, dot used as mod delimiter, no spaces or underscores
+                // eg  'villager', 'Zombie', 'SQUID', 'enderdragon' all ok
+                Class <? extends Entity> entityClazz = ForgeRegistries.ENTITIES.getValue(new ResourceLocation(entityName)).getEntityClass();
+                Class <? extends EntityLiving> livingClazz = null;
+                if (!(entityClazz.isAssignableFrom(EntityLiving.class))) {
+                    confEntity.addMessage("Entity " + entityName + " is not of type EntityLiving");
+                    continue;
+                }
+                else {
+                    livingClazz = (Class <? extends EntityLiving>)entityClazz;
+                }
+
+                if (livingClazz == null)
+                {
+                    confEntity.addMessage("No entity registered called " + entityName);
+                    continue;
+                }
+                if (!creatureType.getCreatureClass().isAssignableFrom(livingClazz))
+                {
+                    confEntity.addMessage("Entity " + entityName + " is not of type " + creatureType);
+                    continue;
+                }
+
+                List<SpawnListEntry> spawns = this.getSpawnableList(creatureType);
+                Integer weight = confEntity.getInt("weight");
+                if (weight != null && weight < 1)
+                {
+                    // weight was set to zero (or negative) so find and remove this spawn
+                    Iterator<SpawnListEntry> spawnIterator = spawns.iterator();
+                    while (spawnIterator.hasNext())
+                    {
+                        SpawnListEntry entry = spawnIterator.next();
+                        if (entry.entityClass == livingClazz)
+                        {
+                            spawnIterator.remove();
+                        }
+                    }
+                }
+                else
+                {
+                    // weight was positive, or omitted, so update an existing spawn or add a new spawn
+                    boolean foundIt = false;
+                    for (SpawnListEntry entry : spawns)
+                    {
+                        if (entry.entityClass == entityClazz)
+                        {
+                            // the entry already exists - adjust the params
+                            entry.itemWeight = confEntity.getInt("weight", entry.itemWeight);
+                            entry.minGroupCount = confEntity.getInt("minGroupCount", entry.minGroupCount);
+                            entry.maxGroupCount = confEntity.getInt("maxGroupCount", entry.maxGroupCount);
+                            foundIt = true;
+                        }
+                    }
+                    if (!foundIt)
+                    {
+                        // the entry does not exist - add it
+                        SpawnListEntry entry = new SpawnListEntry(livingClazz, confEntity.getInt("weight", 10), confEntity.getInt("minGroupCount", 4), confEntity.getInt("maxGroupCount", 4));
+                        spawns.add(entry);
+                    }
+                }
+            }
+        }
+    }
+
+    @Override
+    public BiomeOwner getBiomeOwner()
+    {
+        return BiomeOwner.BIOMESOPLENTY;
+    }
+
+    @Override
+    public void addGenerator(String name, GeneratorStage stage, IGenerator generator)
+    {
+        this.generationManager.addGenerator(name, stage, generator);
+    }
+
+    public IGenerator getGenerator(String name)
+    {
+        return this.generationManager.getGenerator(name);
+    }
+
+    public void removeGenerator(String name)
+    {
+        this.generationManager.removeGenerator(name);
+    }
+
+    @Override
+    public GenerationManager getGenerationManager()
+    {
+        return this.generationManager;
+    }
+
+    @Override
+    public Map<BOPClimates, Integer> getWeightMap()
+    {
+        return this.weightMap;
+    }
+
+    @Override
+    public void addWeight(BOPClimates climate, int weight)
+    {
+        this.weightMap.put(climate, weight);
+    }
+
+    @Override
+    public void clearWeights()
+    {
+        this.weightMap.clear();
+    }
+
+    public int getFogColor(BlockPos pos) { return this.fogColor; }
+
+    public float getFogDensity(BlockPos pos) { return this.fogDensity; }
+
+    @Override
+    public int getSkyColorByTemp(float temperature)
+    {
+        return (this.skyColor == -1) ? super.getSkyColorByTemp(temperature) : this.skyColor;
+    }
+
+    @Override
+    public Biome getBaseBiome()
+    {
+        return this;
+    }
+
+    @Override
+    public ResourceLocation getResourceLocation()
+    {
+        return this.location;
+    }
+
+    public static class PropsBuilder
+    {
+        private final String biomeName;
+
+        /**The colour of this biome as seen in guis**/
+        private int guiColour = 0xffffff;
+        private float baseHeight = 0.1F;
+        private float heightVariation = 0.2F;
+        private float temperature = 0.5F;
+        private float rainfall = 0.5F;
+        private int waterColor = 16777215;
+        private boolean enableSnow = false;
+        private boolean enableRain = true;
+        private String baseBiomeRegName;
+
+        public PropsBuilder(String name) { this.biomeName = name; }
+
+        public PropsBuilder withGuiColour(Integer colour) { if (colour != null) this.guiColour = colour; return this; }
+        public PropsBuilder withTemperature(Float temperature) { if (temperature != null) this.temperature = temperature; return this; }
+        public PropsBuilder withRainfall(Float rainfall) { if (rainfall != null) this.rainfall = rainfall; return this; }
+        public PropsBuilder withBaseHeight(Float baseHeight) { if (baseHeight != null) this.baseHeight = baseHeight; return this; }
+        public PropsBuilder withHeightVariation(Float heightVariation) { if (heightVariation != null) this.heightVariation = heightVariation; return this; }
+        public PropsBuilder withRainDisabled() { this.enableRain = false; return this; }
+        public PropsBuilder withSnowEnabled() { this.enableSnow = true; return this; }
+        public PropsBuilder withWaterColor(Integer waterColor) { if (waterColor != null) this.waterColor = waterColor; return this; }
+        public PropsBuilder withBaseBiome(String name) { if (name != null) this.baseBiomeRegName = name; return this; }
+
+        public BiomeProps build()
+        {
+            return new BiomeProps(this.biomeName, this.temperature, this.rainfall, this.baseHeight, this.heightVariation, this.enableRain, this.enableSnow, this.waterColor, this.baseBiomeRegName, this.guiColour);
+        }
+    }
+
+    public static class BiomeProps extends BiomeProperties
+    {
+        /**The colour of this biome as seen in guis**/
+        private int guiColour = 0xffffff;
+
+        private BiomeProps(String name, float temperature, float rainfall, float baseHeight, float heightVariation, boolean enableRain, boolean enableSnow, int waterColor, String baseBiomeRegName, int guiColour)
+        {
+            super(name);
+
+            this.setTemperature(temperature);
+            this.setRainfall(rainfall);
+            this.setBaseHeight(baseHeight);
+            this.setHeightVariation(heightVariation);
+            if (!enableRain) this.setRainDisabled();
+            if (enableSnow) this.setSnowEnabled();
+            this.setWaterColor(waterColor);
+            this.setBaseBiome(baseBiomeRegName);
+
+            this.guiColour = guiColour;
+        }
+    }
+}

src/main/java/biomesoplenty/common/biome/BiomeConfigData.java

@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright 2014-2019, the Biomes O' Plenty Team
- *
- * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
- *
- * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
- ******************************************************************************/
-package biomesoplenty.common.biome;
-
-import com.google.common.collect.Maps;
-import com.google.gson.annotations.SerializedName;
-
-import java.util.Map;
-import java.util.TreeMap;
-
-public class BiomeConfigData
-{
-    @SerializedName("standard_weights")
-    public TreeMap<String, WeightedBiomeEntry> standardBiomeWeights = Maps.newTreeMap();
-
-    @SerializedName("technical_biome_toggles")
-    public TreeMap<String, ToggleableBiomeEntry> technicalBiomeEntries = Maps.newTreeMap();
-
-    @SerializedName("sub_biome_weights")
-    public TreeMap<String, SubBiomeEntry> subBiomeEntries = Maps.newTreeMap();
-
-    @SerializedName("island_biome_toggles")
-    public TreeMap<String, ToggleableBiomeEntry> islandBiomeEntries = Maps.newTreeMap();
-
-    @SerializedName("vanilla_biome_weights")
-    public TreeMap<String, WeightedBiomeEntry> vanillaBiomeEntries = Maps.newTreeMap();
-
-    public static class WeightedBiomeEntry
-    {
-        public int weight;
-
-        public WeightedBiomeEntry(int weight)
-        {
-            this.weight = weight;
-        }
-    }
-
-    public static class ToggleableBiomeEntry
-    {
-        public boolean enabled;
-
-        public ToggleableBiomeEntry(boolean enabled)
-        {
-            this.enabled = enabled;
-        }
-    }
-
-    public static class SubBiomeEntry
-    {
-        public int weight;
-        public float rarity;
-
-        public SubBiomeEntry(int weight, float rarity)
-        {
-            this.weight = weight;
-            this.rarity = rarity;
-        }
-    }
-}

src/main/java/biomesoplenty/common/biome/BiomeMetadata.java

@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright 2020, the Biomes O' Plenty Team
- *
- * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
- *
- * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
- ******************************************************************************/
-package biomesoplenty.common.biome;
-
-import biomesoplenty.api.enums.BOPClimates;
-import biomesoplenty.common.util.biome.BiomeUtil;
-import com.google.common.collect.ImmutableMap;
-import net.minecraft.util.RegistryKey;
-import net.minecraft.world.biome.Biome;
-import net.minecraft.world.biome.Biomes;
-
-import javax.annotation.Nullable;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.BiFunction;
-
-public class BiomeMetadata
-{
-    private final ImmutableMap<BOPClimates, Integer> weightMap;
-
-    @Nullable
-    private final RegistryKey<Biome> beachBiome;
-
-    @Nullable
-    private final RegistryKey<Biome> riverBiome;
-
-    @Nullable
-    private final BiFunction<Double, Double, Integer> foliageColorFunction;
-
-    @Nullable
-    private final BiFunction<Double, Double, Integer> grassColorFunction;
-
-    @Nullable
-    private final BiFunction<Double, Double, Integer> waterColorFunction;
-
-    protected BiomeMetadata(Map<BOPClimates, Integer> weights, @Nullable RegistryKey<Biome> beachBiome, @Nullable RegistryKey<Biome> riverBiome, BiFunction<Double, Double, Integer> foliageColorFunction, BiFunction<Double, Double, Integer> grassColorFunction, BiFunction<Double, Double, Integer> waterColorFunction)
-    {
-        this.weightMap = ImmutableMap.copyOf(weights);
-        this.beachBiome = beachBiome;
-        this.riverBiome = riverBiome;
-        this.foliageColorFunction = foliageColorFunction;
-        this.grassColorFunction = grassColorFunction;
-        this.waterColorFunction = waterColorFunction;
-    }
-
-    public Map<BOPClimates, Integer> getWeightMap()
-    {
-        return this.weightMap;
-    }
-
-    @Nullable
-    public RegistryKey<Biome> getBeachBiome()
-    {
-        return this.beachBiome;
-    }
-
-    @Nullable
-    public RegistryKey<Biome> getRiverBiome()
-    {
-        return this.riverBiome;
-    }
-
-    @Nullable
-    public BiFunction<Double, Double, Integer> getFoliageColorFunction()
-    {
-        return this.foliageColorFunction;
-    }
-
-    @Nullable
-    public BiFunction<Double, Double, Integer> getGrassColorFunction()
-    {
-        return this.grassColorFunction;
-    }
-
-    @Nullable
-    public BiFunction<Double, Double, Integer> getWaterColorFunction()
-    {
-        return this.waterColorFunction;
-    }
-
-    public boolean hasWeights()
-    {
-        return !this.weightMap.isEmpty() && !this.weightMap.entrySet().stream().allMatch((entry) -> entry.getValue().equals(0));
-    }
-}

src/main/java/biomesoplenty/common/biome/BiomeRegistry.java

@@ -1,680 +0,0 @@
-/*******************************************************************************
- * Copyright 2014-2019, the Biomes O' Plenty Team
- *
- * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
- *
- * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
- ******************************************************************************/
-package biomesoplenty.common.biome;
-
-import biomesoplenty.api.biome.BOPBiomes;
-import biomesoplenty.api.enums.BOPClimates;
-import biomesoplenty.common.util.biome.BiomeUtil;
-import biomesoplenty.common.util.config.JsonUtil;
-import biomesoplenty.core.BiomesOPlenty;
-import biomesoplenty.init.ModBiomes;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
-import com.google.gson.reflect.TypeToken;
-import net.minecraft.util.RegistryKey;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.world.biome.Biome;
-import net.minecraftforge.fml.loading.FMLPaths;
-import net.minecraftforge.registries.ForgeRegistries;
-import org.apache.commons.lang3.tuple.Pair;
-
-import javax.annotation.Nullable;
-import java.io.File;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.*;
-import java.util.function.Consumer;
-
-public class BiomeRegistry
-{
-    private static final String CONFIG_FILE_NAME = "biomes.json";
-
-    private static Map<RegistrationType, List<DeferredRegistration>> deferrances = Maps.newHashMap();
-
-    public static void deferStandardRegistration(BiomeTemplate biome, String name)
-    {
-        defer(RegistrationType.STANDARD_BIOME, new StandardBiomeRegistrationData(biome, name));
-    }
-
-    public static void deferTechnicalBiomeRegistration(BiomeTemplate biome, String name)
-    {
-        defer(RegistrationType.TECHNICAL_BIOME, new ToggleableStandardBiomeRegistrationData(biome, name, true));
-    }
-
-    public static void deferSubBiomeRegistration(RegistryKey<Biome> parent, RegistryKey<Biome> child, int weight, float rarity)
-    {
-        // Don't register sub biome if the parent or child don't exist
-        if (!BiomeUtil.exists(parent) || !BiomeUtil.exists(child)) {
-            return;
-        }
-
-        defer(RegistrationType.SUB_BIOME, new SubBiomeRegistrationData(parent, child, weight, rarity));
-    }
-
-    public static void deferIslandBiomeRegistration(RegistryKey<Biome> key, BOPClimates climate, int weight)
-    {
-        if (!BiomeUtil.exists(key))
-            return;
-
-        defer(RegistrationType.ISLAND_BIOME, new SingleClimateRegistrationData(key, climate, weight));
-    }
-
-    public static void deferVanillaBiomeRegistration(RegistryKey<Biome> key, BOPClimates climate, int weight)
-    {
-        if (!BiomeUtil.exists(key))
-            return;
-
-        defer(RegistrationType.VANILLA_BIOME, new SingleClimateRegistrationData(key, climate, weight));
-    }
-
-    public static void configureStandardBiomes()
-    {
-        List<DeferredRegistration> standardRegistrations = deferrances.get(RegistrationType.STANDARD_BIOME);
-        TreeMap<String, BiomeConfigData.WeightedBiomeEntry> defaultEntries = Maps.newTreeMap();
-        Map<String, StandardBiomeRegistrationData> regDataMap = Maps.newHashMap();
-
-        for (DeferredRegistration<StandardBiomeRegistrationData> registration : standardRegistrations)
-        {
-            StandardBiomeRegistrationData regData = registration.regData;
-
-            // Ignore biomes which don't have any weights set by default
-            if (regData.getMetadata().hasWeights())
-            {
-                String biomeName = new ResourceLocation(BiomesOPlenty.MOD_ID, regData.getName()).toString();
-                Pair<BOPClimates, Integer> primaryWeight = regData.getPrimaryWeight();
-                defaultEntries.put(biomeName, new BiomeConfigData.WeightedBiomeEntry(primaryWeight.getValue()));
-                regDataMap.put(biomeName, registration.regData);
-            }
-        }
-
-        BiomeConfigData defaultConfigData = new BiomeConfigData();
-        defaultConfigData.standardBiomeWeights = defaultEntries;
-        BiomeConfigData configData = getConfigData(defaultConfigData);
-
-        TreeMap<String, BiomeConfigData.WeightedBiomeEntry> revisedStandardBiomeWeights = Maps.newTreeMap(defaultEntries);
-
-        // Merge the config file with the default values
-        for (Map.Entry<String, BiomeConfigData.WeightedBiomeEntry> biomeEntry : configData.standardBiomeWeights.entrySet())
-        {
-            if (revisedStandardBiomeWeights.containsKey(biomeEntry.getKey()))
-            {
-                revisedStandardBiomeWeights.put(biomeEntry.getKey(), biomeEntry.getValue());
-            }
-        }
-
-        // Write back to the config file
-        configData.standardBiomeWeights = revisedStandardBiomeWeights;
-        JsonUtil.writeFile(getConfigFile(), configData);
-
-        for (Map.Entry<String, BiomeConfigData.WeightedBiomeEntry> biomeEntry : configData.standardBiomeWeights.entrySet())
-        {
-            String name = biomeEntry.getKey();
-            BiomeConfigData.WeightedBiomeEntry weight = biomeEntry.getValue();
-
-            // Replace the default weight map for this biome with those from the config file
-            if (regDataMap.containsKey(name))
-            {
-                StandardBiomeRegistrationData registrationData = regDataMap.get(name);
-                registrationData.setPrimaryWeight(weight.weight);
-            }
-        }
-    }
-
-    public static void configureTechnicalBiomes()
-    {
-        List<DeferredRegistration> biomeRegistrations = deferrances.get(RegistrationType.TECHNICAL_BIOME);
-        TreeMap<String, BiomeConfigData.ToggleableBiomeEntry> defaultBiomeEntries = Maps.newTreeMap();
-
-        for (DeferredRegistration<ToggleableStandardBiomeRegistrationData> registration : biomeRegistrations)
-        {
-            ToggleableStandardBiomeRegistrationData regData = registration.regData;
-            String biomeName = new ResourceLocation(BiomesOPlenty.MOD_ID, regData.getName()).toString();
-            defaultBiomeEntries.put(biomeName, new BiomeConfigData.ToggleableBiomeEntry(true));
-        }
-
-        BiomeConfigData defaultConfigData = new BiomeConfigData();
-        defaultConfigData.technicalBiomeEntries = defaultBiomeEntries;
-        BiomeConfigData configData = getConfigData(defaultConfigData);
-
-        TreeMap<String, BiomeConfigData.ToggleableBiomeEntry> revisedBiomeEntries = Maps.newTreeMap(defaultBiomeEntries);
-
-        // Merge the config file with the default values
-        for (Map.Entry<String, BiomeConfigData.ToggleableBiomeEntry> biomeEntry : configData.technicalBiomeEntries.entrySet())
-        {
-            if (revisedBiomeEntries.containsKey(biomeEntry.getKey()))
-            {
-                revisedBiomeEntries.put(biomeEntry.getKey(), biomeEntry.getValue());
-            }
-        }
-
-        // Write back to the config file
-        configData.technicalBiomeEntries = revisedBiomeEntries;
-        JsonUtil.writeFile(getConfigFile(), configData);
-
-        for (DeferredRegistration<ToggleableStandardBiomeRegistrationData> registration : biomeRegistrations)
-        {
-            ToggleableStandardBiomeRegistrationData regData = registration.regData;
-            String biomeName = new ResourceLocation(BiomesOPlenty.MOD_ID, regData.getName()).toString();
-
-            if (revisedBiomeEntries.containsKey(biomeName))
-            {
-                BiomeConfigData.ToggleableBiomeEntry entry = revisedBiomeEntries.get(biomeName);
-
-                if (!entry.enabled)
-                {
-                    registration.regData.setEnabled(false);
-                }
-            }
-        }
-    }
-
-    public static void configureSubBiomes()
-    {
-        List<DeferredRegistration> subBiomeRegistrations = deferrances.get(RegistrationType.SUB_BIOME);
-        TreeMap<String, BiomeConfigData.SubBiomeEntry> defaultSubBiomeEntries = Maps.newTreeMap();
-        Map<String, SubBiomeRegistrationData> regDataMap = Maps.newHashMap();
-
-        for (DeferredRegistration<SubBiomeRegistrationData> registration : subBiomeRegistrations)
-        {
-            SubBiomeRegistrationData regData = registration.regData;
-            String biomeName = registration.regData.getChild().location().toString();
-            defaultSubBiomeEntries.put(biomeName, new BiomeConfigData.SubBiomeEntry(regData.getWeight(), regData.getRarity()));
-            regDataMap.put(biomeName, registration.regData);
-        }
-
-        BiomeConfigData defaultConfigData = new BiomeConfigData();
-        defaultConfigData.subBiomeEntries = defaultSubBiomeEntries;
-        BiomeConfigData configData = getConfigData(defaultConfigData);
-
-        TreeMap<String, BiomeConfigData.SubBiomeEntry> revisedSubBiomeEntries = Maps.newTreeMap(defaultSubBiomeEntries);
-
-        // Merge the config file with the default values
-        for (Map.Entry<String, BiomeConfigData.SubBiomeEntry> biomeEntry : configData.subBiomeEntries.entrySet())
-        {
-            if (revisedSubBiomeEntries.containsKey(biomeEntry.getKey()))
-            {
-                revisedSubBiomeEntries.put(biomeEntry.getKey(), biomeEntry.getValue());
-            }
-        }
-
-        // Write back to the config file
-        configData.subBiomeEntries = revisedSubBiomeEntries;
-        JsonUtil.writeFile(getConfigFile(), configData);
-
-        for (Map.Entry<String, BiomeConfigData.SubBiomeEntry> biomeEntry : configData.subBiomeEntries.entrySet())
-        {
-            String name = biomeEntry.getKey();
-            BiomeConfigData.SubBiomeEntry subBiomeEntry = biomeEntry.getValue();
-
-            // Replace the default values  for this biome with those from the config file
-            if (regDataMap.containsKey(name))
-            {
-                SubBiomeRegistrationData registrationData = regDataMap.get(name);
-                registrationData.setWeight(subBiomeEntry.weight);
-                registrationData.setRarity(subBiomeEntry.rarity);
-            }
-        }
-    }
-
-    public static void configureIslandBiomes()
-    {
-        List<DeferredRegistration> biomeRegistrations = deferrances.get(RegistrationType.ISLAND_BIOME);
-        TreeMap<String, BiomeConfigData.ToggleableBiomeEntry> defaultBiomeEntries = Maps.newTreeMap();
-
-        for (DeferredRegistration<SingleClimateRegistrationData> registration : biomeRegistrations)
-        {
-            SingleClimateRegistrationData regData = registration.regData;
-            String biomeName = regData.getBiome().location().toString();
-            defaultBiomeEntries.put(biomeName, new BiomeConfigData.ToggleableBiomeEntry(true));
-        }
-
-        BiomeConfigData defaultConfigData = new BiomeConfigData();
-        defaultConfigData.islandBiomeEntries = defaultBiomeEntries;
-        BiomeConfigData configData = getConfigData(defaultConfigData);
-
-        TreeMap<String, BiomeConfigData.ToggleableBiomeEntry> revisedBiomeEntries = Maps.newTreeMap(defaultBiomeEntries);
-
-        // Merge the config file with the default values
-        for (Map.Entry<String, BiomeConfigData.ToggleableBiomeEntry> biomeEntry : configData.islandBiomeEntries.entrySet())
-        {
-            if (revisedBiomeEntries.containsKey(biomeEntry.getKey()))
-            {
-                revisedBiomeEntries.put(biomeEntry.getKey(), biomeEntry.getValue());
-            }
-        }
-
-        // Write back to the config file
-        configData.islandBiomeEntries = revisedBiomeEntries;
-        JsonUtil.writeFile(getConfigFile(), configData);
-
-        for (DeferredRegistration<SingleClimateRegistrationData> registration : biomeRegistrations)
-        {
-            SingleClimateRegistrationData regData = registration.regData;
-            String biomeName = regData.getBiome().location().toString();
-
-            if (revisedBiomeEntries.containsKey(biomeName))
-            {
-                BiomeConfigData.ToggleableBiomeEntry entry = revisedBiomeEntries.get(biomeName);
-
-                if (!entry.enabled)
-                {
-                    registration.regData.setWeight(0);
-                }
-            }
-        }
-    }
-
-    public static void configureVanillaBiomes()
-    {
-        List<DeferredRegistration> biomeRegistrations = deferrances.get(RegistrationType.VANILLA_BIOME);
-        TreeMap<String, BiomeConfigData.WeightedBiomeEntry> defaultBiomeEntries = Maps.newTreeMap();
-        Map<String, SingleClimateRegistrationData> regDataMap = Maps.newHashMap();
-
-        for (DeferredRegistration<SingleClimateRegistrationData> registration : biomeRegistrations)
-        {
-            SingleClimateRegistrationData regData = registration.regData;
-            String biomeName = registration.regData.getBiome().location().toString();
-            defaultBiomeEntries.put(biomeName, new BiomeConfigData.WeightedBiomeEntry(regData.getWeight()));
-            regDataMap.put(biomeName, registration.regData);
-        }
-
-        BiomeConfigData defaultConfigData = new BiomeConfigData();
-        defaultConfigData.vanillaBiomeEntries = defaultBiomeEntries;
-        BiomeConfigData configData = getConfigData(defaultConfigData);
-
-        TreeMap<String, BiomeConfigData.WeightedBiomeEntry> revisedBiomeEntries = Maps.newTreeMap(defaultBiomeEntries);
-
-        // Merge the config file with the default values
-        for (Map.Entry<String, BiomeConfigData.WeightedBiomeEntry> biomeEntry : configData.vanillaBiomeEntries.entrySet())
-        {
-            if (revisedBiomeEntries.containsKey(biomeEntry.getKey()))
-            {
-                revisedBiomeEntries.put(biomeEntry.getKey(), biomeEntry.getValue());
-            }
-        }
-
-        // Write back to the config file
-        configData.vanillaBiomeEntries = revisedBiomeEntries;
-        JsonUtil.writeFile(getConfigFile(), configData);
-
-        for (Map.Entry<String, BiomeConfigData.WeightedBiomeEntry> biomeEntry : configData.vanillaBiomeEntries.entrySet())
-        {
-            String name = biomeEntry.getKey();
-            BiomeConfigData.WeightedBiomeEntry islandBiomeEntry = biomeEntry.getValue();
-
-            // Replace the default values for this biome with those from the config file
-            if (regDataMap.containsKey(name))
-            {
-                SingleClimateRegistrationData registrationData = regDataMap.get(name);
-                registrationData.setWeight(islandBiomeEntry.weight);
-            }
-        }
-    }
-
-    private static File getConfigDirFile()
-    {
-        Path configPath = FMLPaths.CONFIGDIR.get();
-        Path bopConfigPath = Paths.get(configPath.toAbsolutePath().toString(), "biomesoplenty");
-        return bopConfigPath.toFile();
-    }
-
-    private static File getConfigFile()
-    {
-        return new File(getConfigDirFile(), CONFIG_FILE_NAME);
-    }
-
-    private static BiomeConfigData getConfigData(BiomeConfigData defaultConfigData)
-    {
-        BiomeConfigData configData = JsonUtil.getOrCreateConfigFile(getConfigDirFile(), CONFIG_FILE_NAME, defaultConfigData, new TypeToken<BiomeConfigData>(){}.getType());
-        return configData;
-    }
-
-    private static <T extends IRegistrationData> void defer(RegistrationType type, T data)
-    {
-        if (!deferrances.containsKey(type))
-            deferrances.put(type, Lists.newArrayList());
-
-        List<DeferredRegistration> list = deferrances.get(type);
-        list.add(new DeferredRegistration(type.regFunc, data));
-    }
-
-    public static void finalizeRegistrations(RegistrationType type)
-    {
-        if (!deferrances.containsKey(type))
-            return;
-
-        if (type == RegistrationType.SUB_BIOME)
-        {
-            Set<RegistryKey<Biome>> children = Sets.newHashSet();
-            deferrances.get(RegistrationType.SUB_BIOME).forEach((reg) -> {
-                RegistryKey<Biome> biome = ((SubBiomeRegistrationData)reg.regData).getChild();
-                if (children.contains(biome))
-                {
-                    throw new RuntimeException(String.format("Sub biome %s cannot be added to multiple parents", biome.location().toString()));
-                }
-                children.add(biome);
-            });
-
-        }
-
-        for (DeferredRegistration reg : deferrances.get(type))
-        {
-            reg.register();
-        }
-    }
-
-    public enum RegistrationType
-    {
-        STANDARD_BIOME((StandardBiomeRegistrationData data) -> {
-            Biome biome = data.getBiome();
-            BiomeMetadata metadata = data.getMetadata();
-            String name = data.getName();
-
-            // Don't register biomes with their weight set to 0, that normally have weights that are non-zero
-            if (!metadata.getWeightMap().isEmpty() && (data.weightMap.isEmpty() || data.weightMap.entrySet().stream().allMatch((entry) -> entry.getValue().equals(0))))
-            {
-                BiomesOPlenty.logger.debug("Weights absent for " + data.getName() + ", disabling...");
-                return;
-            }
-
-            biome.setRegistryName(new ResourceLocation(BiomesOPlenty.MOD_ID, name));
-            ForgeRegistries.BIOMES.register(biome);
-
-            for (Map.Entry<BOPClimates, Integer> entry : data.getWeights().entrySet())
-            {
-                if (entry != null && entry.getValue() > 0)
-                {
-                    BOPClimates climate = entry.getKey();
-                    int weight = entry.getValue();
-                    BiomesOPlenty.logger.debug(String.format("%s weight set to %d for climate %s", name, weight, climate.name()));
-                    climate.addBiome(weight, BiomeUtil.createKey(data.getBiome()));
-                }
-            }
-
-            if (data.getMetadata() != null)
-            {
-                ModBiomes.biomeMetadata.put(BiomeUtil.createKey(data.getBiome()), data.getMetadata());
-            }
-        }),
-        TECHNICAL_BIOME((ToggleableStandardBiomeRegistrationData data) -> {
-            Biome biome = data.getBiome();
-            String name = data.getName();
-
-            if (!data.getEnabled())
-            {
-                BiomesOPlenty.logger.debug("Technical biome " + data.getName() + " is disabled.");
-                return;
-            }
-
-            biome.setRegistryName(new ResourceLocation(BiomesOPlenty.MOD_ID, name));
-            ForgeRegistries.BIOMES.register(biome);
-
-            if (data.getMetadata() != null)
-            {
-                ModBiomes.biomeMetadata.put(BiomeUtil.createKey(data.getBiome()), data.getMetadata());
-            }
-        }),
-        SUB_BIOME((SubBiomeRegistrationData data) -> {
-            if (data.getWeight() == 0)
-            {
-                BiomesOPlenty.logger.debug("Weights absent for sub biome" + data.getChild().location().toString() + ", disabling...");
-                return;
-            }
-
-            String childName = data.getChild().location().toString();
-            BiomesOPlenty.logger.debug(String.format("Sub biome %s weight set to %d", childName, data.getWeight()));
-            ModBiomes.subBiomes.put(BiomeUtil.getBiomeId(data.getParent()), new ModBiomes.WeightedSubBiome(data.getChild(), data.getRarity(), data.getWeight()));
-        }),
-        ISLAND_BIOME((SingleClimateRegistrationData data) -> {
-            if (data.getWeight() == 0)
-            {
-                BiomesOPlenty.logger.debug("Weights absent for island biome" + data.getBiome().location().toString() + ", disabling...");
-                return;
-            }
-
-            String biomeName = data.getBiome().location().toString();
-            BiomesOPlenty.logger.debug(String.format("Island biome %s weight set to %d for climate %s", biomeName, data.getWeight(), data.getClimate().name()));
-            ModBiomes.islandBiomeIds.add(BiomeUtil.getBiomeId(data.getBiome()));
-            data.getClimate().addIslandBiome(data.getWeight(), data.getBiome());
-        }),
-        VANILLA_BIOME((SingleClimateRegistrationData data) -> {
-            if (data.getWeight() == 0)
-            {
-                BiomesOPlenty.logger.debug("Weights absent for vanilla biome" + data.getBiome().location().toString() + ", disabling...");
-                return;
-            }
-
-            data.getClimate().addBiome(data.getWeight(), data.getBiome());
-        });
-
-        public final Consumer<? extends IRegistrationData> regFunc;
-
-        RegistrationType(Consumer<? extends IRegistrationData> regFunc)
-        {
-            this.regFunc = regFunc;
-        }
-    }
-
-    private interface IRegistrationData
-    {
-
-    }
-
-    private static abstract class TemplateRegistrationData implements IRegistrationData
-    {
-        private final Biome biome;
-        private final BiomeMetadata metadata;
-
-        public TemplateRegistrationData(BiomeTemplate template)
-        {
-            this.biome = template.build();
-            this.metadata = template.buildMetadata();
-        }
-
-        public TemplateRegistrationData(Biome biome)
-        {
-            this.biome = biome;
-            this.metadata = null;
-        }
-
-        public Biome getBiome()
-        {
-            return this.biome;
-        }
-
-        @Nullable
-        public BiomeMetadata getMetadata()
-        {
-            return this.metadata;
-        }
-    }
-
-    private static class StandardBiomeRegistrationData extends TemplateRegistrationData
-    {
-        private final String name;
-        private Map<BOPClimates, Integer> weightMap;
-
-        public StandardBiomeRegistrationData(BiomeTemplate biome, String name)
-        {
-            super(biome);
-            this.name = name;
-            this.weightMap = Maps.newHashMap(this.getMetadata().getWeightMap());
-            this.ensureSingleWeight();
-        }
-
-        public String getName()
-        {
-            return this.name;
-        }
-
-        public ImmutableMap<BOPClimates, Integer> getWeights()
-        {
-            return ImmutableMap.copyOf(this.weightMap);
-        }
-
-        public int getWeight(BOPClimates climate)
-        {
-            return this.weightMap.get(climate);
-        }
-
-        public void setWeight(BOPClimates climate, int weight)
-        {
-            this.weightMap.put(climate, weight);
-            this.ensureSingleWeight();
-        }
-
-        public Pair<BOPClimates, Integer> getPrimaryWeight()
-        {
-            List<Pair<BOPClimates, Integer>> pairs = Lists.newArrayList();
-            this.weightMap.entrySet().forEach((entry) -> pairs.add(Pair.of(entry.getKey(), entry.getValue())));
-            return pairs.get(0);
-        }
-
-        public void setPrimaryWeight(int value)
-        {
-            BOPClimates climate = this.getPrimaryWeight().getKey();
-            this.setWeight(climate, value);
-        }
-
-        // This limitation is enforced for config file simplicity, and because we don't need it at this time
-        private void ensureSingleWeight()
-        {
-            if (this.weightMap.size() > 1)
-            {
-                throw new RuntimeException(String.format("%s cannot be assigned to multiple climates!\n%s", new ResourceLocation(BiomesOPlenty.MOD_ID, name).toString(), this.weightMap));
-            }
-        }
-    }
-
-    private static class SubBiomeRegistrationData implements IRegistrationData
-    {
-        private final RegistryKey<Biome> parent;
-        private final RegistryKey<Biome> child;
-        private int weight;
-        private float rarity;
-
-        public SubBiomeRegistrationData(RegistryKey<Biome> parent, RegistryKey<Biome> child, int weight, float rarity)
-        {
-            this.parent = parent;
-            this.child = child;
-            this.weight = weight;
-            this.rarity = rarity;
-        }
-
-        public RegistryKey<Biome> getParent()
-        {
-            return this.parent;
-        }
-
-        public RegistryKey<Biome> getChild()
-        {
-            return this.child;
-        }
-
-        public int getWeight()
-        {
-            return this.weight;
-        }
-
-        public void setWeight(int weight)
-        {
-            this.weight = weight;
-        }
-
-        public float getRarity()
-        {
-            return this.rarity;
-        }
-
-        public void setRarity(float rarity)
-        {
-            this.rarity = rarity;
-        }
-    }
-
-    private static class SingleClimateRegistrationData implements IRegistrationData
-    {
-        private final BOPClimates climate;
-        private final RegistryKey<Biome> biome;
-        private int weight;
-
-        public SingleClimateRegistrationData(RegistryKey<Biome> biome, BOPClimates climate, int weight)
-        {
-            this.biome = biome;
-            this.climate = climate;
-            this.weight = weight;
-        }
-
-        public RegistryKey<Biome> getBiome()
-        {
-            return this.biome;
-        }
-
-        public BOPClimates getClimate()
-        {
-            return this.climate;
-        }
-
-        public int getWeight()
-        {
-            return this.weight;
-        }
-
-        public void setWeight(int weight)
-        {
-            this.weight = weight;
-        }
-    }
-
-    private static class ToggleableStandardBiomeRegistrationData extends TemplateRegistrationData
-    {
-        private final String name;
-        private boolean enabled;
-
-        public ToggleableStandardBiomeRegistrationData(BiomeTemplate biome, String name, boolean enabled)
-        {
-            super(biome);
-            this.name = name;
-            this.enabled = enabled;
-        }
-
-        public String getName()
-        {
-            return this.name;
-        }
-
-        public boolean getEnabled()
-        {
-            return this.enabled;
-        }
-
-        public void setEnabled(boolean enabled)
-        {
-            this.enabled = enabled;
-        }
-    }
-
-    private static class DeferredRegistration<T extends IRegistrationData>
-    {
-        private final Consumer<T> regFunc;
-        private final T regData;
-
-        public DeferredRegistration(Consumer<T> regFunc, T regData)
-        {
-            this.regFunc = regFunc;
-            this.regData = regData;
-        }
-
-        public void register()
-        {
-            this.regFunc.accept(this.regData);
-        }
-    }
-}

src/main/java/biomesoplenty/common/biome/BiomeTemplate.java

@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright 2014-2019, the Biomes O' Plenty Team
- *
- * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
- *
- * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
- ******************************************************************************/
-package biomesoplenty.common.biome;
-
-import biomesoplenty.api.enums.BOPClimates;
-import net.minecraft.util.RegistryKey;
-import net.minecraft.util.math.MathHelper;
-import net.minecraft.world.biome.Biome;
-import net.minecraft.world.biome.BiomeGenerationSettings;
-import net.minecraft.world.biome.Biomes;
-import net.minecraft.world.biome.MobSpawnInfo;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.BiFunction;
-
-public class BiomeTemplate
-{
-    private Map<BOPClimates, Integer> weightMap = new HashMap<BOPClimates, Integer>();
-    private RegistryKey<Biome> beachBiome = Biomes.BEACH;
-    private RegistryKey<Biome> riverBiome = Biomes.RIVER;
-    private BiFunction<Double, Double, Integer> foliageColorFunction;
-    private BiFunction<Double, Double, Integer> grassColorFunction;
-    private BiFunction<Double, Double, Integer> waterColorFunction;
-
-    protected void configureBiome(Biome.Builder builder) {}
-    protected void configureGeneration(BiomeGenerationSettings.Builder builder) {}
-    protected void configureMobSpawns(MobSpawnInfo.Builder builder) {}
-
-    protected void configureDefaultMobSpawns(MobSpawnInfo.Builder builder)
-    {
-        builder.setPlayerCanSpawn();
-    }
-
-    public final Biome build()
-    {
-        Biome.Builder biomeBuilder = new Biome.Builder();
-
-        // Configure the biome generation
-        BiomeGenerationSettings.Builder biomeGenBuilder = new BiomeGenerationSettings.Builder();
-        this.configureGeneration(biomeGenBuilder);
-        biomeBuilder.generationSettings(biomeGenBuilder.build());
-
-        // Configure mob spawning
-        MobSpawnInfo.Builder mobSpawnBuilder = new MobSpawnInfo.Builder();
-        this.configureDefaultMobSpawns(mobSpawnBuilder);
-        this.configureMobSpawns(mobSpawnBuilder);
-        biomeBuilder.mobSpawnSettings(mobSpawnBuilder.build());
-
-        // Configure and build the biome
-        this.configureBiome(biomeBuilder);
-        return biomeBuilder.build();
-    }
-
-    public final BiomeMetadata buildMetadata()
-    {
-        return new BiomeMetadata(this.weightMap, this.beachBiome, this.riverBiome, this.foliageColorFunction, this.grassColorFunction, this.waterColorFunction);
-    }
-
-    public void addWeight(BOPClimates climate, int weight)
-    {
-        this.weightMap.put(climate, weight);
-    }
-
-    public void setBeachBiome(RegistryKey<Biome> biome)
-    {
-        this.beachBiome = biome;
-    }
-
-    public void setRiverBiome(RegistryKey<Biome> biome)
-    {
-        this.riverBiome = biome;
-    }
-
-    public void setFoliageColorFunction(BiFunction<Double, Double, Integer> func)
-    {
-        this.foliageColorFunction = func;
-    }
-
-    public void setGrassColorFunction(BiFunction<Double, Double, Integer> func)
-    {
-        this.grassColorFunction = func;
-    }
-
-    public void setWaterColorFunction(BiFunction<Double, Double, Integer> func)
-    {
-        this.waterColorFunction = func;
-    }
-
-    public static int calculateSkyColor(float temperature)
-    {
-        float lvt_1_1_ = temperature / 3.0F;
-        lvt_1_1_ = MathHelper.clamp(lvt_1_1_, -1.0F, 1.0F);
-        return MathHelper.hsvToRgb(0.62222224F - lvt_1_1_ * 0.05F, 0.5F + lvt_1_1_ * 0.1F, 1.0F);
-    }
-}

src/main/java/biomesoplenty/common/biome/NetherBiomeTemplate.java

@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright 2014-2019, the Biomes O' Plenty Team
- *
- * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
- *
- * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
- ******************************************************************************/
-package biomesoplenty.common.biome;
-
-import net.minecraft.world.biome.MobSpawnInfo;
-
-public class NetherBiomeTemplate extends BiomeTemplate
-{
-    protected void configureDefaultMobSpawns(MobSpawnInfo.Builder builder)
-    {
-        // Do nothing
-    }
-}

src/main/java/biomesoplenty/common/biome/nether/BOPHellBiome.java

@@ -0,0 +1,152 @@
+/*******************************************************************************
+ * Copyright 2014-2017, the Biomes O' Plenty Team
+ *
+ * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
+ *
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
+ ******************************************************************************/
+package biomesoplenty.common.biome.nether;
+
+import java.util.Random;
+
+import biomesoplenty.api.config.IConfigObj;
+import biomesoplenty.common.biome.BOPBiome;
+import biomesoplenty.common.init.ModBiomes;
+import biomesoplenty.core.BiomesOPlenty;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.monster.EntityEnderman;
+import net.minecraft.entity.monster.EntityGhast;
+import net.minecraft.entity.monster.EntityMagmaCube;
+import net.minecraft.entity.monster.EntityPigZombie;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.world.World;
+import net.minecraft.world.chunk.ChunkPrimer;
+
+public class BOPHellBiome extends BOPBiome
+{
+    public IBlockState wallBlock = Blocks.NETHERRACK.getDefaultState();
+    public IBlockState roofTopBlock = Blocks.NETHERRACK.getDefaultState();
+    public IBlockState roofFillerBlock = Blocks.NETHERRACK.getDefaultState();
+
+    public BOPHellBiome(String idName, PropsBuilder defaultBuilder)
+    {
+        super(idName, defaultBuilder);
+
+        this.topBlock = Blocks.NETHERRACK.getDefaultState();
+        this.fillerBlock = Blocks.NETHERRACK.getDefaultState();
+
+        this.spawnableCaveCreatureList.clear();
+        this.spawnableCreatureList.clear();
+        this.spawnableMonsterList.clear();
+        this.spawnableWaterCreatureList.clear();
+
+        this.spawnableMonsterList.add(new SpawnListEntry(EntityGhast.class, 50, 4, 4));
+        this.spawnableMonsterList.add(new SpawnListEntry(EntityPigZombie.class, 100, 4, 4));
+        this.spawnableMonsterList.add(new SpawnListEntry(EntityMagmaCube.class, 2, 4, 4));
+        this.spawnableMonsterList.add(new SpawnListEntry(EntityEnderman.class, 1, 4, 4));
+    }
+
+    @Override
+    public void configure(IConfigObj conf)
+    {
+        super.configure(conf);
+
+        // Allow basic properties to be overridden
+        this.wallBlock = conf.getBlockState("wallBlock", this.wallBlock);
+        this.roofTopBlock = conf.getBlockState("roofTopBlock", this.roofTopBlock);
+        this.roofFillerBlock = conf.getBlockState("roofFillerBlock", this.roofFillerBlock);
+
+        // log any warnings from parsing the config file
+        for (String msg : conf.flushMessages())
+            BiomesOPlenty.logger.info(msg);
+        // write default values to a file
+        ModBiomes.writeDefaultConfigFile(ModBiomes.BOP_DEFAULTS_DIR, this.getResourceLocation().getResourcePath(), conf);
+    }
+
+    @Override
+    public void genTerrainBlocks(World world, Random rand, ChunkPrimer primer, int x, int z, double stoneNoiseVal)
+    {
+        IBlockState roof = this.roofTopBlock;
+        IBlockState roofFiller = this.roofFillerBlock;
+        IBlockState wall = this.wallBlock;
+        IBlockState floor = this.topBlock;
+        IBlockState floorFiller = this.fillerBlock;
+
+        int roofDepth = 4;
+        int floorDepth = 4;
+
+        int localX = x & 15;
+        int localZ = z & 15;
+        int localY = 127;
+        boolean lastSolid = true;
+
+        while (localY >= 0)
+        {
+            int blockSkip = 1;
+            IBlockState currentState = primer.getBlockState(localZ, localY, localX);
+
+            if (currentState.getBlock() == Blocks.NETHERRACK)
+            {
+                // initially set to the wall material. this may be replaced later by a roof
+                primer.setBlockState(localZ, localY, localX, wall);
+
+                // this must be a floor
+                if (!lastSolid)
+                {
+                    primer.setBlockState(localZ, localY, localX, floor);
+
+                    // iterate over the next few blocks and replace them with the floor material. skip those
+                    // blocks too as we've already checked and modified them
+                    for (int floorOffset = 1; floorOffset <= floorDepth - 1 && localY - floorOffset >= 0; floorOffset++)
+                    {
+                        IBlockState state = primer.getBlockState(localZ, localY - floorOffset, localX);
+                        blockSkip = floorOffset + 1;
+
+                        if (state.getBlock() == Blocks.NETHERRACK)
+                        {
+                            primer.setBlockState(localZ, localY - floorOffset, localX, floorFiller);
+                        }
+                        else break;
+                    }
+                }
+
+                // update lastSolid for next time
+                lastSolid = true;
+            }
+            else if (currentState.getMaterial() == Material.AIR)
+            {
+                // previous blocks must be a roof
+                if (lastSolid)
+                {
+                    primer.setBlockState(localZ, localY + 1, localX, roof);
+
+                    // iterate over the previous few blocks to replace them with the roof material
+                    for (int roofOffset = 2; roofOffset <= roofDepth && localY + roofOffset <= 127; roofOffset++)
+                    {
+                        IBlockState state = primer.getBlockState(localZ, localY + roofOffset, localX);
+
+                        // onllocalY replace netherrack or walls, if it's air or anything else then don't continue
+                        if (state.getBlock() == Blocks.NETHERRACK || state == wall)
+                        {
+                            primer.setBlockState(localZ, localY + roofOffset, localX, roofFiller);
+                        }
+                        else break;
+                    }
+                }
+
+                // update lastSolid for next time
+                lastSolid = false;
+            }
+
+            localY -= blockSkip;
+        }
+    }
+
+    @Override
+    public ResourceLocation getBeachLocation()
+    {
+        return null;
+    }
+}

src/main/java/biomesoplenty/common/biome/nether/BiomeCorruptedSands.java

@@ -0,0 +1,40 @@
+/*******************************************************************************
+ * Copyright 2014-2017, the Biomes O' Plenty Team
+ *
+ * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
+ *
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
+ ******************************************************************************/
+package biomesoplenty.common.biome.nether;
+
+import biomesoplenty.api.block.IBlockPosQuery;
+import biomesoplenty.api.enums.BOPClimates;
+import biomesoplenty.api.enums.BOPFoliage;
+import biomesoplenty.api.enums.BOPPlants;
+import biomesoplenty.api.generation.GeneratorStage;
+import biomesoplenty.common.util.biome.GeneratorUtils.ScatterYMethod;
+import biomesoplenty.common.util.block.BlockQuery;
+import biomesoplenty.common.world.generator.GeneratorBramble;
+import biomesoplenty.common.world.generator.GeneratorFlora;
+import net.minecraft.init.Blocks;
+
+public class BiomeCorruptedSands extends BOPHellBiome
+{
+    public BiomeCorruptedSands()
+    {
+        super("corrupted_sands", new PropsBuilder("Corrupted Sands").withGuiColour(0xA93C3E).withTemperature(2.0F).withRainfall(0.0F).withRainDisabled());
+
+        this.addWeight(BOPClimates.HELL, 5);
+        
+        this.topBlock = Blocks.SOUL_SAND.getDefaultState();
+        this.fillerBlock = Blocks.SOUL_SAND.getDefaultState();
+        this.wallBlock = Blocks.SOUL_SAND.getDefaultState();
+        
+        IBlockPosQuery emptySoulsand = BlockQuery.buildAnd().withAirAbove().states(this.topBlock).create();
+        this.addGenerator("bramble", GeneratorStage.FLOWERS,(new GeneratorBramble.Builder()).amountPerChunk(40.0F).placeOn(emptySoulsand).scatterYMethod(ScatterYMethod.NETHER_SURFACE).create());
+        
+        // splatter top blocks
+        this.addGenerator("dead_grass", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(5.0F).with(BOPFoliage.DEADGRASS).scatterYMethod(ScatterYMethod.NETHER_SURFACE).create());
+        this.addGenerator("thorns", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(3.0F).placeOn(emptySoulsand).with(BOPPlants.THORN).scatterYMethod(ScatterYMethod.NETHER_SURFACE).create());
+    }
+}

src/main/java/biomesoplenty/common/biome/nether/BiomeFungiForest.java

@@ -0,0 +1,67 @@
+/*******************************************************************************
+ * Copyright 2014-2017, the Biomes O' Plenty Team
+ *
+ * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
+ *
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
+ ******************************************************************************/
+package biomesoplenty.common.biome.nether;
+
+import java.util.Random;
+
+import biomesoplenty.api.block.BOPBlocks;
+import biomesoplenty.api.block.IBlockPosQuery;
+import biomesoplenty.api.config.IConfigObj;
+import biomesoplenty.api.enums.BOPClimates;
+import biomesoplenty.api.generation.GeneratorStage;
+import biomesoplenty.common.block.BlockBOPGrass;
+import biomesoplenty.common.block.BlockBOPMushroom;
+import biomesoplenty.common.util.biome.GeneratorUtils.ScatterYMethod;
+import biomesoplenty.common.util.block.BlockQuery;
+import biomesoplenty.common.world.generator.GeneratorBigMushroom;
+import biomesoplenty.common.world.generator.GeneratorFlora;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.init.Blocks;
+import net.minecraft.world.World;
+import net.minecraft.world.chunk.ChunkPrimer;
+
+public class BiomeFungiForest extends BOPHellBiome
+{
+    public IBlockState usualTopBlock;
+    public IBlockState alternateTopBlock;
+    
+    public BiomeFungiForest()
+    {
+        super("fungi_forest", new PropsBuilder("Fungi Forest").withGuiColour(0xA93C3E).withTemperature(2.0F).withRainfall(0.0F).withRainDisabled());
+
+        this.addWeight(BOPClimates.HELL, 5);
+        
+        this.usualTopBlock = this.topBlock;
+        this.alternateTopBlock = BOPBlocks.grass.getDefaultState().withProperty(BlockBOPGrass.VARIANT, BlockBOPGrass.BOPGrassType.MYCELIAL_NETHERRACK);
+
+        // shrooms
+        IBlockPosQuery surfaceBlocks = BlockQuery.buildOr().states(this.topBlock).create();
+        this.addGenerator("glowshroom", GeneratorStage.SHROOM,(new GeneratorFlora.Builder()).amountPerChunk(1.5F).generationAttempts(16).with(BlockBOPMushroom.MushroomType.GLOWSHROOM).scatterYMethod(ScatterYMethod.NETHER_SURFACE).create());
+        this.addGenerator("toadstools", GeneratorStage.SHROOM,(new GeneratorFlora.Builder()).amountPerChunk(1.0F).generationAttempts(16).with(BlockBOPMushroom.MushroomType.TOADSTOOL).scatterYMethod(ScatterYMethod.NETHER_SURFACE).create());
+        this.addGenerator("red_mushrooms", GeneratorStage.SHROOM,(new GeneratorFlora.Builder()).amountPerChunk(5.0F).generationAttempts(16).with(Blocks.RED_MUSHROOM.getDefaultState()).scatterYMethod(ScatterYMethod.NETHER_SURFACE).create());
+        this.addGenerator("brown_mushrooms", GeneratorStage.SHROOM,(new GeneratorFlora.Builder()).amountPerChunk(2.0F).generationAttempts(16).with(Blocks.BROWN_MUSHROOM.getDefaultState()).scatterYMethod(ScatterYMethod.NETHER_SURFACE).create());
+        this.addGenerator("big_brown_mushroom", GeneratorStage.BIG_SHROOM,(new GeneratorBigMushroom.Builder()).amountPerChunk(2.0F).mushroomType(GeneratorBigMushroom.BigMushroomType.BROWN).scatterYMethod(ScatterYMethod.NETHER_SURFACE).placeOn(surfaceBlocks).create());
+        this.addGenerator("big_red_mushroom", GeneratorStage.BIG_SHROOM,(new GeneratorBigMushroom.Builder()).amountPerChunk(30.0F).mushroomType(GeneratorBigMushroom.BigMushroomType.RED).scatterYMethod(ScatterYMethod.NETHER_SURFACE).minHeight(5).maxHeight(10).placeOn(surfaceBlocks).create());
+    }
+    
+    @Override
+    public void configure(IConfigObj conf)
+    {
+        super.configure(conf);
+        
+        this.usualTopBlock = this.topBlock;
+        this.alternateTopBlock = conf.getBlockState("alternateTopBlock", this.alternateTopBlock);
+    }
+    
+    @Override
+    public void genTerrainBlocks(World world, Random rand, ChunkPrimer primer, int x, int z, double noise)
+    {
+        this.topBlock = (noise + rand.nextDouble() * 1.0D > 1.8D) ? this.alternateTopBlock : this.usualTopBlock;
+        super.genTerrainBlocks(world, rand, primer, x, z, noise);
+    }
+}

src/main/java/biomesoplenty/common/biome/nether/BiomePhantasmagoricInferno.java

@@ -0,0 +1,41 @@
+/*******************************************************************************
+ * Copyright 2014-2017, the Biomes O' Plenty Team
+ *
+ * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
+ *
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
+ ******************************************************************************/
+package biomesoplenty.common.biome.nether;
+
+import biomesoplenty.api.block.BOPBlocks;
+import biomesoplenty.api.block.IBlockPosQuery;
+import biomesoplenty.api.enums.BOPClimates;
+import biomesoplenty.api.generation.GeneratorStage;
+import biomesoplenty.common.util.biome.GeneratorUtils.ScatterYMethod;
+import biomesoplenty.common.util.block.BlockQuery;
+import biomesoplenty.common.world.generator.GeneratorFlora;
+import biomesoplenty.common.world.generator.GeneratorLakes;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.init.Blocks;
+
+public class BiomePhantasmagoricInferno extends BOPHellBiome
+{
+    public BiomePhantasmagoricInferno()
+    {
+        super("phantasmagoric_inferno", new PropsBuilder("Phantasmagoric Inferno").withGuiColour(0xA93C3E).withTemperature(2.0F).withRainfall(0.0F).withRainDisabled());
+
+        this.addWeight(BOPClimates.HELL, 5);
+        
+        this.topBlock = BOPBlocks.ash_block.getDefaultState();
+        this.fillerBlock = BOPBlocks.ash_block.getDefaultState();
+        
+        // lava lakes
+        this.addGenerator("lava_lakes", GeneratorStage.SAND, (new GeneratorLakes.Builder()).amountPerChunk(4.0F).liquid(Blocks.LAVA).frozenLiquid((IBlockState)null).scatterYMethod(ScatterYMethod.NETHER_SURFACE).create());
+        
+        // splatter top blocks
+        IBlockPosQuery emptyAsh = BlockQuery.buildAnd().withAirAbove().states(this.topBlock).create();
+
+        this.addGenerator("fire", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(2.5F).with(Blocks.FIRE.getDefaultState()).placeOn(emptyAsh).scatterYMethod(ScatterYMethod.NETHER_SURFACE).create());
+        this.addGenerator("blue_fire", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(2.5F).with(BOPBlocks.blue_fire.getDefaultState()).placeOn(emptyAsh).scatterYMethod(ScatterYMethod.NETHER_SURFACE).create());
+    }
+}

src/main/java/biomesoplenty/common/biome/nether/BiomeUndergarden.java

@@ -0,0 +1,71 @@
+/*******************************************************************************
+ * Copyright 2014-2017, the Biomes O' Plenty Team
+ *
+ * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
+ *
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
+ ******************************************************************************/
+package biomesoplenty.common.biome.nether;
+
+import biomesoplenty.api.block.BOPBlocks;
+import biomesoplenty.api.block.IBlockPosQuery;
+import biomesoplenty.api.enums.BOPClimates;
+import biomesoplenty.api.enums.BOPFlowers;
+import biomesoplenty.api.enums.BOPFoliage;
+import biomesoplenty.api.enums.BOPTrees;
+import biomesoplenty.api.enums.BOPWoods;
+import biomesoplenty.api.generation.GeneratorStage;
+import biomesoplenty.common.block.BlockBOPGrass;
+import biomesoplenty.common.block.BlockBOPLeaves;
+import biomesoplenty.common.block.BlockBOPLog;
+import biomesoplenty.common.block.BlockBOPMushroom;
+import biomesoplenty.common.util.biome.GeneratorUtils.ScatterYMethod;
+import biomesoplenty.common.util.block.BlockQuery;
+import biomesoplenty.common.world.generator.GeneratorFlora;
+import biomesoplenty.common.world.generator.GeneratorGrass;
+import biomesoplenty.common.world.generator.GeneratorSplatter;
+import biomesoplenty.common.world.generator.GeneratorVines;
+import biomesoplenty.common.world.generator.GeneratorWeighted;
+import biomesoplenty.common.world.generator.tree.GeneratorTwigletTree;
+import net.minecraft.init.Blocks;
+
+public class BiomeUndergarden extends BOPHellBiome
+{
+    
+    public BiomeUndergarden()
+    {
+        super("undergarden", new PropsBuilder("Undergarden").withGuiColour(0xA93C3E).withTemperature(2.0F).withRainfall(0.0F).withRainDisabled());
+
+        this.addWeight(BOPClimates.HELL, 5);
+        
+        this.topBlock = BOPBlocks.grass.getDefaultState().withProperty(BlockBOPGrass.VARIANT, BlockBOPGrass.BOPGrassType.OVERGROWN_NETHERRACK);
+        
+        // splatter top blocks
+        IBlockPosQuery emptyOvergrownNetherrack = BlockQuery.buildAnd().withAirAbove().states(this.topBlock).create();
+        this.addGenerator("netherrack_splatter", GeneratorStage.SAND, (new GeneratorSplatter.Builder()).amountPerChunk(7.0F).generationAttempts(128).scatterYMethod(ScatterYMethod.NETHER_SURFACE).replace(emptyOvergrownNetherrack).with(Blocks.NETHERRACK.getDefaultState()).create());
+    
+        IBlockPosQuery suitableNetherrackPosition = BlockQuery.buildAnd().withAltitudeBetween(70, 120).states(Blocks.NETHERRACK.getDefaultState()).create();
+        this.addGenerator("ivy", GeneratorStage.FLOWERS,(new GeneratorVines.Builder()).amountPerChunk(25.0F).generationAttempts(128).placeOn(suitableNetherrackPosition).with(BOPBlocks.ivy.getDefaultState()).minHeight(8).maxHeight(20).create());
+        
+        // flowers
+        GeneratorWeighted flowerGenerator = new GeneratorWeighted(1.0F);
+        this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator);
+        flowerGenerator.add("burning_blossom", 4, (new GeneratorFlora.Builder().scatterYMethod(ScatterYMethod.NETHER_SURFACE).with(BOPFlowers.BURNING_BLOSSOM).create()));
+        
+        // trees
+        IBlockPosQuery surfaceBlocks = BlockQuery.buildOr().states(this.topBlock, BOPBlocks.grass.getDefaultState().withProperty(BlockBOPGrass.VARIANT, BlockBOPGrass.BOPGrassType.OVERGROWN_NETHERRACK)).create();
+        GeneratorWeighted treeGenerator = new GeneratorWeighted(15.0F);
+        this.addGenerator("trees", GeneratorStage.TREE, treeGenerator);
+        treeGenerator.add("twiglet", 5, (new GeneratorTwigletTree.Builder()).scatterYMethod(ScatterYMethod.NETHER_SURFACE).placeOn(surfaceBlocks).minHeight(2).maxHeight(2).log(BlockBOPLog.paging.getVariantState(BOPWoods.HELLBARK)).leaves(BlockBOPLeaves.paging.getVariantState(BOPTrees.HELLBARK)).create());
+    
+        // grasses
+        GeneratorWeighted grassGenerator = new GeneratorWeighted(15.0F);
+        this.addGenerator("grass", GeneratorStage.GRASS, grassGenerator);
+        grassGenerator.add("devilweed", 5, (new GeneratorGrass.Builder()).with(BOPFoliage.DEVILWEED).scatterYMethod(ScatterYMethod.NETHER_SURFACE).create());
+        
+        // shrooms
+        this.addGenerator("toadstools", GeneratorStage.SHROOM,(new GeneratorFlora.Builder()).amountPerChunk(1.5F).generationAttempts(16).scatterYMethod(ScatterYMethod.NETHER_SURFACE).with(BlockBOPMushroom.MushroomType.TOADSTOOL).create());
+        this.addGenerator("red_mushrooms", GeneratorStage.SHROOM,(new GeneratorFlora.Builder()).amountPerChunk(2.0F).generationAttempts(16).scatterYMethod(ScatterYMethod.NETHER_SURFACE).with(Blocks.RED_MUSHROOM.getDefaultState()).create());
+        this.addGenerator("brown_mushrooms", GeneratorStage.SHROOM,(new GeneratorFlora.Builder()).amountPerChunk(1.0F).generationAttempts(16).scatterYMethod(ScatterYMethod.NETHER_SURFACE).with(Blocks.BROWN_MUSHROOM.getDefaultState()).create());
+    }
+}

src/main/java/biomesoplenty/common/biome/nether/BiomeVisceralHeap.java

@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright 2014-2017, the Biomes O' Plenty Team
+ *
+ * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
+ *
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
+ ******************************************************************************/
+package biomesoplenty.common.biome.nether;
+
+import biomesoplenty.api.block.BOPBlocks;
+import biomesoplenty.api.block.IBlockPosQuery;
+import biomesoplenty.api.enums.BOPClimates;
+import biomesoplenty.api.generation.GeneratorStage;
+import biomesoplenty.common.block.BlockBOPDoublePlant;
+import biomesoplenty.common.util.biome.GeneratorUtils.ScatterYMethod;
+import biomesoplenty.common.util.block.BlockQuery;
+import biomesoplenty.common.world.generator.GeneratorColumns;
+import biomesoplenty.common.world.generator.GeneratorDoubleFlora;
+import biomesoplenty.common.world.generator.GeneratorLakes;
+import net.minecraft.block.BlockBone;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.EnumFacing;
+
+public class BiomeVisceralHeap extends BOPHellBiome
+{
+    
+    public BiomeVisceralHeap()
+    {
+        super("visceral_heap", new PropsBuilder("Visceral Heap").withGuiColour(0xA93C3E).withTemperature(2.0F).withRainfall(0.0F).withRainDisabled());
+
+        this.addWeight(BOPClimates.HELL, 5);
+        
+        this.topBlock = BOPBlocks.flesh.getDefaultState();
+        this.fillerBlock = BOPBlocks.flesh.getDefaultState();
+        this.wallBlock = BOPBlocks.flesh.getDefaultState();
+        
+        // blood pools
+        this.addGenerator("blood_pools", GeneratorStage.SAND, (new GeneratorLakes.Builder()).amountPerChunk(6.0F).liquid(BOPBlocks.blood).frozenLiquid((IBlockState)null).scatterYMethod(ScatterYMethod.NETHER_SURFACE).create());
+    
+        IBlockPosQuery emptyFlesh = BlockQuery.buildAnd().withAirAbove().states(this.topBlock).create();
+        this.addGenerator("bones", GeneratorStage.FLOWERS,(new GeneratorColumns.Builder()).amountPerChunk(1.5F).placeOn(emptyFlesh).scatterYMethod(ScatterYMethod.NETHER_SURFACE).with(Blocks.BONE_BLOCK.getDefaultState().withProperty(BlockBone.AXIS, EnumFacing.Axis.Y)).minHeight(1).maxHeight(4).create());
+    }
+}

src/main/java/biomesoplenty/common/biome/nether/CrystallineChasmBiome.java

@@ -1,69 +0,0 @@
-package biomesoplenty.common.biome.nether;
-
-import biomesoplenty.api.enums.BOPClimates;
-import biomesoplenty.common.biome.NetherBiomeTemplate;
-import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures;
-import net.minecraft.client.audio.BackgroundMusicTracks;
-import net.minecraft.entity.EntityClassification;
-import net.minecraft.entity.EntityType;
-import net.minecraft.particles.ParticleTypes;
-import net.minecraft.util.SoundEvents;
-import net.minecraft.world.biome.*;
-import net.minecraft.world.gen.GenerationStage;
-import net.minecraft.world.gen.carver.ConfiguredCarvers;
-import net.minecraft.world.gen.feature.Features;
-import net.minecraft.world.gen.feature.structure.StructureFeatures;
-import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder;
-import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilders;
-import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder;
-
-public class CrystallineChasmBiome extends NetherBiomeTemplate
-{
-    public CrystallineChasmBiome()
-    {
-        this.addWeight(BOPClimates.NETHER, 5);
-    }
-
-    @Override
-    protected void configureBiome(Biome.Builder builder)
-    {
-        builder.precipitation(Biome.RainType.NONE).biomeCategory(Biome.Category.NETHER).depth(0.1F).scale(0.2F).temperature(2.0F).downfall(0.0F);
-
-        builder.specialEffects((new BiomeAmbience.Builder()).waterColor(4159204).waterFogColor(329011).fogColor(0x59002C).skyColor(calculateSkyColor(2.0F)).ambientParticle(new ParticleEffectAmbience(ParticleTypes.INSTANT_EFFECT, 0.001785F)).ambientLoopSound(SoundEvents.AMBIENT_CRIMSON_FOREST_LOOP).ambientMoodSound(new MoodSoundAmbience(SoundEvents.AMBIENT_BASALT_DELTAS_MOOD, 6000, 8, 2.0D)).ambientAdditionsSound(new SoundAdditionsAmbience(SoundEvents.AMBIENT_BASALT_DELTAS_ADDITIONS, 0.0111D)).backgroundMusic(BackgroundMusicTracks.createGameMusic(SoundEvents.MUSIC_BIOME_NETHER_WASTES)).build());
-    }
-
-    @Override
-    protected void configureGeneration(BiomeGenerationSettings.Builder builder)
-    {
-        builder.surfaceBuilder(ConfiguredSurfaceBuilders.NETHER);
-
-        //Terrain
-        builder.addStructureStart(StructureFeatures.RUINED_PORTAL_NETHER);
-        builder.addStructureStart(StructureFeatures.NETHER_BRIDGE);
-        builder.addStructureStart(StructureFeatures.BASTION_REMNANT);
-        builder.addCarver(GenerationStage.Carving.AIR, ConfiguredCarvers.NETHER_CAVE);
-
-        builder.addFeature(GenerationStage.Decoration.UNDERGROUND_DECORATION, Features.SPRING_OPEN);
-        builder.addFeature(GenerationStage.Decoration.UNDERGROUND_DECORATION, Features.PATCH_FIRE);
-        builder.addFeature(GenerationStage.Decoration.UNDERGROUND_DECORATION, Features.PATCH_SOUL_FIRE);
-        builder.addFeature(GenerationStage.Decoration.UNDERGROUND_DECORATION, Features.GLOWSTONE_EXTRA);
-        builder.addFeature(GenerationStage.Decoration.UNDERGROUND_DECORATION, Features.GLOWSTONE);
-        builder.addFeature(GenerationStage.Decoration.UNDERGROUND_DECORATION, Features.BROWN_MUSHROOM_NETHER);
-        builder.addFeature(GenerationStage.Decoration.UNDERGROUND_DECORATION, Features.RED_MUSHROOM_NETHER);
-        builder.addFeature(GenerationStage.Decoration.UNDERGROUND_DECORATION, Features.ORE_MAGMA);
-        builder.addFeature(GenerationStage.Decoration.UNDERGROUND_DECORATION, Features.SPRING_CLOSED);
-
-        //Decoration
-        builder.addFeature(GenerationStage.Decoration.UNDERGROUND_DECORATION, BOPConfiguredFeatures.LARGE_CRYSTAL);
-        builder.addFeature(GenerationStage.Decoration.UNDERGROUND_DECORATION, BOPConfiguredFeatures.SMALL_CRYSTAL);
-
-        DefaultBiomeFeatures.addNetherDefaultOres(builder);
-    }
-
-    @Override
-    protected void configureMobSpawns(MobSpawnInfo.Builder builder)
-    {
-        //Entities
-        builder.addSpawn(EntityClassification.CREATURE, new MobSpawnInfo.Spawners(EntityType.STRIDER, 60, 1, 2));
-    }
-}

src/main/java/biomesoplenty/common/biome/nether/UndergrowthBiome.java

@@ -1,77 +0,0 @@
-package biomesoplenty.common.biome.nether;
-
-import biomesoplenty.api.enums.BOPClimates;
-import biomesoplenty.common.biome.NetherBiomeTemplate;
-import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures;
-import net.minecraft.client.audio.BackgroundMusicTracks;
-import net.minecraft.entity.EntityClassification;
-import net.minecraft.entity.EntityType;
-import net.minecraft.particles.ParticleTypes;
-import net.minecraft.util.SoundEvents;
-import net.minecraft.world.biome.*;
-import net.minecraft.world.gen.GenerationStage;
-import net.minecraft.world.gen.carver.ConfiguredCarvers;
-import net.minecraft.world.gen.feature.Features;
-import net.minecraft.world.gen.feature.structure.StructureFeatures;
-import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder;
-import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilders;
-import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder;
-
-public class UndergrowthBiome extends NetherBiomeTemplate
-{
-    public UndergrowthBiome()
-    {
-        this.addWeight(BOPClimates.NETHER, 10);
-    }
-
-    @Override
-    protected void configureBiome(Biome.Builder builder)
-    {
-        builder.precipitation(Biome.RainType.NONE).biomeCategory(Biome.Category.NETHER).depth(0.1F).scale(0.2F).temperature(2.0F).downfall(0.0F);
-
-        builder.specialEffects((new BiomeAmbience.Builder()).waterColor(4159204).waterFogColor(329011).fogColor(0x1C2109).skyColor(calculateSkyColor(2.0F)).ambientParticle(new ParticleEffectAmbience(ParticleTypes.MYCELIUM, 0.00714F)).ambientLoopSound(SoundEvents.AMBIENT_WARPED_FOREST_LOOP).ambientMoodSound(new MoodSoundAmbience(SoundEvents.AMBIENT_CRIMSON_FOREST_MOOD, 6000, 8, 2.0D)).ambientAdditionsSound(new SoundAdditionsAmbience(SoundEvents.AMBIENT_NETHER_WASTES_ADDITIONS, 0.0111D)).backgroundMusic(BackgroundMusicTracks.createGameMusic(SoundEvents.MUSIC_BIOME_NETHER_WASTES)).build());
-    }
-
-    @Override
-    protected void configureGeneration(BiomeGenerationSettings.Builder builder)
-    {
-        builder.surfaceBuilder(ConfiguredSurfaceBuilders.NETHER);
-
-        //Terrain
-        builder.addStructureStart(StructureFeatures.RUINED_PORTAL_NETHER);
-        builder.addStructureStart(StructureFeatures.NETHER_BRIDGE);
-        builder.addStructureStart(StructureFeatures.BASTION_REMNANT);
-        builder.addCarver(GenerationStage.Carving.AIR, ConfiguredCarvers.NETHER_CAVE);
-
-        builder.addFeature(GenerationStage.Decoration.UNDERGROUND_DECORATION, Features.SPRING_OPEN);
-        builder.addFeature(GenerationStage.Decoration.UNDERGROUND_DECORATION, Features.PATCH_FIRE);
-        builder.addFeature(GenerationStage.Decoration.UNDERGROUND_DECORATION, Features.PATCH_SOUL_FIRE);
-        builder.addFeature(GenerationStage.Decoration.UNDERGROUND_DECORATION, Features.GLOWSTONE_EXTRA);
-        builder.addFeature(GenerationStage.Decoration.UNDERGROUND_DECORATION, Features.GLOWSTONE);
-        builder.addFeature(GenerationStage.Decoration.UNDERGROUND_DECORATION, Features.BROWN_MUSHROOM_NETHER);
-        builder.addFeature(GenerationStage.Decoration.UNDERGROUND_DECORATION, Features.RED_MUSHROOM_NETHER);
-        builder.addFeature(GenerationStage.Decoration.UNDERGROUND_DECORATION, Features.ORE_MAGMA);
-        builder.addFeature(GenerationStage.Decoration.UNDERGROUND_DECORATION, Features.SPRING_CLOSED);
-
-        //Vegetation
-        builder.addFeature(GenerationStage.Decoration.UNDERGROUND_DECORATION, BOPConfiguredFeatures.UNDERGROWTH_TREES);
-
-        builder.addFeature(GenerationStage.Decoration.UNDERGROUND_DECORATION, BOPConfiguredFeatures.NETHER_BRAMBLE);
-        builder.addFeature(GenerationStage.Decoration.UNDERGROUND_DECORATION, BOPConfiguredFeatures.UNDERGROWTH_FLOWERS);
-        builder.addFeature(GenerationStage.Decoration.UNDERGROUND_DECORATION, BOPConfiguredFeatures.SPROUTS_UNDERGROWTH);
-        builder.addFeature(GenerationStage.Decoration.UNDERGROUND_DECORATION, BOPConfiguredFeatures.DEAD_GRASS_45);
-        builder.addFeature(GenerationStage.Decoration.UNDERGROUND_DECORATION, BOPConfiguredFeatures.NETHER_VINES);
-
-        DefaultBiomeFeatures.addNetherDefaultOres(builder);
-    }
-
-    @Override
-    protected void configureMobSpawns(MobSpawnInfo.Builder builder)
-    {
-        //Entities
-        builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.GHAST, 50, 4, 4));
-        builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.MAGMA_CUBE, 2, 4, 4));
-        builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.HOGLIN, 9, 3, 4));
-        builder.addSpawn(EntityClassification.CREATURE, new MobSpawnInfo.Spawners(EntityType.STRIDER, 60, 1, 2));
-    }
-}

src/main/java/biomesoplenty/common/biome/nether/VisceralHeapBiome.java

@@ -1,65 +0,0 @@
-package biomesoplenty.common.biome.nether;
-
-import biomesoplenty.api.enums.BOPClimates;
-import biomesoplenty.common.biome.NetherBiomeTemplate;
-import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures;
-import biomesoplenty.common.world.gen.surfacebuilders.BOPConfiguredSurfaceBuilders;
-import biomesoplenty.common.world.gen.surfacebuilders.BOPSurfaceBuilders;
-import net.minecraft.client.audio.BackgroundMusicTracks;
-import net.minecraft.entity.EntityClassification;
-import net.minecraft.entity.EntityType;
-import net.minecraft.particles.ParticleTypes;
-import net.minecraft.util.SoundEvents;
-import net.minecraft.world.biome.*;
-import net.minecraft.world.gen.GenerationStage;
-import net.minecraft.world.gen.carver.ConfiguredCarvers;
-import net.minecraft.world.gen.feature.Features;
-import net.minecraft.world.gen.feature.structure.StructureFeatures;
-import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder;
-import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder;
-
-public class VisceralHeapBiome extends NetherBiomeTemplate
-{
-    public VisceralHeapBiome()
-    {
-        this.addWeight(BOPClimates.NETHER, 7);
-    }
-
-    @Override
-    protected void configureBiome(Biome.Builder builder)
-    {
-        builder.precipitation(Biome.RainType.NONE).biomeCategory(Biome.Category.NETHER).depth(0.1F).scale(0.2F).temperature(2.0F).downfall(0.0F);
-
-        builder.specialEffects((new BiomeAmbience.Builder()).waterColor(4159204).waterFogColor(329011).fogColor(0x601F18).skyColor(calculateSkyColor(2.0F)).ambientParticle(new ParticleEffectAmbience(ParticleTypes.FALLING_LAVA, 0.001785F)).ambientLoopSound(SoundEvents.AMBIENT_NETHER_WASTES_LOOP).ambientMoodSound(new MoodSoundAmbience(SoundEvents.AMBIENT_SOUL_SAND_VALLEY_MOOD, 6000, 8, 2.0D)).ambientAdditionsSound(new SoundAdditionsAmbience(SoundEvents.AMBIENT_CRIMSON_FOREST_ADDITIONS, 0.0111D)).backgroundMusic(BackgroundMusicTracks.createGameMusic(SoundEvents.MUSIC_BIOME_CRIMSON_FOREST)).build());
-    }
-
-    @Override
-    protected void configureGeneration(BiomeGenerationSettings.Builder builder)
-    {
-        builder.surfaceBuilder(BOPConfiguredSurfaceBuilders.VISCERAL_HEAP);
-
-        //Terrain
-        builder.addStructureStart(StructureFeatures.RUINED_PORTAL_NETHER);
-        builder.addStructureStart(StructureFeatures.NETHER_BRIDGE);
-        builder.addStructureStart(StructureFeatures.BASTION_REMNANT);
-        builder.addCarver(GenerationStage.Carving.AIR, ConfiguredCarvers.NETHER_CAVE);
-
-        builder.addFeature(GenerationStage.Decoration.UNDERGROUND_DECORATION, Features.SPRING_OPEN);
-        builder.addFeature(GenerationStage.Decoration.UNDERGROUND_DECORATION, Features.ORE_MAGMA);
-        builder.addFeature(GenerationStage.Decoration.UNDERGROUND_DECORATION, Features.SPRING_CLOSED);
-
-        builder.addFeature(GenerationStage.Decoration.UNDERGROUND_DECORATION, BOPConfiguredFeatures.FLESH_TENDON);
-        builder.addFeature(GenerationStage.Decoration.UNDERGROUND_DECORATION, BOPConfiguredFeatures.BONE_SPINE);
-
-        DefaultBiomeFeatures.addNetherDefaultOres(builder);
-    }
-
-    @Override
-    protected void configureMobSpawns(MobSpawnInfo.Builder builder)
-    {
-        //Entities
-        builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.GHAST, 50, 4, 4));
-        builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.ZOMBIFIED_PIGLIN, 100, 4, 4));
-        builder.addSpawn(EntityClassification.CREATURE, new MobSpawnInfo.Spawners(EntityType.STRIDER, 60, 1, 2));
-    }
-}

src/main/java/biomesoplenty/common/biome/nether/WitheredAbyssBiome.java

@@ -1,57 +0,0 @@
-package biomesoplenty.common.biome.nether;
-
-import biomesoplenty.api.enums.BOPClimates;
-import biomesoplenty.common.biome.NetherBiomeTemplate;
-import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures;
-import biomesoplenty.common.world.gen.surfacebuilders.BOPConfiguredSurfaceBuilders;
-import biomesoplenty.common.world.gen.surfacebuilders.BOPSurfaceBuilders;
-import net.minecraft.client.audio.BackgroundMusicTracks;
-import net.minecraft.entity.EntityClassification;
-import net.minecraft.entity.EntityType;
-import net.minecraft.particles.ParticleTypes;
-import net.minecraft.util.SoundEvents;
-import net.minecraft.world.biome.*;
-import net.minecraft.world.gen.GenerationStage;
-import net.minecraft.world.gen.carver.ConfiguredCarvers;
-import net.minecraft.world.gen.feature.structure.StructureFeatures;
-import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder;
-
-public class WitheredAbyssBiome extends NetherBiomeTemplate
-{
-    public WitheredAbyssBiome()
-    {
-        this.addWeight(BOPClimates.NETHER, 3);
-    }
-
-    @Override
-    protected void configureBiome(Biome.Builder builder)
-    {
-        builder.precipitation(Biome.RainType.NONE).biomeCategory(Biome.Category.NETHER).depth(0.1F).scale(0.2F).temperature(2.0F).downfall(0.0F);
-
-        builder.specialEffects((new BiomeAmbience.Builder()).waterColor(4159204).waterFogColor(329011).fogColor(0x09060F).skyColor(calculateSkyColor(2.0F)).ambientParticle(new ParticleEffectAmbience(ParticleTypes.SMOKE, 0.00357F)).ambientLoopSound(SoundEvents.AMBIENT_SOUL_SAND_VALLEY_LOOP).ambientMoodSound(new MoodSoundAmbience(SoundEvents.AMBIENT_SOUL_SAND_VALLEY_MOOD, 6000, 8, 2.0D)).backgroundMusic(BackgroundMusicTracks.createGameMusic(SoundEvents.MUSIC_BIOME_BASALT_DELTAS)).build());
-    }
-
-    @Override
-    protected void configureGeneration(BiomeGenerationSettings.Builder builder)
-    {
-        builder.surfaceBuilder(BOPConfiguredSurfaceBuilders.WITHERED_ABYSS);
-
-        //Terrain
-        builder.addStructureStart(StructureFeatures.NETHER_BRIDGE);
-        builder.addStructureStart(StructureFeatures.BASTION_REMNANT);
-        builder.addCarver(GenerationStage.Carving.AIR, ConfiguredCarvers.NETHER_CAVE);
-
-        //Decoration
-        builder.addFeature(GenerationStage.Decoration.UNDERGROUND_DECORATION, BOPConfiguredFeatures.OBSIDIAN_SPLATTER);
-
-        DefaultBiomeFeatures.addNetherDefaultOres(builder);
-    }
-
-    @Override
-    protected void configureMobSpawns(MobSpawnInfo.Builder builder)
-    {
-        //Entities
-        builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.ENDERMAN, 1, 4, 4));
-        builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.WITHER_SKELETON, 1, 1, 1));
-    }
-}

src/main/java/biomesoplenty/common/biome/overworld/AlpsBiome.java

@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright 2014-2019, the Biomes O' Plenty Team
- *
- * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
- *
- * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
- ******************************************************************************/
-package biomesoplenty.common.biome.overworld;
-
-import biomesoplenty.api.enums.BOPClimates;
-import biomesoplenty.common.biome.BiomeTemplate;
-import biomesoplenty.common.world.gen.surfacebuilders.BOPConfiguredSurfaceBuilders;
-import biomesoplenty.common.world.gen.surfacebuilders.BOPSurfaceBuilders;
-import net.minecraft.entity.EntityClassification;
-import net.minecraft.entity.EntityType;
-import net.minecraft.world.biome.*;
-import net.minecraft.world.gen.feature.structure.StructureFeatures;
-import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder;
-
-public class AlpsBiome extends BiomeTemplate
-{
-    public AlpsBiome()
-    {
-        this.addWeight(BOPClimates.ICE_CAP, 5);
-        this.setBeachBiome(null);
-        this.setRiverBiome(null);
-    }
-
-    @Override
-    protected void configureBiome(Biome.Builder builder)
-    {
-        builder.precipitation(Biome.RainType.SNOW).biomeCategory(Biome.Category.ICY).depth(7.5F).scale(0.2F).temperature(-0.25F).downfall(0.3F);
-
-        builder.specialEffects((new BiomeAmbience.Builder()).waterColor(4159204).waterFogColor(329011).fogColor(12638463).skyColor(calculateSkyColor(-0.25F)).ambientMoodSound(MoodSoundAmbience.LEGACY_CAVE_SETTINGS).build());
-    }
-
-    @Override
-    protected void configureGeneration(BiomeGenerationSettings.Builder builder)
-    {
-        builder.surfaceBuilder(BOPConfiguredSurfaceBuilders.DEEP_SNOW);
-
-        // Structures
-        DefaultBiomeFeatures.addDefaultOverworldLandStructures(builder);
-        builder.addStructureStart(StructureFeatures.RUINED_PORTAL_MOUNTAIN);
-
-        // Underground
-        DefaultBiomeFeatures.addDefaultCarvers(builder);
-        DefaultBiomeFeatures.addDefaultMonsterRoom(builder);
-        DefaultBiomeFeatures.addDefaultUndergroundVariety(builder);
-        DefaultBiomeFeatures.addDefaultOres(builder);
-        DefaultBiomeFeatures.addDefaultSoftDisks(builder);
-
-        // Other Features
-        DefaultBiomeFeatures.addDefaultSprings(builder);
-        DefaultBiomeFeatures.addExtraEmeralds(builder);
-        DefaultBiomeFeatures.addInfestedStone(builder);
-        DefaultBiomeFeatures.addSurfaceFreezing(builder);
-    }
-
-    @Override
-    protected void configureMobSpawns(MobSpawnInfo.Builder builder)
-    {
-        // Entities
-        builder.addSpawn(EntityClassification.CREATURE, new MobSpawnInfo.Spawners(EntityType.LLAMA, 5, 4, 6));
-        builder.addSpawn(EntityClassification.AMBIENT, new MobSpawnInfo.Spawners(EntityType.BAT, 10, 8, 8));
-        builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.SKELETON, 100, 4, 4));
-        builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.SLIME, 100, 4, 4));
-        builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.ENDERMAN, 10, 1, 4));
-        builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.STRAY, 80, 4, 4));
-    }
-}

src/main/java/biomesoplenty/common/biome/overworld/AlpsFoothillsBiome.java

@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright 2014-2019, the Biomes O' Plenty Team
- *
- * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
- *
- * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
- ******************************************************************************/
-package biomesoplenty.common.biome.overworld;
-
-import biomesoplenty.common.biome.BiomeTemplate;
-import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures;
-import biomesoplenty.common.world.gen.surfacebuilders.BOPConfiguredSurfaceBuilders;
-import net.minecraft.entity.EntityClassification;
-import net.minecraft.entity.EntityType;
-import net.minecraft.world.biome.*;
-import net.minecraft.world.gen.GenerationStage;
-import net.minecraft.world.gen.feature.structure.StructureFeatures;
-import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder;
-import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder;
-
-public class AlpsFoothillsBiome extends BiomeTemplate
-{
-    public AlpsFoothillsBiome()
-    {
-        this.setBeachBiome(null);
-        this.setRiverBiome(null);
-    }
-
-    @Override
-    protected void configureBiome(Biome.Builder builder)
-    {
-        builder.precipitation(Biome.RainType.SNOW).biomeCategory(Biome.Category.ICY).depth(3.0F).scale(0.3F).temperature(-0.25F).downfall(0.3F);
-
-        builder.specialEffects((new BiomeAmbience.Builder()).waterColor(4159204).waterFogColor(329011).fogColor(12638463).skyColor(calculateSkyColor(-0.25F)).ambientMoodSound(MoodSoundAmbience.LEGACY_CAVE_SETTINGS).build());
-    }
-
-    @Override
-    protected void configureGeneration(BiomeGenerationSettings.Builder builder)
-    {
-        builder.surfaceBuilder(BOPConfiguredSurfaceBuilders.ALPS_FOOTHILLS);
-
-        // Structures
-        DefaultBiomeFeatures.addDefaultOverworldLandStructures(builder);
-        builder.addStructureStart(StructureFeatures.RUINED_PORTAL_MOUNTAIN);
-
-        // Underground
-        DefaultBiomeFeatures.addDefaultCarvers(builder);
-        DefaultBiomeFeatures.addDefaultMonsterRoom(builder);
-        DefaultBiomeFeatures.addDefaultUndergroundVariety(builder);
-        DefaultBiomeFeatures.addDefaultOres(builder);
-        DefaultBiomeFeatures.addDefaultSoftDisks(builder);
-
-        ////////////////////////////////////////////////////////////
-
-        // Vegetation
-        builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.ALPS_FOOTHILLS_TREES);
-
-        ////////////////////////////////////////////////////////////
-
-        // Other Features
-        DefaultBiomeFeatures.addDefaultSprings(builder);
-        DefaultBiomeFeatures.addExtraEmeralds(builder);
-        DefaultBiomeFeatures.addInfestedStone(builder);
-        DefaultBiomeFeatures.addSurfaceFreezing(builder);
-    }
-
-    @Override
-    protected void configureMobSpawns(MobSpawnInfo.Builder builder)
-    {
-        // Entities
-        builder.addSpawn(EntityClassification.CREATURE, new MobSpawnInfo.Spawners(EntityType.LLAMA, 5, 4, 6));
-        builder.addSpawn(EntityClassification.AMBIENT, new MobSpawnInfo.Spawners(EntityType.BAT, 10, 8, 8));
-        builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.SPIDER, 100, 4, 4));
-        builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.ZOMBIE, 95, 4, 4));
-        builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.ZOMBIE_VILLAGER, 5, 1, 1));
-        builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.SKELETON, 100, 4, 4));
-        builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.CREEPER, 100, 4, 4));
-        builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.SLIME, 100, 4, 4));
-        builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.ENDERMAN, 10, 1, 4));
-        builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.WITCH, 5, 1, 1));
-        builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.STRAY, 80, 4, 4));
-    }
-}

src/main/java/biomesoplenty/common/biome/overworld/BOPOverworldBiome.java

@@ -0,0 +1,207 @@
+/*******************************************************************************
+ * Copyright 2015-2016, the Biomes O' Plenty Team
+ * 
+ * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
+ * 
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
+ ******************************************************************************/
+
+package biomesoplenty.common.biome.overworld;
+
+import java.util.Random;
+
+import biomesoplenty.api.block.BOPBlocks;
+import biomesoplenty.api.block.IBlockPosQuery;
+import biomesoplenty.api.config.IBOPWorldSettings;
+import biomesoplenty.api.config.IBOPWorldSettings.GeneratorType;
+import biomesoplenty.api.config.IConfigObj;
+import biomesoplenty.api.enums.BOPFlowers;
+import biomesoplenty.api.enums.BOPPlants;
+import biomesoplenty.api.generation.GeneratorStage;
+import biomesoplenty.common.biome.BOPBiome;
+import biomesoplenty.common.block.BlockBOPMushroom;
+import biomesoplenty.common.init.ModBiomes;
+import biomesoplenty.common.util.biome.BiomeUtils;
+import biomesoplenty.common.util.biome.GeneratorUtils.ScatterYMethod;
+import biomesoplenty.common.util.block.BlockQuery;
+import biomesoplenty.common.world.TerrainSettings;
+import biomesoplenty.common.world.generator.GeneratorColumns;
+import biomesoplenty.common.world.generator.GeneratorFlora;
+import biomesoplenty.core.BiomesOPlenty;
+import net.minecraft.block.BlockSand;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.init.Biomes;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.world.World;
+import net.minecraft.world.chunk.ChunkPrimer;
+
+public class BOPOverworldBiome extends BOPBiome
+{
+    public IBlockState seaFloorBlock = Blocks.DIRT.getDefaultState();
+    
+    public boolean canSpawnInBiome = true;
+    public boolean canGenerateVillages = true;
+    public boolean canGenerateRivers = true;
+    
+    public ResourceLocation beachBiomeLocation = BiomeUtils.getLocForBiome(Biomes.BEACH);
+    
+    public TerrainSettings terrainSettings = new TerrainSettings();
+    public boolean noNeighborTerrainInfuence = false;
+    public int avgDirtDepth = 3;
+
+    public BOPOverworldBiome(String idName, PropsBuilder defaultBuilder)
+    {
+        super(idName, defaultBuilder);
+
+        this.terrainSettings.setDefaults();
+
+        // roots
+        this.addGenerator("roots", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(4.0F).with(BOPPlants.ROOT).create());
+
+        IBlockPosQuery suitableStonePosition = BlockQuery.buildAnd().withAltitudeBetween(0, 55).blocks(Blocks.STONE).create();
+        this.addGenerator("glowshrooms", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(1.5F).generationAttempts(64).placeOn(suitableStonePosition).with(BOPBlocks.mushroom.getDefaultState().withProperty(BlockBOPMushroom.VARIANT, BlockBOPMushroom.MushroomType.GLOWSHROOM)).scatterYMethod(ScatterYMethod.BELOW_GROUND).create());
+    }
+    
+    @Override
+    public void applySettings(IBOPWorldSettings settings)
+    {
+    }
+    
+    @Override
+    public void configure(IConfigObj conf)
+    {
+        super.configure(conf);
+        // Allow basic properties to be overridden
+
+        this.seaFloorBlock = conf.getBlockState("seaFloorBlock", this.seaFloorBlock);
+
+        this.terrainSettings.avgHeight = conf.getFloat("averageHeight", (float)this.terrainSettings.avgHeight);
+        this.terrainSettings.variationBelow = conf.getFloat("variationBelow", (float)this.terrainSettings.variationBelow);
+        this.terrainSettings.variationAbove = conf.getFloat("variationAbove", (float)this.terrainSettings.variationAbove);
+        
+        this.canSpawnInBiome = conf.getBool("canSpawnInBiome", this.canSpawnInBiome);
+        this.canGenerateVillages = conf.getBool("canGenerateVillages", this.canGenerateVillages);
+        this.canGenerateRivers = conf.getBool("canGenerateRivers", this.canGenerateRivers);
+        
+        this.beachBiomeLocation = conf.getResourceLocation("beachBiomeLocation", this.beachBiomeLocation);
+
+        // log any warnings from parsing the config file
+        for (String msg : conf.flushMessages())
+            BiomesOPlenty.logger.info(msg);
+        // write default values to a file
+        ModBiomes.writeDefaultConfigFile(ModBiomes.BOP_DEFAULTS_DIR, this.getResourceLocation().getResourcePath(), conf);
+    }
+    
+    @Override
+    public void genTerrainBlocks(World world, Random rand, ChunkPrimer primer, int x, int z, double stoneNoiseVal)
+    {
+        IBlockState topBlock = this.topBlock;
+        IBlockState fillerBlock = this.fillerBlock;
+        IBlockState seaFloorBlock = this.seaFloorBlock;
+
+        boolean hitFloorYet = false;
+        int topBlocksToFill = 0;
+        int dirtBlocksToFill = 0;
+        int seaFloorBlocksToFill = 0;
+        int dirtDepth = Math.max(0, (int)(stoneNoiseVal / 3.0D + this.avgDirtDepth + rand.nextDouble() * 0.25D));
+        int seaFloorDepth = 1 + rand.nextInt(2);
+        
+        int localX = x & 15;
+        int localZ = z & 15;
+
+        // start at the top and move downwards
+        for (int y = 255; y >= 0; --y)
+        {
+            
+            IBlockState state = primer.getBlockState(localZ, y, localX);
+            
+            // bedrock at the bottom
+            if (y <= rand.nextInt(5))
+            {
+                primer.setBlockState(localZ, y, localX, Blocks.BEDROCK.getDefaultState());
+                continue;
+            }
+
+            if (state.getMaterial() == Material.AIR)
+            {
+                // topBlocks and dirtBlocks can occur after any pocket of air
+                topBlocksToFill = (topBlock == null ? 0 : 1);
+                dirtBlocksToFill = dirtDepth;
+                continue;
+            }
+            else if (!hitFloorYet && state.getMaterial() == Material.WATER)
+            {
+                // seaFloorBlocks can occur after surface water
+                seaFloorBlocksToFill = seaFloorDepth;
+            }
+            
+            if (state.getBlock() == Blocks.STONE)
+            {
+                hitFloorYet = true;
+                if (topBlocksToFill > 0)
+                {
+                    if (y >= 62)
+                    {
+                        primer.setBlockState(localZ, y, localX, topBlock);
+                    }
+                    else if (y >= 56 - dirtDepth)
+                    {
+                        primer.setBlockState(localZ, y, localX, fillerBlock);
+                    }
+                    else
+                    {
+                        primer.setBlockState(localZ, y, localX, Blocks.GRAVEL.getDefaultState());
+                        dirtBlocksToFill = 0;
+                    }
+                    topBlocksToFill--;
+                }
+                else if (seaFloorBlocksToFill > 0)
+                {
+                    primer.setBlockState(localZ, y, localX, seaFloorBlock);
+                    --seaFloorBlocksToFill;
+                }
+                else if (dirtBlocksToFill > 0)
+                {
+                    primer.setBlockState(localZ, y, localX, fillerBlock);
+                    --dirtBlocksToFill;
+
+                    // add sandstone after a patch of sand
+                    if (dirtBlocksToFill == 0 && fillerBlock.getBlock() == Blocks.SAND)
+                    {
+                        dirtBlocksToFill = rand.nextInt(4) + Math.max(0, y - 63);
+                        fillerBlock = fillerBlock.getValue(BlockSand.VARIANT) == BlockSand.EnumType.RED_SAND ? Blocks.RED_SANDSTONE.getDefaultState() : Blocks.SANDSTONE.getDefaultState();
+                    }
+                    if (dirtBlocksToFill == 0 && fillerBlock.getBlock() == BOPBlocks.white_sand)
+                    {
+                        dirtBlocksToFill = rand.nextInt(4) + Math.max(0, y - 63);
+                        fillerBlock = BOPBlocks.white_sandstone.getDefaultState();
+                    }
+                }
+            }
+        }
+    }
+    
+    @Override
+    public ResourceLocation getBeachLocation()
+    {
+        return this.beachBiomeLocation;
+    }
+
+    // the below two methods convert between our values and Vanilla.
+    // they're mostly used for mods like Pioneer rather than us.
+
+    @Override
+    public float getBaseHeight()
+    {
+        return ((float)this.terrainSettings.avgHeight - 65.0F) / 17.0F;
+    }
+
+    @Override
+    public float getHeightVariation()
+    {
+        // average the heightVariation values for above and below
+        return Math.abs((((float)this.terrainSettings.variationAbove - 7.0F) / (20.0F * 4.0F) + ((float)this.terrainSettings.variationBelow - 4.0F) / 20.0F) / 2.0F);
+    }
+}

src/main/java/biomesoplenty/common/biome/overworld/BambooBlossomGroveBiome.java

@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright 2014-2019, the Biomes O' Plenty Team
- *
- * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
- *
- * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
- ******************************************************************************/
-package biomesoplenty.common.biome.overworld;
-
-import biomesoplenty.api.enums.BOPClimates;
-import biomesoplenty.common.biome.BiomeTemplate;
-import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures;
-import net.minecraft.entity.EntityClassification;
-import net.minecraft.entity.EntityType;
-import net.minecraft.world.biome.*;
-import net.minecraft.world.gen.GenerationStage;
-import net.minecraft.world.gen.feature.Features;
-import net.minecraft.world.gen.feature.structure.StructureFeatures;
-import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder;
-import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilders;
-import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder;
-
-public class BambooBlossomGroveBiome extends BiomeTemplate
-{
-    public BambooBlossomGroveBiome()
-    {
-    }
-
-    @Override
-    protected void configureBiome(Biome.Builder builder)
-    {
-        builder.precipitation(Biome.RainType.RAIN).biomeCategory(Biome.Category.FOREST).depth(0.05F).scale(0.05F).temperature(0.6F).downfall(0.9F);
-
-        builder.specialEffects((new BiomeAmbience.Builder()).waterColor(4159204).waterFogColor(329011).fogColor(12638463).skyColor(calculateSkyColor(0.6F)).grassColorOverride(0x85CE71).foliageColorOverride(0x63BF66).ambientMoodSound(MoodSoundAmbience.LEGACY_CAVE_SETTINGS).build());
-    }
-
-    @Override
-    protected void configureGeneration(BiomeGenerationSettings.Builder builder)
-    {
-        builder.surfaceBuilder(ConfiguredSurfaceBuilders.GRASS);
-
-        // Structures
-        DefaultBiomeFeatures.addDefaultOverworldLandStructures(builder);
-        builder.addStructureStart(StructureFeatures.RUINED_PORTAL_STANDARD);
-
-        // Underground
-        DefaultBiomeFeatures.addDefaultCarvers(builder);
-        DefaultBiomeFeatures.addDefaultLakes(builder);
-        DefaultBiomeFeatures.addDefaultMonsterRoom(builder);
-        DefaultBiomeFeatures.addDefaultUndergroundVariety(builder);
-        DefaultBiomeFeatures.addDefaultOres(builder);
-
-        ////////////////////////////////////////////////////////////
-
-        // Vegetation
-        builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.BAMBOO_BLOSSOM_GROVE_TREES);
-        builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.CHERRY_BLOSSOM_GROVE_FLOWERS);
-
-        builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.CLOVER_3);
-        builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.LILAC_2);
-        builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.LILY_PAD_5);
-        builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.SHORT_BAMBOO_5);
-        builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.STANDARD_GRASS_12);
-        builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Features.BROWN_MUSHROOM_NORMAL);
-        builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Features.PATCH_SUGAR_CANE);
-        builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Features.RED_MUSHROOM_NORMAL);
-        builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Features.SEAGRASS_COLD);
-
-        ////////////////////////////////////////////////////////////
-
-        // Other Features
-        DefaultBiomeFeatures.addDefaultSprings(builder);
-        DefaultBiomeFeatures.addSurfaceFreezing(builder);
-    }
-
-    @Override
-    protected void configureMobSpawns(MobSpawnInfo.Builder builder)
-    {
-        // Entities
-        builder.addSpawn(EntityClassification.CREATURE, new MobSpawnInfo.Spawners(EntityType.SHEEP, 12, 4, 4));
-        builder.addSpawn(EntityClassification.CREATURE, new MobSpawnInfo.Spawners(EntityType.PIG, 10, 4, 4));
-        builder.addSpawn(EntityClassification.CREATURE, new MobSpawnInfo.Spawners(EntityType.CHICKEN, 10, 4, 4));
-        builder.addSpawn(EntityClassification.CREATURE, new MobSpawnInfo.Spawners(EntityType.COW, 8, 4, 4));
-        builder.addSpawn(EntityClassification.CREATURE, new MobSpawnInfo.Spawners(EntityType.PANDA, 80, 1, 2));
-        builder.addSpawn(EntityClassification.AMBIENT, new MobSpawnInfo.Spawners(EntityType.BAT, 10, 8, 8));
-        builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.SPIDER, 100, 4, 4));
-        builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.ZOMBIE, 95, 4, 4));
-        builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.ZOMBIE_VILLAGER, 5, 1, 1));
-        builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.SKELETON, 100, 4, 4));
-        builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.CREEPER, 100, 4, 4));
-        builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.SLIME, 100, 4, 4));
-        builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.ENDERMAN, 10, 1, 4));
-        builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.WITCH, 5, 1, 1));
-    }
-}

src/main/java/biomesoplenty/common/biome/overworld/BayouBiome.java

@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright 2014-2019, the Biomes O' Plenty Team
- *
- * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
- *
- * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
- ******************************************************************************/
-package biomesoplenty.common.biome.overworld;
-
-import biomesoplenty.api.biome.BOPBiomes;
-import biomesoplenty.api.enums.BOPClimates;
-import biomesoplenty.common.biome.BiomeTemplate;
-import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures;
-import net.minecraft.entity.EntityClassification;
-import net.minecraft.entity.EntityType;
-import net.minecraft.world.biome.*;
-import net.minecraft.world.gen.GenerationStage;
-import net.minecraft.world.gen.feature.*;
-import net.minecraft.world.gen.feature.structure.StructureFeatures;
-import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder;
-import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilders;
-import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder;
-
-public class BayouBiome extends BiomeTemplate
-{
-    public BayouBiome()
-    {
-        this.addWeight(BOPClimates.SUBTROPICAL, 10);
-        this.setBeachBiome(BOPBiomes.bayou_mangrove);
-    }
-
-    @Override
-    protected void configureBiome(Biome.Builder builder)
-    {
-        builder.precipitation(Biome.RainType.RAIN).biomeCategory(Biome.Category.SWAMP).depth(-0.3F).scale(0.0F).temperature(0.95F).downfall(0.9F);
-
-        builder.specialEffects((new BiomeAmbience.Builder()).waterColor(0x62AF84).waterFogColor(0x0C211C).fogColor(12638463).skyColor(calculateSkyColor(0.95F)).grassColorOverride(0x6FAA50).foliageColorOverride(0x8BDB67).ambientMoodSound(MoodSoundAmbience.LEGACY_CAVE_SETTINGS).build());
-    }
-
-    @Override
-    protected void configureGeneration(BiomeGenerationSettings.Builder builder)
-    {
-        builder.surfaceBuilder(ConfiguredSurfaceBuilders.GRASS);
-
-        // Structures
-        DefaultBiomeFeatures.addDefaultOverworldLandStructures(builder);
-        builder.addStructureStart(StructureFeatures.RUINED_PORTAL_SWAMP);
-
-        // Underground
-        DefaultBiomeFeatures.addDefaultCarvers(builder);
-        DefaultBiomeFeatures.addDefaultLakes(builder);
-        DefaultBiomeFeatures.addDefaultMonsterRoom(builder);
-        DefaultBiomeFeatures.addDefaultUndergroundVariety(builder);
-        DefaultBiomeFeatures.addDefaultOres(builder);
-        DefaultBiomeFeatures.addSwampClayDisk(builder);
-
-        builder.addFeature(GenerationStage.Decoration.UNDERGROUND_ORES, BOPConfiguredFeatures.MUD_DISK);
-
-        ////////////////////////////////////////////////////////////
-
-        // Vegetation
-        builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.BAYOU_TREES);
-
-        builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.CATTAIL_6);
-        builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.FERN_GRASS_8);
-        builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.LARGE_FERN_7);
-        builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.LILY_PAD_10);
-        builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.TALL_GRASS_6);
-        builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Features.BROWN_MUSHROOM_NORMAL);
-        builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Features.PATCH_SUGAR_CANE);
-        builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Features.RED_MUSHROOM_NORMAL);
-        builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Features.SEAGRASS_SWAMP);
-
-        ////////////////////////////////////////////////////////////
-
-        // Other Features
-        DefaultBiomeFeatures.addDefaultSprings(builder);
-        DefaultBiomeFeatures.addSurfaceFreezing(builder);
-    }
-
-    @Override
-    protected void configureMobSpawns(MobSpawnInfo.Builder builder)
-    {
-        // Entities
-        builder.addSpawn(EntityClassification.AMBIENT, new MobSpawnInfo.Spawners(EntityType.BAT, 10, 8, 8));
-        builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.SPIDER, 100, 4, 4));
-        builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.ZOMBIE, 95, 4, 4));
-        builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.ZOMBIE_VILLAGER, 5, 1, 1));
-        builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.SKELETON, 100, 4, 4));
-        builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.CREEPER, 100, 4, 4));
-        builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.SLIME, 100, 4, 4));
-        builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.ENDERMAN, 10, 1, 4));
-        builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.WITCH, 5, 1, 1));
-        builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.SLIME, 1, 1, 1));
-    }
-}

src/main/java/biomesoplenty/common/biome/overworld/BayouMangroveBiome.java

@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright 2014-2019, the Biomes O' Plenty Team
- *
- * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
- *
- * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
- ******************************************************************************/
-package biomesoplenty.common.biome.overworld;
-
-import biomesoplenty.common.biome.BiomeTemplate;
-import biomesoplenty.common.world.gen.feature.BOPConfiguredFeatures;
-import biomesoplenty.common.world.gen.surfacebuilders.BOPConfiguredSurfaceBuilders;
-import net.minecraft.entity.EntityClassification;
-import net.minecraft.entity.EntityType;
-import net.minecraft.world.biome.*;
-import net.minecraft.world.gen.GenerationStage;
-import net.minecraft.world.gen.feature.Features;
-import net.minecraft.world.gen.feature.structure.StructureFeatures;
-
-public class BayouMangroveBiome extends BiomeTemplate
-{
-    public BayouMangroveBiome()
-    {
-        this.setBeachBiome(null);
-    }
-
-    @Override
-    protected void configureBiome(Biome.Builder builder)
-    {
-        builder.precipitation(Biome.RainType.RAIN).biomeCategory(Biome.Category.SWAMP).depth(-0.175F).scale(-0.075F).temperature(0.95F).downfall(0.9F);
-
-        builder.specialEffects((new BiomeAmbience.Builder()).waterColor(0x62AF84).waterFogColor(0x0C211C).fogColor(12638463).skyColor(calculateSkyColor(0.95F)).grassColorOverride(0x6FAA50).foliageColorOverride(0x8BDB67).ambientMoodSound(MoodSoundAmbience.LEGACY_CAVE_SETTINGS).build());
-    }
-
-    @Override
-    protected void configureGeneration(BiomeGenerationSettings.Builder builder)
-    {
-        builder.surfaceBuilder(BOPConfiguredSurfaceBuilders.MANGROVE);
-
-        // Structures
-        DefaultBiomeFeatures.addDefaultOverworldLandStructures(builder);
-        builder.addStructureStart(StructureFeatures.RUINED_PORTAL_SWAMP);
-
-        // Underground
-        DefaultBiomeFeatures.addDefaultCarvers(builder);
-        DefaultBiomeFeatures.addDefaultLakes(builder);
-
-        builder.addFeature(GenerationStage.Decoration.LAKES, BOPConfiguredFeatures.WATER_LAKE_COMMON);
-
-        DefaultBiomeFeatures.addDefaultMonsterRoom(builder);
-        DefaultBiomeFeatures.addDefaultUndergroundVariety(builder);
-        DefaultBiomeFeatures.addDefaultOres(builder);
-
-        ////////////////////////////////////////////////////////////
-
-        // Vegetation
-        builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.MANGROVE_ROOTS);
-        builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.SPROUTS_75);
-        builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, BOPConfiguredFeatures.STANDARD_GRASS_12);
-        builder.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Features.SEAGRASS_RIVER);
-
-        ////////////////////////////////////////////////////////////
-
-        // Other Features
-        DefaultBiomeFeatures.addDefaultSprings(builder);
-        DefaultBiomeFeatures.addSurfaceFreezing(builder);
-    }
-
-    @Override
-    protected void configureMobSpawns(MobSpawnInfo.Builder builder)
-    {
-        // Entities
-        builder.addSpawn(EntityClassification.WATER_AMBIENT, new MobSpawnInfo.Spawners(EntityType.COD, 10, 3, 6));
-        builder.addSpawn(EntityClassification.WATER_AMBIENT, new MobSpawnInfo.Spawners(EntityType.TROPICAL_FISH, 5, 8, 8));
-        builder.addSpawn(EntityClassification.WATER_CREATURE, new MobSpawnInfo.Spawners(EntityType.SQUID, 5, 4, 4));
-        builder.addSpawn(EntityClassification.AMBIENT, new MobSpawnInfo.Spawners(EntityType.BAT, 10, 8, 8));
-        builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.SPIDER, 100, 4, 4));
-        builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.ZOMBIE, 95, 4, 4));
-        builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.ZOMBIE_VILLAGER, 5, 1, 1));
-        builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.SKELETON, 100, 4, 4));
-        builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.CREEPER, 100, 4, 4));
-        builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.SLIME, 100, 4, 4));
-        builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.ENDERMAN, 10, 1, 4));
-        builder.addSpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.WITCH, 5, 1, 1));
-    }
-}

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenAlps.java

@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * Copyright 2015-2016, the Biomes O' Plenty Team
+ * 
+ * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
+ * 
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
+ ******************************************************************************/
+
+package biomesoplenty.common.biome.overworld;
+
+import biomesoplenty.api.enums.BOPClimates;
+import biomesoplenty.api.generation.GeneratorStage;
+import biomesoplenty.common.world.generator.GeneratorOreSingle;
+import net.minecraft.init.Blocks;
+
+public class BiomeGenAlps extends BOPOverworldBiome
+{
+    public BiomeGenAlps()
+    {
+        super("alps", new PropsBuilder("Alps").withGuiColour(13421772).withSnowEnabled().withTemperature(-0.25F).withRainfall(0.3F));
+        
+        this.terrainSettings.avgHeight(198).heightVariation(12, 12).octaves(1, 1, 2, 2, 3, 3);
+        this.topBlock = Blocks.SNOW.getDefaultState();
+        this.fillerBlock = Blocks.SNOW.getDefaultState();
+
+        this.canGenerateRivers = false;
+        this.canSpawnInBiome = false;
+        this.canGenerateVillages = false;
+        
+        this.beachBiomeLocation = null;
+        
+        this.addWeight(BOPClimates.TUNDRA, 3);
+        this.addWeight(BOPClimates.COLD_DESERT, 5);
+        
+        this.avgDirtDepth = 8;
+
+        this.spawnableCreatureList.clear();
+        
+        // gem
+        this.addGenerator("emerald", GeneratorStage.SAND, (new GeneratorOreSingle.Builder()).amountPerChunk(12).with(Blocks.EMERALD_ORE.getDefaultState()).create());
+    }
+}

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenAlpsFoothills.java

@@ -0,0 +1,61 @@
+/*******************************************************************************
+ * Copyright 2015-2016, the Biomes O' Plenty Team
+ * 
+ * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
+ * 
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
+ ******************************************************************************/
+
+package biomesoplenty.common.biome.overworld;
+
+import biomesoplenty.api.block.BOPBlocks;
+import biomesoplenty.api.block.IBlockPosQuery;
+import biomesoplenty.api.enums.BOPTrees;
+import biomesoplenty.api.enums.BOPWoods;
+import biomesoplenty.api.generation.GeneratorStage;
+import biomesoplenty.common.block.BlockBOPGrass;
+import biomesoplenty.common.util.biome.GeneratorUtils.ScatterYMethod;
+import biomesoplenty.common.util.block.BlockQuery;
+import biomesoplenty.common.world.generator.GeneratorLakes;
+import biomesoplenty.common.world.generator.GeneratorOreSingle;
+import biomesoplenty.common.world.generator.GeneratorWeighted;
+import biomesoplenty.common.world.generator.tree.GeneratorTaigaTree;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.passive.EntityLlama;
+import net.minecraft.init.Blocks;
+
+public class BiomeGenAlpsFoothills extends BOPOverworldBiome
+{
+    public BiomeGenAlpsFoothills()
+    {
+        super("alps_foothills", new PropsBuilder("Alps Foothills").withGuiColour(13421772).withSnowEnabled().withTemperature(-0.25F).withRainfall(0.3F));
+        
+	    this.terrainSettings.avgHeight(120).heightVariation(48, 64).octaves(0, 1, 1, 3, 1, 0);
+	    
+	    this.topBlock = BOPBlocks.grass.getDefaultState().withProperty(BlockBOPGrass.VARIANT, BlockBOPGrass.BOPGrassType.OVERGROWN_STONE);
+	    this.fillerBlock = Blocks.STONE.getDefaultState();
+	    this.avgDirtDepth = 8;
+
+        this.canGenerateRivers = false;
+        this.canSpawnInBiome = false;
+        this.canGenerateVillages = false;
+        
+        this.beachBiomeLocation = null;
+        
+        this.clearWeights();
+
+        this.spawnableCreatureList.clear();
+        this.spawnableCreatureList.add(new SpawnListEntry(EntityLlama.class, 5, 4, 6));
+        
+        IBlockPosQuery emptyStone = BlockQuery.buildAnd().withAirAbove().states(BOPBlocks.grass.getDefaultState().withProperty(BlockBOPGrass.VARIANT, BlockBOPGrass.BOPGrassType.OVERGROWN_STONE)).create();
+        GeneratorWeighted treeGenerator = new GeneratorWeighted(0.5F);
+        this.addGenerator("trees", GeneratorStage.TREE, treeGenerator);
+        treeGenerator.add("fir", 1, (new GeneratorTaigaTree.Builder()).placeOn(emptyStone).log(BOPWoods.FIR).leaves(BOPTrees.FIR).minHeight(10).maxHeight(19).create());
+    
+        // hot springs
+        this.addGenerator("hot_springs", GeneratorStage.SAND, (new GeneratorLakes.Builder()).amountPerChunk(0.5F).liquid(BOPBlocks.hot_spring_water).frozenLiquid((IBlockState)null).scatterYMethod(ScatterYMethod.AT_SURFACE).create());
+        
+        // gem
+        this.addGenerator("emerald", GeneratorStage.SAND, (new GeneratorOreSingle.Builder()).amountPerChunk(12).with(Blocks.EMERALD_ORE.getDefaultState()).create());
+    }
+}

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBayou.java

@@ -0,0 +1,127 @@
+/*******************************************************************************
+ * Copyright 2015-2016, the Biomes O' Plenty Team
+ * 
+ * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
+ * 
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
+ ******************************************************************************/
+
+package biomesoplenty.common.biome.overworld;
+
+import java.util.Random;
+
+import biomesoplenty.api.block.BOPBlocks;
+import biomesoplenty.api.block.IBlockPosQuery;
+import biomesoplenty.api.enums.BOPClimates;
+import biomesoplenty.api.enums.BOPFoliage;
+import biomesoplenty.api.enums.BOPPlants;
+import biomesoplenty.api.enums.BOPTrees;
+import biomesoplenty.api.enums.BOPWoods;
+import biomesoplenty.api.generation.GeneratorStage;
+import biomesoplenty.common.block.BlockBOPCoral;
+import biomesoplenty.common.block.BlockBOPDoublePlant;
+import biomesoplenty.common.block.BlockBOPLeaves;
+import biomesoplenty.common.util.biome.GeneratorUtils.ScatterYMethod;
+import biomesoplenty.common.util.block.BlockQuery;
+import biomesoplenty.common.world.generator.GeneratorDoubleFlora;
+import biomesoplenty.common.world.generator.GeneratorFlora;
+import biomesoplenty.common.world.generator.GeneratorGrass;
+import biomesoplenty.common.world.generator.GeneratorSplatter;
+import biomesoplenty.common.world.generator.GeneratorWaterside;
+import biomesoplenty.common.world.generator.GeneratorWeighted;
+import biomesoplenty.common.world.generator.tree.GeneratorBasicTree;
+import biomesoplenty.common.world.generator.tree.GeneratorBayouTree;
+import biomesoplenty.common.world.generator.tree.GeneratorBigTree;
+import net.minecraft.block.BlockDoublePlant;
+import net.minecraft.block.BlockOldLeaf;
+import net.minecraft.block.BlockTallGrass;
+import net.minecraft.entity.monster.EntitySlime;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+import net.minecraft.world.gen.feature.WorldGenFossils;
+
+public class BiomeGenBayou extends BOPOverworldBiome
+{    
+    
+    public BiomeGenBayou()
+    {
+        super("bayou", new PropsBuilder("Bayou").withGuiColour(0x7DAD51).withTemperature(0.95F).withRainfall(0.9F).withWaterColor(0xB7FF32));
+        
+        // terrain
+        this.terrainSettings.avgHeight(62).heightVariation(6, 3).octaves(1, 1, 1, 1, 0, 0).sidewaysNoise(0.0F);
+        
+        //this.skyColor = 0xACC4BC;
+        this.seaFloorBlock = BOPBlocks.mud.getDefaultState();
+        
+        this.canSpawnInBiome = false;
+        this.canGenerateRivers = false;
+        this.canGenerateVillages = false;
+        
+        this.beachBiomeLocation = null;
+
+        this.addWeight(BOPClimates.SUBTROPICAL, 10);
+        
+        this.spawnableMonsterList.add(new SpawnListEntry(EntitySlime.class, 10, 1, 3));
+        
+        // mud
+        IBlockPosQuery emptyGrassOrDirt = BlockQuery.buildAnd().withAirAbove().states(this.topBlock, this.fillerBlock).create();
+        this.addGenerator("mud", GeneratorStage.SAND_PASS2, (new GeneratorWaterside.Builder()).amountPerChunk(1).maxRadius(3).with(BOPBlocks.mud.getDefaultState()).create());
+        this.addGenerator("mud_splatter", GeneratorStage.SAND, (new GeneratorSplatter.Builder()).amountPerChunk(0.2F).replace(emptyGrassOrDirt).with(BOPBlocks.mud.getDefaultState()).create());
+        
+        // trees & logs
+        GeneratorWeighted treeGenerator = new GeneratorWeighted(8.0F);
+        this.addGenerator("trees", GeneratorStage.TREE, treeGenerator);
+        treeGenerator.add("willow", 4, (new GeneratorBasicTree.Builder()).log(BOPWoods.WILLOW).leaves(BlockBOPLeaves.paging.getVariantState(BOPTrees.WILLOW).withProperty(BlockOldLeaf.CHECK_DECAY, Boolean.valueOf(false))).minHeight(6).maxHeight(12).maxLeavesRadius(1).vine(BOPBlocks.willow_vine.getDefaultState()).leavesOffset(0).create());
+        treeGenerator.add("willow_decaying", 2, (new GeneratorBigTree.Builder()).log(BOPWoods.WILLOW).leaves(BlockBOPLeaves.paging.getVariantState(BOPTrees.WILLOW).withProperty(BlockOldLeaf.CHECK_DECAY, Boolean.valueOf(false))).foliageHeight(1).maxHeight(16).create());
+        treeGenerator.add("cypress", 3, (new GeneratorBayouTree.Builder()).log(BOPWoods.WILLOW).leaves(BlockBOPLeaves.paging.getVariantState(BOPTrees.WILLOW).withProperty(BlockOldLeaf.CHECK_DECAY, Boolean.valueOf(false))).minHeight(12).maxHeight(20).maxLeavesRadius(1).vine(BOPBlocks.willow_vine.getDefaultState()).leavesOffset(0).create());
+        
+        // grasses
+        GeneratorWeighted grassGenerator = new GeneratorWeighted(2.0F);
+        this.addGenerator("grass", GeneratorStage.GRASS, grassGenerator);
+        grassGenerator.add("shortgrass", 1, (new GeneratorGrass.Builder()).with(BOPFoliage.SHORTGRASS).create());
+        grassGenerator.add("tallgrass", 2, (new GeneratorGrass.Builder()).with(BlockTallGrass.EnumType.GRASS).create());
+        grassGenerator.add("doublegrass", 1, (new GeneratorDoubleFlora.Builder()).with(BlockDoublePlant.EnumPlantType.GRASS).create());
+        grassGenerator.add("fern", 2, (new GeneratorGrass.Builder()).with(BlockTallGrass.EnumType.FERN).create());
+        
+        // other plants
+        this.addGenerator("cattail", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(1.0F).with(BOPPlants.CATTAIL).create());
+        this.addGenerator("double_cattail", GeneratorStage.FLOWERS, (new GeneratorDoubleFlora.Builder()).amountPerChunk(0.5F).with(BlockBOPDoublePlant.DoublePlantType.TALL_CATTAIL).create());
+        this.addGenerator("double_fern", GeneratorStage.FLOWERS, (new GeneratorDoubleFlora.Builder()).amountPerChunk(0.75F).with(BlockDoublePlant.EnumPlantType.FERN).create());
+        
+        // water plants
+        this.addGenerator("lily", GeneratorStage.LILYPAD, (new GeneratorFlora.Builder()).amountPerChunk(2.0F).with(Blocks.WATERLILY.getDefaultState()).create());
+        this.addGenerator("algae", GeneratorStage.LILYPAD, (new GeneratorFlora.Builder()).amountPerChunk(4.0F).replace(Blocks.WATER).with(BOPBlocks.coral.getDefaultState().withProperty(BlockBOPCoral.VARIANT, BlockBOPCoral.CoralType.ALGAE)).scatterYMethod(ScatterYMethod.AT_GROUND).create());
+        this.addGenerator("water_reeds", GeneratorStage.LILYPAD, (new GeneratorFlora.Builder()).amountPerChunk(0.75F).with(BOPPlants.REED).generationAttempts(32).create());
+        this.addGenerator("watergrass", GeneratorStage.LILYPAD, (new GeneratorFlora.Builder()).amountPerChunk(2.0F).with(BOPPlants.WATERGRASS).generationAttempts(32).create());
+        
+        // shrooms
+        this.addGenerator("red_mushrooms", GeneratorStage.SHROOM,(new GeneratorFlora.Builder()).amountPerChunk(0.3F).generationAttempts(16).with(Blocks.RED_MUSHROOM.getDefaultState()).create());
+        this.addGenerator("brown_mushrooms", GeneratorStage.SHROOM,(new GeneratorFlora.Builder()).amountPerChunk(0.5F).generationAttempts(16).with(Blocks.BROWN_MUSHROOM.getDefaultState()).create());
+        
+    }
+    
+    @Override
+    public void decorate(World worldIn, Random rand, BlockPos pos)
+    {
+        super.decorate(worldIn, rand, pos);
+
+        if(net.minecraftforge.event.terraingen.TerrainGen.decorate(worldIn, rand, pos, net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.FOSSIL))
+        if (rand.nextInt(64) == 0)
+        {
+            (new WorldGenFossils()).generate(worldIn, rand, pos);
+        }
+    }
+    
+    @Override
+    public int getGrassColorAtPos(BlockPos pos)
+    {
+        return getModdedBiomeGrassColor(0x6FAA50);
+    }
+    
+    @Override
+    public int getFoliageColorAtPos(BlockPos pos)
+    {
+        return getModdedBiomeFoliageColor(0x8BDB67);
+    }
+}

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBog.java

@@ -0,0 +1,174 @@
+/*******************************************************************************
+ * Copyright 2015-2016, the Biomes O' Plenty Team
+ * 
+ * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
+ * 
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
+ ******************************************************************************/
+
+package biomesoplenty.common.biome.overworld;
+
+import java.util.Random;
+
+import biomesoplenty.api.biome.BOPBiomes;
+import biomesoplenty.api.block.BOPBlocks;
+import biomesoplenty.api.block.BlockQueries;
+import biomesoplenty.api.config.IConfigObj;
+import biomesoplenty.api.enums.BOPClimates;
+import biomesoplenty.api.enums.BOPFoliage;
+import biomesoplenty.api.enums.BOPPlants;
+import biomesoplenty.api.generation.GeneratorStage;
+import biomesoplenty.common.block.BlockBOPDirt;
+import biomesoplenty.common.block.BlockBOPDoublePlant;
+import biomesoplenty.common.block.BlockBOPFlatPlant;
+import biomesoplenty.common.block.BlockBOPGrass;
+import biomesoplenty.common.block.BlockBOPMushroom;
+import biomesoplenty.common.world.generator.GeneratorBigMushroom;
+import biomesoplenty.common.world.generator.GeneratorDoubleFlora;
+import biomesoplenty.common.world.generator.GeneratorFlora;
+import biomesoplenty.common.world.generator.GeneratorGrass;
+import biomesoplenty.common.world.generator.GeneratorLakes;
+import biomesoplenty.common.world.generator.GeneratorWaterside;
+import biomesoplenty.common.world.generator.GeneratorWeighted;
+import biomesoplenty.common.world.generator.tree.GeneratorBigTree;
+import biomesoplenty.common.world.generator.tree.GeneratorTwigletTree;
+import net.minecraft.block.BlockPlanks;
+import net.minecraft.block.BlockTallGrass;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.monster.EntitySlime;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+import net.minecraft.world.chunk.ChunkPrimer;
+import net.minecraft.world.gen.feature.WorldGenFossils;
+
+public class BiomeGenBog extends BOPOverworldBiome
+{    
+    public IBlockState usualTopBlock;
+    public IBlockState alternateTopBlock;
+    
+    public BiomeGenBog()
+    {
+        super("bog", new PropsBuilder("Bog").withGuiColour(0xD8935F).withTemperature(0.5F).withRainfall(0.9F).withWaterColor(0xBCFF96));
+        
+        // terrain
+        this.terrainSettings.avgHeight(63).heightVariation(5, 1).octaves(1, 4, 3, 1, 1, 0);
+        
+        this.topBlock = BOPBlocks.grass.getDefaultState().withProperty(BlockBOPGrass.VARIANT, BlockBOPGrass.BOPGrassType.LOAMY);
+        this.fillerBlock = BOPBlocks.dirt.getDefaultState().withProperty(BlockBOPDirt.VARIANT, BlockBOPDirt.BOPDirtType.LOAMY);
+        this.usualTopBlock = this.topBlock;
+        this.alternateTopBlock = BOPBlocks.dirt.getDefaultState().withProperty(BlockBOPDirt.VARIANT, BlockBOPDirt.BOPDirtType.LOAMY).withProperty(BlockBOPDirt.COARSE, true);
+        this.seaFloorBlock = BOPBlocks.mud.getDefaultState();
+        
+        this.canGenerateRivers = false;
+        this.canGenerateVillages = false;
+        
+        if (BOPBiomes.gravel_beach.isPresent())
+        {
+        	this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
+        }
+        
+        this.addWeight(BOPClimates.COLD_SWAMP, 5);
+        
+        this.spawnableCreatureList.clear();
+        this.spawnableMonsterList.add(new SpawnListEntry(EntitySlime.class, 10, 1, 3));
+        
+        // lakes
+        this.addGenerator("lakes", GeneratorStage.SAND, (new GeneratorLakes.Builder()).amountPerChunk(1.0F).waterLakeForBiome(this).create());
+
+        // mud
+        this.addGenerator("mud", GeneratorStage.SAND_PASS2, (new GeneratorWaterside.Builder()).amountPerChunk(4).maxRadius(7).with(BOPBlocks.mud.getDefaultState()).create());
+        
+        // trees & logs
+        GeneratorWeighted treeGenerator = new GeneratorWeighted(2);
+        this.addGenerator("trees", GeneratorStage.TREE, treeGenerator);
+        treeGenerator.add("oak_tree", 1, (new GeneratorBigTree.Builder()).foliageHeight(1).maxHeight(15).create());
+        treeGenerator.add("dark_oak_twiglet", 5, (new GeneratorTwigletTree.Builder()).log(BlockPlanks.EnumType.DARK_OAK).leaves(BlockPlanks.EnumType.DARK_OAK).minHeight(1).maxHeight(4).leafChance(0.3F, 0.9F).create());
+        treeGenerator.add("oak_twiglet", 6, (new GeneratorTwigletTree.Builder()).minHeight(2).maxHeight(5).leafChance(0.3F, 0.9F).create());
+        
+        // grasses
+        GeneratorWeighted grassGenerator = new GeneratorWeighted(0.75F);
+        this.addGenerator("grass", GeneratorStage.GRASS, grassGenerator);
+        grassGenerator.add("shortgrass", 2, (new GeneratorGrass.Builder()).with(BOPFoliage.SHORTGRASS).create());
+        grassGenerator.add("tallgrass", 1, (new GeneratorGrass.Builder()).with(BlockTallGrass.EnumType.GRASS).create());
+        
+        // other plants
+        this.addGenerator("bushes", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(3.0F).with(BOPFoliage.BUSH).create());
+        this.addGenerator("dead_leaf_piles", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(0.5F).placeOn(BlockQueries.darkFertile).with(BlockBOPFlatPlant.PlantType.DEADLEAFPILE).generationAttempts(64).create());
+        this.addGenerator("cattail", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(0.1F).with(BOPPlants.CATTAIL).create());
+        this.addGenerator("double_cattail", GeneratorStage.FLOWERS, (new GeneratorDoubleFlora.Builder()).amountPerChunk(0.1F).with(BlockBOPDoublePlant.DoublePlantType.TALL_CATTAIL).create());
+        
+        // water plants
+        this.addGenerator("water_reeds", GeneratorStage.LILYPAD, (new GeneratorFlora.Builder()).amountPerChunk(0.2F).with(BOPPlants.REED).generationAttempts(32).create());
+
+        // shrooms
+        this.addGenerator("brown_mushrooms", GeneratorStage.SHROOM,(new GeneratorFlora.Builder()).amountPerChunk(2.0F).generationAttempts(16).with(Blocks.BROWN_MUSHROOM.getDefaultState()).create());
+        this.addGenerator("red_mushrooms", GeneratorStage.SHROOM,(new GeneratorFlora.Builder()).amountPerChunk(1.0F).generationAttempts(16).with(Blocks.RED_MUSHROOM.getDefaultState()).create());
+        this.addGenerator("toadstools", GeneratorStage.SHROOM,(new GeneratorFlora.Builder()).amountPerChunk(0.5F).generationAttempts(16).with(BlockBOPMushroom.MushroomType.TOADSTOOL).create());
+        
+        this.addGenerator("big_brown_mushroom", GeneratorStage.BIG_SHROOM,(new GeneratorBigMushroom.Builder()).amountPerChunk(0.2F).minHeight(5).maxHeight(7).mushroomType(GeneratorBigMushroom.BigMushroomType.BROWN).create());
+    }
+    
+    @Override
+    public void configure(IConfigObj conf)
+    {
+        super.configure(conf);
+        
+        this.usualTopBlock = this.topBlock;
+        this.alternateTopBlock = conf.getBlockState("alternateTopBlock", this.alternateTopBlock);
+    }
+    
+    @Override
+    public void genTerrainBlocks(World world, Random rand, ChunkPrimer primer, int x, int z, double noise)
+    {
+        this.topBlock = (noise + rand.nextDouble() * 1.0D > 1.9D) ? this.alternateTopBlock : this.usualTopBlock;
+        
+        double d0 = GRASS_COLOR_NOISE.getValue((double)x * 0.25D, (double)z * 0.25D);
+
+        if (d0 > 0.0D)
+        {
+            int i = x & 15;
+            int j = z & 15;
+
+            for (int k = 255; k >= 0; --k)
+            {
+                if (primer.getBlockState(j, k, i).getMaterial() != Material.AIR)
+                {
+                    if (k == 62 && primer.getBlockState(j, k, i).getBlock() != Blocks.WATER)
+                    {
+                    	primer.setBlockState(j, k, i, WATER);
+                    }
+
+                    break;
+                }
+            }
+        }
+        
+        super.genTerrainBlocks(world, rand, primer, x, z, noise);
+    }
+    
+    @Override
+    public void decorate(World worldIn, Random rand, BlockPos pos)
+    {
+        super.decorate(worldIn, rand, pos);
+
+        if(net.minecraftforge.event.terraingen.TerrainGen.decorate(worldIn, rand, pos, net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.FOSSIL))
+        if (rand.nextInt(64) == 0)
+        {
+            (new WorldGenFossils()).generate(worldIn, rand, pos);
+        }
+    }
+    
+    @Override
+    public int getGrassColorAtPos(BlockPos pos)
+    {
+        return getModdedBiomeGrassColor(0xC1997C);
+    }
+    
+    @Override
+    public int getFoliageColorAtPos(BlockPos pos)
+    {
+        return getModdedBiomeFoliageColor(0x9DAF60);
+    }
+}

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBorealForest.java

@@ -0,0 +1,89 @@
+package biomesoplenty.common.biome.overworld;
+
+import biomesoplenty.api.biome.BOPBiomes;
+import biomesoplenty.api.block.BlockQueries;
+import biomesoplenty.api.enums.BOPClimates;
+import biomesoplenty.api.enums.BOPFoliage;
+import biomesoplenty.api.enums.BOPPlants;
+import biomesoplenty.api.enums.BOPTrees;
+import biomesoplenty.api.generation.GeneratorStage;
+import biomesoplenty.common.block.BlockBOPFlatPlant;
+import biomesoplenty.common.world.generator.GeneratorFlora;
+import biomesoplenty.common.world.generator.GeneratorGrass;
+import biomesoplenty.common.world.generator.GeneratorWaterside;
+import biomesoplenty.common.world.generator.GeneratorWeighted;
+import biomesoplenty.common.world.generator.tree.GeneratorBasicTree;
+import biomesoplenty.common.world.generator.tree.GeneratorBigTree;
+import biomesoplenty.common.world.generator.tree.GeneratorTaigaTree;
+import net.minecraft.block.BlockFlower;
+import net.minecraft.block.BlockPlanks;
+import net.minecraft.block.BlockTallGrass;
+import net.minecraft.entity.passive.EntityRabbit;
+import net.minecraft.entity.passive.EntityWolf;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.math.BlockPos;
+
+public class BiomeGenBorealForest extends BOPOverworldBiome
+{    
+    public BiomeGenBorealForest()
+    {
+        super("boreal_forest", new PropsBuilder("Boreal Forest").withGuiColour(0x9FB771).withTemperature(0.3F).withRainfall(0.6F));
+        
+        // terrain
+        this.terrainSettings.avgHeight(70).heightVariation(15, 30);
+
+        this.addWeight(BOPClimates.BOREAL, 7);
+
+        this.canGenerateVillages = false;
+        
+        if (BOPBiomes.gravel_beach.isPresent())
+        {
+        	this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
+        }
+        
+        this.spawnableCreatureList.add(new SpawnListEntry(EntityWolf.class, 5, 4, 4));
+        this.spawnableCreatureList.add(new SpawnListEntry(EntityRabbit.class, 4, 2, 3));
+        
+        // sand and gravel
+        this.addGenerator("gravel", GeneratorStage.SAND_PASS2, (new GeneratorWaterside.Builder()).amountPerChunk(6).maxRadius(7).with(Blocks.GRAVEL.getDefaultState()).create());
+        
+        // trees & logs
+        GeneratorWeighted treeGenerator = new GeneratorWeighted(8);
+        this.addGenerator("trees", GeneratorStage.TREE, treeGenerator);
+        treeGenerator.add("oak", 3, (new GeneratorBasicTree.Builder()).create());
+        treeGenerator.add("yellow_autumn", 4, (new GeneratorBigTree.Builder()).log(BlockPlanks.EnumType.BIRCH).leaves(BOPTrees.YELLOW_AUTUMN).foliageHeight(3).maxHeight(13).create());
+        treeGenerator.add("spruce", 5, (new GeneratorTaigaTree.Builder()).minHeight(10).maxHeight(19).create());
+ 
+        // grasses
+        GeneratorWeighted grassGenerator = new GeneratorWeighted(1.75F);
+        this.addGenerator("grass", GeneratorStage.GRASS, grassGenerator);
+        grassGenerator.add("shortgrass", 1, (new GeneratorGrass.Builder()).with(BOPFoliage.SHORTGRASS).create());
+        grassGenerator.add("tallgrass", 2, (new GeneratorGrass.Builder()).with(BlockTallGrass.EnumType.GRASS).create());
+        grassGenerator.add("fern", 4, (new GeneratorGrass.Builder()).with(BlockTallGrass.EnumType.FERN).create());
+        
+        // flowers
+        GeneratorWeighted flowerGenerator = new GeneratorWeighted(0.2F);
+        this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator);
+        flowerGenerator.add("dandelion", 1, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.DANDELION).create()));
+        flowerGenerator.add("poppy", 1, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.POPPY).create()));
+        
+        // other plants
+        this.addGenerator("bushes", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(0.75F).with(BOPFoliage.BUSH).create());
+        this.addGenerator("dead_leaf_piles", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(1.0F).placeOn(BlockQueries.darkFertile).with(BlockBOPFlatPlant.PlantType.DEADLEAFPILE).generationAttempts(64).create());
+        
+        // water plants
+        this.addGenerator("water_reeds", GeneratorStage.LILYPAD, (new GeneratorFlora.Builder()).amountPerChunk(0.25F).with(BOPPlants.REED).generationAttempts(32).create());
+    }
+    
+    @Override
+    public int getGrassColorAtPos(BlockPos pos)
+    {
+        return getModdedBiomeGrassColor(0x9FB771);
+    }
+    
+    @Override
+    public int getFoliageColorAtPos(BlockPos pos)
+    {
+        return getModdedBiomeFoliageColor(0xC9CE65);
+    }
+}

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBrushland.java

@@ -0,0 +1,102 @@
+package biomesoplenty.common.biome.overworld;
+
+import java.util.Random;
+
+import biomesoplenty.api.block.BOPBlocks;
+import biomesoplenty.api.block.IBlockPosQuery;
+import biomesoplenty.api.enums.BOPClimates;
+import biomesoplenty.api.enums.BOPFoliage;
+import biomesoplenty.api.enums.BOPPlants;
+import biomesoplenty.api.enums.BOPTrees;
+import biomesoplenty.api.enums.BOPWoods;
+import biomesoplenty.api.generation.GeneratorStage;
+import biomesoplenty.common.block.BlockBOPDirt;
+import biomesoplenty.common.block.BlockBOPGrass;
+import biomesoplenty.common.util.block.BlockQuery;
+import biomesoplenty.common.world.generator.GeneratorColumns;
+import biomesoplenty.common.world.generator.GeneratorFlora;
+import biomesoplenty.common.world.generator.GeneratorGrass;
+import biomesoplenty.common.world.generator.GeneratorSplatter;
+import biomesoplenty.common.world.generator.GeneratorWaterside;
+import biomesoplenty.common.world.generator.GeneratorWeighted;
+import biomesoplenty.common.world.generator.tree.GeneratorBigTree;
+import biomesoplenty.common.world.generator.tree.GeneratorTwigletTree;
+import net.minecraft.block.BlockPlanks;
+import net.minecraft.block.BlockTallGrass;
+import net.minecraft.entity.passive.EntityRabbit;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+import net.minecraft.world.gen.feature.WorldGenFossils;
+
+public class BiomeGenBrushland extends BOPOverworldBiome
+{   
+    
+    public BiomeGenBrushland()
+    {
+        super("brushland", new PropsBuilder("Brushland").withGuiColour(0xC6C19B).withTemperature(1.5F).withRainfall(0.1F).withRainDisabled());
+        
+        // terrain
+        this.terrainSettings.avgHeight(65).heightVariation(2, 9);
+
+        this.topBlock = BOPBlocks.grass.getDefaultState().withProperty(BlockBOPGrass.VARIANT, BlockBOPGrass.BOPGrassType.SANDY);
+        this.fillerBlock = BOPBlocks.dirt.getDefaultState().withProperty(BlockBOPDirt.VARIANT, BlockBOPDirt.BOPDirtType.SANDY);
+        
+        this.addWeight(BOPClimates.HOT_DESERT, 3);
+        
+        this.canGenerateVillages = true;
+        
+        this.spawnableCreatureList.add(new SpawnListEntry(EntityRabbit.class, 4, 2, 3));
+        
+        // splatter top blocks
+        IBlockPosQuery emptyGrass = BlockQuery.buildAnd().withAirAbove().states(this.topBlock).create();
+        this.addGenerator("dirt_splatter", GeneratorStage.SAND, (new GeneratorSplatter.Builder()).amountPerChunk(4.75F).generationAttempts(128).replace(emptyGrass).with(BOPBlocks.dirt.getDefaultState().withProperty(BlockBOPDirt.VARIANT, BlockBOPDirt.BOPDirtType.SANDY).withProperty(BlockBOPDirt.COARSE, true)).create());
+        
+        //sand
+        this.addGenerator("sand", GeneratorStage.SAND_PASS2, (new GeneratorWaterside.Builder()).amountPerChunk(4).maxRadius(7).with(Blocks.SAND.getDefaultState()).create());
+
+        // trees & logs
+        GeneratorWeighted treeGenerator = new GeneratorWeighted(3.5F);
+        this.addGenerator("trees", GeneratorStage.TREE, treeGenerator);        
+        treeGenerator.add("dead_tree", 1, (new GeneratorBigTree.Builder()).minHeight(7).maxHeight(12).foliageHeight(0).foliageDensity(0.5D).log(BOPWoods.DEAD).leaves(Blocks.AIR.getDefaultState()).create());
+        treeGenerator.add("brush_twiglet", 18, (new GeneratorTwigletTree.Builder()).minHeight(1).maxHeight(4).log(BlockPlanks.EnumType.ACACIA).leaves(BOPTrees.DEAD).create());        
+        treeGenerator.add("decaying_tree", 3, (new GeneratorBigTree.Builder()).amountPerChunk(1.0F).minHeight(4).maxHeight(11).foliageHeight(1).create());
+        
+        // grasses
+        GeneratorWeighted grassGenerator = new GeneratorWeighted(1.0F);
+        this.addGenerator("grass", GeneratorStage.GRASS, grassGenerator);
+        grassGenerator.add("shortgrass", 3, (new GeneratorGrass.Builder()).with(BOPFoliage.SHORTGRASS).create());
+        grassGenerator.add("tallgrass", 1, (new GeneratorGrass.Builder()).with(BlockTallGrass.EnumType.GRASS).create());
+        
+        // other plants
+        this.addGenerator("cacti", GeneratorStage.FLOWERS,(new GeneratorColumns.Builder()).amountPerChunk(0.2F).generationAttempts(24).placeOn(this.topBlock).with(Blocks.CACTUS.getDefaultState()).minHeight(1).maxHeight(2).create());
+        this.addGenerator("tiny_cacti", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(0.4F).with(BOPPlants.TINYCACTUS).create());
+        this.addGenerator("desertgrass", GeneratorStage.GRASS, (new GeneratorGrass.Builder()).amountPerChunk(2.0F).with(BOPFoliage.DESERTGRASS).generationAttempts(8).create());
+        this.addGenerator("thorns", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(1.0F).with(BOPPlants.THORN).create());
+        this.addGenerator("dead_bushes", GeneratorStage.FLOWERS, (new GeneratorFlora.Builder()).amountPerChunk(1.75F).with(Blocks.DEADBUSH.getDefaultState()).create());
+    }
+    
+    @Override
+    public void decorate(World worldIn, Random rand, BlockPos pos)
+    {
+        super.decorate(worldIn, rand, pos);
+
+        if(net.minecraftforge.event.terraingen.TerrainGen.decorate(worldIn, rand, pos, net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.FOSSIL))
+        if (rand.nextInt(64) == 0)
+        {
+            (new WorldGenFossils()).generate(worldIn, rand, pos);
+        }
+    }
+
+    @Override
+    public int getGrassColorAtPos(BlockPos pos)
+    {
+        return getModdedBiomeGrassColor(0xE5DFA9);
+    }
+    
+    @Override
+    public int getFoliageColorAtPos(BlockPos pos)
+    {
+        	return getModdedBiomeFoliageColor(0xDAE0B3);
+    }
+}

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenChaparral.java

@@ -0,0 +1,118 @@
+/*******************************************************************************
+ * Copyright 2015-2016, the Biomes O' Plenty Team
+ * 
+ * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
+ * 
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
+ ******************************************************************************/
+
+package biomesoplenty.common.biome.overworld;
+
+import java.util.Random;
+
+import biomesoplenty.api.block.BOPBlocks;
+import biomesoplenty.api.block.IBlockPosQuery;
+import biomesoplenty.api.config.IConfigObj;
+import biomesoplenty.api.enums.BOPClimates;
+import biomesoplenty.api.enums.BOPFoliage;
+import biomesoplenty.api.enums.BOPTrees;
+import biomesoplenty.api.generation.GeneratorStage;
+import biomesoplenty.common.block.BlockBOPGrass;
+import biomesoplenty.common.util.biome.GeneratorUtils.ScatterYMethod;
+import biomesoplenty.common.util.block.BlockQuery;
+import biomesoplenty.common.world.generator.GeneratorFlora;
+import biomesoplenty.common.world.generator.GeneratorGrass;
+import biomesoplenty.common.world.generator.GeneratorSplotches;
+import biomesoplenty.common.world.generator.GeneratorWaterside;
+import biomesoplenty.common.world.generator.GeneratorWeighted;
+import biomesoplenty.common.world.generator.tree.GeneratorBush;
+import biomesoplenty.common.world.generator.tree.GeneratorTwigletTree;
+import net.minecraft.block.BlockFlower;
+import net.minecraft.block.BlockPlanks;
+import net.minecraft.block.BlockTallGrass;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.passive.EntityDonkey;
+import net.minecraft.entity.passive.EntityHorse;
+import net.minecraft.entity.passive.EntityRabbit;
+import net.minecraft.init.Blocks;
+import net.minecraft.world.World;
+import net.minecraft.world.chunk.ChunkPrimer;
+
+public class BiomeGenChaparral extends BOPOverworldBiome
+{    
+    public IBlockState usualTopBlock;
+    public IBlockState usualFillerBlock;
+    public IBlockState alternateTopBlock;
+    public IBlockState alternateFillerBlock;
+    
+    public BiomeGenChaparral()
+    {
+        super("chaparral", new PropsBuilder("Chaparral").withGuiColour(0xC4D675).withTemperature(0.8F).withRainfall(0.15F));
+        
+        // terrain
+        this.terrainSettings.avgHeight(80).heightVariation(10, 40);
+        
+        this.addWeight(BOPClimates.WARM_TEMPERATE, 3);
+        this.addWeight(BOPClimates.DRY_TEMPERATE, 5);
+        
+        this.usualTopBlock = this.topBlock;
+        this.usualFillerBlock = this.fillerBlock;
+        this.alternateTopBlock = Blocks.STONE.getDefaultState();
+        this.alternateFillerBlock = Blocks.STONE.getDefaultState();
+
+        this.spawnableCreatureList.add(new SpawnListEntry(EntityHorse.class, 1, 2, 6));
+        this.spawnableCreatureList.add(new SpawnListEntry(EntityDonkey.class, 1, 1, 1));
+        this.spawnableCreatureList.add(new SpawnListEntry(EntityRabbit.class, 4, 2, 3));
+        
+        this.canGenerateVillages = true;
+        
+        // sand
+        this.addGenerator("sand", GeneratorStage.SAND_PASS2, (new GeneratorWaterside.Builder()).amountPerChunk(3).maxRadius(7).with(Blocks.SAND.getDefaultState()).create());
+        
+        // stone patches
+        IBlockPosQuery emptyStoneOrGrass = BlockQuery.buildAnd().withAirAbove().states(this.topBlock, Blocks.STONE.getDefaultState()).create();
+        this.addGenerator("stone_patches", GeneratorStage.SAND, (new GeneratorSplotches.Builder()).amountPerChunk(5).splotchSize(15).replace(emptyStoneOrGrass).with(BOPBlocks.grass.getDefaultState().withProperty(BlockBOPGrass.VARIANT, BlockBOPGrass.BOPGrassType.OVERGROWN_STONE)).scatterYMethod(ScatterYMethod.AT_SURFACE).create());
+        
+        // flowers
+        GeneratorWeighted flowerGenerator = new GeneratorWeighted(0.6F);
+        this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator);
+        flowerGenerator.add("dandelion", 7, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.DANDELION).create()));
+        flowerGenerator.add("poppy", 1, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.POPPY).create()));
+        
+        // grasses
+        GeneratorWeighted grassGenerator = new GeneratorWeighted(1.5F);
+        this.addGenerator("grass", GeneratorStage.GRASS, grassGenerator);
+        grassGenerator.add("tallgrass", 2, (new GeneratorGrass.Builder()).with(BlockTallGrass.EnumType.GRASS).create());
+        grassGenerator.add("shortgrass", 1, (new GeneratorGrass.Builder()).with(BOPFoliage.SHORTGRASS).create());
+        
+        // trees
+        GeneratorWeighted treeGenerator = new GeneratorWeighted(8.5F);
+        this.addGenerator("trees", GeneratorStage.TREE, treeGenerator);
+        treeGenerator.add("twiglet", 2, (new GeneratorTwigletTree.Builder()).minHeight(2).maxHeight(2).log(BlockPlanks.EnumType.OAK).leaves(BlockPlanks.EnumType.OAK).create());
+        treeGenerator.add("oak_bush", 4, (new GeneratorBush.Builder()).maxHeight(2).create());
+        treeGenerator.add("small_bush", 1, (new GeneratorFlora.Builder()).placeOn(this.topBlock).replace(Material.AIR).withNonDecayingLeaf(BOPTrees.DEAD).create());
+        
+        // other plants
+        this.addGenerator("bushes", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(1.5F).with(BOPFoliage.BUSH).create());
+    }
+    
+    @Override
+    public void configure(IConfigObj conf)
+    {
+        super.configure(conf);
+        
+        this.usualTopBlock = this.topBlock;
+        this.usualFillerBlock = this.fillerBlock;
+        this.alternateTopBlock = conf.getBlockState("alternateTopBlock", this.alternateTopBlock);
+        this.alternateFillerBlock = conf.getBlockState("alternateFillerBlock", this.alternateFillerBlock);
+    }
+    
+    @Override
+    public void genTerrainBlocks(World world, Random rand, ChunkPrimer primer, int x, int z, double noise)
+    {
+        this.topBlock = (noise + rand.nextDouble() * 1.0D > 2.0D) ? this.alternateTopBlock : this.usualTopBlock;
+        this.fillerBlock = (noise + rand.nextDouble() * 1.0D > 2.0D) ? this.alternateFillerBlock : this.usualFillerBlock;
+        super.genTerrainBlocks(world, rand, primer, x, z, noise);
+    }
+}

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCherryBlossomGrove.java

@@ -0,0 +1,94 @@
+/*******************************************************************************
+ * Copyright 2015-2016, the Biomes O' Plenty Team
+ * 
+ * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
+ * 
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
+ ******************************************************************************/
+
+package biomesoplenty.common.biome.overworld;
+
+import biomesoplenty.api.block.BOPBlocks;
+import biomesoplenty.api.block.BlockQueries;
+import biomesoplenty.api.enums.BOPClimates;
+import biomesoplenty.api.enums.BOPFlowers;
+import biomesoplenty.api.enums.BOPFoliage;
+import biomesoplenty.api.enums.BOPTrees;
+import biomesoplenty.api.enums.BOPWoods;
+import biomesoplenty.api.generation.GeneratorStage;
+import biomesoplenty.common.block.BlockBOPDirt;
+import biomesoplenty.common.block.BlockBOPDoublePlant;
+import biomesoplenty.common.block.BlockBOPFlatPlant;
+import biomesoplenty.common.block.BlockBOPGrass;
+import biomesoplenty.common.world.generator.GeneratorDoubleFlora;
+import biomesoplenty.common.world.generator.GeneratorFlora;
+import biomesoplenty.common.world.generator.GeneratorGrass;
+import biomesoplenty.common.world.generator.GeneratorWeighted;
+import biomesoplenty.common.world.generator.tree.GeneratorBasicTree;
+import biomesoplenty.common.world.generator.tree.GeneratorBigTree;
+import net.minecraft.block.BlockDoublePlant;
+import net.minecraft.block.BlockFlower;
+import net.minecraft.block.BlockTallGrass;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.math.BlockPos;
+ 
+public class BiomeGenCherryBlossomGrove extends BOPOverworldBiome
+{
+    public BiomeGenCherryBlossomGrove()
+    {
+        super("cherry_blossom_grove", new PropsBuilder("Cherry Blossom Grove").withGuiColour(0xF88F8F).withTemperature(0.55F).withRainfall(0.8F));
+        
+        // terrain
+        this.terrainSettings.avgHeight(63).heightVariation(5, 25).sidewaysNoise(0.8F);
+        
+        this.topBlock = BOPBlocks.grass.getDefaultState().withProperty(BlockBOPGrass.VARIANT, BlockBOPGrass.BOPGrassType.SILTY);
+        this.fillerBlock = BOPBlocks.dirt.getDefaultState().withProperty(BlockBOPDirt.VARIANT, BlockBOPDirt.BOPDirtType.SILTY);
+        
+        this.canSpawnInBiome = false;
+        this.canGenerateVillages = false;
+    
+        this.addWeight(BOPClimates.COOL_TEMPERATE, 2);
+        
+        // flowers
+        GeneratorWeighted flowerGenerator = new GeneratorWeighted(2.5F);
+        this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator);
+        flowerGenerator.add("pink_daffodil", 6, (new GeneratorFlora.Builder().with(BOPFlowers.PINK_DAFFODIL).create()));
+        flowerGenerator.add("syringa", 4, (new GeneratorDoubleFlora.Builder().with(BlockDoublePlant.EnumPlantType.SYRINGA).create()));
+        flowerGenerator.add("houstonia", 3, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.HOUSTONIA).create()));
+        flowerGenerator.add("oxeye_daisy", 3, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.OXEYE_DAISY).create()));
+        flowerGenerator.add("dandelion", 1, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.DANDELION).create()));
+        flowerGenerator.add("poppy", 1, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.POPPY).create()));
+        
+        // trees
+        GeneratorWeighted treeGenerator = new GeneratorWeighted(3.0F);
+        this.addGenerator("trees", GeneratorStage.TREE, treeGenerator);
+        treeGenerator.add("pink_cherry", 2, (new GeneratorBasicTree.Builder()).log(BOPWoods.CHERRY).leaves(BOPTrees.PINK_CHERRY).create());
+        treeGenerator.add("white_cherry", 1, (new GeneratorBasicTree.Builder()).log(BOPWoods.CHERRY).leaves(BOPTrees.WHITE_CHERRY).create());
+        treeGenerator.add("large_pink_cherry", 4, (new GeneratorBigTree.Builder()).log(BOPWoods.CHERRY).leaves(BOPTrees.PINK_CHERRY).create());
+        treeGenerator.add("large_white_cherry", 2, (new GeneratorBigTree.Builder()).log(BOPWoods.CHERRY).leaves(BOPTrees.WHITE_CHERRY).create());
+        
+        // other plants
+        this.addGenerator("flax", GeneratorStage.FLOWERS,(new GeneratorDoubleFlora.Builder()).amountPerChunk(0.2F).with(BlockBOPDoublePlant.DoublePlantType.FLAX).generationAttempts(6).create());
+        
+        // water plants
+        this.addGenerator("lily", GeneratorStage.LILYPAD, (new GeneratorFlora.Builder()).amountPerChunk(0.1F).with(Blocks.WATERLILY.getDefaultState()).create());
+        
+        // grasses
+        GeneratorWeighted grassGenerator = new GeneratorWeighted(3.0F);
+        this.addGenerator("grass", GeneratorStage.GRASS, grassGenerator);
+        grassGenerator.add("shortgrass", 1, (new GeneratorGrass.Builder()).with(BOPFoliage.SHORTGRASS).create());
+        grassGenerator.add("tallgrass", 2, (new GeneratorGrass.Builder()).with(BlockTallGrass.EnumType.GRASS).create());
+    }
+    
+    @Override
+    public int getGrassColorAtPos(BlockPos pos)
+    {
+        return getModdedBiomeGrassColor(0x96EA9B);
+    }
+
+    @Override
+    public int getFoliageColorAtPos(BlockPos pos)
+    {
+        return getModdedBiomeFoliageColor(0xA3FFAA);
+    }
+}

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenColdDesert.java

@@ -0,0 +1,84 @@
+/*******************************************************************************
+ * Copyright 2015-2016, the Biomes O' Plenty Team
+ * 
+ * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
+ * 
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
+ ******************************************************************************/
+
+package biomesoplenty.common.biome.overworld;
+
+import java.util.Random;
+
+import biomesoplenty.api.biome.BOPBiomes;
+import biomesoplenty.api.block.IBlockPosQuery;
+import biomesoplenty.api.config.IConfigObj;
+import biomesoplenty.api.enums.BOPClimates;
+import biomesoplenty.api.generation.GeneratorStage;
+import biomesoplenty.common.util.biome.GeneratorUtils.ScatterYMethod;
+import biomesoplenty.common.util.block.BlockQuery.BlockQueryBlock;
+import biomesoplenty.common.world.generator.GeneratorBlobs;
+import biomesoplenty.common.world.generator.GeneratorSplatter;
+import biomesoplenty.common.world.generator.GeneratorSplotches;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.monster.EntityPolarBear;
+import net.minecraft.init.Blocks;
+import net.minecraft.world.World;
+import net.minecraft.world.chunk.ChunkPrimer;
+
+public class BiomeGenColdDesert extends BOPOverworldBiome
+{    
+    
+	public IBlockState usualTopBlock;
+    public IBlockState alternateTopBlock;
+    
+    public BiomeGenColdDesert()
+    {
+        super("cold_desert", new PropsBuilder("Cold Desert").withGuiColour(0xB3AF9B).withTemperature(0.2F).withRainfall(0.0F));
+        
+        this.canSpawnInBiome = false;
+        this.canGenerateVillages = false;
+        
+        if (BOPBiomes.gravel_beach.isPresent())
+        {
+        	this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
+        }
+        
+        // terrain
+        this.terrainSettings.avgHeight(64).heightVariation(5, 10).sidewaysNoise(0.7D);
+        
+        this.topBlock = Blocks.GRAVEL.getDefaultState();
+        this.fillerBlock = Blocks.STONE.getDefaultState();
+        this.usualTopBlock = this.topBlock;
+        this.alternateTopBlock = Blocks.SNOW.getDefaultState();
+        
+        this.canGenerateRivers = false;
+
+        this.addWeight(BOPClimates.COLD_DESERT, 15);
+
+        this.spawnableCreatureList.clear();
+        this.spawnableCreatureList.add(new SpawnListEntry(EntityPolarBear.class, 1, 1, 2));
+        
+        // gravel, stone and boulders
+        IBlockPosQuery surface = new BlockQueryBlock(Blocks.STONE, Blocks.GRAVEL);
+        this.addGenerator("stone_patches", GeneratorStage.SAND, (new GeneratorSplotches.Builder()).amountPerChunk(6).splotchSize(24).placeOn(surface).replace(surface).with(Blocks.STONE.getDefaultState()).scatterYMethod(ScatterYMethod.AT_SURFACE).create());
+        this.addGenerator("boulders", GeneratorStage.SAND_PASS2, (new GeneratorBlobs.Builder()).amountPerChunk(0.2F).placeOn(surface).with(Blocks.COBBLESTONE.getDefaultState()).minRadius(1.0F).maxRadius(3.0F).numBalls(4).scatterYMethod(ScatterYMethod.AT_SURFACE).create());
+        this.addGenerator("packed_ice_splatter", GeneratorStage.SAND, (new GeneratorSplatter.Builder()).amountPerChunk(1.0F).replace(surface).with(Blocks.PACKED_ICE.getDefaultState()).create());
+    }
+    
+    @Override
+    public void configure(IConfigObj conf)
+    {
+        super.configure(conf);
+        
+        this.usualTopBlock = this.topBlock;
+        this.alternateTopBlock = conf.getBlockState("alternateTopBlock", this.alternateTopBlock);
+    }
+    
+    @Override
+    public void genTerrainBlocks(World world, Random rand, ChunkPrimer primer, int x, int z, double noise)
+    {
+        this.topBlock = (noise + rand.nextDouble() * 3.0D > 1.8D) ? this.alternateTopBlock : this.usualTopBlock;
+        super.genTerrainBlocks(world, rand, primer, x, z, noise);
+    }
+}

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenColdTundra.java

@@ -0,0 +1,100 @@
+/*******************************************************************************
+ * Copyright 2015-2016, the Biomes O' Plenty Team
+ * 
+ * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
+ * 
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
+ ******************************************************************************/
+
+package biomesoplenty.common.biome.overworld;
+
+import biomesoplenty.api.biome.BOPBiomes;
+import biomesoplenty.api.block.BOPBlocks;
+import biomesoplenty.api.block.BlockQueries;
+import biomesoplenty.api.enums.BOPFoliage;
+import biomesoplenty.api.enums.BOPPlants;
+import biomesoplenty.api.enums.BOPTrees;
+import biomesoplenty.api.generation.GeneratorStage;
+import biomesoplenty.common.block.BlockBOPDirt;
+import biomesoplenty.common.block.BlockBOPFlatPlant;
+import biomesoplenty.common.block.BlockBOPGrass;
+import biomesoplenty.common.util.biome.GeneratorUtils.ScatterYMethod;
+import biomesoplenty.common.world.generator.GeneratorBlobs;
+import biomesoplenty.common.world.generator.GeneratorFlora;
+import biomesoplenty.common.world.generator.GeneratorGrass;
+import biomesoplenty.common.world.generator.GeneratorLakes;
+import biomesoplenty.common.world.generator.GeneratorWaterside;
+import biomesoplenty.common.world.generator.GeneratorWeighted;
+import biomesoplenty.common.world.generator.tree.GeneratorTwigletTree;
+import net.minecraft.block.BlockPlanks;
+import net.minecraft.block.BlockTallGrass;
+import net.minecraft.block.material.Material;
+import net.minecraft.entity.passive.EntityRabbit;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.math.BlockPos;
+
+public class BiomeGenColdTundra extends BOPOverworldBiome
+{    
+    public BiomeGenColdTundra()
+    {
+        super("cold_tundra", new PropsBuilder("Cold Tundra").withGuiColour(0xA09456).withTemperature(0.0F).withRainfall(0.5F));
+
+        // terrain
+        this.terrainSettings.avgHeight(64).heightVariation(5, 10).minHeight(59);
+        
+        this.topBlock = BOPBlocks.grass.getDefaultState().withProperty(BlockBOPGrass.VARIANT, BlockBOPGrass.BOPGrassType.SILTY);
+        this.fillerBlock = BOPBlocks.dirt.getDefaultState().withProperty(BlockBOPDirt.VARIANT, BlockBOPDirt.BOPDirtType.SILTY);
+
+        this.clearWeights();
+        
+        this.canGenerateRivers = false;
+        this.canSpawnInBiome = false;
+        this.canGenerateVillages = false;
+        
+        if (BOPBiomes.gravel_beach.isPresent())
+        {
+        	this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
+        }
+        
+        this.spawnableCreatureList.clear();
+        this.spawnableCreatureList.add(new SpawnListEntry(EntityRabbit.class, 4, 2, 3));
+        
+        // boulders
+        this.addGenerator("large_boulders", GeneratorStage.SAND, (new GeneratorBlobs.Builder()).amountPerChunk(0.15F).placeOn(this.topBlock).with(Blocks.COBBLESTONE.getDefaultState()).minRadius(1.0F).maxRadius(3.0F).numBalls(3).scatterYMethod(ScatterYMethod.AT_SURFACE).create());
+        this.addGenerator("small_boulders", GeneratorStage.SAND, (new GeneratorFlora.Builder()).amountPerChunk(0.3F).replace(Material.AIR).placeOn(this.topBlock).with(Blocks.COBBLESTONE.getDefaultState()).scatterYMethod(ScatterYMethod.AT_SURFACE).create());
+        
+        // gravel
+        this.addGenerator("gravel", GeneratorStage.SAND_PASS2, (new GeneratorWaterside.Builder()).amountPerChunk(12).maxRadius(7).with(Blocks.GRAVEL.getDefaultState()).create());
+        
+        // lakes
+        this.addGenerator("lakes", GeneratorStage.SAND, (new GeneratorLakes.Builder()).amountPerChunk(0.1F).waterLakeForBiome(this).create());        
+
+        // trees
+        GeneratorWeighted treeGenerator = new GeneratorWeighted(4.0F);
+        this.addGenerator("trees", GeneratorStage.TREE, treeGenerator);
+        treeGenerator.add("twiglet", 1, (new GeneratorTwigletTree.Builder()).minHeight(2).maxHeight(2).log(BlockPlanks.EnumType.OAK).leaves(BOPTrees.MAPLE).create());
+        treeGenerator.add("small_bush", 2, (new GeneratorFlora.Builder()).placeOn(this.topBlock).replace(Material.AIR).withNonDecayingLeaf(BOPTrees.DEAD).create());
+        
+        // other plants
+        this.addGenerator("dead_leaf_piles", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(0.3F).placeOn(BlockQueries.darkFertile).with(BlockBOPFlatPlant.PlantType.DEADLEAFPILE).generationAttempts(64).create());
+ 
+        // grasses
+        GeneratorWeighted grassGenerator = new GeneratorWeighted(1.5F);
+        this.addGenerator("grass", GeneratorStage.GRASS, grassGenerator);
+        grassGenerator.add("shortgrass", 4, (new GeneratorGrass.Builder()).with(BOPFoliage.SHORTGRASS).create());
+        grassGenerator.add("tallgrass", 1, (new GeneratorGrass.Builder()).with(BlockTallGrass.EnumType.GRASS).create());
+    }
+    
+    @Override
+    public int getGrassColorAtPos(BlockPos pos)
+    {
+        return getModdedBiomeGrassColor(0xB78658);
+    }
+    
+    @Override
+    public int getFoliageColorAtPos(BlockPos pos)
+    {
+        return getModdedBiomeFoliageColor(0xC1954D);
+    }
+
+}

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenConiferousForest.java

@@ -0,0 +1,81 @@
+package biomesoplenty.common.biome.overworld;
+
+import biomesoplenty.api.biome.BOPBiomes;
+import biomesoplenty.api.block.BOPBlocks;
+import biomesoplenty.api.block.BlockQueries;
+import biomesoplenty.api.enums.BOPClimates;
+import biomesoplenty.api.enums.BOPFoliage;
+import biomesoplenty.api.enums.BOPTrees;
+import biomesoplenty.api.enums.BOPWoods;
+import biomesoplenty.api.generation.GeneratorStage;
+import biomesoplenty.common.block.BlockBOPDirt;
+import biomesoplenty.common.block.BlockBOPFlatPlant;
+import biomesoplenty.common.block.BlockBOPGrass;
+import biomesoplenty.common.block.BlockBOPMushroom;
+import biomesoplenty.common.world.generator.GeneratorFlora;
+import biomesoplenty.common.world.generator.GeneratorGrass;
+import biomesoplenty.common.world.generator.GeneratorWaterside;
+import biomesoplenty.common.world.generator.GeneratorWeighted;
+import biomesoplenty.common.world.generator.tree.GeneratorTaigaTree;
+import net.minecraft.block.BlockFlower;
+import net.minecraft.block.BlockTallGrass;
+import net.minecraft.entity.passive.EntityRabbit;
+import net.minecraft.entity.passive.EntityWolf;
+import net.minecraft.init.Blocks;
+
+public class BiomeGenConiferousForest extends BOPOverworldBiome
+{
+    
+    public BiomeGenConiferousForest()
+    {
+        super("coniferous_forest", new PropsBuilder("Coniferous Forest").withGuiColour(0x528F60).withTemperature(0.45F).withRainfall(0.5F));
+        
+        // terrain
+        this.terrainSettings.avgHeight(68).heightVariation(10, 20);
+        
+        this.canGenerateVillages = true;
+        
+        if (BOPBiomes.gravel_beach.isPresent())
+        {
+        	this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
+        }
+    
+        this.addWeight(BOPClimates.BOREAL, 10);
+        
+        this.topBlock = BOPBlocks.grass.getDefaultState().withProperty(BlockBOPGrass.VARIANT, BlockBOPGrass.BOPGrassType.LOAMY);
+        this.fillerBlock = BOPBlocks.dirt.getDefaultState().withProperty(BlockBOPDirt.VARIANT, BlockBOPDirt.BOPDirtType.LOAMY);
+
+        this.spawnableCreatureList.add(new SpawnListEntry(EntityWolf.class, 8, 4, 4));
+        this.spawnableCreatureList.add(new SpawnListEntry(EntityRabbit.class, 4, 2, 3));
+        
+        // gravel
+        this.addGenerator("gravel", GeneratorStage.SAND_PASS2, (new GeneratorWaterside.Builder()).amountPerChunk(4).maxRadius(7).with(Blocks.GRAVEL.getDefaultState()).create());
+        
+        // trees
+        GeneratorWeighted treeGenerator = new GeneratorWeighted(8.0F);
+        this.addGenerator("trees", GeneratorStage.TREE, treeGenerator);
+        treeGenerator.add("fir", 5, (new GeneratorTaigaTree.Builder()).log(BOPWoods.FIR).leaves(BOPTrees.FIR).minHeight(5).maxHeight(28).create());
+        treeGenerator.add("mega_fir", 3, (new GeneratorTaigaTree.Builder()).log(BOPWoods.FIR).leaves(BOPTrees.FIR).minHeight(20).maxHeight(40).trunkWidth(2).create());
+        
+        // other plants
+        this.addGenerator("dead_leaf_piles", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(0.7F).placeOn(BlockQueries.darkFertile).with(BlockBOPFlatPlant.PlantType.DEADLEAFPILE).generationAttempts(64).create());
+
+        // shrooms
+        this.addGenerator("toadstools", GeneratorStage.SHROOM,(new GeneratorFlora.Builder()).amountPerChunk(0.3F).generationAttempts(16).with(BlockBOPMushroom.MushroomType.TOADSTOOL).create());
+        this.addGenerator("brown_mushrooms", GeneratorStage.SHROOM,(new GeneratorFlora.Builder()).amountPerChunk(0.2F).generationAttempts(16).with(Blocks.BROWN_MUSHROOM.getDefaultState()).create());
+        this.addGenerator("red_mushrooms", GeneratorStage.SHROOM,(new GeneratorFlora.Builder()).amountPerChunk(0.1F).generationAttempts(16).with(Blocks.RED_MUSHROOM.getDefaultState()).create());
+        
+        // flowers
+        GeneratorWeighted flowerGenerator = new GeneratorWeighted(0.3F);
+        this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator);
+        flowerGenerator.add("dandelion", 1, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.DANDELION).create()));
+        flowerGenerator.add("poppy", 1, (new GeneratorFlora.Builder().with(BlockFlower.EnumFlowerType.POPPY).create()));
+        
+        // grasses
+        GeneratorWeighted grassGenerator = new GeneratorWeighted(1.7F);
+        this.addGenerator("grass", GeneratorStage.GRASS, grassGenerator);
+        grassGenerator.add("tallgrass", 4, (new GeneratorGrass.Builder()).with(BlockTallGrass.EnumType.GRASS).generationAttempts(128).create());
+        grassGenerator.add("shortgrass", 3, (new GeneratorGrass.Builder()).with(BOPFoliage.SHORTGRASS).create());
+        grassGenerator.add("fern", 1, (new GeneratorGrass.Builder()).with(BlockTallGrass.EnumType.FERN).create());
+    }
+}

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCoralReef.java

@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright 2015-2016, the Biomes O' Plenty Team
+ * 
+ * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
+ * 
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
+ ******************************************************************************/
+
+package biomesoplenty.common.biome.overworld;
+
+import biomesoplenty.api.block.BOPBlocks;
+import biomesoplenty.api.generation.GeneratorStage;
+import biomesoplenty.common.block.BlockBOPCoral;
+import biomesoplenty.common.util.biome.BiomeUtils;
+import biomesoplenty.common.util.biome.GeneratorUtils.ScatterYMethod;
+import biomesoplenty.common.world.generator.GeneratorFlora;
+import net.minecraft.init.Biomes;
+import net.minecraft.init.Blocks;
+ 
+public class BiomeGenCoralReef extends BOPOverworldBiome
+{
+    public BiomeGenCoralReef()
+    {
+        super("coral_reef", new PropsBuilder("Coral Reef").withGuiColour(18285));
+        
+        // terrain
+        this.terrainSettings.avgHeight(45).heightVariation(5, 10); 
+    
+        this.canSpawnInBiome = false;
+        this.canGenerateVillages = false;
+        this.canGenerateRivers = false;
+        
+        this.beachBiomeLocation = BiomeUtils.getLocForBiome(Biomes.OCEAN);
+        
+        clearWeights();
+
+        // coral
+        this.addGenerator("pink_coral", GeneratorStage.LILYPAD, (new GeneratorFlora.Builder()).amountPerChunk(15.0F).replace(Blocks.WATER).with(BOPBlocks.coral.getDefaultState().withProperty(BlockBOPCoral.VARIANT, BlockBOPCoral.CoralType.PINK)).scatterYMethod(ScatterYMethod.AT_GROUND).create());
+        this.addGenerator("orange_coral", GeneratorStage.LILYPAD, (new GeneratorFlora.Builder()).amountPerChunk(15.0F).replace(Blocks.WATER).with(BOPBlocks.coral.getDefaultState().withProperty(BlockBOPCoral.VARIANT, BlockBOPCoral.CoralType.ORANGE)).scatterYMethod(ScatterYMethod.AT_GROUND).create());
+        this.addGenerator("blue_coral", GeneratorStage.LILYPAD, (new GeneratorFlora.Builder()).amountPerChunk(15.0F).replace(Blocks.WATER).with(BOPBlocks.coral.getDefaultState().withProperty(BlockBOPCoral.VARIANT, BlockBOPCoral.CoralType.BLUE)).scatterYMethod(ScatterYMethod.AT_GROUND).create());
+        this.addGenerator("glowing_coral", GeneratorStage.LILYPAD, (new GeneratorFlora.Builder()).amountPerChunk(15.0F).replace(Blocks.WATER).with(BOPBlocks.coral.getDefaultState().withProperty(BlockBOPCoral.VARIANT, BlockBOPCoral.CoralType.GLOWING)).scatterYMethod(ScatterYMethod.AT_GROUND).create());
+        this.addGenerator("algae", GeneratorStage.LILYPAD, (new GeneratorFlora.Builder()).amountPerChunk(3.0F).replace(Blocks.WATER).with(BOPBlocks.coral.getDefaultState().withProperty(BlockBOPCoral.VARIANT, BlockBOPCoral.CoralType.ALGAE)).scatterYMethod(ScatterYMethod.AT_GROUND).create());
+    }
+}

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCrag.java

@@ -0,0 +1,64 @@
+/*******************************************************************************
+ * Copyright 2015-2016, the Biomes O' Plenty Team
+ * 
+ * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
+ * 
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
+ ******************************************************************************/
+
+package biomesoplenty.common.biome.overworld;
+
+import biomesoplenty.api.block.BOPBlocks;
+import biomesoplenty.api.block.IBlockPosQuery;
+import biomesoplenty.api.enums.BOPClimates;
+import biomesoplenty.api.enums.BOPFoliage;
+import biomesoplenty.api.generation.GeneratorStage;
+import biomesoplenty.common.block.BlockBOPGrass;
+import biomesoplenty.common.util.biome.GeneratorUtils.ScatterYMethod;
+import biomesoplenty.common.util.block.BlockQuery;
+import biomesoplenty.common.world.generator.GeneratorGrass;
+import biomesoplenty.common.world.generator.GeneratorOreSingle;
+import biomesoplenty.common.world.generator.GeneratorSplatter;
+import biomesoplenty.common.world.generator.GeneratorSplotches;
+import biomesoplenty.common.world.generator.GeneratorWeighted;
+import net.minecraft.block.BlockTallGrass;
+import net.minecraft.init.Blocks;
+
+public class BiomeGenCrag extends BOPOverworldBiome
+{    
+    public BiomeGenCrag()
+    {
+        super("crag", new PropsBuilder("Crag").withGuiColour(0x8AAD9D).withTemperature(0.3F).withRainfall(0.4F));
+        
+        // terrain
+        this.terrainSettings.avgHeight(120).heightVariation(25, 60).octaves(0, 1, 2, 1, 1, 0).sidewaysNoise(0.0F);
+
+        this.canSpawnInBiome = false;
+        this.canGenerateVillages = false;
+        this.canGenerateRivers = false;
+        
+        this.beachBiomeLocation = null;
+
+        this.addWeight(BOPClimates.COOL_TEMPERATE, 1);
+
+        this.spawnableCreatureList.clear();
+        
+        this.topBlock = Blocks.GRAVEL.getDefaultState();
+        this.fillerBlock = Blocks.STONE.getDefaultState();
+        
+        // gravel, cobblestone, overgrown stone
+        IBlockPosQuery surface = BlockQuery.buildAnd().withAirAbove().states(this.topBlock).create();
+        this.addGenerator("overgrown_stone_patches", GeneratorStage.SAND, (new GeneratorSplotches.Builder()).amountPerChunk(24).splotchSize(16).placeOn(surface).replace(surface).with(BOPBlocks.grass.getDefaultState().withProperty(BlockBOPGrass.VARIANT, BlockBOPGrass.BOPGrassType.OVERGROWN_STONE)).scatterYMethod(ScatterYMethod.AT_SURFACE).create());
+        this.addGenerator("cobblestone_splatter", GeneratorStage.SAND, (new GeneratorSplatter.Builder()).amountPerChunk(4.0F).replace(surface).with(Blocks.COBBLESTONE.getDefaultState()).create());
+        this.addGenerator("stone_splatter", GeneratorStage.SAND, (new GeneratorSplatter.Builder()).amountPerChunk(4.0F).replace(surface).with(Blocks.STONE.getDefaultState()).create());
+        
+        // grasses
+        GeneratorWeighted grassGenerator = new GeneratorWeighted(4.0F);
+        this.addGenerator("grass", GeneratorStage.GRASS, grassGenerator);
+        grassGenerator.add("tallgrass", 1, (new GeneratorGrass.Builder()).with(BlockTallGrass.EnumType.GRASS).generationAttempts(128).create());
+        grassGenerator.add("shortgrass", 2, (new GeneratorGrass.Builder()).with(BOPFoliage.SHORTGRASS).create());
+        
+        // gem
+        this.addGenerator("emeralds", GeneratorStage.SAND, (new GeneratorOreSingle.Builder()).amountPerChunk(12).with(Blocks.EMERALD_ORE.getDefaultState()).create());
+    }
+}

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeadForest.java

@@ -0,0 +1,91 @@
+/*******************************************************************************
+ * Copyright 2015-2016, the Biomes O' Plenty Team
+ * 
+ * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
+ * 
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
+ ******************************************************************************/
+
+package biomesoplenty.common.biome.overworld;
+
+import biomesoplenty.api.biome.BOPBiomes;
+import biomesoplenty.api.block.BOPBlocks;
+import biomesoplenty.api.block.BlockQueries;
+import biomesoplenty.api.enums.BOPClimates;
+import biomesoplenty.api.enums.BOPFoliage;
+import biomesoplenty.api.enums.BOPPlants;
+import biomesoplenty.api.enums.BOPTrees;
+import biomesoplenty.api.enums.BOPWoods;
+import biomesoplenty.api.generation.GeneratorStage;
+import biomesoplenty.common.block.BlockBOPDirt;
+import biomesoplenty.common.block.BlockBOPFlatPlant;
+import biomesoplenty.common.block.BlockBOPGrass;
+import biomesoplenty.common.world.generator.GeneratorFlora;
+import biomesoplenty.common.world.generator.GeneratorGrass;
+import biomesoplenty.common.world.generator.GeneratorWaterside;
+import biomesoplenty.common.world.generator.GeneratorWeighted;
+import biomesoplenty.common.world.generator.tree.GeneratorBasicTree;
+import biomesoplenty.common.world.generator.tree.GeneratorBigTree;
+import biomesoplenty.common.world.generator.tree.GeneratorTaigaTree;
+import net.minecraft.block.BlockTallGrass;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.math.BlockPos;
+
+public class BiomeGenDeadForest extends BOPOverworldBiome
+{    
+    public BiomeGenDeadForest()
+    {
+        super("dead_forest", new PropsBuilder("Dead Forest").withGuiColour(0xBCA165).withTemperature(0.3F).withRainfall(0.3F));
+        
+        // terrain
+        this.terrainSettings.avgHeight(68).heightVariation(8, 25);
+        
+        this.topBlock = BOPBlocks.grass.getDefaultState().withProperty(BlockBOPGrass.VARIANT, BlockBOPGrass.BOPGrassType.LOAMY);
+        this.fillerBlock = BOPBlocks.dirt.getDefaultState().withProperty(BlockBOPDirt.VARIANT, BlockBOPDirt.BOPDirtType.LOAMY);
+        
+        this.canSpawnInBiome = false;
+        this.canGenerateVillages = false;
+        
+        if (BOPBiomes.gravel_beach.isPresent())
+        {
+        	this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
+        }
+        
+        this.addWeight(BOPClimates.BOREAL, 3);
+        this.addWeight(BOPClimates.DRY_TEMPERATE, 3);
+        
+        // gravel
+        this.addGenerator("gravel", GeneratorStage.SAND_PASS2, (new GeneratorWaterside.Builder()).amountPerChunk(4).maxRadius(7).with(Blocks.GRAVEL.getDefaultState()).create());
+
+        // trees
+        GeneratorWeighted treeGenerator = new GeneratorWeighted(2.5F);
+        this.addGenerator("trees", GeneratorStage.TREE, treeGenerator);
+        treeGenerator.add("spruce", 3, (new GeneratorTaigaTree.Builder()).minHeight(6).maxHeight(16).create());
+        treeGenerator.add("dying_tree", 5, (new GeneratorBigTree.Builder()).minHeight(5).maxHeight(12).foliageHeight(2).leaves(BOPTrees.DEAD).create());
+        treeGenerator.add("oak", 3, (new GeneratorBasicTree.Builder()).leaves(BOPTrees.DEAD).create());
+        treeGenerator.add("dead_tree", 1, (new GeneratorBigTree.Builder()).minHeight(5).maxHeight(12).foliageHeight(0).foliageDensity(0.5D).log(BOPWoods.DEAD).leaves(Blocks.AIR.getDefaultState()).create());
+        
+        // other plants
+        this.addGenerator("thorns", GeneratorStage.FLOWERS, (new GeneratorFlora.Builder()).amountPerChunk(0.25F).with(BOPPlants.THORN).create());
+        this.addGenerator("water_reeds", GeneratorStage.LILYPAD, (new GeneratorFlora.Builder()).amountPerChunk(0.8F).with(BOPPlants.REED).generationAttempts(32).create());
+        this.addGenerator("dead_leaf_piles", GeneratorStage.FLOWERS, (new GeneratorFlora.Builder()).amountPerChunk(3.0F).placeOn(BlockQueries.darkFertile).with(BlockBOPFlatPlant.PlantType.DEADLEAFPILE).generationAttempts(64).create());        
+        
+        // grasses
+        GeneratorWeighted grassGenerator = new GeneratorWeighted(2.0F);
+        this.addGenerator("grass", GeneratorStage.GRASS, grassGenerator);
+        grassGenerator.add("shortgrass", 10, (new GeneratorGrass.Builder()).with(BOPFoliage.SHORTGRASS).create());
+        grassGenerator.add("dead_bushes", 1, (new GeneratorGrass.Builder()).with(BlockTallGrass.EnumType.DEAD_BUSH).create());
+    }
+    
+    @Override
+    public int getGrassColorAtPos(BlockPos pos)
+    {
+        return getModdedBiomeGrassColor(0xBCA165);
+    }
+    
+    @Override
+    public int getFoliageColorAtPos(BlockPos pos)
+    {
+        return getModdedBiomeFoliageColor(0xBCA165);
+    }
+}

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeadPlains.java

@@ -0,0 +1,89 @@
+/*******************************************************************************
+ * Copyright 2015-2016, the Biomes O' Plenty Team
+ * 
+ * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
+ * 
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
+ ******************************************************************************/
+
+package biomesoplenty.common.biome.overworld;
+
+import biomesoplenty.api.biome.BOPBiomes;
+import biomesoplenty.api.block.BOPBlocks;
+import biomesoplenty.api.block.BlockQueries;
+import biomesoplenty.api.enums.BOPClimates;
+import biomesoplenty.api.enums.BOPFoliage;
+import biomesoplenty.api.enums.BOPPlants;
+import biomesoplenty.api.enums.BOPTrees;
+import biomesoplenty.api.enums.BOPWoods;
+import biomesoplenty.api.generation.GeneratorStage;
+import biomesoplenty.common.block.BlockBOPDirt;
+import biomesoplenty.common.block.BlockBOPFlatPlant;
+import biomesoplenty.common.block.BlockBOPGrass;
+import biomesoplenty.common.world.generator.GeneratorFlora;
+import biomesoplenty.common.world.generator.GeneratorGrass;
+import biomesoplenty.common.world.generator.GeneratorWaterside;
+import biomesoplenty.common.world.generator.GeneratorWeighted;
+import biomesoplenty.common.world.generator.tree.GeneratorBasicTree;
+import biomesoplenty.common.world.generator.tree.GeneratorBigTree;
+import biomesoplenty.common.world.generator.tree.GeneratorTaigaTree;
+import net.minecraft.block.BlockTallGrass;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.math.BlockPos;
+
+public class BiomeGenDeadPlains extends BOPOverworldBiome
+{    
+    public BiomeGenDeadPlains()
+    {
+        super("dead_plains", new PropsBuilder("Dead Plains").withGuiColour(0xD6BA7E).withTemperature(0.3F).withRainfall(0.3F));
+        
+        // terrain
+        this.terrainSettings.avgHeight(67).heightVariation(6, 6);
+        
+        this.topBlock = BOPBlocks.grass.getDefaultState().withProperty(BlockBOPGrass.VARIANT, BlockBOPGrass.BOPGrassType.LOAMY);
+        this.fillerBlock = BOPBlocks.dirt.getDefaultState().withProperty(BlockBOPDirt.VARIANT, BlockBOPDirt.BOPDirtType.LOAMY);
+        
+        this.canSpawnInBiome = false;
+        this.canGenerateVillages = false;
+        
+        if (BOPBiomes.gravel_beach.isPresent())
+        {
+        	this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
+        }
+        
+        this.clearWeights();
+        
+        // gravel
+        this.addGenerator("gravel", GeneratorStage.SAND_PASS2, (new GeneratorWaterside.Builder()).amountPerChunk(4).maxRadius(7).with(Blocks.GRAVEL.getDefaultState()).create());
+
+        // trees
+        GeneratorWeighted treeGenerator = new GeneratorWeighted(0.2F);
+        this.addGenerator("trees", GeneratorStage.TREE, treeGenerator);
+        treeGenerator.add("oak", 3, (new GeneratorBasicTree.Builder()).leaves(BOPTrees.DEAD).create());
+        treeGenerator.add("dead_tree", 1, (new GeneratorBigTree.Builder()).minHeight(5).maxHeight(12).foliageHeight(0).foliageDensity(0.5D).log(BOPWoods.DEAD).leaves(Blocks.AIR.getDefaultState()).create());
+        
+        // other plants
+        this.addGenerator("thorns", GeneratorStage.FLOWERS, (new GeneratorFlora.Builder()).amountPerChunk(0.1F).with(BOPPlants.THORN).create());
+        this.addGenerator("water_reeds", GeneratorStage.LILYPAD, (new GeneratorFlora.Builder()).amountPerChunk(1.0F).with(BOPPlants.REED).generationAttempts(32).create());
+        this.addGenerator("dead_leaf_piles", GeneratorStage.FLOWERS, (new GeneratorFlora.Builder()).amountPerChunk(0.5F).placeOn(BlockQueries.darkFertile).with(BlockBOPFlatPlant.PlantType.DEADLEAFPILE).generationAttempts(64).create());        
+        
+        // grasses
+        GeneratorWeighted grassGenerator = new GeneratorWeighted(4.5F);
+        this.addGenerator("grass", GeneratorStage.GRASS, grassGenerator);
+        grassGenerator.add("shortgrass", 15, (new GeneratorGrass.Builder()).with(BOPFoliage.SHORTGRASS).create());
+        grassGenerator.add("tallgrass", 5, (new GeneratorGrass.Builder()).with(BlockTallGrass.EnumType.GRASS).create());
+        grassGenerator.add("dead_bushes", 1, (new GeneratorGrass.Builder()).with(BlockTallGrass.EnumType.DEAD_BUSH).create());
+    }
+    
+    @Override
+    public int getGrassColorAtPos(BlockPos pos)
+    {
+        return getModdedBiomeGrassColor(0xBCA165);
+    }
+    
+    @Override
+    public int getFoliageColorAtPos(BlockPos pos)
+    {
+        return getModdedBiomeFoliageColor(0xBCA165);
+    }
+}

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeadSwamp.java

@@ -0,0 +1,103 @@
+/*******************************************************************************
+ * Copyright 2015-2016, the Biomes O' Plenty Team
+ * 
+ * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
+ * 
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
+ ******************************************************************************/
+
+package biomesoplenty.common.biome.overworld;
+
+import java.util.Random;
+
+import biomesoplenty.api.block.BOPBlocks;
+import biomesoplenty.api.enums.BOPClimates;
+import biomesoplenty.api.enums.BOPFoliage;
+import biomesoplenty.api.enums.BOPPlants;
+import biomesoplenty.api.enums.BOPTrees;
+import biomesoplenty.api.enums.BOPWoods;
+import biomesoplenty.api.generation.GeneratorStage;
+import biomesoplenty.common.block.BlockBOPCoral;
+import biomesoplenty.common.block.BlockBOPDirt;
+import biomesoplenty.common.block.BlockBOPGrass;
+import biomesoplenty.common.util.biome.GeneratorUtils.ScatterYMethod;
+import biomesoplenty.common.world.generator.GeneratorFlora;
+import biomesoplenty.common.world.generator.GeneratorGrass;
+import biomesoplenty.common.world.generator.GeneratorSplotches;
+import biomesoplenty.common.world.generator.GeneratorWaterside;
+import biomesoplenty.common.world.generator.GeneratorWeighted;
+import biomesoplenty.common.world.generator.tree.GeneratorBigTree;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+import net.minecraft.world.gen.feature.WorldGenFossils;
+
+public class BiomeGenDeadSwamp extends BOPOverworldBiome
+{
+    
+    public BiomeGenDeadSwamp()
+    {
+        super("dead_swamp", new PropsBuilder("Dead Swamp").withGuiColour(0x8BAF48).withTemperature(0.6F).withRainfall(0.9F).withWaterColor(0xA2AD51));
+        
+        // terrain
+        this.terrainSettings.avgHeight(63).heightVariation(6, 3);
+
+        //this.skyColor = 0x627268;
+        this.topBlock = BOPBlocks.grass.getDefaultState().withProperty(BlockBOPGrass.VARIANT, BlockBOPGrass.BOPGrassType.LOAMY);
+        this.fillerBlock = BOPBlocks.dirt.getDefaultState().withProperty(BlockBOPDirt.VARIANT, BlockBOPDirt.BOPDirtType.LOAMY);
+        this.seaFloorBlock = BOPBlocks.mud.getDefaultState();
+        
+        this.canSpawnInBiome = false;
+        this.canGenerateRivers = false;
+        this.canGenerateVillages = false;
+        
+        this.beachBiomeLocation = null;
+
+        this.addWeight(BOPClimates.COLD_SWAMP, 3);
+        
+        this.spawnableCreatureList.clear();
+
+        // mud
+        this.addGenerator("mud", GeneratorStage.SAND_PASS2, (new GeneratorWaterside.Builder()).amountPerChunk(8).maxRadius(7).with(BOPBlocks.mud.getDefaultState()).create());
+        this.addGenerator("mud_patches", GeneratorStage.SAND_PASS2, (new GeneratorSplotches.Builder()).amountPerChunk(1).splotchSize(12).replace(this.topBlock).with(BOPBlocks.mud.getDefaultState()).scatterYMethod(ScatterYMethod.AT_SURFACE).create());
+        
+        // trees
+        GeneratorWeighted treeGenerator = new GeneratorWeighted(0.6F);
+        this.addGenerator("trees", GeneratorStage.TREE, treeGenerator);
+        treeGenerator.add("dying_tree", 3, (new GeneratorBigTree.Builder()).minHeight(5).maxHeight(12).foliageHeight(1).log(BOPWoods.DEAD).leaves(BOPTrees.DEAD).create());
+        treeGenerator.add("dead_tree", 1, (new GeneratorBigTree.Builder()).minHeight(5).maxHeight(12).foliageHeight(0).foliageDensity(0.5D).log(BOPWoods.DEAD).leaves(Blocks.AIR.getDefaultState()).create());
+        
+        // water plants
+        this.addGenerator("water_reeds", GeneratorStage.LILYPAD, (new GeneratorFlora.Builder()).amountPerChunk(0.5F).with(BOPPlants.REED).generationAttempts(32).create());
+        this.addGenerator("algae", GeneratorStage.LILYPAD, (new GeneratorFlora.Builder()).amountPerChunk(0.5F).replace(Blocks.WATER).with(BOPBlocks.coral.getDefaultState().withProperty(BlockBOPCoral.VARIANT, BlockBOPCoral.CoralType.ALGAE)).generationAttempts(32).scatterYMethod(ScatterYMethod.AT_GROUND).create());
+
+        // grasses
+        GeneratorWeighted grassGenerator = new GeneratorWeighted(1.4F);
+        this.addGenerator("grass", GeneratorStage.GRASS, grassGenerator);
+        grassGenerator.add("shortgrass", 4, (new GeneratorGrass.Builder()).with(BOPFoliage.SHORTGRASS).create());
+    }
+    
+    @Override
+    public void decorate(World worldIn, Random rand, BlockPos pos)
+    {
+        super.decorate(worldIn, rand, pos);
+
+        if(net.minecraftforge.event.terraingen.TerrainGen.decorate(worldIn, rand, pos, net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.FOSSIL))
+        if (rand.nextInt(64) == 0)
+        {
+            (new WorldGenFossils()).generate(worldIn, rand, pos);
+        }
+    }
+    
+    @Override
+    public int getGrassColorAtPos(BlockPos pos)
+    {
+        return getModdedBiomeGrassColor(0x66704C);
+    }
+    
+    @Override
+    public int getFoliageColorAtPos(BlockPos pos)
+    {
+        return getModdedBiomeFoliageColor(0x66704C);
+    }
+}

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFen.java

@@ -0,0 +1,121 @@
+/*******************************************************************************
+ * Copyright 2015-2016, the Biomes O' Plenty Team
+ * 
+ * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
+ * 
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
+ ******************************************************************************/
+
+package biomesoplenty.common.biome.overworld;
+
+import java.util.Random;
+
+import biomesoplenty.api.biome.BOPBiomes;
+import biomesoplenty.api.block.BOPBlocks;
+import biomesoplenty.api.block.BlockQueries;
+import biomesoplenty.api.enums.BOPClimates;
+import biomesoplenty.api.enums.BOPFoliage;
+import biomesoplenty.api.enums.BOPPlants;
+import biomesoplenty.api.enums.BOPTrees;
+import biomesoplenty.api.generation.GeneratorStage;
+import biomesoplenty.common.block.BlockBOPDirt;
+import biomesoplenty.common.block.BlockBOPDoublePlant;
+import biomesoplenty.common.block.BlockBOPFlatPlant;
+import biomesoplenty.common.block.BlockBOPGrass;
+import biomesoplenty.common.block.BlockBOPMushroom;
+import biomesoplenty.common.world.generator.GeneratorDoubleFlora;
+import biomesoplenty.common.world.generator.GeneratorFlora;
+import biomesoplenty.common.world.generator.GeneratorGrass;
+import biomesoplenty.common.world.generator.GeneratorWaterside;
+import biomesoplenty.common.world.generator.GeneratorWeighted;
+import biomesoplenty.common.world.generator.tree.GeneratorBigTree;
+import biomesoplenty.common.world.generator.tree.GeneratorTwigletTree;
+import net.minecraft.block.BlockDoublePlant;
+import net.minecraft.block.BlockPlanks;
+import net.minecraft.block.BlockTallGrass;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+import net.minecraft.world.gen.feature.WorldGenFossils;
+
+public class BiomeGenFen extends BOPOverworldBiome
+{
+        
+    public BiomeGenFen()
+    {
+        super("fen", new PropsBuilder("Fen").withGuiColour(0xBAC481).withTemperature(0.4F).withRainfall(0.4F));
+
+        // terrain
+        this.terrainSettings.avgHeight(63).heightVariation(8, 6).octaves(1, 4, 3, 1, 1, 0);
+        
+        this.topBlock = BOPBlocks.grass.getDefaultState().withProperty(BlockBOPGrass.VARIANT, BlockBOPGrass.BOPGrassType.LOAMY);
+        this.fillerBlock = BOPBlocks.dirt.getDefaultState().withProperty(BlockBOPDirt.VARIANT, BlockBOPDirt.BOPDirtType.LOAMY);
+        
+        this.canSpawnInBiome = false;
+        this.canGenerateRivers = false;
+        this.canGenerateVillages = false;
+        
+        if (BOPBiomes.gravel_beach.isPresent())
+        {
+        	this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
+        }
+
+        this.addWeight(BOPClimates.COLD_SWAMP, 5);
+
+        // mud
+        this.addGenerator("mud", GeneratorStage.SAND_PASS2, (new GeneratorWaterside.Builder()).amountPerChunk(1).maxRadius(7).with(BOPBlocks.mud.getDefaultState()).create());
+        
+        // trees and logs
+        GeneratorWeighted treeGenerator = new GeneratorWeighted(6);
+        this.addGenerator("trees", GeneratorStage.TREE, treeGenerator);
+        treeGenerator.add("oak_tree", 1, (new GeneratorTwigletTree.Builder()).leaves(BOPTrees.DEAD).minHeight(5).maxHeight(10).leafChance(0.3F, 0.9F).create());
+        treeGenerator.add("dark_oak_tree", 7, (new GeneratorBigTree.Builder()).log(BlockPlanks.EnumType.DARK_OAK).leaves(BlockPlanks.EnumType.DARK_OAK).foliageHeight(3).maxHeight(12).create());
+        treeGenerator.add("birch_twiglet", 1, (new GeneratorTwigletTree.Builder()).log(BlockPlanks.EnumType.BIRCH).leaves(BlockPlanks.EnumType.BIRCH).minHeight(2).maxHeight(4).leafChance(0.3F, 0.9F).create());
+        
+        // grasses
+        GeneratorWeighted grassGenerator = new GeneratorWeighted(5.0F);
+        this.addGenerator("grass", GeneratorStage.GRASS, grassGenerator);
+        grassGenerator.add("shortgrass", 4, (new GeneratorGrass.Builder()).with(BOPFoliage.SHORTGRASS).create());
+        grassGenerator.add("tallgrass", 2, (new GeneratorGrass.Builder()).with(BlockTallGrass.EnumType.GRASS).create());
+        grassGenerator.add("doublegrass", 3, (new GeneratorDoubleFlora.Builder()).with(BlockDoublePlant.EnumPlantType.GRASS).create());
+         
+        // other plants
+        this.addGenerator("cattail", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(0.25F).with(BOPPlants.CATTAIL).create());
+        this.addGenerator("double_cattail", GeneratorStage.FLOWERS,(new GeneratorDoubleFlora.Builder()).amountPerChunk(0.25F).with(BlockBOPDoublePlant.DoublePlantType.TALL_CATTAIL).create());
+        this.addGenerator("dead_leaf_piles", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(1.5F).placeOn(BlockQueries.darkFertile).with(BlockBOPFlatPlant.PlantType.DEADLEAFPILE).generationAttempts(64).create());
+        
+        // water plants
+        this.addGenerator("water_reeds", GeneratorStage.LILYPAD, (new GeneratorFlora.Builder()).amountPerChunk(10.0F).with(BOPPlants.REED).generationAttempts(32).create());
+        this.addGenerator("watergrass", GeneratorStage.LILYPAD, (new GeneratorFlora.Builder()).amountPerChunk(5.0F).with(BOPPlants.WATERGRASS).generationAttempts(32).create());
+        this.addGenerator("lily", GeneratorStage.LILYPAD, (new GeneratorFlora.Builder()).amountPerChunk(0.1F).with(Blocks.WATERLILY.getDefaultState()).create());
+        
+        // shrooms
+        this.addGenerator("toadstools", GeneratorStage.SHROOM,(new GeneratorFlora.Builder()).amountPerChunk(0.2F).generationAttempts(16).with(BlockBOPMushroom.MushroomType.TOADSTOOL).create());
+        this.addGenerator("brown_mushrooms", GeneratorStage.SHROOM,(new GeneratorFlora.Builder()).amountPerChunk(0.4F).generationAttempts(16).with(Blocks.BROWN_MUSHROOM.getDefaultState()).create());
+        this.addGenerator("red_mushrooms", GeneratorStage.SHROOM,(new GeneratorFlora.Builder()).amountPerChunk(0.4F).generationAttempts(16).with(Blocks.RED_MUSHROOM.getDefaultState()).create());
+    }
+    
+    @Override
+    public void decorate(World worldIn, Random rand, BlockPos pos)
+    {
+        super.decorate(worldIn, rand, pos);
+
+        if(net.minecraftforge.event.terraingen.TerrainGen.decorate(worldIn, rand, pos, net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.FOSSIL))
+        if (rand.nextInt(64) == 0)
+        {
+            (new WorldGenFossils()).generate(worldIn, rand, pos);
+        }
+    }
+    
+    @Override
+    public int getGrassColorAtPos(BlockPos pos)
+    {
+        return getModdedBiomeGrassColor(0xC1BE7F);
+    }
+
+    @Override
+    public int getFoliageColorAtPos(BlockPos pos)
+    {
+        return getModdedBiomeFoliageColor(0xABBF65);
+    }
+}

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFloodplains.java

@@ -0,0 +1,82 @@
+package biomesoplenty.common.biome.overworld;
+
+import java.util.Random;
+
+import biomesoplenty.api.biome.BOPBiomes;
+import biomesoplenty.api.block.BOPBlocks;
+import biomesoplenty.api.block.BlockQueries;
+import biomesoplenty.api.enums.BOPClimates;
+import biomesoplenty.api.enums.BOPFlowers;
+import biomesoplenty.api.enums.BOPPlants;
+import biomesoplenty.api.generation.GeneratorStage;
+import biomesoplenty.common.block.BlockBOPCoral;
+import biomesoplenty.common.util.biome.GeneratorUtils.ScatterYMethod;
+import biomesoplenty.common.world.generator.GeneratorDoubleFlora;
+import biomesoplenty.common.world.generator.GeneratorFlora;
+import biomesoplenty.common.world.generator.GeneratorGrass;
+import biomesoplenty.common.world.generator.GeneratorWaterside;
+import biomesoplenty.common.world.generator.GeneratorWeighted;
+import biomesoplenty.common.world.generator.tree.GeneratorBasicTree;
+import biomesoplenty.common.world.generator.tree.GeneratorBigTree;
+import biomesoplenty.common.world.generator.tree.GeneratorBush;
+import biomesoplenty.common.world.generator.tree.GeneratorMahoganyTree;
+import net.minecraft.block.BlockDoublePlant;
+import net.minecraft.block.BlockFlower;
+import net.minecraft.block.BlockPlanks;
+import net.minecraft.block.BlockTallGrass;
+import net.minecraft.entity.passive.EntityOcelot;
+import net.minecraft.entity.passive.EntityParrot;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+import net.minecraft.world.gen.feature.WorldGenFossils;
+
+public class BiomeGenFloodplains extends BOPOverworldBiome
+{
+    
+    public BiomeGenFloodplains()
+    {
+        super("floodplains", new PropsBuilder("Floodplains").withGuiColour(0x88E140).withTemperature(0.85F).withRainfall(1.2F).withWaterColor(0xE1FFD1));
+
+        // terrain
+        this.terrainSettings.avgHeight(61).heightVariation(3, 3).octaves(5, 5, 0, 0, 1, 1);
+        
+        this.canSpawnInBiome = false;
+        this.canGenerateRivers = false;
+        this.canGenerateVillages = false;
+
+        this.addWeight(BOPClimates.TROPICAL, 5);
+        
+        this.beachBiomeLocation = null;
+        
+        this.spawnableCreatureList.clear();
+
+        //trees
+        GeneratorWeighted treeGenerator = new GeneratorWeighted(7.0F);
+        this.addGenerator("trees", GeneratorStage.TREE, treeGenerator);
+        treeGenerator.add("jungle_tree", 1, (new GeneratorBigTree.Builder()).log(BlockPlanks.EnumType.JUNGLE).leaves(BlockPlanks.EnumType.JUNGLE).minHeight(7).maxHeight(12).foliageHeight(2).scatterYMethod(ScatterYMethod.AT_GROUND).create());
+        treeGenerator.add("oak_bush", 8, (new GeneratorBush.Builder()).maxHeight(2).create());
+        
+        // grasses
+        GeneratorWeighted grassGenerator = new GeneratorWeighted(3.5F);
+        this.addGenerator("grass", GeneratorStage.GRASS, grassGenerator);
+        grassGenerator.add("tallgrass", 5, (new GeneratorGrass.Builder()).with(BlockTallGrass.EnumType.GRASS).generationAttempts(128).create());
+        
+        // water plants
+        this.addGenerator("lily", GeneratorStage.LILYPAD, (new GeneratorFlora.Builder()).amountPerChunk(5.0F).with(Blocks.WATERLILY.getDefaultState()).create());
+        this.addGenerator("algae", GeneratorStage.LILYPAD, (new GeneratorFlora.Builder()).amountPerChunk(8.0F).replace(Blocks.WATER).with(BOPBlocks.coral.getDefaultState().withProperty(BlockBOPCoral.VARIANT, BlockBOPCoral.CoralType.ALGAE)).scatterYMethod(ScatterYMethod.AT_GROUND).create());   
+        this.addGenerator("watergrass", GeneratorStage.LILYPAD, (new GeneratorFlora.Builder()).amountPerChunk(5.0F).with(BOPPlants.WATERGRASS).generationAttempts(32).create());
+    }
+    
+    @Override
+    public void decorate(World worldIn, Random rand, BlockPos pos)
+    {
+        super.decorate(worldIn, rand, pos);
+
+        if(net.minecraftforge.event.terraingen.TerrainGen.decorate(worldIn, rand, pos, net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.FOSSIL))
+        if (rand.nextInt(64) == 0)
+        {
+            (new WorldGenFossils()).generate(worldIn, rand, pos);
+        }
+    }
+}

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFlowerMeadow.java

@@ -0,0 +1,87 @@
+/*******************************************************************************
+ * Copyright 2015-2016, the Biomes O' Plenty Team
+ * 
+ * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
+ * 
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
+ ******************************************************************************/
+
+package biomesoplenty.common.biome.overworld;
+
+import biomesoplenty.api.biome.BOPBiomes;
+import biomesoplenty.api.enums.BOPFoliage;
+import biomesoplenty.api.generation.GeneratorStage;
+import biomesoplenty.common.block.BlockBOPDoublePlant;
+import biomesoplenty.common.world.generator.GeneratorDoubleFlora;
+import biomesoplenty.common.world.generator.GeneratorFlora;
+import biomesoplenty.common.world.generator.GeneratorGrass;
+import biomesoplenty.common.world.generator.GeneratorWeighted;
+import biomesoplenty.common.world.generator.tree.GeneratorBush;
+import biomesoplenty.common.world.generator.tree.GeneratorTaigaTree;
+import net.minecraft.block.BlockDoublePlant;
+import net.minecraft.block.BlockFlower.EnumFlowerType;
+import net.minecraft.block.BlockTallGrass;
+import net.minecraft.util.math.BlockPos;
+
+public class BiomeGenFlowerMeadow extends BOPOverworldBiome
+{    
+    public BiomeGenFlowerMeadow()
+    {
+        super("flower_meadow", new PropsBuilder("Flower Meadow").withGuiColour(0x75D17F).withTemperature(0.4F).withRainfall(0.7F));
+
+        // terrain
+        this.terrainSettings.avgHeight(64).heightVariation(5, 5).octaves(0, 1, 2, 2, 1, 0).sidewaysNoise(0.1D);
+
+        this.clearWeights();
+        
+        this.canGenerateVillages = false;
+        
+        if (BOPBiomes.gravel_beach.isPresent())
+        {
+        	this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
+        }
+        
+        // trees & logs
+        GeneratorWeighted treeGenerator = new GeneratorWeighted(2.0F);
+        this.addGenerator("trees", GeneratorStage.TREE, treeGenerator);
+        treeGenerator.add("oak_bush", 3, (new GeneratorBush.Builder()).maxHeight(2).create());
+        treeGenerator.add("spruce", 1, (new GeneratorTaigaTree.Builder()).maxHeight(13).create());
+       
+        // flowers
+        GeneratorWeighted flowerGenerator = new GeneratorWeighted(20.0F);
+        this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator);
+        flowerGenerator.add("pink_tulip", 6, (new GeneratorFlora.Builder().with(EnumFlowerType.PINK_TULIP).create()));
+        flowerGenerator.add("white_tulip", 9, (new GeneratorFlora.Builder().with(EnumFlowerType.WHITE_TULIP).create()));
+        flowerGenerator.add("orange_tulip", 11, (new GeneratorFlora.Builder().with(EnumFlowerType.ORANGE_TULIP).create()));
+        flowerGenerator.add("red_tulip", 14, (new GeneratorFlora.Builder().with(EnumFlowerType.RED_TULIP).create()));
+        flowerGenerator.add("oxeye_daisy", 3, (new GeneratorFlora.Builder().with(EnumFlowerType.OXEYE_DAISY).create()));
+        flowerGenerator.add("dandelion", 3, (new GeneratorFlora.Builder().with(EnumFlowerType.DANDELION).create()));
+        flowerGenerator.add("poppy", 3, (new GeneratorFlora.Builder().with(EnumFlowerType.POPPY).create()));
+        flowerGenerator.add("houstonia", 2, (new GeneratorFlora.Builder().with(EnumFlowerType.HOUSTONIA).create()));
+        flowerGenerator.add("rose", 3, (new GeneratorDoubleFlora.Builder()).amountPerChunk(1).with(BlockDoublePlant.EnumPlantType.ROSE).create());
+        flowerGenerator.add("syringa", 1, (new GeneratorDoubleFlora.Builder()).amountPerChunk(1).with(BlockDoublePlant.EnumPlantType.SYRINGA).create());
+        flowerGenerator.add("sunflower", 2, (new GeneratorDoubleFlora.Builder().with(BlockDoublePlant.EnumPlantType.SUNFLOWER).create()));
+        
+        // grasses
+        GeneratorWeighted grassGenerator = new GeneratorWeighted(12.0F);
+        this.addGenerator("grass", GeneratorStage.GRASS, grassGenerator);
+        grassGenerator.add("shortgrass", 1, (new GeneratorGrass.Builder()).with(BOPFoliage.SHORTGRASS).create());
+        grassGenerator.add("tallgrass", 2, (new GeneratorGrass.Builder()).with(BlockTallGrass.EnumType.GRASS).create());
+        
+        // other plants
+        this.addGenerator("bushes", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(0.1F).with(BOPFoliage.BUSH).create());
+        this.addGenerator("flax", GeneratorStage.FLOWERS,(new GeneratorDoubleFlora.Builder()).amountPerChunk(0.3F).with(BlockBOPDoublePlant.DoublePlantType.FLAX).generationAttempts(6).create());
+    }
+    
+    @Override
+    public int getGrassColorAtPos(BlockPos pos)
+    {
+        return getModdedBiomeGrassColor(0x63B26D);
+    }
+    
+    @Override
+    public int getFoliageColorAtPos(BlockPos pos)
+    {
+        return getModdedBiomeFoliageColor(0x63B26D);
+    }
+}

src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrassland.java

@@ -0,0 +1,85 @@
+/*******************************************************************************
+ * Copyright 2015-2016, the Biomes O' Plenty Team
+ * 
+ * This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International Public License.
+ * 
+ * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
+ ******************************************************************************/
+
+package biomesoplenty.common.biome.overworld;
+
+import biomesoplenty.api.biome.BOPBiomes;
+import biomesoplenty.api.block.BlockQueries;
+import biomesoplenty.api.enums.BOPClimates;
+import biomesoplenty.api.enums.BOPFoliage;
+import biomesoplenty.api.enums.BOPPlants;
+import biomesoplenty.api.generation.GeneratorStage;
+import biomesoplenty.common.block.BlockBOPDoublePlant;
+import biomesoplenty.common.world.generator.GeneratorColumns;
+import biomesoplenty.common.world.generator.GeneratorDoubleFlora;
+import biomesoplenty.common.world.generator.GeneratorFlora;
+import biomesoplenty.common.world.generator.GeneratorGrass;
+import biomesoplenty.common.world.generator.GeneratorLakes;
+import biomesoplenty.common.world.generator.GeneratorWaterside;
+import biomesoplenty.common.world.generator.GeneratorWeighted;
+import net.minecraft.block.BlockTallGrass;
+import net.minecraft.entity.passive.EntityDonkey;
+import net.minecraft.entity.passive.EntityHorse;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.math.BlockPos;
+
+public class BiomeGenGrassland extends BOPOverworldBiome {
+    
+    public BiomeGenGrassland() {
+
+        super("grassland", new PropsBuilder("Grassland").withGuiColour(0x8DD882).withTemperature(0.6F).withRainfall(0.7F));
+
+        // terrain
+        this.terrainSettings.avgHeight(64).heightVariation(6, 25).octaves(0, 1, 2, 2, 1, 0).sidewaysNoise(0.1D);
+
+        this.addWeight(BOPClimates.COOL_TEMPERATE, 5);
+        this.addWeight(BOPClimates.WET_TEMPERATE, 3);
+        
+        if (BOPBiomes.gravel_beach.isPresent())
+        {
+        	this.beachBiomeLocation = ((BOPOverworldBiome)BOPBiomes.gravel_beach.get()).getResourceLocation();
+        }
+        
+        this.canGenerateVillages = true;
+        
+        this.spawnableCreatureList.add(new SpawnListEntry(EntityHorse.class, 5, 2, 6));
+        this.spawnableCreatureList.add(new SpawnListEntry(EntityDonkey.class, 1, 1, 1));
+        
+        // lakes
+        this.addGenerator("lakes", GeneratorStage.SAND, (new GeneratorLakes.Builder()).waterLakeForBiome(this).amountPerChunk(0.2F).create());
+        
+        // sand and gravel
+        this.addGenerator("sand", GeneratorStage.SAND_PASS2, (new GeneratorWaterside.Builder()).amountPerChunk(3).maxRadius(7).with(Blocks.SAND.getDefaultState()).create());
+        this.addGenerator("gravel", GeneratorStage.SAND_PASS2, (new GeneratorWaterside.Builder()).amountPerChunk(4).maxRadius(7).with(Blocks.GRAVEL.getDefaultState()).create());
+                
+        // other plants
+        this.addGenerator("sugar_cane", GeneratorStage.FLOWERS,(new GeneratorColumns.Builder()).amountPerChunk(4.0F).generationAttempts(24).placeOn(BlockQueries.litFertileWaterside).with(Blocks.REEDS.getDefaultState()).minHeight(1).maxHeight(3).create());
+        this.addGenerator("flax", GeneratorStage.FLOWERS,(new GeneratorDoubleFlora.Builder()).amountPerChunk(0.1F).with(BlockBOPDoublePlant.DoublePlantType.FLAX).generationAttempts(6).create());
+        
+        // water plants
+        this.addGenerator("water_reeds", GeneratorStage.LILYPAD,(new GeneratorFlora.Builder()).amountPerChunk(0.3F).with(BOPPlants.REED).generationAttempts(32).create());  
+        
+        // grasses
+        GeneratorWeighted grassGenerator = new GeneratorWeighted(0.6F);
+        this.addGenerator("grass", GeneratorStage.GRASS, grassGenerator);
+        grassGenerator.add("shortgrass", 1, (new GeneratorGrass.Builder()).with(BOPFoliage.SHORTGRASS).create());
+        grassGenerator.add("tallgrass", 4, (new GeneratorGrass.Builder()).with(BlockTallGrass.EnumType.GRASS).create());
+    }
+    
+    @Override
+    public int getGrassColorAtPos(BlockPos pos)
+    {
+        return getModdedBiomeGrassColor(0x8DD882);
+    }
+    
+    @Override
+    public int getFoliageColorAtPos(BlockPos pos)
+    {
+        return getModdedBiomeFoliageColor(0x85CC6E);
+    }
+}