Overhauled configuration properties
Moved all configuration variables from mod_pocketDim to DDProperties (formerly DimDoorsConfig). Changed property names to be clearer in config file, modified some comments, and generally cleaned up the config file. Fixed some missing properties and variables that were reading from the wrong properties. Modified the order in which mod_pocketDim instantiated some of its static fields so that they would load after properties are read. Almost all classes load after properties are read. Fixed indentation across various files and replaced references to properties in mod_pocketDim with references to DDProperties.
This commit is contained in:
SenseiKiwi
@@ -1,7 +1,5 @@
|
||||
package StevenDimDoors.mod_pocketDim.world;
|
||||
|
||||
import StevenDimDoors.mod_pocketDim.CloudRenderBlank;
|
||||
import StevenDimDoors.mod_pocketDim.mod_pocketDim;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.util.ChunkCoordinates;
|
||||
@@ -10,182 +8,175 @@ import net.minecraft.world.WorldProvider;
|
||||
import net.minecraft.world.biome.BiomeGenBase;
|
||||
import net.minecraft.world.biome.WorldChunkManagerHell;
|
||||
import net.minecraft.world.chunk.IChunkProvider;
|
||||
import net.minecraft.world.storage.WorldInfo;
|
||||
import net.minecraftforge.client.IRenderHandler;
|
||||
import StevenDimDoors.mod_pocketDim.CloudRenderBlank;
|
||||
import StevenDimDoors.mod_pocketDim.DDProperties;
|
||||
import StevenDimDoors.mod_pocketDim.mod_pocketDim;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
|
||||
public class LimboProvider extends WorldProvider
|
||||
{
|
||||
|
||||
@Override
|
||||
public String getDimensionName() {
|
||||
// TODO Auto-generated method stub
|
||||
return "Limbo";
|
||||
}
|
||||
|
||||
private IRenderHandler skyRenderer;
|
||||
|
||||
private IRenderHandler skyRenderer;
|
||||
private DDProperties properties = null;
|
||||
|
||||
public LimboProvider()
|
||||
{
|
||||
this.hasNoSky=false;
|
||||
|
||||
|
||||
this.skyRenderer =new limboSkyProvider();
|
||||
this.hasNoSky = false;
|
||||
this.skyRenderer = new limboSkyProvider();
|
||||
if (properties == null)
|
||||
properties = DDProperties.instance();
|
||||
}
|
||||
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public IRenderHandler getSkyRenderer()
|
||||
{
|
||||
return this.skyRenderer;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
protected void registerWorldChunkManager()
|
||||
{
|
||||
super.worldChunkMgr = new WorldChunkManagerHell(mod_pocketDim.limboBiome,1,1);
|
||||
//this.dimensionId = ConfigAtum.dimensionID;
|
||||
}
|
||||
|
||||
@Override
|
||||
public BiomeGenBase getBiomeGenForCoords(int x, int z)
|
||||
{
|
||||
return mod_pocketDim.limboBiome;
|
||||
}
|
||||
|
||||
public boolean canRespawnHere()
|
||||
{
|
||||
return properties.HardcoreLimboEnabled && properties.LimboEnabled;
|
||||
}
|
||||
|
||||
public boolean isBlockHighHumidity(int x, int y, int z)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public boolean canSnowAt(int x, int y, int z)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public IRenderHandler getSkyRenderer()
|
||||
{
|
||||
return this.skyRenderer;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
protected void registerWorldChunkManager()
|
||||
{
|
||||
super.worldChunkMgr = new WorldChunkManagerHell(mod_pocketDim.limboBiome,1,1);
|
||||
//this.dimensionId = ConfigAtum.dimensionID;
|
||||
}
|
||||
|
||||
@Override
|
||||
public BiomeGenBase getBiomeGenForCoords(int x, int z)
|
||||
protected void generateLightBrightnessTable()
|
||||
{
|
||||
float modifier = 0.0F;
|
||||
|
||||
for (int steps = 0; steps <= 15; ++steps)
|
||||
{
|
||||
return mod_pocketDim.limboBiome;
|
||||
float var3 = 1.0F - (float)steps / 15.0F;
|
||||
this.lightBrightnessTable[steps] = ((0.0F + var3) / (var3 * 3.0F + 1.0F) * (1.0F - modifier) + modifier)*3;
|
||||
// System.out.println( this.lightBrightnessTable[steps]+"light");
|
||||
}
|
||||
|
||||
public boolean canRespawnHere()
|
||||
{
|
||||
|
||||
return mod_pocketDim.hardcoreLimbo&&mod_pocketDim.isLimboActive;
|
||||
}
|
||||
public boolean isBlockHighHumidity(int x, int y, int z)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public boolean canSnowAt(int x, int y, int z)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
@Override
|
||||
protected void generateLightBrightnessTable()
|
||||
{
|
||||
float modifier = 0.0F;
|
||||
}
|
||||
|
||||
for (int steps = 0; steps <= 15; ++steps)
|
||||
{
|
||||
float var3 = 1.0F - (float)steps / 15.0F;
|
||||
this.lightBrightnessTable[steps] = ((0.0F + var3) / (var3 * 3.0F + 1.0F) * (1.0F - modifier) + modifier)*3;
|
||||
// System.out.println( this.lightBrightnessTable[steps]+"light");
|
||||
}
|
||||
}
|
||||
|
||||
public ChunkCoordinates getSpawnPoint()
|
||||
{
|
||||
|
||||
return this.getRandomizedSpawnPoint();
|
||||
}
|
||||
public ChunkCoordinates getSpawnPoint()
|
||||
{
|
||||
|
||||
public float calculateCelestialAngle(long par1, float par3)
|
||||
{
|
||||
int var4 = (int)(par1 % 24000L);
|
||||
float var5 = ((float)var4 + par3) / 24000.0F - 0.25F;
|
||||
return this.getRandomizedSpawnPoint();
|
||||
}
|
||||
|
||||
if (var5 < 0.0F)
|
||||
{
|
||||
++var5;
|
||||
}
|
||||
public float calculateCelestialAngle(long par1, float par3)
|
||||
{
|
||||
int var4 = (int)(par1 % 24000L);
|
||||
float var5 = ((float)var4 + par3) / 24000.0F - 0.25F;
|
||||
|
||||
if (var5 > 1.0F)
|
||||
{
|
||||
--var5;
|
||||
}
|
||||
if (var5 < 0.0F)
|
||||
{
|
||||
++var5;
|
||||
}
|
||||
|
||||
float var6 = var5;
|
||||
var5 = 1.0F - (float)((Math.cos((double)var5 * Math.PI) + 1.0D) / 2.0D);
|
||||
var5 = var6 + (var5 - var6) / 3.0F;
|
||||
return 0;
|
||||
}
|
||||
if (var5 > 1.0F)
|
||||
{
|
||||
--var5;
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public int getMoonPhase(long par1, float par3)
|
||||
{
|
||||
return 4;
|
||||
}
|
||||
float var6 = var5;
|
||||
var5 = 1.0F - (float)((Math.cos((double)var5 * Math.PI) + 1.0D) / 2.0D);
|
||||
var5 = var6 + (var5 - var6) / 3.0F;
|
||||
return 0;
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@SideOnly(Side.CLIENT)
|
||||
public int getMoonPhase(long par1, float par3)
|
||||
{
|
||||
return 4;
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public String getSaveFolder()
|
||||
{
|
||||
return (dimensionId == 0 ? null : "DimensionalDoors/Limbo" + dimensionId);
|
||||
}
|
||||
|
||||
public boolean canCoordinateBeSpawn(int par1, int par2)
|
||||
{
|
||||
int var3 = this.worldObj.getFirstUncoveredBlock(par1, par2);
|
||||
return var3 == mod_pocketDim.blockLimboID;
|
||||
}
|
||||
@Override
|
||||
{
|
||||
return (dimensionId == 0 ? null : "DimensionalDoors/Limbo" + dimensionId);
|
||||
}
|
||||
|
||||
public boolean canCoordinateBeSpawn(int par1, int par2)
|
||||
{
|
||||
int var3 = this.worldObj.getFirstUncoveredBlock(par1, par2);
|
||||
return var3 == properties.LimboBlockID;
|
||||
}
|
||||
@Override
|
||||
public double getHorizon()
|
||||
{
|
||||
return worldObj.getHeight()/4-800;
|
||||
}
|
||||
{
|
||||
return worldObj.getHeight()/4-800;
|
||||
}
|
||||
public Vec3 getSkyColor(Entity cameraEntity, float partialTicks)
|
||||
{
|
||||
setCloudRenderer( new CloudRenderBlank());
|
||||
return this.worldObj.getWorldVec3Pool().getVecFromPool((double)0, (double)0, (double)0);
|
||||
setCloudRenderer( new CloudRenderBlank());
|
||||
return this.worldObj.getWorldVec3Pool().getVecFromPool((double)0, (double)0, (double)0);
|
||||
|
||||
}
|
||||
@SideOnly(Side.CLIENT)
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public Vec3 getFogColor(float par1, float par2)
|
||||
{
|
||||
return this.worldObj.getWorldVec3Pool().getVecFromPool((double).2, (double).2, (double).2);
|
||||
{
|
||||
return this.worldObj.getWorldVec3Pool().getVecFromPool((double).2, (double).2, (double).2);
|
||||
|
||||
}
|
||||
public int getRespawnDimension(EntityPlayerMP player)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
}
|
||||
public int getRespawnDimension(EntityPlayerMP player)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IChunkProvider createChunkGenerator()
|
||||
{
|
||||
return new LimboGenerator(worldObj, 45);
|
||||
}
|
||||
public boolean canBlockFreeze(int x, int y, int z, boolean byWater)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
public boolean canBlockFreeze(int x, int y, int z, boolean byWater)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ChunkCoordinates getRandomizedSpawnPoint()
|
||||
{
|
||||
ChunkCoordinates var5 = new ChunkCoordinates(0,0,0);
|
||||
public ChunkCoordinates getRandomizedSpawnPoint()
|
||||
{
|
||||
ChunkCoordinates var5 = new ChunkCoordinates(0,0,0);
|
||||
|
||||
|
||||
int spawnFuzz = 10000;
|
||||
int spawnFuzzHalf = spawnFuzz / 2;
|
||||
|
||||
{
|
||||
var5.posX += this.worldObj.rand.nextInt(spawnFuzz) - spawnFuzzHalf;
|
||||
var5.posZ += this.worldObj.rand.nextInt(spawnFuzz) - spawnFuzzHalf;
|
||||
var5.posY = 700;
|
||||
}
|
||||
int spawnFuzz = 10000;
|
||||
int spawnFuzzHalf = spawnFuzz / 2;
|
||||
|
||||
return var5;
|
||||
|
||||
|
||||
{
|
||||
var5.posX += this.worldObj.rand.nextInt(spawnFuzz) - spawnFuzzHalf;
|
||||
var5.posZ += this.worldObj.rand.nextInt(spawnFuzz) - spawnFuzzHalf;
|
||||
var5.posY = 700;
|
||||
}
|
||||
|
||||
return var5;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user