From b3909f83b94a5c61856c84913610d65a9fb9afff Mon Sep 17 00:00:00 2001 From: tmcgeorge Date: Thu, 7 Nov 2013 22:55:26 -0600 Subject: [PATCH] Cleanup some debugging and other derp --- src/tconstruct/blocks/SignalBus.java | 14 ---------- src/tconstruct/blocks/SignalTerminal.java | 26 ------------------- .../component/SignalBusMasterLogic.java | 23 ---------------- .../blocks/logic/SignalBusLogic.java | 5 ---- .../blocks/logic/SignalTerminalLogic.java | 20 -------------- .../multiblock/MultiblockMasterBaseLogic.java | 5 ---- 6 files changed, 93 deletions(-) diff --git a/src/tconstruct/blocks/SignalBus.java b/src/tconstruct/blocks/SignalBus.java index 992a74d0..8372ba6d 100644 --- a/src/tconstruct/blocks/SignalBus.java +++ b/src/tconstruct/blocks/SignalBus.java @@ -77,20 +77,6 @@ public class SignalBus extends Block implements ITileEntityProvider { this.setStepSound(soundMetalFootstep); setCreativeTab(TConstructRegistry.blockTab); } - - @Override - public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9) { - if (par1World.isRemote) { return false; } - TileEntity te = par1World.getBlockTileEntity(par2, par3, par4); - if (te != null && te instanceof SignalBusLogic) { - TConstruct.logger.info(((SignalBusLogic)te).debugString()); - if (((SignalBusLogic)te).getMultiblockMaster() != null) { - TConstruct.logger.info((((SignalBusLogic)te).getMultiblockMaster().debugString())); - } - } - - return false; - } @Override public void onNeighborTileChange(World world, int x, int y, int z, int tileX, int tileY, int tileZ) { diff --git a/src/tconstruct/blocks/SignalTerminal.java b/src/tconstruct/blocks/SignalTerminal.java index 758a3043..1d3b62cf 100644 --- a/src/tconstruct/blocks/SignalTerminal.java +++ b/src/tconstruct/blocks/SignalTerminal.java @@ -171,19 +171,6 @@ public class SignalTerminal extends Block implements ITileEntityProvider return 1; } - /** - * checks to see if you can place this block can be placed on that side of a block: BlockLever overrides - */ - public boolean canPlaceBlockOnSide (World world, int x, int y, int z, int side) - { - ForgeDirection dir = ForgeDirection.getOrientation(side); - return true || (dir == ForgeDirection.NORTH && world.isBlockSolidOnSide(x, y, z + 1, ForgeDirection.NORTH)) - || (dir == ForgeDirection.SOUTH && world.isBlockSolidOnSide(x, y, z - 1, ForgeDirection.SOUTH)) - || (dir == ForgeDirection.WEST && world.isBlockSolidOnSide(x + 1, y, z, ForgeDirection.WEST)) - || (dir == ForgeDirection.EAST && world.isBlockSolidOnSide(x - 1, y, z, ForgeDirection.EAST)) || (dir == ForgeDirection.UP && world.isBlockSolidOnSide(x, y - 1, z, ForgeDirection.UP)) - || (dir == ForgeDirection.DOWN && world.isBlockSolidOnSide(x, y + 1, z, ForgeDirection.DOWN)); - } - /** * Checks to see if its valid to put this block at the specified coordinates. Args: world, x, y, z */ @@ -437,18 +424,14 @@ public class SignalTerminal extends Block implements ITileEntityProvider @Override public boolean onBlockActivated (World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9) { - int meta = par1World.getBlockMetadata(par2, par3, par4); TileEntity te = par1World.getBlockTileEntity(par2, par3, par4); if (!par1World.isRemote) { if (te != null && te instanceof SignalTerminalLogic) { - // ((SignalTerminalLogic) te).nextChannel(); if (!par1World.isRemote) { - // par1World.scheduleBlockUpdate(par2, par3, par4, this.blockID, 1); - // par1World.markBlockForRenderUpdate(par2, par3, par4); par1World.markBlockForUpdate(par2, par3, par4); } int boxHit = closestClicked(par5EntityPlayer, 3.0F, (SignalTerminalLogic) te, getBoxes((SignalTerminalLogic) te)); @@ -478,15 +461,6 @@ public class SignalTerminal extends Block implements ITileEntityProvider } } - if (te instanceof SignalTerminalLogic) - { - TConstruct.logger.info(((SignalTerminalLogic) te).debugString()); - } - - TConstruct.logger.info("meta: " + meta); - - //this.setBlockBoundsBasedOnState(par1World, par2, par3, par4); - return false; } diff --git a/src/tconstruct/blocks/component/SignalBusMasterLogic.java b/src/tconstruct/blocks/component/SignalBusMasterLogic.java index a7d6a84b..a6489690 100644 --- a/src/tconstruct/blocks/component/SignalBusMasterLogic.java +++ b/src/tconstruct/blocks/component/SignalBusMasterLogic.java @@ -224,29 +224,6 @@ public class SignalBusMasterLogic extends MultiblockMasterBaseLogic // Nothing important at the moment } - @Override - public String debugString () - { - String fromSuper = super.debugString(); - - if (worldObj.isRemote) - { - return fromSuper; - } - - String tstring = "Tethered Buses: " + tetheredBuses.size() + "\n Signals: ["; - for (int n = 0; n < 16; n++) - { - tstring += n + ":" + masterSignals[n]; - - if (n != 15) - tstring += ", "; - } - tstring += "]"; - - return fromSuper + "\n" + tstring; - } - public void forceUpdate () { forceUpdate = true; diff --git a/src/tconstruct/blocks/logic/SignalBusLogic.java b/src/tconstruct/blocks/logic/SignalBusLogic.java index 49b6db27..c941c93d 100644 --- a/src/tconstruct/blocks/logic/SignalBusLogic.java +++ b/src/tconstruct/blocks/logic/SignalBusLogic.java @@ -477,11 +477,6 @@ public class SignalBusLogic extends MultiblockBaseLogic implements IActiveLogic, return new SignalBusMasterLogic(this.worldObj); } - public String debugString () - { - return "Connected: " + transceivers.size(); - } - public byte[] getLocalSignals () { return localHighSignals; diff --git a/src/tconstruct/blocks/logic/SignalTerminalLogic.java b/src/tconstruct/blocks/logic/SignalTerminalLogic.java index cfa02d28..737de15a 100644 --- a/src/tconstruct/blocks/logic/SignalTerminalLogic.java +++ b/src/tconstruct/blocks/logic/SignalTerminalLogic.java @@ -335,26 +335,6 @@ public class SignalTerminalLogic extends TileEntity implements ISignalTransceive return connectedSides.clone(); } - public String debugString () - { - String tstr = ""; - - if (!worldObj.isRemote) - { - byte tbyte = (byte) 0; - for (int n = 0; n < 6; n++) - { - if (connectedSides[n] != -1) - { - tbyte &= (1 << n); - } - } - tstr += "Sides: " + tbyte + "\n"; - } - - return tstr; - } - /* Packets */ @Override public Packet getDescriptionPacket () diff --git a/src/tconstruct/library/multiblock/MultiblockMasterBaseLogic.java b/src/tconstruct/library/multiblock/MultiblockMasterBaseLogic.java index 197d731e..e2f2ff4d 100644 --- a/src/tconstruct/library/multiblock/MultiblockMasterBaseLogic.java +++ b/src/tconstruct/library/multiblock/MultiblockMasterBaseLogic.java @@ -392,9 +392,4 @@ public abstract class MultiblockMasterBaseLogic public abstract void formatDescriptionPacket (NBTTagCompound data); public abstract void decodeDescriptionPacket (NBTTagCompound data); - - public String debugString () - { - return "refCoords: [" + referenceCoord.x + "," + referenceCoord.y + "," + referenceCoord.z + "]"; - } }