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

Fixed NPEs on launch with the Promised Land

This commit is contained in:
Adubbz 2014-01-27 15:44:19 +11:00
parent e8509ae4bf
commit ffe8f4aefc
3 changed files with 23 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/biomesoplenty/common/configuration/BOPConfigurationIDs.java
View File

@ -97,10 +97,10 @@ public class BOPConfigurationIDs
public static int polarID; public static int polarID;
public static int prairieID; public static int prairieID;
public static int promisedLandForestID; public static int wonderousWoodsID;
public static int promisedLandPlainsID; public static int majesticMeadowID;
public static int promisedLandShrubID; public static int promisedLandShrubID;
public static int promisedLandSwampID; public static int blessedBogID;
public static int quagmireID; public static int quagmireID;
public static int rainforestID; public static int rainforestID;
@ -198,9 +198,9 @@ public class BOPConfigurationIDs
beachGravelID = config.get("Biome IDs", "Gravel Beach ID", 75).getInt(); beachGravelID = config.get("Biome IDs", "Gravel Beach ID", 75).getInt();
beachOvergrownID = config.get("Biome IDs", "Overgrown Beach ID", 76).getInt(); beachOvergrownID = config.get("Biome IDs", "Overgrown Beach ID", 76).getInt();
promisedLandForestID = config.get("Biome IDs", "Wonderous Woods (Promised Land) ID", 77).getInt(); wonderousWoodsID = config.get("Biome IDs", "Wonderous Woods (Promised Land) ID", 77).getInt();
promisedLandPlainsID = config.get("Biome IDs", "Majestic Meadow (Promised Land) ID", 78).getInt(); majesticMeadowID = config.get("Biome IDs", "Majestic Meadow (Promised Land) ID", 78).getInt();
promisedLandSwampID = config.get("Biome IDs", "Blessed Bog (Promised Land) ID", 79).getInt(); blessedBogID = config.get("Biome IDs", "Blessed Bog (Promised Land) ID", 79).getInt();
netherBaseID = config.get("Biome IDs", "Nether Base (Nether) ID", 80).getInt(); netherBaseID = config.get("Biome IDs", "Nether Base (Nether) ID", 80).getInt();
netherGardenID = config.get("Biome IDs", "Undergarden (Nether) ID", 81).getInt(); netherGardenID = config.get("Biome IDs", "Undergarden (Nether) ID", 81).getInt();

12
src/main/java/biomesoplenty/common/core/BOPBiomes.java
View File

@ -173,9 +173,9 @@ public class BOPBiomes
registerBiome(new BOPBiomeEntry(new BiomeGenWetland(BOPConfigurationIDs.wetlandID).setBiomeName("Wetland"), TemperatureType.WARM, 50)); registerBiome(new BOPBiomeEntry(new BiomeGenWetland(BOPConfigurationIDs.wetlandID).setBiomeName("Wetland"), TemperatureType.WARM, 50));
registerBiome(new BOPBiomeEntry(new BiomeGenWoodland(BOPConfigurationIDs.woodlandID).setBiomeName("Woodland"), TemperatureType.WARM, 50)); registerBiome(new BOPBiomeEntry(new BiomeGenWoodland(BOPConfigurationIDs.woodlandID).setBiomeName("Woodland"), TemperatureType.WARM, 50));
registerBiome(new BOPBiomeEntry(new BiomeGenPromisedLandForest(BOPConfigurationIDs.promisedLandForestID).setBiomeName("Wonderous Woods"), TemperatureType.WARM, 50)); registerBiome(new BOPBiomeEntry(new BiomeGenPromisedLandForest(BOPConfigurationIDs.wonderousWoodsID).setBiomeName("Wonderous Woods"), TemperatureType.WARM, 50));
registerBiome(new BOPBiomeEntry(new BiomeGenPromisedLandPlains(BOPConfigurationIDs.promisedLandPlainsID).setBiomeName("Majestic Meadow"), TemperatureType.WARM, 50)); registerBiome(new BOPBiomeEntry(new BiomeGenPromisedLandPlains(BOPConfigurationIDs.majesticMeadowID).setBiomeName("Majestic Meadow"), TemperatureType.WARM, 50));
registerBiome(new BOPBiomeEntry(new BiomeGenPromisedLandSwamp(BOPConfigurationIDs.promisedLandSwampID).setBiomeName("Blessed Bog"), TemperatureType.WARM, 50)); registerBiome(new BOPBiomeEntry(new BiomeGenPromisedLandSwamp(BOPConfigurationIDs.blessedBogID).setBiomeName("Blessed Bog"), TemperatureType.WARM, 50));
} }
private static void addSpawnBiomes() private static void addSpawnBiomes()
@ -291,10 +291,10 @@ public class BOPBiomes
//BiomeDictionary.registerBiomeType(BOPBiomeHelper.getBOPBiome("polar"), Type.FROZEN, Type.WATER); //BiomeDictionary.registerBiomeType(BOPBiomeHelper.getBOPBiome("polar"), Type.FROZEN, Type.WATER);
BiomeDictionary.registerBiomeType(BOPBiomeHelper.getBOPBiome("prairie"), Type.PLAINS); BiomeDictionary.registerBiomeType(BOPBiomeHelper.getBOPBiome("prairie"), Type.PLAINS);
BiomeDictionary.registerBiomeType(BOPBiomeHelper.getBOPBiome("promisedLandForest"), Type.FOREST, Type.MAGICAL); BiomeDictionary.registerBiomeType(BOPBiomeHelper.getBOPBiome("wonderousWoods"), Type.FOREST, Type.MAGICAL);
BiomeDictionary.registerBiomeType(BOPBiomeHelper.getBOPBiome("promisedLandPlains"), Type.PLAINS, Type.MAGICAL); BiomeDictionary.registerBiomeType(BOPBiomeHelper.getBOPBiome("majesticMeadow"), Type.PLAINS, Type.MAGICAL);
//BiomeDictionary.registerBiomeType(BOPBiomeHelper.getBOPBiome("promisedLandShrub"), Type.PLAINS, Type.FOREST, Type.MAGICAL); //BiomeDictionary.registerBiomeType(BOPBiomeHelper.getBOPBiome("promisedLandShrub"), Type.PLAINS, Type.FOREST, Type.MAGICAL);
BiomeDictionary.registerBiomeType(BOPBiomeHelper.getBOPBiome("promisedLandSwamp"), Type.SWAMP, Type.MAGICAL); BiomeDictionary.registerBiomeType(BOPBiomeHelper.getBOPBiome("blessedBog"), Type.SWAMP, Type.MAGICAL);
BiomeDictionary.registerBiomeType(BOPBiomeHelper.getBOPBiome("quagmire"), Type.WASTELAND, Type.SWAMP); BiomeDictionary.registerBiomeType(BOPBiomeHelper.getBOPBiome("quagmire"), Type.WASTELAND, Type.SWAMP);
BiomeDictionary.registerBiomeType(BOPBiomeHelper.getBOPBiome("rainforest"), Type.JUNGLE, Type.HILLS, Type.FOREST); BiomeDictionary.registerBiomeType(BOPBiomeHelper.getBOPBiome("rainforest"), Type.JUNGLE, Type.HILLS, Type.FOREST);

