From 607eb3131662307bb57d187a34fe54940ad0d766 Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Sat, 15 Nov 2014 18:46:11 -0500 Subject: [PATCH] A few minor cleanups --- .../java/mekanism/common/tile/TileEntityChargepad.java | 9 +++++---- .../java/mekanism/generators/common/FusionReactor.java | 10 ---------- .../tile/reactor/TileEntityReactorController.java | 1 - 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/src/main/java/mekanism/common/tile/TileEntityChargepad.java b/src/main/java/mekanism/common/tile/TileEntityChargepad.java index 4af8c3d1f..410baeee3 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChargepad.java +++ b/src/main/java/mekanism/common/tile/TileEntityChargepad.java @@ -71,7 +71,8 @@ public class TileEntityChargepad extends TileEntityNoisyElectricBlock robit.setEnergy(robit.getEnergy() + toGive); setEnergy(getEnergy() - toGive); - } else if(entity instanceof EntityPlayer) + } + else if(entity instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) entity; @@ -122,7 +123,7 @@ public class TileEntityChargepad extends TileEntityNoisyElectricBlock } else if(MekanismUtils.useIC2() && itemstack.getItem() instanceof IElectricItem) { - double sent = ElectricItem.manager.charge(itemstack, (int)(getEnergy()* general.TO_IC2), 4, true, false)* general.FROM_IC2; + double sent = ElectricItem.manager.charge(itemstack, (int)(getEnergy()*general.TO_IC2), 4, true, false)*general.FROM_IC2; setEnergy(getEnergy() - sent); } else if(MekanismUtils.useRF() && itemstack.getItem() instanceof IEnergyContainerItem) @@ -130,9 +131,9 @@ public class TileEntityChargepad extends TileEntityNoisyElectricBlock IEnergyContainerItem item = (IEnergyContainerItem)itemstack.getItem(); int itemEnergy = (int)Math.round(Math.min(Math.sqrt(item.getMaxEnergyStored(itemstack)), item.getMaxEnergyStored(itemstack) - item.getEnergyStored(itemstack))); - int toTransfer = (int)Math.round(Math.min(itemEnergy, (getEnergy()* general.TO_TE))); + int toTransfer = (int)Math.round(Math.min(itemEnergy, (getEnergy()*general.TO_TE))); - setEnergy(getEnergy() - (item.receiveEnergy(itemstack, toTransfer, false)* general.FROM_TE)); + setEnergy(getEnergy() - (item.receiveEnergy(itemstack, toTransfer, false)*general.FROM_TE)); } } } diff --git a/src/main/java/mekanism/generators/common/FusionReactor.java b/src/main/java/mekanism/generators/common/FusionReactor.java index b8b4ca45d..514b716ec 100644 --- a/src/main/java/mekanism/generators/common/FusionReactor.java +++ b/src/main/java/mekanism/generators/common/FusionReactor.java @@ -312,8 +312,6 @@ public class FusionReactor implements IFusionReactor public void formMultiblock() { updatedThisTick = true; - - Mekanism.logger.info("Attempting to form multiblock"); Coord4D controllerPosition = Coord4D.get(controller); Coord4D centreOfReactor = controllerPosition.getFromSide(ForgeDirection.DOWN, 2); @@ -322,32 +320,24 @@ public class FusionReactor implements IFusionReactor reactorBlocks.add(controller); - Mekanism.logger.info("Centre at " + centreOfReactor.toString()); if(!createFrame(centreOfReactor)) { unformMultiblock(); - Mekanism.logger.info("Reactor failed: Frame not complete."); return; } - Mekanism.logger.info("Frame valid"); if(!addSides(centreOfReactor)) { unformMultiblock(); - Mekanism.logger.info("Reactor failed: Sides not complete."); return; } - Mekanism.logger.info("Side Blocks Valid"); if(!centreIsClear(centreOfReactor)) { unformMultiblock(); - Mekanism.logger.info("Blocks in chamber."); return; } - Mekanism.logger.info("Centre is clear"); - formed = true; if(!controller.getWorldObj().isRemote) diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java index f5344f1e4..f36ddc4cb 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java @@ -236,7 +236,6 @@ public class TileEntityReactorController extends TileEntityReactorBlock implemen tritiumTank.setGas(new GasStack(GasRegistry.getGas("tritium"), dataStream.readInt())); waterTank.setFluid(new FluidStack(FluidRegistry.getFluid("water"), dataStream.readInt())); steamTank.setFluid(new FluidStack(FluidRegistry.getFluid("steam"), dataStream.readInt())); - } else if(getReactor() != null) {