diff --git a/src/main/java/com/builtbroken/assemblyline/fluid/pipes/tele/INetworkConnector.java b/src/main/java/com/builtbroken/assemblyline/fluid/pipes/tele/INetworkConnector.java deleted file mode 100644 index 28fd7dc0e..000000000 --- a/src/main/java/com/builtbroken/assemblyline/fluid/pipes/tele/INetworkConnector.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.builtbroken.assemblyline.fluid.pipes.tele; - -import com.builtbroken.assemblyline.api.fluid.INetworkPipe; - -/** Used by IFluidNetworkPart to signal this block is remotely connected to another network. It will - * cause that network to seak out all other connected network and try to merge them */ -public interface INetworkConnector extends INetworkPipe -{ - /** gets the pipes frequency */ - public int getFrequency(); - - public void setFrequency(int id); - - /** gets the pipes owner */ - public String getOwner(); - - public void setOwner(String username); -} diff --git a/src/main/java/com/builtbroken/assemblyline/item/ItemInstaHole.java b/src/main/java/com/builtbroken/assemblyline/item/ItemInstaHole.java index b550c2a99..9bbec6ddd 100644 --- a/src/main/java/com/builtbroken/assemblyline/item/ItemInstaHole.java +++ b/src/main/java/com/builtbroken/assemblyline/item/ItemInstaHole.java @@ -11,7 +11,7 @@ import com.builtbroken.minecraft.DarkCore; /** Creative mod tool to quickly create a large hole in the ground. Is designed only for debug * testing of ore generation. - * + * * @author DarkGuardsman */ public class ItemInstaHole extends Item { diff --git a/src/main/java/com/builtbroken/assemblyline/item/ItemMiningLaser.java b/src/main/java/com/builtbroken/assemblyline/item/ItemMiningLaser.java index b4de9bbbb..775cb7ba1 100644 --- a/src/main/java/com/builtbroken/assemblyline/item/ItemMiningLaser.java +++ b/src/main/java/com/builtbroken/assemblyline/item/ItemMiningLaser.java @@ -251,7 +251,7 @@ public class ItemMiningLaser extends ItemElectric implements IExtraItemInfo this.blockRange = config.get("Laser", "Range", this.blockRange).getInt(this.blockRange); this.firingDelay = config.get("Laser", "Delay", this.firingDelay).getInt(this.firingDelay); this.damageToEntities = (float) config.get("Laser", "Damage", this.damageToEntities).getDouble(this.damageToEntities); - this.batterySize = (long) (config.get("Energy", "BatteryCap", this.batterySize).getInt()); + this.batterySize = (config.get("Energy", "BatteryCap", this.batterySize).getInt()); this.wattPerShot = (float) (config.get("Energy", "FiringCost", this.wattPerShot * 1000).getDouble(this.wattPerShot * 1000) / 1000); this.setFire = config.get("Laser", "SetFire", true, "Set plants, and wood on fire").getBoolean(true); this.createLava = config.get("Laser", "MakeLava", true, "Turn some blocks into lava like obby").getBoolean(true); diff --git a/src/main/java/com/builtbroken/assemblyline/machine/TileApertureExcavator.java b/src/main/java/com/builtbroken/assemblyline/machine/TileApertureExcavator.java index 8ed0d21a9..ef6cca7a2 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/TileApertureExcavator.java +++ b/src/main/java/com/builtbroken/assemblyline/machine/TileApertureExcavator.java @@ -90,8 +90,6 @@ public class TileApertureExcavator extends TileEntityEnergyMachine } } - - private void dropItems(ItemStack item) { if (item != null) diff --git a/src/main/java/com/builtbroken/assemblyline/machine/TileFracker.java b/src/main/java/com/builtbroken/assemblyline/machine/TileFracker.java index dedbb48b4..16795c46e 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/TileFracker.java +++ b/src/main/java/com/builtbroken/assemblyline/machine/TileFracker.java @@ -82,6 +82,7 @@ public class TileFracker extends TileEntityEnergyMachine implements IFluidHandle } } + @Override public boolean onActivated(EntityPlayer entityPlayer) { entityPlayer.addChatMessage("Gas: " + tank.getFluidAmount()); diff --git a/src/main/java/com/builtbroken/assemblyline/machine/TileFrackingPipe.java b/src/main/java/com/builtbroken/assemblyline/machine/TileFrackingPipe.java index 0bdea5af4..55b82b9cc 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/TileFrackingPipe.java +++ b/src/main/java/com/builtbroken/assemblyline/machine/TileFrackingPipe.java @@ -3,6 +3,7 @@ package com.builtbroken.assemblyline.machine; import net.minecraft.tileentity.TileEntity; /** @author Archadia */ -public class TileFrackingPipe extends TileEntity { +public class TileFrackingPipe extends TileEntity +{ } diff --git a/src/main/java/com/builtbroken/assemblyline/machine/TileGasBurner.java b/src/main/java/com/builtbroken/assemblyline/machine/TileGasBurner.java index fd43b4b2d..c2f347a97 100644 --- a/src/main/java/com/builtbroken/assemblyline/machine/TileGasBurner.java +++ b/src/main/java/com/builtbroken/assemblyline/machine/TileGasBurner.java @@ -9,51 +9,58 @@ import net.minecraftforge.fluids.IFluidHandler; import com.builtbroken.minecraft.fluid.GasTank; import com.builtbroken.minecraft.prefab.TileEntityMachine; -/** - * @author Archadia - * - */ -public class TileGasBurner extends TileEntityMachine implements IFluidHandler { +/** @author Archadia */ +public class TileGasBurner extends TileEntityMachine implements IFluidHandler +{ - GasTank tank = new GasTank(5000); + GasTank tank = new GasTank(5000); - public TileGasBurner() { + public TileGasBurner() + { - } + } - @Override - public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { - if(resource != null) { - if(resource.getFluid().isGaseous()) { - return tank.fill(resource, doFill); - } - } - return 0; - } + @Override + public int fill(ForgeDirection from, FluidStack resource, boolean doFill) + { + if (resource != null) + { + if (resource.getFluid().isGaseous()) + { + return tank.fill(resource, doFill); + } + } + return 0; + } - @Override - public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { - return null; - } + @Override + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) + { + return null; + } - @Override - public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { - return null; - } + @Override + public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) + { + return null; + } - @Override - public boolean canFill(ForgeDirection from, Fluid fluid) { - return true; - } + @Override + public boolean canFill(ForgeDirection from, Fluid fluid) + { + return true; + } - @Override - public boolean canDrain(ForgeDirection from, Fluid fluid) { - return false; - } + @Override + public boolean canDrain(ForgeDirection from, Fluid fluid) + { + return false; + } - @Override - public FluidTankInfo[] getTankInfo(ForgeDirection from) { - return null; - } + @Override + public FluidTankInfo[] getTankInfo(ForgeDirection from) + { + return null; + } }