From bf03b8cc8f2c74b9bd5ddf695ea76ae16c8e7de4 Mon Sep 17 00:00:00 2001 From: draknyte1 Date: Sun, 12 Mar 2017 13:58:30 +1000 Subject: $ Fixed old logic within the HG. $ Fixed textures not loading form the correct location. --- .../core/block/machine/HeliumGenerator.java | 6 ++-- .../general/TileEntityHeliumGenerator.java | 35 +--------------------- 2 files changed, 4 insertions(+), 37 deletions(-) (limited to 'src/Java/gtPlusPlus/core') diff --git a/src/Java/gtPlusPlus/core/block/machine/HeliumGenerator.java b/src/Java/gtPlusPlus/core/block/machine/HeliumGenerator.java index 98c7eaafd2..e4e9d9985c 100644 --- a/src/Java/gtPlusPlus/core/block/machine/HeliumGenerator.java +++ b/src/Java/gtPlusPlus/core/block/machine/HeliumGenerator.java @@ -52,9 +52,9 @@ public class HeliumGenerator extends BlockContainer public void registerBlockIcons(final IIconRegister p_149651_1_) { this.blockIcon = p_149651_1_.registerIcon(CORE.MODID + ":" + "Chrono/" + "CyberPanel2"); - this.textureTop = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "CyberPanel2"); - this.textureBottom = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "CyberPanel"); - this.textureFront = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "CyberPanel"); + this.textureTop = p_149651_1_.registerIcon(CORE.MODID + ":" + "Chrono/" + "CyberPanel2"); + this.textureBottom = p_149651_1_.registerIcon(CORE.MODID + ":" + "Chrono/" + "CyberPanel"); + this.textureFront = p_149651_1_.registerIcon(CORE.MODID + ":" + "Chrono/" + "CyberPanel"); } /** diff --git a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityHeliumGenerator.java b/src/Java/gtPlusPlus/core/tileentities/general/TileEntityHeliumGenerator.java index 7cf7c992e2..913f24f1b5 100644 --- a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityHeliumGenerator.java +++ b/src/Java/gtPlusPlus/core/tileentities/general/TileEntityHeliumGenerator.java @@ -84,40 +84,7 @@ public class TileEntityHeliumGenerator extends TileEntity{ @Override public void updateEntity(){ if (!this.worldObj.isRemote){ - this.tickCount++; - //Utils.LOG_INFO("Ticking "+this.tickCount); - //Check if the Tile is within water once per second. - if ((this.tickCount%20)==0){ - - } - else { - - } - - if (true){ - this.calculateTickrate(); - } - - //Try add some loot once every 30 seconds. - if ((this.tickCount%this.baseTickRate)==0){ - if (true){ - //Add loot - //Utils.LOG_INFO("Adding Loot to the fishtrap at x["+this.locationX+"] y["+this.locationY+"] z["+this.locationZ+"] (Ticking for loot every "+this.baseTickRate+" ticks)"); - this.tryAddLoot(); - this.markDirty(); - } - else { - Utils.LOG_INFO("This Trap does not have enough water around it."); - Utils.LOG_INFO("Not adding Loot to the fishtrap at x["+this.locationX+"] y["+this.locationY+"] z["+this.locationZ+"] (Ticking for loot every "+this.baseTickRate+" ticks)"); - this.markDirty(); - } - this.tickCount = 0; - } - if (this.tickCount > (this.baseTickRate+500)){ - this.tickCount = 0; - } - - + } } -- cgit