Cleaned up configuration. Some refactoting.

This commit is contained in:
Amnet 2013-04-23 12:35:29 +02:00
parent 4387e43847
commit c853d692a1
7 changed files with 697 additions and 771 deletions

View File

@ -113,7 +113,7 @@ public class BiomesOPlenty
public void load(FMLInitializationEvent event)
{
LanguageRegistry.instance().addStringLocalization("itemGroup.tabBiomesOPlenty", "en_US", "Biomes O\' Plenty");
LanguageRegistry.instance().addStringLocalization("generator.BIOMESOP", "en_US", "Biomes O\' Plenty");
//LanguageRegistry.instance().addStringLocalization("generator.BIOMESOP", "en_US", "Biomes O\' Plenty");
// Add helpers for compatibility
MinecraftForge.TERRAIN_GEN_BUS.register(new WorldTypeSize());

View File

@ -27,8 +27,6 @@ import biomesoplenty.worldgen.WorldGenOminous2;
import biomesoplenty.worldgen.WorldGenOriginTree;
import biomesoplenty.worldgen.WorldGenPromisedTree;
import biomesoplenty.worldgen.WorldGenTaiga9;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class BlockBOPSapling extends BlockSapling
{
@ -76,7 +74,7 @@ public class BlockBOPSapling extends BlockSapling
int meta = world.getBlockMetadata(x, y, z) & TYPES;
Object obj = null;
int rnd = random.nextInt(8);
System.out.println(meta);
if (obj == null)
{
switch (meta)

View File

@ -29,6 +29,28 @@ public class BOPBiomes {
public static void init()
{
// Initialize biomes
initializeBiomes();
//Initialize new world type
//WTBiomesOP = new WTBiomesOP();
//Biome Dictionary
addToBiomeDictionary();
//Spawning
addSpawnBiomes();
//Village spawning
addVillageBiomes();
//Stronghold spawning
addStrongholdBiomes();
registerBiomes();
}
private static void initializeBiomes()
{
Biomes.alps = Optional.of((new BiomeGenAlps(BOPConfiguration.alpsID)).setColor(353825).setBiomeName("Alps").func_76733_a(5159473).setTemperatureRainfall(0.0F, 0.0F).setMinMaxHeight(5.0F, 5.0F));
Biomes.arctic = Optional.of((new BiomeGenArctic(BOPConfiguration.arcticID)).setColor(14090235).setBiomeName("Arctic").setTemperatureRainfall(0.0F, 0.0F).setMinMaxHeight(0.1F, 0.7F));
Biomes.badlands = Optional.of((new BiomeGenBadlands(BOPConfiguration.badlandsID)).setColor(16421912).setBiomeName("Badlands").setTemperatureRainfall(2.0F, 0.0F).setMinMaxHeight(0.3F, 0.9F));
@ -109,11 +131,10 @@ public class BOPBiomes {
Biomes.taigaNew = Optional.of((new BiomeGenTaigaNew(BOPConfiguration.taigaNewID)).setColor(747097).setBiomeName("Taiga").func_76733_a(5159473).setEnableSnow().setTemperatureRainfall(0.05F, 0.8F).setMinMaxHeight(0.1F, 0.4F));
Biomes.swamplandNew = Optional.of((new BiomeGenSwampNew(BOPConfiguration.swamplandNewID)).setColor(522674).setBiomeName("Swampland").func_76733_a(9154376).setMinMaxHeight(-0.2F, 0.1F).setTemperatureRainfall(0.8F, 0.9F));
Biomes.jungleNew = Optional.of((new BiomeGenJungleNew(BOPConfiguration.jungleNewID)).setColor(5470985).setBiomeName("Jungle").func_76733_a(5470985).setTemperatureRainfall(1.2F, 0.9F).setMinMaxHeight(0.2F, 0.4F));
}
//Initialize new world type
WTBiomesOP = new WTBiomesOP();
//Biome Dictionary
private static void addToBiomeDictionary()
{
BiomeDictionary.registerBiomeType(Biomes.alps.get(), Type.FROZEN, Type.MOUNTAIN);
BiomeDictionary.registerBiomeType(Biomes.arctic.get(), Type.FROZEN, Type.FOREST, Type.HILLS);
BiomeDictionary.registerBiomeType(Biomes.badlands.get(), Type.DESERT, Type.WASTELAND);
@ -192,8 +213,10 @@ public class BOPBiomes {
BiomeDictionary.registerBiomeType(Biomes.taigaNew.get(), Type.FROZEN);
BiomeDictionary.registerBiomeType(Biomes.swamplandNew.get(), Type.SWAMP);
BiomeDictionary.registerBiomeType(Biomes.jungleNew.get(), Type.JUNGLE);
}
//Spawning
private static void addSpawnBiomes()
{
addSpawnBiome(Biomes.alps);
addSpawnBiome(Biomes.arctic);
addSpawnBiome(Biomes.badlands);
@ -261,8 +284,10 @@ public class BOPBiomes {
addSpawnBiome(Biomes.taigaNew);
addSpawnBiome(Biomes.swamplandNew);
addSpawnBiome(Biomes.jungleNew);
}
//Village spawning
private static void addVillageBiomes()
{
addVillageBiome(Biomes.arctic);
addVillageBiome(Biomes.bayou);
addVillageBiome(Biomes.birchForest);
@ -292,8 +317,10 @@ public class BOPBiomes {
addVillageBiome(Biomes.forestNew);
addVillageBiome(Biomes.taigaNew);
addVillageBiome(Biomes.swamplandNew);
}
//Stronghold spawning
private static void addStrongholdBiomes()
{
addStrongholdBiome(Biomes.alps);
addStrongholdBiome(Biomes.arctic);
addStrongholdBiome(Biomes.badlands);
@ -371,353 +398,291 @@ public class BOPBiomes {
addStrongholdBiome(Biomes.taigaNew);
addStrongholdBiome(Biomes.swamplandNew);
addStrongholdBiome(Biomes.jungleNew);
}
if (BOPConfiguration.addToDefault == true)
private static void registerBiomes()
{
if (BOPConfiguration.alpsGen == true)
if (BOPConfiguration.addToDefault)
{
if (BOPConfiguration.alpsGen)
registerBiome(Biomes.alps);
}
if (BOPConfiguration.arcticGen == true)
{
if (BOPConfiguration.arcticGen)
registerBiome(Biomes.arctic);
}
if (BOPConfiguration.badlandsGen == true)
{
if (BOPConfiguration.badlandsGen)
registerBiome(Biomes.badlands);
}
if (BOPConfiguration.bambooForestGen == true)
{
if (BOPConfiguration.bambooForestGen)
registerBiome(Biomes.bambooForest);
}
if (BOPConfiguration.bayouGen == true)
{
if (BOPConfiguration.bayouGen)
registerBiome(Biomes.bayou);
}
if (BOPConfiguration.birchForestGen == true)
{
if (BOPConfiguration.birchForestGen)
registerBiome(Biomes.birchForest);
}
if (BOPConfiguration.bogGen == true)
{
if (BOPConfiguration.bogGen)
registerBiome(Biomes.bog);
}
if (BOPConfiguration.borealForestGen == true)
{
if (BOPConfiguration.borealForestGen)
registerBiome(Biomes.borealForest);
}
if (BOPConfiguration.canyonGen == true)
{
if (BOPConfiguration.canyonGen)
registerBiome(Biomes.canyon);
}
if (BOPConfiguration.chaparralGen == true)
{
if (BOPConfiguration.chaparralGen)
registerBiome(Biomes.chaparral);
}
if (BOPConfiguration.cherryBlossomGroveGen == true)
{
if (BOPConfiguration.cherryBlossomGroveGen)
registerBiome(Biomes.cherryBlossomGrove);
}
if (BOPConfiguration.coniferousForestGen == true)
{
if (BOPConfiguration.coniferousForestGen)
registerBiome(Biomes.coniferousForest);
}
if (BOPConfiguration.cragGen == true)
{
if (BOPConfiguration.cragGen)
registerBiome(Biomes.crag);
}
if (BOPConfiguration.deadForestGen == true)
{
if (BOPConfiguration.deadForestGen)
registerBiome(Biomes.deadForest);
}
if (BOPConfiguration.deadSwampGen == true)
{
if (BOPConfiguration.deadSwampGen)
registerBiome(Biomes.deadSwamp);
}
if (BOPConfiguration.deadlandsGen == true)
{
if (BOPConfiguration.deadlandsGen)
registerBiome(Biomes.deadlands);
}
if (BOPConfiguration.deciduousForestGen == true)
{
if (BOPConfiguration.deciduousForestGen)
registerBiome(Biomes.deciduousForest);
}
if (BOPConfiguration.drylandsGen == true)
{
if (BOPConfiguration.drylandsGen)
registerBiome(Biomes.drylands);
}
if (BOPConfiguration.dunesGen == true)
{
if (BOPConfiguration.dunesGen)
registerBiome(Biomes.dunes);
}
if (BOPConfiguration.fenGen == true)
{
if (BOPConfiguration.fenGen)
registerBiome(Biomes.fen);
}
if (BOPConfiguration.fieldGen == true)
{
if (BOPConfiguration.fieldGen)
registerBiome(Biomes.field);
}
if (BOPConfiguration.frostForestGen == true)
{
if (BOPConfiguration.frostForestGen)
registerBiome(Biomes.frostForest);
}
if (BOPConfiguration.fungiForestGen == true)
{
if (BOPConfiguration.fungiForestGen)
registerBiome(Biomes.fungiForest);
}
if (BOPConfiguration.gardenGen == true)
{
if (BOPConfiguration.gardenGen)
registerBiome(Biomes.garden);
}
if (BOPConfiguration.glacierGen == true)
{
if (BOPConfiguration.glacierGen)
registerBiome(Biomes.glacier);
}
if (BOPConfiguration.grasslandGen == true)
{
if (BOPConfiguration.grasslandGen)
registerBiome(Biomes.grassland);
}
if (BOPConfiguration.groveGen == true)
{
if (BOPConfiguration.groveGen)
registerBiome(Biomes.grove);
}
if (BOPConfiguration.heathlandGen == true)
{
if (BOPConfiguration.heathlandGen)
registerBiome(Biomes.heathland);
}
if (BOPConfiguration.highlandGen == true)
{
if (BOPConfiguration.highlandGen)
registerBiome(Biomes.highland);
}
if (BOPConfiguration.iceSheetGen == true)
{
if (BOPConfiguration.iceSheetGen)
registerBiome(Biomes.iceSheet);
}
if (BOPConfiguration.icyHillsGen == true)
{
if (BOPConfiguration.icyHillsGen)
registerBiome(Biomes.icyHills);
}
if (BOPConfiguration.jadeCliffsGen == true)
{
if (BOPConfiguration.jadeCliffsGen)
registerBiome(Biomes.jadeCliffs);
}
if (BOPConfiguration.lushDesertGen == true)
{
if (BOPConfiguration.lushDesertGen)
registerBiome(Biomes.lushDesert);
}
if (BOPConfiguration.lushSwampGen == true)
{
if (BOPConfiguration.lushSwampGen)
registerBiome(Biomes.lushSwamp);
}
if (BOPConfiguration.mangroveGen == true)
{
if (BOPConfiguration.mangroveGen)
registerBiome(Biomes.mangrove);
}
if (BOPConfiguration.mapleWoodsGen == true)
{
if (BOPConfiguration.mapleWoodsGen)
registerBiome(Biomes.mapleWoods);
}
if (BOPConfiguration.marshGen == true)
{
if (BOPConfiguration.marshGen)
registerBiome(Biomes.marsh);
}
if (BOPConfiguration.meadowGen == true)
{
if (BOPConfiguration.meadowGen)
registerBiome(Biomes.meadow);
}
if (BOPConfiguration.mesaGen == true)
{
if (BOPConfiguration.mesaGen)
registerBiome(Biomes.mesa);
}
if (BOPConfiguration.moorGen == true)
{
if (BOPConfiguration.moorGen)
registerBiome(Biomes.moor);
}
if (BOPConfiguration.mountainGen == true)
{
if (BOPConfiguration.mountainGen)
registerBiome(Biomes.mountain);
}
if (BOPConfiguration.mushroomIslandGen == true)
{
if (BOPConfiguration.mushroomIslandGen)
GameRegistry.addBiome(BiomeGenBase.mushroomIsland);
}
if (BOPConfiguration.mysticGroveGen == true)
{
if (BOPConfiguration.mysticGroveGen)
registerBiome(Biomes.mysticGrove);
}
if (BOPConfiguration.oasisGen == true)
{
if (BOPConfiguration.oasisGen)
registerBiome(Biomes.oasis);
}
if (BOPConfiguration.ominousWoodsGen == true)
{
if (BOPConfiguration.ominousWoodsGen)
registerBiome(Biomes.ominousWoods);
}
if (BOPConfiguration.orchardGen == true)
{
if (BOPConfiguration.orchardGen)
registerBiome(Biomes.orchard);
}
if (BOPConfiguration.originValleyGen == true)
{
if (BOPConfiguration.originValleyGen)
registerBiome(Biomes.originValley);
}
if (BOPConfiguration.outbackGen == true)
{
if (BOPConfiguration.outbackGen)
registerBiome(Biomes.outback);
}
if (BOPConfiguration.pastureGen == true)
{
if (BOPConfiguration.pastureGen)
registerBiome(Biomes.pasture);
}
if (BOPConfiguration.prairieGen == true)
{
if (BOPConfiguration.prairieGen)
registerBiome(Biomes.prairie);
}
if (BOPConfiguration.quagmireGen == true)
{
if (BOPConfiguration.quagmireGen)
registerBiome(Biomes.quagmire);
}
if (BOPConfiguration.rainforestGen == true)
{
if (BOPConfiguration.rainforestGen)
registerBiome(Biomes.rainforest);
}
if (BOPConfiguration.redwoodForestGen == true)
{
if (BOPConfiguration.redwoodForestGen)
registerBiome(Biomes.redwoodForest);
}
if (BOPConfiguration.sacredSpringsGen == true)
{
if (BOPConfiguration.sacredSpringsGen)
registerBiome(Biomes.sacredSprings);
}
if (BOPConfiguration.savannaGen == true)
{
if (BOPConfiguration.savannaGen)
registerBiome(Biomes.savanna);
}
if (BOPConfiguration.scrublandGen == true)
{
if (BOPConfiguration.scrublandGen)
registerBiome(Biomes.scrubland);
}
if (BOPConfiguration.seasonalForestGen == true)
{
if (BOPConfiguration.seasonalForestGen)
registerBiome(Biomes.seasonalForest);
}
if (BOPConfiguration.shieldGen == true)
{
if (BOPConfiguration.shieldGen)
registerBiome(Biomes.shield);
}
if (BOPConfiguration.shrublandGen == true)
{
if (BOPConfiguration.shrublandGen)
registerBiome(Biomes.shrubland);
}
if (BOPConfiguration.snowyWoodsGen == true)
{
if (BOPConfiguration.snowyWoodsGen)
registerBiome(Biomes.snowyWoods);
}
if (BOPConfiguration.spruceWoodsGen == true)
{
if (BOPConfiguration.spruceWoodsGen)
registerBiome(Biomes.spruceWoods);
}
if (BOPConfiguration.steppeGen == true)
{
if (BOPConfiguration.steppeGen)
registerBiome(Biomes.steppe);
}
if (BOPConfiguration.swampwoodsGen == true)
{
if (BOPConfiguration.swampwoodsGen)
registerBiome(Biomes.swampwoods);
}
if (BOPConfiguration.temperateRainforestGen == true)
{
if (BOPConfiguration.temperateRainforestGen)
registerBiome(Biomes.temperateRainforest);
}
if (BOPConfiguration.thicketGen == true)
{
if (BOPConfiguration.thicketGen)
registerBiome(Biomes.thicket);
}
if (BOPConfiguration.tropicalRainforestGen == true)
{
if (BOPConfiguration.tropicalRainforestGen)
registerBiome(Biomes.tropicalRainforest);
}
if (BOPConfiguration.tropicsGen == true)
{
if (BOPConfiguration.tropicsGen)
registerBiome(Biomes.tropics);
}
if (BOPConfiguration.tundraGen == true)
{
if (BOPConfiguration.tundraGen)
registerBiome(Biomes.tundra);
}
if (BOPConfiguration.volcanoGen == true)
{
if (BOPConfiguration.volcanoGen)
registerBiome(Biomes.volcano);
}
if (BOPConfiguration.wastelandGen == true)
{
if (BOPConfiguration.wastelandGen)
registerBiome(Biomes.wasteland);
}
if (BOPConfiguration.wetlandGen == true)
{
if (BOPConfiguration.wetlandGen)
registerBiome(Biomes.wetland);
}
if (BOPConfiguration.woodlandGen == true)
{
if (BOPConfiguration.woodlandGen)
registerBiome(Biomes.woodland);
}
if (BOPConfiguration.plainsGen == true)
{
if (BOPConfiguration.vanillaEnhanced == true)
// Vanilla biomes generation
if (BOPConfiguration.plainsGen)
if (BOPConfiguration.vanillaEnhanced)
{
registerBiome(Biomes.plainsNew);
GameRegistry.removeBiome(BiomeGenBase.plains);
}
}
if (BOPConfiguration.desertGen == true)
{
if (BOPConfiguration.vanillaEnhanced == true)
else
GameRegistry.removeBiome(BiomeGenBase.plains);
if (BOPConfiguration.desertGen)
if (BOPConfiguration.vanillaEnhanced)
{
registerBiome(Biomes.desertNew);
GameRegistry.removeBiome(BiomeGenBase.desert);
}
}
if (BOPConfiguration.extremeHillsGen == true)
{
if (BOPConfiguration.vanillaEnhanced == true)
else
GameRegistry.removeBiome(BiomeGenBase.desert);
if (BOPConfiguration.extremeHillsGen)
if (BOPConfiguration.vanillaEnhanced)
{
registerBiome(Biomes.extremeHillsNew);
GameRegistry.removeBiome(BiomeGenBase.extremeHills);
}
}
if (BOPConfiguration.forestGen == true)
{
if (BOPConfiguration.vanillaEnhanced == true)
else
GameRegistry.removeBiome(BiomeGenBase.extremeHills);
if (BOPConfiguration.forestGen)
if (BOPConfiguration.vanillaEnhanced)
{
registerBiome(Biomes.forestNew);
GameRegistry.removeBiome(BiomeGenBase.forest);
}
}
if (BOPConfiguration.taigaGen == true)
{
if (BOPConfiguration.vanillaEnhanced == true)
else
GameRegistry.removeBiome(BiomeGenBase.forest);
if (BOPConfiguration.taigaGen)
if (BOPConfiguration.vanillaEnhanced)
{
registerBiome(Biomes.taigaNew);
GameRegistry.removeBiome(BiomeGenBase.taiga);
}
}
if (BOPConfiguration.swamplandGen == true)
{
if (BOPConfiguration.vanillaEnhanced == true)
else
GameRegistry.removeBiome(BiomeGenBase.taiga);
if (BOPConfiguration.swamplandGen)
if (BOPConfiguration.vanillaEnhanced)
{
registerBiome(Biomes.swamplandNew);
GameRegistry.removeBiome(BiomeGenBase.swampland);
}
}
if (BOPConfiguration.jungleGen == true)
{
if (BOPConfiguration.vanillaEnhanced == true)
else
GameRegistry.removeBiome(BiomeGenBase.swampland);
if (BOPConfiguration.jungleGen)
if (BOPConfiguration.vanillaEnhanced)
{
registerBiome(Biomes.jungleNew);
GameRegistry.removeBiome(BiomeGenBase.jungle);
}
}
else
GameRegistry.removeBiome(BiomeGenBase.jungle);
}
}

View File

@ -4,8 +4,6 @@ import java.io.File;
import java.util.logging.Level;
import net.minecraftforge.common.Configuration;
import biomesoplenty.BiomesOPlenty;
import biomesoplenty.ClientProxy;
import cpw.mods.fml.common.FMLLog;
public class BOPConfiguration {
@ -18,6 +16,7 @@ public class BOPConfiguration {
public static boolean addToDefault;
public static boolean achievements;
public static boolean vanillaEnhanced;
public static int promisedLandDimID;
public static boolean alpsGen;
@ -93,8 +92,7 @@ public class BOPConfiguration {
public static boolean wetlandGen;
public static boolean woodlandGen;
public static boolean oceanGen;
// Vanilla biomes
public static boolean plainsGen;
public static boolean desertGen;
public static boolean extremeHillsGen;
@ -173,24 +171,15 @@ public class BOPConfiguration {
public static int colourizedLeavesID;
public static int shroomPowderID;
public static int mudBallID;
public static int mudBrickID;
public static int cattailItemID;
public static int bambooItemID;
public static int barleyItemID;
public static int shortGrassItemID;
public static int mediumGrassItemID;
public static int bushItemID;
public static int sproutItemID;
public static int mossItemID;
public static int ashesID;
public static int ancientStaffID;
public static int ancientStaffHandleID;
public static int ancientStaffPoleID;
public static int ancientStaffTopperID;
public static int enderporterID;
public static int bopDiscID;
public static int bopDiscMudID;
public static int miscItemsID;
public static int swordMudID;
public static int shovelMudID;
public static int pickaxeMudID;
@ -200,7 +189,8 @@ public class BOPConfiguration {
public static int chestplateMudID;
public static int leggingsMudID;
public static int bootsMudID;
public static int amethystID;
public static int swordAmethystID;
public static int shovelAmethystID;
public static int pickaxeAmethystID;
@ -313,8 +303,6 @@ public class BOPConfiguration {
public static void init(File configFile)
{
boolean isClient = BiomesOPlenty.proxy instanceof ClientProxy;
config = new Configuration(configFile);
try
@ -323,18 +311,11 @@ public class BOPConfiguration {
skyColors = true;
biomeSize = config.get("Biome Settings", "Biome Size", 4, null).getInt();
achievements = config.get("Achievement Settings", "Add Biomes O Plenty Achievemnets", true).getBoolean(false);
achievements = config.get("Achievement Settings", "Add Biomes O\' Plenty Achievements", true).getBoolean(false);
vanillaEnhanced = config.get("Biome Settings", "Enhanced Vanilla Biomes", true).getBoolean(false);
promisedLandDimID = config.get("Dimension Settings", "Promised Land Dimension ID", 20, null).getInt();
if (!isClient)
{
addToDefault = config.get("Biome Settings", "Add Biomes To Default World", true).getBoolean(false);
}
else
{
addToDefault = config.get("Biome Settings", "Add Biomes To Default World", false).getBoolean(false);
}
addToDefault = config.get("Biome Settings", "Add Biomes To Default World", true).getBoolean(true);
alpsGen = config.get("Biomes To Generate", "Alps", true).getBoolean(false);
arcticGen = config.get("Biomes To Generate", "Arctic", true).getBoolean(false);
@ -353,13 +334,10 @@ public class BOPConfiguration {
deadSwampGen = config.get("Biomes To Generate", "DeadSwamp", true).getBoolean(false);
deadlandsGen = config.get("Biomes To Generate", "Deadlands", true).getBoolean(false);
deciduousForestGen = config.get("Biomes To Generate", "DeciduousForest", true).getBoolean(false);
desertGen = config.get("Biomes To Generate", "Desert", true).getBoolean(false);
drylandsGen = config.get("Biomes To Generate", "Drylands", true).getBoolean(false);
dunesGen = config.get("Biomes To Generate", "Dunes", true).getBoolean(false);
extremeHillsGen = config.get("Biomes To Generate", "ExtremeHills", true).getBoolean(false);
fenGen = config.get("Biomes To Generate", "Fen", true).getBoolean(false);
fieldGen = config.get("Biomes To Generate", "Field", true).getBoolean(false);
forestGen = config.get("Biomes To Generate", "Forest", 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);
@ -371,7 +349,6 @@ public class BOPConfiguration {
iceSheetGen = config.get("Biomes To Generate", "IcySheet", true).getBoolean(false);
icyHillsGen = config.get("Biomes To Generate", "IcyHills", true).getBoolean(false);
jadeCliffsGen = config.get("Biomes To Generate", "JadeCliffs", true).getBoolean(false);
jungleGen = config.get("Biomes To Generate", "Jungle", 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);
@ -389,7 +366,6 @@ public class BOPConfiguration {
originValleyGen = config.get("Biomes To Generate", "OriginValley", true).getBoolean(false);
outbackGen = config.get("Biomes To Generate", "Outback", true).getBoolean(false);
pastureGen = config.get("Biomes To Generate", "Pasture", true).getBoolean(false);
plainsGen = config.get("Biomes To Generate", "Plains", true).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);
@ -403,9 +379,7 @@ public class BOPConfiguration {
snowyWoodsGen = config.get("Biomes To Generate", "SnowyWoods", true).getBoolean(false);
spruceWoodsGen = config.get("Biomes To Generate", "SpruceWoods", true).getBoolean(false);
steppeGen = config.get("Biomes To Generate", "Steppe", true).getBoolean(false);
swamplandGen = config.get("Biomes To Generate", "Swampland", true).getBoolean(false);
swampwoodsGen = config.get("Biomes To Generate", "Swampwoods", true).getBoolean(false);
taigaGen = config.get("Biomes To Generate", "Taiga", true).getBoolean(false);
temperateRainforestGen = config.get("Biomes To Generate", "TemperateRainforest", true).getBoolean(false);
thicketGen = config.get("Biomes To Generate", "Thicket", true).getBoolean(false);
tropicalRainforestGen = config.get("Biomes To Generate", "TropicalRainforest", true).getBoolean(false);
@ -416,7 +390,14 @@ public class BOPConfiguration {
wetlandGen = config.get("Biomes To Generate", "Wetland", true).getBoolean(false);
woodlandGen = config.get("Biomes To Generate", "Woodland", true).getBoolean(false);
oceanGen = config.get("Vanilla Biomes To Generate", "Ocean", true).getBoolean(false);
// 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);
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);
// Get Terrain Block ID's
mudID = config.getTerrainBlock("Terrain Block IDs", "Mud ID", 160, null).getInt();
@ -490,44 +471,35 @@ public class BOPConfiguration {
colourizedLeavesID = config.getBlock("Colourized Leaves ID", 1962, null).getInt();
// Get Item ID's
shroomPowderID = config.getItem("Shroom Powder ID", 1001, null).getInt();
mudBallID = config.getItem("Mud Ball ID", 1002, null).getInt();
mudBrickID = config.getItem("Mud Brick ID", 1003, null).getInt();
bambooItemID = config.getItem("Bamboo ID", 1004).getInt();
cattailItemID = config.getItem("Cattail ID", 1005).getInt();
ancientStaffID = config.getItem("Ancient Staff ID", 1006).getInt();
enderporterID = config.getItem("Enderporter ID", 1007).getInt();
ashesID = config.getItem("Pile of Ashes ID", 1008, null).getInt();
barleyItemID = config.getItem("Barley ID", 1009).getInt();
amethystID = config.getItem("Amethyst ID", 1010).getInt();
ancientStaffHandleID = config.getItem("Ancient Staff Handle ID", 1011, null).getInt();
ancientStaffPoleID = config.getItem("Ancient Staff Pole ID", 1012, null).getInt();
ancientStaffTopperID = config.getItem("Ancient Staff Topper ID", 1013, null).getInt();
shortGrassItemID = config.getItem("Short Grass (Item) ID", 1014, null).getInt();
mediumGrassItemID = config.getItem("Medium Grass (Item) ID", 1015, null).getInt();
bushItemID = config.getItem("Bush (Item) ID", 1016, null).getInt();
sproutItemID = config.getItem("Sprout (Item) ID", 1017, null).getInt();
mossItemID = config.getItem("Moss (Item) ID", 1018, null).getInt();
bopDiscID = config.getItem("Traversia Music Disc ID", 1019, null).getInt();
bopDiscMudID = config.getItem("Muddy Music Disc ID", 1020, null).getInt();
swordMudID = config.getItem("Muddy Sword ID", 1060, null).getInt();
shovelMudID = config.getItem("Muddy Shovel ID", 1061, null).getInt();
pickaxeMudID = config.getItem("Muddy Pickaxe ID", 1062, null).getInt();
axeMudID = config.getItem("Muddy Axe ID", 1063, null).getInt();
hoeMudID = config.getItem("Muddy Hoe ID", 1064, null).getInt();
helmetMudID = config.getItem("Muddy Helmet ID", 1065, null).getInt();
chestplateMudID = config.getItem("Muddy Chestplate ID", 1066, null).getInt();
leggingsMudID = config.getItem("Muddy Leggings ID", 1067, null).getInt();
bootsMudID = config.getItem("Muddy Boots ID", 1068, null).getInt();
swordAmethystID = config.getItem("Amethyst Sword ID", 1069, null).getInt();
shovelAmethystID = config.getItem("Amethyst Shovel ID", 1070, null).getInt();
pickaxeAmethystID = config.getItem("Amethyst Pickaxe ID", 1071, null).getInt();
axeAmethystID = config.getItem("Amethyst Axe ID", 1072, null).getInt();
hoeAmethystID = config.getItem("Amethyst Hoe ID", 1073, null).getInt();
helmetAmethystID = config.getItem("Amethyst Helmet ID", 1074, null).getInt();
chestplateAmethystID = config.getItem("Amethyst Chestplate ID", 1075, null).getInt();
leggingsAmethystID = config.getItem("Amethyst Leggings ID", 1076, null).getInt();
bootsAmethystID = config.getItem("Amethyst Boots ID", 1077, null).getInt();
shroomPowderID = config.getItem("Shroom Powder ID", 21001, null).getInt();
ancientStaffID = config.getItem("Ancient Staff ID", 21006).getInt();
enderporterID = config.getItem("Enderporter ID", 21007).getInt();
miscItemsID = config.getItem("Misc Items ID", 21010).getInt();
bopDiscID = config.getItem("Traversia Music Disc ID", 21019, null).getInt();
bopDiscMudID = config.getItem("Muddy Music Disc ID", 21020, null).getInt();
swordMudID = config.getItem("Muddy Sword ID", 21060, null).getInt();
shovelMudID = config.getItem("Muddy Shovel ID", 21061, null).getInt();
pickaxeMudID = config.getItem("Muddy Pickaxe ID", 21062, null).getInt();
axeMudID = config.getItem("Muddy Axe ID", 21063, null).getInt();
hoeMudID = config.getItem("Muddy Hoe ID", 21064, null).getInt();
helmetMudID = config.getItem("Muddy Helmet ID", 21065, null).getInt();
chestplateMudID = config.getItem("Muddy Chestplate ID", 21066, null).getInt();
leggingsMudID = config.getItem("Muddy Leggings ID", 21067, null).getInt();
bootsMudID = config.getItem("Muddy Boots ID", 21068, null).getInt();
swordAmethystID = config.getItem("Amethyst Sword ID", 21069, null).getInt();
shovelAmethystID = config.getItem("Amethyst Shovel ID", 21070, null).getInt();
pickaxeAmethystID = config.getItem("Amethyst Pickaxe ID", 21071, null).getInt();
axeAmethystID = config.getItem("Amethyst Axe ID", 21072, null).getInt();
hoeAmethystID = config.getItem("Amethyst Hoe ID", 21073, null).getInt();
helmetAmethystID = config.getItem("Amethyst Helmet ID", 21074, null).getInt();
chestplateAmethystID = config.getItem("Amethyst Chestplate ID", 21075, null).getInt();
leggingsAmethystID = config.getItem("Amethyst Leggings ID", 21076, null).getInt();
bootsAmethystID = config.getItem("Amethyst Boots ID", 21077, null).getInt();
//Mob IDs
jungleSpiderID = config.get("Mob IDs", "Jungle Spider ID", 101, null).getInt();

View File

@ -100,7 +100,7 @@ public class BOPItems {
{
// Item declaration
Items.shroomPowder = Optional.of(new ItemShroomPowder(BOPConfiguration.shroomPowderID, 1, 0.5F, false));
Items.miscItems = Optional.of(new ItemBOP(BOPConfiguration.amethystID));
Items.miscItems = Optional.of(new ItemBOP(BOPConfiguration.miscItemsID));
Items.ancientStaff = Optional.of(new ItemBOPAncientStaff(BOPConfiguration.ancientStaffID));

View File

@ -19,10 +19,6 @@ public class WTBiomesOP extends WorldTypeBase
this.removeBiome(BiomeGenBase.taiga);
this.removeBiome(BiomeGenBase.swampland);
this.removeBiome(BiomeGenBase.jungle);
if (BOPConfiguration.oceanGen)
{
this.removeBiome(BiomeGenBase.ocean);
}
if (BOPConfiguration.alpsGen == true)
{

View File

@ -1,6 +1,5 @@
package biomesoplenty.worldtype;
import biomesoplenty.configuration.BOPConfiguration;
import net.minecraft.world.World;
import net.minecraft.world.WorldType;
import net.minecraft.world.biome.BiomeGenBase;
@ -33,9 +32,5 @@ public class WorldTypeBase extends WorldType
this.removeBiome(BiomeGenBase.taiga);
this.removeBiome(BiomeGenBase.swampland);
this.removeBiome(BiomeGenBase.jungle);
if (BOPConfiguration.oceanGen)
{
this.removeBiome(BiomeGenBase.ocean);
}
}
}