Readded configurable biome gen

This commit is contained in:
Adubbz 2014-01-16 20:46:37 +11:00
parent d4ea26833c
commit ab3f000e4c
9 changed files with 110 additions and 281 deletions

View File

@ -2,6 +2,7 @@ package biomesoplenty;
import net.minecraft.creativetab.CreativeTabs;
import biomesoplenty.common.configuration.BOPConfiguration;
import biomesoplenty.common.configuration.BOPConfigurationBiomeGen;
import biomesoplenty.common.configuration.BOPConfigurationWorldFeatures;
import biomesoplenty.common.configuration.structures.BOPConfigurationStrongholds;
import biomesoplenty.common.configuration.structures.BOPConfigurationVillages;
@ -56,6 +57,7 @@ public class BiomesOPlenty
BOPArmor.init();
BOPCrafting.init();
BOPBiomes.init();
BOPConfigurationBiomeGen.init(BOPConfiguration.biomeGenConfigFile);
BOPConfigurationVillages.init(BOPConfiguration.villagesConfigFile);
BOPConfigurationStrongholds.init(BOPConfiguration.strongholdsConfigFile);
WorldGenFieldAssociation.init();

View File

@ -3,24 +3,32 @@ package biomesoplenty.api;
import java.util.ArrayList;
import java.util.HashMap;
import net.minecraft.world.biome.BiomeGenBase;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.text.WordUtils;
import net.minecraft.world.biome.BiomeGenBase;
import biomesoplenty.common.world.GenLayerBiomeBOP;
public class BOPBiomeHelper
{
public static HashMap<String, BiomeGenBase> biomeList = new HashMap();
public static HashMap<String, BOPBiomeListEntry> biomeList = new HashMap();
public static void registerBiome(BiomeGenBase biome, String name)
public static void registerBiome(BOPBiomeListEntry biome, String name)
{
biomeList.put(name, biome);
}
public static BiomeGenBase get(String name)
{
return biomeList.get(name);
for (String key : biomeList.keySet()) System.out.println(key);
return biomeList.get(name).biome;
}
public static BiomeGenBase getBOPBiome(String name)
{
return get("biomesoplenty:" + name);
}
public static String convertBiomeName(String originalName)

View File

@ -25,7 +25,6 @@ public class BOPConfiguration
miscConfigFile = new File(configpath + "misc.cfg");
BOPConfigurationMain.init(mainConfigFile);
BOPConfigurationBiomeGen.init(biomeGenConfigFile);
BOPConfigurationTerrainGen.init(terrainGenConfigFile);
BOPConfigurationIDs.init(idConfigFile);
BOPConfigurationMisc.init(miscConfigFile);

View File

@ -1,239 +1,53 @@
package biomesoplenty.common.configuration;
import java.io.File;
import java.util.ArrayList;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraftforge.common.config.Configuration;
import org.apache.commons.lang3.text.WordUtils;
import org.apache.logging.log4j.Level;
import biomesoplenty.api.BOPBiomeHelper;
import biomesoplenty.api.BOPBiomeHelper.BOPBiomeListEntry;
import biomesoplenty.common.world.GenLayerBiomeBOP;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.FMLLog;
public class BOPConfigurationBiomeGen
{
public static Configuration config;
public static boolean alpsGen;
public static boolean arcticGen;
public static boolean autumnHillsGen;
public static boolean badlandsGen;
public static boolean bambooForestGen;
public static boolean bayouGen;
public static boolean birchForestGen;
public static boolean bogGen;
public static boolean borealForestGen;
public static boolean brushlandGen;
public static boolean canyonGen;
public static boolean chaparralGen;
public static boolean cherryBlossomGroveGen;
public static boolean coniferousForestGen;
public static boolean coniferousForestSnowGen;
public static boolean cragGen;
public static boolean deadForestGen;
public static boolean deadForestSnowGen;
public static boolean deadSwampGen;
public static boolean deadlandsGen;
public static boolean deciduousForestGen;
public static boolean dunesGen;
public static boolean fenGen;
public static boolean flowerFieldGen;
public static boolean frostForestGen;
public static boolean fungiForestGen;
public static boolean gardenGen;
public static boolean glacierGen;
public static boolean grasslandGen;
public static boolean groveGen;
public static boolean heathlandGen;
public static boolean highlandGen;
public static boolean hotSpringsGen;
public static boolean icyHillsGen;
public static boolean jadeCliffsGen;
public static boolean lavenderFieldsGen;
public static boolean lushDesertGen;
public static boolean lushSwampGen;
public static boolean mangroveGen;
public static boolean mapleWoodsGen;
public static boolean marshGen;
public static boolean meadowGen;
public static boolean mesaGen;
public static boolean moorGen;
public static boolean mountainGen;
// public static boolean mushroomIslandGen;
public static boolean mysticGroveGen;
public static boolean oasisGen;
public static boolean oceanGen;
public static boolean ominousWoodsGen;
public static boolean orchardGen;
public static boolean originValleyGen;
public static boolean outbackGen;
public static boolean overgrownGreensGen;
public static boolean pastureGen;
public static boolean polarGen;
public static boolean prairieGen;
public static boolean quagmireGen;
public static boolean rainforestGen;
public static boolean redwoodForestGen;
public static boolean sacredSpringsGen;
public static boolean savannaGen;
public static boolean scrublandGen;
public static boolean seasonalForestGen;
public static boolean shieldGen;
public static boolean shrublandGen;
public static boolean silkgladesGen;
public static boolean sludgepitGen;
public static boolean spruceWoodsGen;
public static boolean steppeGen;
public static boolean temperateRainforestGen;
public static boolean thicketGen;
public static boolean timberGen;
public static boolean tropicalRainforestGen;
public static boolean tropicsGen;
public static boolean tundraGen;
public static boolean volcanoGen;
public static boolean wastelandGen;
public static boolean wetlandGen;
public static boolean woodlandGen;
// Vanilla biomes
public static boolean plainsGen;
public static boolean desertGen;
public static boolean extremeHillsGen;
public static boolean forestGen;
public static boolean taigaGen;
public static boolean swamplandGen;
public static boolean jungleGen;
// Nether biomes
public static boolean undergardenGen;
public static boolean corruptedSandsGen;
public static boolean phantasmagoricInfernoGen;
public static boolean boneyardGen;
public static boolean bloodyHeapGen;
// Beach variations
public static boolean gravelBeachGen;
public static boolean overgrownBeachGen;
// Ocean biomes
public static boolean coralReefGen;
public static boolean kelpForestGen;
public static boolean oceanicAbyssGen;
public static ArrayList<String> disabledBiomes = new ArrayList();
public static void addDefaultDisabledBiomes()
{
}
public static void init(File configFile)
{
addDefaultDisabledBiomes();
config = new Configuration(configFile);
try
{
config.load();
//Biome generation
alpsGen = config.get("Biomes To Generate", "Alps", true).getBoolean(false);
arcticGen = config.get("Biomes To Generate", "Arctic", true).getBoolean(false);
autumnHillsGen = config.get("Biomes To Generate", "AutumnHills", true).getBoolean(false);
badlandsGen = config.get("Biomes To Generate", "Badlands", true).getBoolean(false);
bambooForestGen = config.get("Biomes To Generate", "BambooForest", true).getBoolean(false);
bayouGen = config.get("Biomes To Generate", "Bayou", true).getBoolean(false);
birchForestGen = config.get("Biomes To Generate", "BirchForest", true).getBoolean(false);
bogGen = config.get("Biomes To Generate", "Bog", true).getBoolean(false);
borealForestGen = config.get("Biomes To Generate", "BorealForest", true).getBoolean(false);
brushlandGen = config.get("Biomes To Generate", "Brushland", true).getBoolean(false);
canyonGen = config.get("Biomes To Generate", "Canyon", true).getBoolean(false);
chaparralGen = config.get("Biomes To Generate", "Chaparral", true).getBoolean(false);
cherryBlossomGroveGen = config.get("Biomes To Generate", "CherryBlossomGrove", true).getBoolean(false);
coniferousForestGen = config.get("Biomes To Generate", "ConiferousForest", true).getBoolean(false);
coniferousForestSnowGen = config.get("Biomes To Generate", "ConiferousForestSnow", true).getBoolean(false);
cragGen = config.get("Biomes To Generate", "Crag", true).getBoolean(false);
deadForestGen = config.get("Biomes To Generate", "DeadForest", true).getBoolean(false);
deadForestSnowGen = config.get("Biomes To Generate", "DeadForestSnow", true).getBoolean(false);
deadSwampGen = config.get("Biomes To Generate", "DeadSwamp", true).getBoolean(false);
deadlandsGen = config.get("Biomes To Generate", "Deadlands", false).getBoolean(false);
deciduousForestGen = config.get("Biomes To Generate", "DeciduousForest", true).getBoolean(false);
dunesGen = config.get("Biomes To Generate", "Dunes", true).getBoolean(false);
fenGen = config.get("Biomes To Generate", "Fen", true).getBoolean(false);
flowerFieldGen = config.get("Biomes To Generate", "FlowerField", true).getBoolean(false);
frostForestGen = config.get("Biomes To Generate", "FrostForest", true).getBoolean(false);
fungiForestGen = config.get("Biomes To Generate", "FungiForest", true).getBoolean(false);
gardenGen = config.get("Biomes To Generate", "Garden", true).getBoolean(false);
glacierGen = config.get("Biomes To Generate", "Glacier", true).getBoolean(false);
grasslandGen = config.get("Biomes To Generate", "Grassland", true).getBoolean(false);
groveGen = config.get("Biomes To Generate", "Grove", true).getBoolean(false);
heathlandGen = config.get("Biomes To Generate", "Heathland", true).getBoolean(false);
highlandGen = config.get("Biomes To Generate", "Highland", true).getBoolean(false);
hotSpringsGen = config.get("Biomes To Generate", "HotSprings", true).getBoolean(false);
icyHillsGen = config.get("Biomes To Generate", "IcyHills", true).getBoolean(false);
jadeCliffsGen = config.get("Biomes To Generate", "JadeCliffs", true).getBoolean(false);
lavenderFieldsGen = config.get("Biomes To Generate", "LavenderFields", true).getBoolean(false);
lushDesertGen = config.get("Biomes To Generate", "LushDesert", true).getBoolean(false);
lushSwampGen = config.get("Biomes To Generate", "LushSwamp", true).getBoolean(false);
mangroveGen = config.get("Biomes To Generate", "Mangrove", true).getBoolean(false);
mapleWoodsGen = config.get("Biomes To Generate", "MapleWoods", true).getBoolean(false);
marshGen = config.get("Biomes To Generate", "Marsh", true).getBoolean(false);
meadowGen = config.get("Biomes To Generate", "Meadow", true).getBoolean(false);
mesaGen = config.get("Biomes To Generate", "Mesa", true).getBoolean(false);
moorGen = config.get("Biomes To Generate", "Moor", true).getBoolean(false);
mountainGen = config.get("Biomes To Generate", "Mountain", true).getBoolean(false);
// mushroomIslandGen = config.get("Biomes To Generate", "MushroomIsland", true).getBoolean(false);
mysticGroveGen = config.get("Biomes To Generate", "MysticGrove", true).getBoolean(false);
oasisGen = config.get("Biomes To Generate", "Oasis", true).getBoolean(false);
ominousWoodsGen = config.get("Biomes To Generate", "OminousWoods", true).getBoolean(false);
orchardGen = config.get("Biomes To Generate", "Orchard", true).getBoolean(false);
originValleyGen = config.get("Biomes To Generate", "OriginValley", true).getBoolean(false);
outbackGen = config.get("Biomes To Generate", "Outback", true).getBoolean(false);
overgrownGreensGen = config.get("Biomes To Generate", "OvergrownGreens", true).getBoolean(false);
pastureGen = config.get("Biomes To Generate", "Pasture", true).getBoolean(false);
polarGen = config.get("Biomes To Generate", "Polar", false).getBoolean(false);
prairieGen = config.get("Biomes To Generate", "Prairie", true).getBoolean(false);
quagmireGen = config.get("Biomes To Generate", "Quagmire", true).getBoolean(false);
rainforestGen = config.get("Biomes To Generate", "Rainforest", true).getBoolean(false);
redwoodForestGen = config.get("Biomes To Generate", "RedwoodForest", true).getBoolean(false);
sacredSpringsGen = config.get("Biomes To Generate", "SacredSprings", true).getBoolean(false);
savannaGen = config.get("Biomes To Generate", "Savanna", true).getBoolean(false);
scrublandGen = config.get("Biomes To Generate", "Scrubland", true).getBoolean(false);
seasonalForestGen = config.get("Biomes To Generate", "SeasonalForest", true).getBoolean(false);
shieldGen = config.get("Biomes To Generate", "Shield", true).getBoolean(false);
shrublandGen = config.get("Biomes To Generate", "Shrubland", true).getBoolean(false);
silkgladesGen = config.get("Biomes To Generate", "Silkglades", true).getBoolean(false);
sludgepitGen = config.get("Biomes To Generate", "Sludgepit", true).getBoolean(false);
spruceWoodsGen = config.get("Biomes To Generate", "SpruceWoods", true).getBoolean(false);
steppeGen = config.get("Biomes To Generate", "Steppe", true).getBoolean(false);
temperateRainforestGen = config.get("Biomes To Generate", "TemperateRainforest", true).getBoolean(false);
thicketGen = config.get("Biomes To Generate", "Thicket", true).getBoolean(false);
timberGen = config.get("Biomes To Generate", "Timber", true).getBoolean(false);
tropicalRainforestGen = config.get("Biomes To Generate", "TropicalRainforest", true).getBoolean(false);
tropicsGen = config.get("Biomes To Generate", "Tropics", true).getBoolean(false);
tundraGen = config.get("Biomes To Generate", "Tundra", true).getBoolean(false);
volcanoGen = config.get("Biomes To Generate", "Volcano", true).getBoolean(false);
wastelandGen = config.get("Biomes To Generate", "Wasteland", true).getBoolean(false);
wetlandGen = config.get("Biomes To Generate", "Wetland", true).getBoolean(false);
woodlandGen = config.get("Biomes To Generate", "Woodland", true).getBoolean(false);
for (BOPBiomeListEntry entry : BOPBiomeHelper.biomeList.values())
{
BiomeGenBase biome = entry.biome;
String name = biome.biomeName;
String convertedName = BOPBiomeHelper.convertBiomeName(name);
// Vanilla biomes
desertGen = config.get("Vanilla Biomes To Generate", "Desert", true).getBoolean(true);
extremeHillsGen = config.get("Vanilla Biomes To Generate", "ExtremeHills", true).getBoolean(true);
forestGen = config.get("Vanilla Biomes To Generate", "Forest", true).getBoolean(true);
jungleGen = config.get("Vanilla Biomes To Generate", "Jungle", true).getBoolean(true);
oceanGen = config.get("Vanilla Biomes To Generate", "Ocean", true).getBoolean(false);
plainsGen = config.get("Vanilla Biomes To Generate", "Plains", true).getBoolean(true);
swamplandGen = config.get("Vanilla Biomes To Generate", "Swampland", true).getBoolean(true);
taigaGen = config.get("Vanilla Biomes To Generate", "Taiga", true).getBoolean(true);
// Nether biomes
undergardenGen = config.get("Nether Biomes To Generate", "Undergarden", true).getBoolean(true);
corruptedSandsGen = config.get("Nether Biomes To Generate", "CorruptedSands", true).getBoolean(true);
phantasmagoricInfernoGen = config.get("Nether Biomes To Generate", "PhantasmagoricInferno", true).getBoolean(true);
boneyardGen = config.get("Nether Biomes To Generate", "Boneyard", true).getBoolean(true);
bloodyHeapGen = config.get("Nether Biomes To Generate", "BloodyHeap", true).getBoolean(true);
// Beach variations
gravelBeachGen = config.get("Beach Variations To Generate", "Gravel Beach", true).getBoolean(true);
overgrownBeachGen = config.get("Beach Variations To Generate", "Overgrown Beach", false).getBoolean(true);
if (config.get("Biomes To Generate (There must be at least one from each category)", name + " (" + WordUtils.capitalize(entry.temperatureType.toString().toLowerCase()) + ")", !disabledBiomes.contains(convertedName)).getBoolean(!disabledBiomes.contains(convertedName)))
{
BOPBiomeHelper.getCorrespondingTemperatureTypeList(entry.temperatureType).add(biome);
}
}
// Ocean biomes
coralReefGen = config.get("Ocean Biomes To Generate", "Coral Reef", true).getBoolean(false);
kelpForestGen = config.get("Ocean Biomes To Generate", "Kelp Forest", true).getBoolean(false);
oceanicAbyssGen = config.get("Ocean Biomes To Generate", "Oceanic Abyss", true).getBoolean(false);
FMLCommonHandler.instance().getFMLLogger().log(Level.INFO, "[BiomesOPlenty] Generated Biome Gen Config!");
}
catch (Exception e)

View File

@ -3,14 +3,16 @@ package biomesoplenty.common.configuration.structures;
import java.io.File;
import java.util.ArrayList;
import org.apache.logging.log4j.Level;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.FMLLog;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraftforge.common.BiomeManager;
import net.minecraftforge.common.config.Configuration;
import org.apache.logging.log4j.Level;
import biomesoplenty.api.BOPBiomeHelper;
import biomesoplenty.api.BOPBiomeHelper.BOPBiomeListEntry;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.FMLLog;
public class BOPConfigurationStrongholds
{
@ -109,8 +111,10 @@ public class BOPConfigurationStrongholds
{
config.load();
for (BiomeGenBase biome : BOPBiomeHelper.biomeList.values())
for (BOPBiomeListEntry entry : BOPBiomeHelper.biomeList.values())
{
BiomeGenBase biome = entry.biome;
String name = biome.biomeName;
String convertedName = BOPBiomeHelper.convertBiomeName(name);

View File

@ -11,6 +11,7 @@ import net.minecraft.world.biome.BiomeGenBase;
import net.minecraftforge.common.BiomeManager;
import net.minecraftforge.common.config.Configuration;
import biomesoplenty.api.BOPBiomeHelper;
import biomesoplenty.api.BOPBiomeHelper.BOPBiomeListEntry;
public class BOPConfigurationVillages
{
@ -105,8 +106,10 @@ public class BOPConfigurationVillages
villageDistance = config.get("Biomes O\' Plenty World Type Settings", "Distance between villages", 32, "In Vanilla it is set to 32").getInt();
if (villageDistance < 8) villageDistance = 8;
for (BiomeGenBase biome : BOPBiomeHelper.biomeList.values())
for (BOPBiomeListEntry entry : BOPBiomeHelper.biomeList.values())
{
BiomeGenBase biome = entry.biome;
String name = biome.biomeName;
String convertedName = BOPBiomeHelper.convertBiomeName(name);

View File

@ -89,29 +89,29 @@ public class BOPBiomes
private static void registerBiomes()
{
addBiomeToList(new BOPBiomeListEntry(BiomeGenBase.desert, BOPBiomeTemperatureType.HOT));
addBiomeToList(new BOPBiomeListEntry(BiomeGenBase.desert, BOPBiomeTemperatureType.HOT));
addBiomeToList(new BOPBiomeListEntry(BiomeGenBase.desert, BOPBiomeTemperatureType.HOT));
addBiomeToList(new BOPBiomeListEntry(BiomeGenBase.field_150588_X, BOPBiomeTemperatureType.HOT));
addBiomeToList(new BOPBiomeListEntry(BiomeGenBase.field_150588_X, BOPBiomeTemperatureType.HOT));
addBiomeToList(new BOPBiomeListEntry(BiomeGenBase.plains, BOPBiomeTemperatureType.HOT));
addBiomeToList(new BOPBiomeListEntry(BiomeGenBase.forest, BOPBiomeTemperatureType.WARM));
addBiomeToList(new BOPBiomeListEntry(BiomeGenBase.field_150585_R, BOPBiomeTemperatureType.WARM));
addBiomeToList(new BOPBiomeListEntry(BiomeGenBase.extremeHills, BOPBiomeTemperatureType.WARM));
addBiomeToList(new BOPBiomeListEntry(BiomeGenBase.plains, BOPBiomeTemperatureType.WARM));
addBiomeToList(new BOPBiomeListEntry(BiomeGenBase.field_150583_P, BOPBiomeTemperatureType.WARM));
addBiomeToList(new BOPBiomeListEntry(BiomeGenBase.swampland, BOPBiomeTemperatureType.WARM));
addBiomeToList(new BOPBiomeListEntry(BiomeGenBase.forest, BOPBiomeTemperatureType.COOL));
addBiomeToList(new BOPBiomeListEntry(BiomeGenBase.extremeHills, BOPBiomeTemperatureType.COOL));
addBiomeToList(new BOPBiomeListEntry(BiomeGenBase.taiga, BOPBiomeTemperatureType.COOL));
addBiomeToList(new BOPBiomeListEntry(BiomeGenBase.plains, BOPBiomeTemperatureType.COOL));
addBiomeToList(new BOPBiomeListEntry(BiomeGenBase.icePlains, BOPBiomeTemperatureType.ICY));
addBiomeToList(new BOPBiomeListEntry(BiomeGenBase.icePlains, BOPBiomeTemperatureType.ICY));
addBiomeToList(new BOPBiomeListEntry(BiomeGenBase.icePlains, BOPBiomeTemperatureType.ICY));
addBiomeToList(new BOPBiomeListEntry(BiomeGenBase.field_150584_S, BOPBiomeTemperatureType.ICY));
registerVanillaBiome(new BOPBiomeListEntry(BiomeGenBase.desert, BOPBiomeTemperatureType.HOT));
registerVanillaBiome(new BOPBiomeListEntry(BiomeGenBase.desert, BOPBiomeTemperatureType.HOT));
registerVanillaBiome(new BOPBiomeListEntry(BiomeGenBase.desert, BOPBiomeTemperatureType.HOT));
registerVanillaBiome(new BOPBiomeListEntry(BiomeGenBase.field_150588_X, BOPBiomeTemperatureType.HOT));
registerVanillaBiome(new BOPBiomeListEntry(BiomeGenBase.field_150588_X, BOPBiomeTemperatureType.HOT));
registerVanillaBiome(new BOPBiomeListEntry(BiomeGenBase.plains, BOPBiomeTemperatureType.HOT));
registerVanillaBiome(new BOPBiomeListEntry(BiomeGenBase.forest, BOPBiomeTemperatureType.WARM));
registerVanillaBiome(new BOPBiomeListEntry(BiomeGenBase.field_150585_R, BOPBiomeTemperatureType.WARM));
registerVanillaBiome(new BOPBiomeListEntry(BiomeGenBase.extremeHills, BOPBiomeTemperatureType.WARM));
registerVanillaBiome(new BOPBiomeListEntry(BiomeGenBase.plains, BOPBiomeTemperatureType.WARM));
registerVanillaBiome(new BOPBiomeListEntry(BiomeGenBase.field_150583_P, BOPBiomeTemperatureType.WARM));
registerVanillaBiome(new BOPBiomeListEntry(BiomeGenBase.swampland, BOPBiomeTemperatureType.WARM));
registerVanillaBiome(new BOPBiomeListEntry(BiomeGenBase.forest, BOPBiomeTemperatureType.COOL));
registerVanillaBiome(new BOPBiomeListEntry(BiomeGenBase.extremeHills, BOPBiomeTemperatureType.COOL));
registerVanillaBiome(new BOPBiomeListEntry(BiomeGenBase.taiga, BOPBiomeTemperatureType.COOL));
registerVanillaBiome(new BOPBiomeListEntry(BiomeGenBase.plains, BOPBiomeTemperatureType.COOL));
registerVanillaBiome(new BOPBiomeListEntry(BiomeGenBase.icePlains, BOPBiomeTemperatureType.ICY));
registerVanillaBiome(new BOPBiomeListEntry(BiomeGenBase.icePlains, BOPBiomeTemperatureType.ICY));
registerVanillaBiome(new BOPBiomeListEntry(BiomeGenBase.icePlains, BOPBiomeTemperatureType.ICY));
registerVanillaBiome(new BOPBiomeListEntry(BiomeGenBase.field_150584_S, BOPBiomeTemperatureType.ICY));
registerBiome(new BOPBiomeListEntry(new BiomeGenAlps(BOPConfigurationIDs.alpsID).setBiomeName("Alps"), BOPBiomeTemperatureType.ICY));
registerBiome(new BOPBiomeListEntry(new BiomeGenArctic(BOPConfigurationIDs.arcticID).setBiomeName("Arctic"), BOPBiomeTemperatureType.ICY));
@ -188,9 +188,9 @@ public class BOPBiomes
}
else
{
for (BiomeGenBase biome : BOPBiomeHelper.biomeList.values())
for (BOPBiomeListEntry entry : BOPBiomeHelper.biomeList.values())
{
addSpawnBiome(biome);
addSpawnBiome(entry.biome);
}
}
}
@ -200,10 +200,14 @@ public class BOPBiomes
onlyBiome = biome.biome;
}
public static void registerVanillaBiome(BOPBiomeListEntry biome)
{
BOPBiomeHelper.registerBiome(biome, "minecraft:" + BOPBiomeHelper.convertBiomeName(biome.biome.biomeName));
}
public static void registerBiome(BOPBiomeListEntry biome)
{
BOPBiomeHelper.registerBiome(biome.biome, BOPBiomeHelper.convertBiomeName(biome.biome.biomeName));
addBiomeToList(biome);
BOPBiomeHelper.registerBiome(biome, "biomesoplenty:" + BOPBiomeHelper.convertBiomeName(biome.biome.biomeName));
}
public static void addBiomeToList(BOPBiomeListEntry biome)
@ -216,11 +220,6 @@ public class BOPBiomes
BiomeManager.addSpawnBiome(biome);
}
public static void addStrongholdBiome(BiomeGenBase biome)
{
System.out.println(biome.biomeName);
}
public static void clearAllSpawnBiomes()
{
WorldChunkManager.allowedBiomes.clear();

View File

@ -39,7 +39,7 @@ public class BOPEntities
registerEntityEgg(EntityJungleSpider.class, 5147192, 11013646);
EntityRegistry.addSpawn(EntityJungleSpider.class, 8, 1, 3, EnumCreatureType.monster, BOPBiomeHelper.get("bambooForest"), BiomeGenBase.jungle, BOPBiomeHelper.get("tropicalRainforest")/*, Biomes.oasis.get()*/, BOPBiomeHelper.get("tropics"));
EntityRegistry.addSpawn(EntityJungleSpider.class, 8, 1, 3, EnumCreatureType.monster, BOPBiomeHelper.getBOPBiome("bambooForest"), BiomeGenBase.jungle, BOPBiomeHelper.getBOPBiome("tropicalRainforest")/*, Biomes.oasis.get()*/, BOPBiomeHelper.getBOPBiome("tropics"));
}
if (BOPConfigurationIDs.rosesterID > 0)
@ -60,7 +60,7 @@ public class BOPEntities
registerEntityEgg(EntityGlob.class, 6836276, 8414787);
EntityRegistry.addSpawn(EntityGlob.class, 1, 1, 1, EnumCreatureType.creature, BOPBiomeHelper.get("bog"), BOPBiomeHelper.get("deadSwamp"), BOPBiomeHelper.get("fen"), BOPBiomeHelper.get("moor"), BOPBiomeHelper.get("quagmire"), BOPBiomeHelper.get("sludgepit"), BiomeGenBase.swampland);
EntityRegistry.addSpawn(EntityGlob.class, 1, 1, 1, EnumCreatureType.creature, BOPBiomeHelper.getBOPBiome("bog"), BOPBiomeHelper.getBOPBiome("deadSwamp"), BOPBiomeHelper.getBOPBiome("fen"), BOPBiomeHelper.getBOPBiome("moor"), BOPBiomeHelper.getBOPBiome("quagmire"), BOPBiomeHelper.getBOPBiome("sludgepit"), BiomeGenBase.swampland);
}
if (BOPConfigurationIDs.phantomID > 0)

View File

@ -15,7 +15,7 @@ public class VillageMaterialEventHandler
public void getVillageBlockID(BiomeEvent.GetVillageBlockID event)
{
//Arctic
if (event.biome == BOPBiomeHelper.get("arctic"))
if (event.biome == BOPBiomeHelper.getBOPBiome("arctic"))
{
//Cobblestone
if (event.original == Blocks.cobblestone)
@ -141,7 +141,7 @@ public class VillageMaterialEventHandler
}*/
//Brushland
if (event.biome == BOPBiomeHelper.get("brushland"))
if (event.biome == BOPBiomeHelper.getBOPBiome("brushland"))
{
//Gravel
if (event.original == Blocks.gravel)
@ -152,7 +152,7 @@ public class VillageMaterialEventHandler
}
//Coniferous Forest
if (event.biome == BOPBiomeHelper.get("coniferousForest"))
if (event.biome == BOPBiomeHelper.getBOPBiome("coniferousForest"))
{
//Cobblestone
if (event.original == Blocks.cobblestone)
@ -263,7 +263,7 @@ public class VillageMaterialEventHandler
}*/
//Grove
if (event.biome == BOPBiomeHelper.get("grove"))
if (event.biome == BOPBiomeHelper.getBOPBiome("grove"))
{
//Cobblestone
if (event.original == Blocks.cobblestone)
@ -314,7 +314,7 @@ public class VillageMaterialEventHandler
}
//Heathland
if (event.biome == BOPBiomeHelper.get("heathland"))
if (event.biome == BOPBiomeHelper.getBOPBiome("heathland"))
{
//Logs
if (event.original == Blocks.log)
@ -346,7 +346,7 @@ public class VillageMaterialEventHandler
}
//Lush Desert
if (event.biome == BOPBiomeHelper.get("lushDesert"))
if (event.biome == BOPBiomeHelper.getBOPBiome("lushDesert"))
{
//Cobblestone
if (event.original == Blocks.cobblestone)
@ -399,7 +399,7 @@ public class VillageMaterialEventHandler
}
//Lush Swamp
if (event.biome == BOPBiomeHelper.get("lushSwamp"))
if (event.biome == BOPBiomeHelper.getBOPBiome("lushSwamp"))
{
//Gravel
if (event.original == Blocks.cobblestone)
@ -410,7 +410,7 @@ public class VillageMaterialEventHandler
}
//Maple Woods
if (event.biome == BOPBiomeHelper.get("mapleWoods"))
if (event.biome == BOPBiomeHelper.getBOPBiome("mapleWoods"))
{
//Wooden Stairs
if (event.original == Blocks.oak_stairs)
@ -421,7 +421,7 @@ public class VillageMaterialEventHandler
}
//Meadow
if (event.biome == BOPBiomeHelper.get("meadow"))
if (event.biome == BOPBiomeHelper.getBOPBiome("meadow"))
{
//Cobblestone
if (event.original == Blocks.cobblestone)
@ -523,7 +523,7 @@ public class VillageMaterialEventHandler
}*/
//Outback
if (event.biome == BOPBiomeHelper.get("outback"))
if (event.biome == BOPBiomeHelper.getBOPBiome("outback"))
{
//Cobblestone
if (event.original == Blocks.cobblestone)
@ -620,7 +620,7 @@ public class VillageMaterialEventHandler
}*/
//Prairie
if (event.biome == BOPBiomeHelper.get("prairie"))
if (event.biome == BOPBiomeHelper.getBOPBiome("prairie"))
{
//Gravel
if (event.original == Blocks.gravel)
@ -714,7 +714,7 @@ public class VillageMaterialEventHandler
}*/
//Snowy Coniferous Forest
if (event.biome == BOPBiomeHelper.get("snowyConiferousForest"))
if (event.biome == BOPBiomeHelper.getBOPBiome("snowyConiferousForest"))
{
//Cobblestone
if (event.original == Blocks.cobblestone)
@ -779,7 +779,7 @@ public class VillageMaterialEventHandler
}
//Spruce Woods
if (event.biome == BOPBiomeHelper.get("spruceWoods"))
if (event.biome == BOPBiomeHelper.getBOPBiome("spruceWoods"))
{
//Wooden Stairs
if (event.original == Blocks.oak_stairs)
@ -862,7 +862,7 @@ public class VillageMaterialEventHandler
}*/
//Tropical Rainforest
if (event.biome == BOPBiomeHelper.get("tropicalRainforest"))
if (event.biome == BOPBiomeHelper.getBOPBiome("tropicalRainforest"))
{
//Cobblestone
if (event.original == Blocks.cobblestone)
@ -920,7 +920,7 @@ public class VillageMaterialEventHandler
}
//Wetland
if (event.biome == BOPBiomeHelper.get("wetland"))
if (event.biome == BOPBiomeHelper.getBOPBiome("wetland"))
{
//Cobblestone
if (event.original == Blocks.cobblestone)
@ -1000,7 +1000,7 @@ public class VillageMaterialEventHandler
}*/
//Coniferous Forest
if (event.biome == BOPBiomeHelper.get("coniferousForest"))
if (event.biome == BOPBiomeHelper.getBOPBiome("coniferousForest"))
{
//Cobblestone
if (event.original == Blocks.cobblestone)
@ -1050,7 +1050,7 @@ public class VillageMaterialEventHandler
}*/
//Grove
if (event.biome == BOPBiomeHelper.get("grove"))
if (event.biome == BOPBiomeHelper.getBOPBiome("grove"))
{
//Cobblestone
if (event.original == Blocks.cobblestone)
@ -1089,7 +1089,7 @@ public class VillageMaterialEventHandler
}
//Heathland
if (event.biome == BOPBiomeHelper.get("heathland"))
if (event.biome == BOPBiomeHelper.getBOPBiome("heathland"))
{
//Logs
if (event.original == Blocks.log)
@ -1107,7 +1107,7 @@ public class VillageMaterialEventHandler
}
//Lush Desert
if (event.biome == BOPBiomeHelper.get("lushDesert"))
if (event.biome == BOPBiomeHelper.getBOPBiome("lushDesert"))
{
//Cobblestone
if (event.original == Blocks.cobblestone)
@ -1133,7 +1133,7 @@ public class VillageMaterialEventHandler
}
//Maple Woods
if (event.biome == BOPBiomeHelper.get("mapleWoods"))
if (event.biome == BOPBiomeHelper.getBOPBiome("mapleWoods"))
{
//Logs
if (event.original == Blocks.log)
@ -1151,7 +1151,7 @@ public class VillageMaterialEventHandler
}
//Meadow
if (event.biome == BOPBiomeHelper.get("meadow"))
if (event.biome == BOPBiomeHelper.getBOPBiome("meadow"))
{
//Cobblestone
if (event.original == Blocks.cobblestone)
@ -1215,7 +1215,7 @@ public class VillageMaterialEventHandler
}*/
//Outback
if (event.biome == BOPBiomeHelper.get("outback"))
if (event.biome == BOPBiomeHelper.getBOPBiome("outback"))
{
//Wooden Planks
if (event.original == Blocks.planks)
@ -1244,7 +1244,7 @@ public class VillageMaterialEventHandler
}*/
//Snowy Coniferous Forest
if (event.biome == BOPBiomeHelper.get("snowyConiferousForest"))
if (event.biome == BOPBiomeHelper.getBOPBiome("snowyConiferousForest"))
{
//Cobblestone
if (event.original == Blocks.cobblestone)
@ -1276,7 +1276,7 @@ public class VillageMaterialEventHandler
}
//Spruce Woods
if (event.biome == BOPBiomeHelper.get("spruceWoods"))
if (event.biome == BOPBiomeHelper.getBOPBiome("spruceWoods"))
{
//Logs
if (event.original == Blocks.log)
@ -1294,7 +1294,7 @@ public class VillageMaterialEventHandler
}
//Tropical Rainforest
if (event.biome == BOPBiomeHelper.get("tropicalRainforest"))
if (event.biome == BOPBiomeHelper.getBOPBiome("tropicalRainforest"))
{
//Cobblestone
if (event.original == Blocks.cobblestone)
@ -1326,7 +1326,7 @@ public class VillageMaterialEventHandler
}
//Wetland
if (event.biome == BOPBiomeHelper.get("wetland"))
if (event.biome == BOPBiomeHelper.getBOPBiome("wetland"))
{
//Cobblestone
if (event.original == Blocks.cobblestone)