diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/bop')
4 files changed, 8 insertions, 22 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java index 171bb9a58c..d73462da60 100644 --- a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java +++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java @@ -40,10 +40,6 @@ public class LeavesBase extends BlockLeaves { Blocks.fire.setFireInfo(this, 80, 150); } - private void setVanillaVariable(Object toSet, Object value) { - toSet = value; - } - @Override public int quantityDropped(Random p_149745_1_) { return p_149745_1_.nextInt(20) == 0 ? 1 : 0; @@ -96,7 +92,8 @@ public class LeavesBase extends BlockLeaves { .registerIcon(GTPlusPlus.ID + ":" + "trees/" + "leaves/" + "leaves_" + leafType[i][j]); } } - setVanillaVariable(this.field_150129_M, this.leafTextures); + // TODO uncomment the line below, I don't want to do it now in case it causes a crash + // this.field_150129_M = this.leafTextures; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java index 2cf8ba1fbc..317c61ee63 100644 --- a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java +++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java @@ -40,10 +40,6 @@ public abstract class LogBase extends BlockLog { Blocks.fire.setFireInfo(this, 20, 100); } - private void setVanillaVariable(Object toSet, Object value) { - toSet = value; - } - /** * returns a list of blocks with the same ID, but different meta (eg: wood returns 4 blocks) */ @@ -78,8 +74,8 @@ public abstract class LogBase extends BlockLog { this.textureTop[i] = iIcon .registerIcon(GTPlusPlus.ID + ":" + "trees/" + "logs/" + "log_" + treeType[i] + "_top"); } - - setVanillaVariable(this.field_150167_a, this.textureSide); - setVanillaVariable(this.field_150166_b, this.textureTop); + // TODO uncomment the line below, I don't want to do it now in case it causes a crash + // this.field_150167_a = this.textureSide; + // this.field_150166_b = this.textureTop; } } diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java index ff5c8770d4..d0728304c4 100644 --- a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java +++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java @@ -48,10 +48,6 @@ public class SaplingBase extends BlockSapling { this.setCreativeTab(AddToCreativeTab.tabBOP); } - private void setVanillaVariable(Object toSet, Object value) { - toSet = value; - } - /** * Gets the block's texture. Args: side, meta */ diff --git a/src/main/java/gtPlusPlus/xmod/bop/world/features/trees/WorldGenRainForestTree_Ex.java b/src/main/java/gtPlusPlus/xmod/bop/world/features/trees/WorldGenRainForestTree_Ex.java index d3ad2efaea..c7207a3b5d 100644 --- a/src/main/java/gtPlusPlus/xmod/bop/world/features/trees/WorldGenRainForestTree_Ex.java +++ b/src/main/java/gtPlusPlus/xmod/bop/world/features/trees/WorldGenRainForestTree_Ex.java @@ -297,14 +297,11 @@ public class WorldGenRainForestTree_Ex extends WorldGenAbstractTree { return false; } else if (xDir == xDirMax - 1 && zDir == zDirMin + 1) { return false; - } else if (xDir == xDirMax - 1 && zDir == zDirMax - 1) { - return false; + } else { + return xDir != xDirMax - 1 || zDir != zDirMax - 1; } - return true; } - return false; - } else { - return false; } + return false; } } |