45
src/main/java/biomesoplenty/common/world/WorldProviderPromised.java
View File

@ -20,16 +20,18 @@ import net.minecraftforge.common.DimensionManager;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
public class WorldProviderPromised extends WorldProvider { public class WorldProviderPromised extends WorldProvider
{
@Override @Override
public void setDimension (int dim) { public void setDimension (int dim)
{
this.dimensionId = dim; this.dimensionId = dim;
super.setDimension(dim); super.setDimension(dim);
} }
@Override @Override
public long getSeed () { public long getSeed ()
{
Long seed = super.getSeed(); Long seed = super.getSeed();
return seed; return seed;
} }
@ -50,30 +52,23 @@ public class WorldProviderPromised extends WorldProvider {
dimensionId = BOPConfigurationIDs.promisedLandDimID; dimensionId = BOPConfigurationIDs.promisedLandDimID;
} }
/** @Override
* A message to display to the user when they transfer to this dimension.
*
* @return The message to be displayed
*/
public String getWelcomeMessage() public String getWelcomeMessage()
{ {
if (this instanceof WorldProviderPromised) if (this instanceof WorldProviderPromised)
{ {
return "Entering the "+getDimensionName(); return "Entering the " + getDimensionName();
} }
return null; return null;
} }
/**
* A Message to display to the user when they transfer out of this dismension. @Override
*
* @return The message to be displayed
*/
public String getDepartMessage() public String getDepartMessage()
{ {
if (this instanceof WorldProviderPromised) if (this instanceof WorldProviderPromised)
{ {
return "Leaving the "+getDimensionName(); return "Leaving the " +getDimensionName();
} }
return null; return null;
} }
@ -107,11 +102,6 @@ public class WorldProviderPromised extends WorldProvider {
return 0.0F; return 0.0F;
} }
public boolean darkenSkyDuringRain()
{
return false;
}
@Override @Override
public boolean canCoordinateBeSpawn(int par1, int par2) public boolean canCoordinateBeSpawn(int par1, int par2)
{ {
@ -192,17 +182,4 @@ public class WorldProviderPromised extends WorldProvider {
//{ //{
// return new ChunkProviderPromised(worldObj, worldObj.getSeed()); // return new ChunkProviderPromised(worldObj, worldObj.getSeed());
//} //}
//@Override
public boolean isLightingDisabled()
{
return true;
}
//@Override
public Float[] getLightingMultipliers(WorldClient worldclient)
{
return new Float[] { 0.92F, 0.98F, 0.95F };
}
} }