aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/world
diff options
context:
space:
mode:
authorJordan Byrne <draknyte1@hotmail.com>2018-02-26 17:14:29 +1000
committerJordan Byrne <draknyte1@hotmail.com>2018-02-26 17:14:29 +1000
commitfe89a9835edc5b10a052cd58669b1826f5b57abd (patch)
tree0d9542b0caa05329c5a5a639897fef742ab4b1f9 /src/Java/gtPlusPlus/core/world
parent41eb02602c8a6d5899b3e375572ee9990a5a752b (diff)
downloadGT5-Unofficial-fe89a9835edc5b10a052cd58669b1826f5b57abd.tar.gz
GT5-Unofficial-fe89a9835edc5b10a052cd58669b1826f5b57abd.tar.bz2
GT5-Unofficial-fe89a9835edc5b10a052cd58669b1826f5b57abd.zip
$ Findbugs Fixes.
Diffstat (limited to 'src/Java/gtPlusPlus/core/world')
-rw-r--r--src/Java/gtPlusPlus/core/world/darkworld/biome/BiomeGenerator_Custom.java73
-rw-r--r--src/Java/gtPlusPlus/core/world/darkworld/biome/Biome_DarkWorld.java2
-rw-r--r--src/Java/gtPlusPlus/core/world/explosions/MiningExplosion.java12
3 files changed, 3 insertions, 84 deletions
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/biome/BiomeGenerator_Custom.java b/src/Java/gtPlusPlus/core/world/darkworld/biome/BiomeGenerator_Custom.java
index 74a67dfc5e..294d61f802 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/biome/BiomeGenerator_Custom.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/biome/BiomeGenerator_Custom.java
@@ -22,78 +22,7 @@ public class BiomeGenerator_Custom extends BiomeDecorator {
/** The world the BiomeDecorator is currently decorating */
public World currentWorld;
/** The Biome Decorator's random number generator. */
- public Random randomGenerator;
- /** The X-coordinate of the chunk currently being decorated */
- public int chunk_X;
- /** The Z-coordinate of the chunk currently being decorated */
- public int chunk_Z;
- /** The clay generator. */
- public WorldGenerator clayGen = new WorldGenClay(4);
- /** The sand generator. */
- public WorldGenerator sandGen;
- /** The gravel generator. */
- public WorldGenerator gravelAsSandGen;
- /** The dirt generator. */
- public WorldGenerator dirtGen;
- public WorldGenerator gravelGen;
- public WorldGenerator coalGen;
- public WorldGenerator ironGen;
- /** Field that holds gold WorldGenMinable */
- public WorldGenerator goldGen;
- /** Field that holds redstone WorldGenMinable */
- public WorldGenerator redstoneGen;
- /** Field that holds diamond WorldGenMinable */
- public WorldGenerator diamondGen;
- /** Field that holds Lapis WorldGenMinable */
- public WorldGenerator lapisGen;
- public WorldGenFlowers yellowFlowerGen;
- /** Field that holds mushroomBrown WorldGenFlowers */
- public WorldGenerator mushroomBrownGen;
- /** Field that holds mushroomRed WorldGenFlowers */
- public WorldGenerator mushroomRedGen;
- /** Field that holds big mushroom generator */
- public WorldGenerator bigMushroomGen;
- /** Field that holds WorldGenReed */
- public WorldGenerator reedGen;
- /** Field that holds WorldGenCactus */
- public WorldGenerator cactusGen;
- /** The water lily generation! */
- public WorldGenerator waterlilyGen;
- /** Amount of waterlilys per chunk. */
- public int waterlilyPerChunk;
- /** The number of trees to attempt to generate per chunk. Up to 10 in forests, none in deserts. */
- public int treesPerChunk;
- /**
- * The number of yellow flower patches to generate per chunk. The game generates much less than this number, since
- * it attempts to generate them at a random altitude.
- */
- public int flowersPerChunk;
- /** The amount of tall grass to generate per chunk. */
- public int grassPerChunk;
- /** The number of dead bushes to generate per chunk. Used in deserts and swamps. */
- public int deadBushPerChunk;
- /**
- * The number of extra mushroom patches per chunk. It generates 1/4 this number in brown mushroom patches, and 1/8
- * this number in red mushroom patches. These mushrooms go beyond the default base number of mushrooms.
- */
- public int mushroomsPerChunk;
- /** The number of reeds to generate per chunk. Reeds won't generate if the randomly selected placement is unsuitable. */
- public int reedsPerChunk;
- /** The number of cactus plants to generate per chunk. Cacti only work on sand. */
- public int cactiPerChunk;
- /** The number of sand patches to generate per chunk. Sand patches only generate when part of it is underwater. */
- public int sandPerChunk;
- /**
- * The number of sand patches to generate per chunk. Sand patches only generate when part of it is underwater. There
- * appear to be two separate fields for this.
- */
- public int sandPerChunk2;
- /** The number of clay patches to generate per chunk. Only generates when part of it is underwater. */
- public int clayPerChunk;
- /** Amount of big mushrooms per chunk */
- public int bigMushroomsPerChunk;
- /** True if decorator should generate surface lava & water */
- public boolean generateLakes;
+ public Random randomGenerator;
public WorldGenerator fluoriteGen;
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/biome/Biome_DarkWorld.java b/src/Java/gtPlusPlus/core/world/darkworld/biome/Biome_DarkWorld.java
index 92f3f43d95..f912fb7c6a 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/biome/Biome_DarkWorld.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/biome/Biome_DarkWorld.java
@@ -99,7 +99,7 @@ public class Biome_DarkWorld {
if (mTempList != null){
mTempList[CORE.DARKBIOME_ID] = this;
mInternalBiomeList.set(null, mTempList);
- if (mClone != mInternalBiomeList && mClone.hashCode() != mInternalBiomeList.hashCode()){
+ if (mTempList != mInternalBiomeList.get(null)){
ReflectionUtils.setFinalStatic(mInternalBiomeList, mTempList);
Logger.REFLECTION("Set Biome ID for Dark World Biome internally in 'biomeList' field from "+BiomeGenBase.class.getCanonicalName()+".");
return true;
diff --git a/src/Java/gtPlusPlus/core/world/explosions/MiningExplosion.java b/src/Java/gtPlusPlus/core/world/explosions/MiningExplosion.java
index bcbb16a3b6..ead327d85a 100644
--- a/src/Java/gtPlusPlus/core/world/explosions/MiningExplosion.java
+++ b/src/Java/gtPlusPlus/core/world/explosions/MiningExplosion.java
@@ -16,20 +16,10 @@ import net.minecraft.util.*;
import net.minecraft.world.*;
public class MiningExplosion extends Explosion {
- /** whether or not the explosion sets fire to blocks around it */
- public boolean isFlaming = false;
- /** whether or not this explosion spawns smoke particles */
- public boolean isSmoking = true;
private final int field_77289_h = 16;
private final Random explosionRNG = new XSTR();
private final World worldObj;
- public double explosionX;
- public double explosionY;
- public double explosionZ;
- public Entity exploder;
- public float explosionSize;
- /** A list of ChunkPositions of blocks affected by this explosion */
- public List<ChunkPosition> affectedBlockPositions = new ArrayList<>();
+
private final Map<Entity, Vec3> field_77288_k = new HashMap<>();
public MiningExplosion(final World worldObj, final Entity entityObj, final double x, final double y, final double z, final float size)
{