Cleanup & Formatting

This commit is contained in:
DarkGuardsman 2014-01-06 00:34:05 -05:00
parent 242c91e8f5
commit ef6a38c578
7 changed files with 49 additions and 60 deletions

View file

@ -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);
}

View file

@ -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 /** Creative mod tool to quickly create a large hole in the ground. Is designed only for debug
* testing of ore generation. * testing of ore generation.
* *
* @author DarkGuardsman */ * @author DarkGuardsman */
public class ItemInstaHole extends Item public class ItemInstaHole extends Item
{ {

View file

@ -251,7 +251,7 @@ public class ItemMiningLaser extends ItemElectric implements IExtraItemInfo
this.blockRange = config.get("Laser", "Range", this.blockRange).getInt(this.blockRange); this.blockRange = config.get("Laser", "Range", this.blockRange).getInt(this.blockRange);
this.firingDelay = config.get("Laser", "Delay", this.firingDelay).getInt(this.firingDelay); this.firingDelay = config.get("Laser", "Delay", this.firingDelay).getInt(this.firingDelay);
this.damageToEntities = (float) config.get("Laser", "Damage", this.damageToEntities).getDouble(this.damageToEntities); 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.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.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); this.createLava = config.get("Laser", "MakeLava", true, "Turn some blocks into lava like obby").getBoolean(true);

View file

@ -90,8 +90,6 @@ public class TileApertureExcavator extends TileEntityEnergyMachine
} }
} }
private void dropItems(ItemStack item) private void dropItems(ItemStack item)
{ {
if (item != null) if (item != null)

View file

@ -82,6 +82,7 @@ public class TileFracker extends TileEntityEnergyMachine implements IFluidHandle
} }
} }
@Override
public boolean onActivated(EntityPlayer entityPlayer) public boolean onActivated(EntityPlayer entityPlayer)
{ {
entityPlayer.addChatMessage("Gas: " + tank.getFluidAmount()); entityPlayer.addChatMessage("Gas: " + tank.getFluidAmount());

View file

@ -3,6 +3,7 @@ package com.builtbroken.assemblyline.machine;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
/** @author Archadia */ /** @author Archadia */
public class TileFrackingPipe extends TileEntity { public class TileFrackingPipe extends TileEntity
{
} }

View file

@ -9,51 +9,58 @@ import net.minecraftforge.fluids.IFluidHandler;
import com.builtbroken.minecraft.fluid.GasTank; import com.builtbroken.minecraft.fluid.GasTank;
import com.builtbroken.minecraft.prefab.TileEntityMachine; import com.builtbroken.minecraft.prefab.TileEntityMachine;
/** /** @author Archadia */
* @author Archadia public class TileGasBurner extends TileEntityMachine implements IFluidHandler
* {
*/
public class TileGasBurner extends TileEntityMachine implements IFluidHandler {
GasTank tank = new GasTank(5000); GasTank tank = new GasTank(5000);
public TileGasBurner() { public TileGasBurner()
{
} }
@Override @Override
public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { public int fill(ForgeDirection from, FluidStack resource, boolean doFill)
if(resource != null) { {
if(resource.getFluid().isGaseous()) { if (resource != null)
return tank.fill(resource, doFill); {
} if (resource.getFluid().isGaseous())
} {
return 0; return tank.fill(resource, doFill);
} }
}
return 0;
}
@Override @Override
public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain)
return null; {
} return null;
}
@Override @Override
public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain)
return null; {
} return null;
}
@Override @Override
public boolean canFill(ForgeDirection from, Fluid fluid) { public boolean canFill(ForgeDirection from, Fluid fluid)
return true; {
} return true;
}
@Override @Override
public boolean canDrain(ForgeDirection from, Fluid fluid) { public boolean canDrain(ForgeDirection from, Fluid fluid)
return false; {
} return false;
}
@Override @Override
public FluidTankInfo[] getTankInfo(ForgeDirection from) { public FluidTankInfo[] getTankInfo(ForgeDirection from)
return null; {
} return null;
}
} }