etc
/
BiomesOPlenty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixing the inconsistent biome maps.

This commit is contained in:
Amnet 2013-11-05 01:26:15 +01:00
parent f5d64a032f
commit be1441520e
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/biomesoplenty/BiomesOPlenty.java
View File

@ -33,6 +33,7 @@ import biomesoplenty.helpers.CreativeTabsBOP;
import biomesoplenty.helpers.Version;
import biomesoplenty.integration.BOPCrossIntegration;
import biomesoplenty.world.WorldProviderPromised;
import biomesoplenty.world.WorldTypeBOP;
import biomesoplenty.world.WorldTypeSize;
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.Mod.EventHandler;
@ -128,6 +129,9 @@ public class BiomesOPlenty
public void postInit(FMLPostInitializationEvent event)
{
BOPCrossIntegration.postInit();
//Initialize new world type
BOPBiomes.WTBiomesOP = new WorldTypeBOP();
TickRegistry.registerTickHandler(new TickHandlerClient(), Side.CLIENT);
TickRegistry.registerTickHandler(new TickHandlerServer(), Side.SERVER);

13
common/biomesoplenty/configuration/BOPBiomes.java
View File

@ -61,7 +61,6 @@ import biomesoplenty.biomes.BiomeGenMesa;
import biomesoplenty.biomes.BiomeGenMoor;
import biomesoplenty.biomes.BiomeGenMountain;
import biomesoplenty.biomes.BiomeGenMysticGrove;
import biomesoplenty.biomes.BiomeGenMysticGroveThin;
import biomesoplenty.biomes.BiomeGenOasis;
import biomesoplenty.biomes.BiomeGenOminousWoods;
import biomesoplenty.biomes.BiomeGenOminousWoodsThick;
@ -158,7 +157,7 @@ public class BOPBiomes {
initializeBiomes();
//Initialize new world type
WTBiomesOP = new WorldTypeBOP();
//WTBiomesOP = new WorldTypeBOP();
// Adding biomes to World Types
addBiomes();
@ -234,8 +233,7 @@ public class BOPBiomes {
Biomes.mesa = Optional.of((new BiomeGenMesa(BOPConfigurationIDs.mesaID)).setColor(16421912).setBiomeName("Mesa").setDisableRain().setTemperatureRainfall(2.0F, 0.05F).setMinMaxHeight(0.4F, 2.0F));
Biomes.moor = Optional.of((new BiomeGenMoor(BOPConfigurationIDs.moorID)).setColor(16421912).setBiomeName("Moor").setTemperatureRainfall(0.5F, 1.0F).setMinMaxHeight(0.7F, 0.8F));
Biomes.mountain = Optional.of((new BiomeGenMountain(BOPConfigurationIDs.mountainID)).setColor(14090235).setBiomeName("Mountain").setTemperatureRainfall(0.5F, 0.1F).setMinMaxHeight(1.0F, 1.5F));
Biomes.mysticGrove = Optional.of((new BiomeGenMysticGrove(BOPConfigurationIDs.mysticGroveID)).setColor(353825).setBiomeName("Mystic Grove").func_76733_a(5159473).setTemperatureRainfall(0.9F, 1.0F).setMinMaxHeight(0.3F, 0.8F));
Biomes.mysticGroveThin = Optional.of((new BiomeGenMysticGroveThin(BOPConfigurationIDs.mysticGroveThinID)).setColor(353825).setBiomeName("Thinned Mystic Grove").func_76733_a(5159473).setTemperatureRainfall(0.9F, 1.0F).setMinMaxHeight(0.1F, 0.3F));
Biomes.mysticGrove = Optional.of((new BiomeGenMysticGrove(BOPConfigurationIDs.mysticGroveID)).setColor(353825).setBiomeName("Mystic Grove").setDisableRain().func_76733_a(5159473).setTemperatureRainfall(0.9F, 1.0F));
Biomes.netherBase = Optional.of((new BiomeGenNetherBase(BOPConfigurationIDs.netherBaseID)).setColor(16711680).setBiomeName("Nether").setDisableRain().setTemperatureRainfall(2.0F, 0.0F));
Biomes.netherGarden = Optional.of((new BiomeGenNetherGarden(BOPConfigurationIDs.netherGardenID)).setColor(16711680).setBiomeName("Undergarden").setDisableRain().setTemperatureRainfall(2.0F, 0.0F));
@ -250,8 +248,8 @@ public class BOPBiomes {
Biomes.oceanCoral = Optional.of((new BiomeGenOceanCoral(BOPConfigurationIDs.oceanCoralID)).setColor(10486015).setBiomeName("Coral Reef").setMinMaxHeight(-0.1F, 0.0F).setTemperatureRainfall(0.5F, 0.9F));
Biomes.oceanKelp = Optional.of((new BiomeGenOceanKelp(BOPConfigurationIDs.oceanKelpID)).setColor(10486015).setBiomeName("Kelp Forest").setMinMaxHeight(-0.4F, -0.1F).setTemperatureRainfall(0.5F, 0.9F));
Biomes.ominousWoods = Optional.of((new BiomeGenOminousWoods(BOPConfigurationIDs.ominousWoodsID)).setColor(353825).setBiomeName("Ominous Woods").func_76733_a(5159473).setTemperatureRainfall(0.8F, 0.9F).setMinMaxHeight(0.1F, 0.3F));
Biomes.ominousWoodsThick = Optional.of((new BiomeGenOminousWoodsThick(BOPConfigurationIDs.ominousWoodsThickID)).setColor(353825).setBiomeName("Thick Ominous Woods").func_76733_a(5159473).setTemperatureRainfall(0.8F, 0.9F).setMinMaxHeight(0.4F, 0.8F));
Biomes.ominousWoods = Optional.of((new BiomeGenOminousWoods(BOPConfigurationIDs.ominousWoodsID)).setColor(353825).setBiomeName("Ominous Woods").func_76733_a(5159473).setTemperatureRainfall(0.8F, 0.9F));
Biomes.ominousWoodsThick = Optional.of((new BiomeGenOminousWoodsThick(BOPConfigurationIDs.ominousWoodsThickID)).setColor(353825).setBiomeName("Thick Ominous Woods").func_76733_a(5159473).setTemperatureRainfall(0.8F, 0.9F));
Biomes.orchard = Optional.of((new BiomeGenOrchard(BOPConfigurationIDs.orchardID)).setColor(9286496).setBiomeName("Orchard").setTemperatureRainfall(0.8F, 0.4F));
Biomes.originValley = Optional.of((new BiomeGenOriginValley(BOPConfigurationIDs.originValleyID)).setColor(353825).setBiomeName("Origin Valley").func_76733_a(5159473).setTemperatureRainfall(0.7F, 0.8F).setMinMaxHeight(0.2F, 0.6F));
Biomes.outback = Optional.of((new BiomeGenOutback(BOPConfigurationIDs.outbackID)).setColor(9286496).setBiomeName("Outback").setTemperatureRainfall(0.8F, 0.05F).setMinMaxHeight(0.3F, 0.4F));
@ -378,7 +376,6 @@ public class BOPBiomes {
BiomeDictionary.registerBiomeType(Biomes.moor.get(), Type.HILLS, Type.SWAMP);
BiomeDictionary.registerBiomeType(Biomes.mountain.get(), Type.MOUNTAIN);
BiomeDictionary.registerBiomeType(Biomes.mysticGrove.get(), Type.MAGICAL, Type.FOREST);
BiomeDictionary.registerBiomeType(Biomes.mysticGroveThin.get(), Type.MAGICAL, Type.FOREST);
BiomeDictionary.registerBiomeType(Biomes.netherBase.get(), Type.NETHER);
BiomeDictionary.registerBiomeType(Biomes.netherGarden.get(), Type.NETHER, Type.JUNGLE);
@ -1514,7 +1511,7 @@ public class BOPBiomes {
worldTypes.add(WorldType.DEFAULT);
worldTypes.add(WorldType.LARGE_BIOMES);
}
worldTypes.add(WTBiomesOP);
//worldTypes.add(WTBiomesOP);
}
return ImmutableSet.copyOf(worldTypes);
}

4
common/biomesoplenty/helpers/Version.java
View File

@ -9,6 +9,7 @@ import java.util.logging.Level;
import net.minecraft.world.World;
import net.minecraft.world.WorldType;
import net.minecraftforge.common.Property;
import biomesoplenty.configuration.BOPBiomes;
import biomesoplenty.configuration.configfile.BOPConfigurationMain;
import biomesoplenty.world.WorldTypeBOP;
import cpw.mods.fml.common.FMLCommonHandler;
@ -62,7 +63,6 @@ public class Version implements Runnable {
public static boolean needsBOPWorldtypeAndMarkAsSeen(World world)
{
WorldType terrainType = world.getWorldInfo().getTerrainType();
WorldTypeBOP bopType = new WorldTypeBOP();
Property property = BOPConfigurationMain.config.get("Vars", "Seen WorldType Msg", false);
String worldTypeProp = property.getString();
@ -70,7 +70,7 @@ public class Version implements Runnable {
if (terrainType == null || property.getBoolean(false) == true)
return false;
if (terrainType.getWorldTypeName().equals(bopType.getWorldTypeName()) || terrainType.getWorldTypeName().equals("ATG"))
if (terrainType.getWorldTypeName().equals(BOPBiomes.WTBiomesOP.getWorldTypeName()) || terrainType.getWorldTypeName().equals("ATG"))
{
property.set(true);

2
common/biomesoplenty/world/WorldTypeBOP.java
View File

@ -15,7 +15,7 @@ public class WorldTypeBOP extends WorldType
{
public WorldTypeBOP() {
super(4, "BIOMESOP");
this.biomesForWorldType = super.getBiomesForWorldType();
this.biomesForWorldType = WorldType.DEFAULT.getBiomesForWorldType();
this.removeAllBiomes();
if (BOPConfigurationBiomeGen.alpsGen == true)