diff options
Diffstat (limited to 'src/Java/gtPlusPlus/core/block')
| -rw-r--r-- | src/Java/gtPlusPlus/core/block/general/BlockTankXpConverter.java | 90 |
1 files changed, 4 insertions, 86 deletions
diff --git a/src/Java/gtPlusPlus/core/block/general/BlockTankXpConverter.java b/src/Java/gtPlusPlus/core/block/general/BlockTankXpConverter.java index bab2ecc349..215c79ed10 100644 --- a/src/Java/gtPlusPlus/core/block/general/BlockTankXpConverter.java +++ b/src/Java/gtPlusPlus/core/block/general/BlockTankXpConverter.java @@ -165,71 +165,18 @@ public class BlockTankXpConverter extends BlockContainer { } private final boolean generateRainbowMap() { - int id = 0; - this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(0, 255, 0)); - this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(51, 255, 0)); - this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(102, 255, 0)); - this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(153, 255, 0)); - this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(204, 255, 0)); - this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(255, 255, 0)); - this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(255, 204, 0)); - this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(255, 153, 0)); - this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(255, 102, 0)); - this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(255, 51, 0)); - this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(255, 0, 0)); - this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(255, 0, 51)); - this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(255, 0, 102)); - this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(255, 0, 153)); - this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(255, 0, 204)); - this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(255, 0, 255)); - this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(204, 0, 255)); - this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(153, 0, 255)); - this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(102, 0, 255)); - this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(51, 0, 255)); - this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(0, 0, 255)); - this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(0, 51, 255)); - this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(0, 102, 255)); - this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(0, 153, 255)); - this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(0, 204, 255)); - this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(0, 255, 255)); - this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(0, 255, 204)); - this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(0, 255, 153)); - this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(0, 255, 102)); - this.mRainbowMap.put(id++, new Triplet<Integer, Integer, Integer>(0, 255, 51)); - this.mRainbowTickMax = this.mRainbowMap.size(); return true; } @Override public int getBlockColor() { - return Utils.rgbtoHexValue(0, 0, 0); + return super.getBlockColor(); } @Override public int colorMultiplier(final IBlockAccess p_149720_1_, final int p_149720_2_, final int p_149720_3_, final int p_149720_4_) { - - if ((this.mRainbowTick < 0) || (this.mRainbowTick > this.mRainbowTickMax)) { - this.mRainbowTick = 0; - } - //Utils.LOG_INFO("x: "+this.mRainbowTick); - if (this.mRainbowTick <= this.mRainbowTickMax) { - Triplet<Integer, Integer, Integer> mT = this.mRainbowMap.get(this.mRainbowTick); - try { - return Utils.rgbtoHexValue(mT.getValue_1(), mT.getValue_1(), mT.getValue_1()); - } - catch (final Throwable t) { - try { - mT = this.mRainbowMap.get(this.mRainbowTick - 1); - return Utils.rgbtoHexValue(mT.getValue_1(), mT.getValue_1(), mT.getValue_1()); - } - catch (final Throwable t1) { - return Utils.rgbtoHexValue(0, 0, 0); - } - } - } - - return Utils.rgbtoHexValue(0, 0, 0); + return super.colorMultiplier(p_149720_1_, p_149720_2_, p_149720_3_, p_149720_4_); } @Override @@ -240,7 +187,7 @@ public class BlockTankXpConverter extends BlockContainer { @Override public void randomDisplayTick(final World world, final int x, final int y, final int z, final Random rand) { - this.mRainbowTick++; + //this.mRainbowTick++; super.randomDisplayTick(world, x, y, z, rand); } @@ -251,36 +198,7 @@ public class BlockTankXpConverter extends BlockContainer { @Override public int getLightValue() { - final int mTicker = this.mRainbowTick; - if ((mTicker == 0) || (mTicker == 17)){ - return 1; - } - else if ((mTicker == 1) || (mTicker == 16)){ - return 2; - } - else if ((mTicker == 2) || (mTicker == 15)){ - return 3; - } - else if ((mTicker == 3) || (mTicker == 14)){ - return 4; - } - else if ((mTicker == 4) || (mTicker == 13)){ return 6; - } - else if ((mTicker == 5) || (mTicker == 12)){ - return 8; - } - else if ((mTicker == 6) || (mTicker == 11)){ - return 10; - } - else if ((mTicker == 7) || (mTicker == 10)){ - return 12; - } - else if ((mTicker == 8) || (mTicker == 9)){ - return 14; - } - return 0; - - } + } } |