Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Cleanup and bug fixes

Browse source 
Worked on fixing a possible bug with release valve draining and
ITankContainer that might not have had tanks on that side.
This commit is contained in:
Rseifert 2013-04-10 17:32:46 -04:00
parent c6c0f3c9f5
commit 6d98e90acb
12 changed files with 45 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/minecraft/fluidmech/client/ClientProxy.java
View file

@ -14,13 +14,13 @@ import fluidmech.client.render.RenderTank;
import fluidmech.client.render.pipeextentions.RenderPipe;
import fluidmech.common.CommonProxy;
import fluidmech.common.FluidMech;
import fluidmech.common.machines.TileEntityReleaseValve;
import fluidmech.common.machines.TileEntitySink;
import fluidmech.common.machines.TileEntityTank;
import fluidmech.common.machines.mech.TileEntityGenerator;
import fluidmech.common.machines.mech.TileEntityRod;
import fluidmech.common.machines.pipes.TileEntityPipe;
import fluidmech.common.pump.TileEntityStarterPump;
import fluidmech.common.tiles.TileEntityReleaseValve;
import fluidmech.common.tiles.TileEntitySink;
import fluidmech.common.tiles.TileEntityTank;
public class ClientProxy extends CommonProxy
{

2
src/minecraft/fluidmech/client/model/ModelLiquidTank.java
View file

@ -9,8 +9,8 @@ package fluidmech.client.model;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.tileentity.TileEntity;
import fluidmech.common.machines.TileEntityTank;
import fluidmech.common.machines.pipes.TileEntityPipe;
import fluidmech.common.tiles.TileEntityTank;
public class ModelLiquidTank extends ModelBase
{

2
src/minecraft/fluidmech/client/render/RenderReleaseValve.java
View file

@ -10,7 +10,7 @@ import org.lwjgl.opengl.GL11;
import fluidmech.client.model.ModelLargePipe;
import fluidmech.client.model.ModelReleaseValve;
import fluidmech.common.FluidMech;
import fluidmech.common.machines.TileEntityReleaseValve;
import fluidmech.common.tiles.TileEntityReleaseValve;
public class RenderReleaseValve extends TileEntitySpecialRenderer
{

2
src/minecraft/fluidmech/client/render/RenderSink.java
View file

@ -8,7 +8,7 @@ import org.lwjgl.opengl.GL11;
import fluidmech.client.model.ModelSink;
import fluidmech.common.FluidMech;
import fluidmech.common.machines.TileEntitySink;
import fluidmech.common.tiles.TileEntitySink;
public class RenderSink extends TileEntitySpecialRenderer
{

2
src/minecraft/fluidmech/client/render/RenderTank.java
View file

@ -12,7 +12,7 @@ import org.lwjgl.opengl.GL11;
import fluidmech.client.model.ModelLiquidTank;
import fluidmech.client.model.ModelLiquidTankCorner;
import fluidmech.common.FluidMech;
import fluidmech.common.machines.TileEntityTank;
import fluidmech.common.tiles.TileEntityTank;
public class RenderTank extends TileEntitySpecialRenderer
{

6
src/minecraft/fluidmech/common/FluidMech.java
View file

@ -11,9 +11,6 @@ import fluidmech.common.item.ItemBlockTank;
import fluidmech.common.item.ItemParts;
import fluidmech.common.item.ItemParts.Parts;
import fluidmech.common.item.ItemTools;
import fluidmech.common.machines.TileEntityReleaseValve;
import fluidmech.common.machines.TileEntitySink;
import fluidmech.common.machines.TileEntityTank;
import fluidmech.common.machines.mech.BlockGenerator;
import fluidmech.common.machines.mech.BlockRod;
import fluidmech.common.machines.mech.TileEntityGenerator;
@ -27,6 +24,9 @@ import fluidmech.common.pump.BlockPumpMachine;
import fluidmech.common.pump.TileEntityConstructionPump;
import fluidmech.common.pump.TileEntityDrain;
import fluidmech.common.pump.TileEntityStarterPump;
import fluidmech.common.tiles.TileEntityReleaseValve;
import fluidmech.common.tiles.TileEntitySink;
import fluidmech.common.tiles.TileEntityTank;
import hydraulic.api.ColorCode;
import hydraulic.helpers.FluidHelper;

2
src/minecraft/fluidmech/common/block/BlockReleaseValve.java
View file

@ -11,7 +11,7 @@ import net.minecraft.world.World;
import universalelectricity.prefab.block.BlockAdvanced;
import fluidmech.common.FluidMech;
import fluidmech.common.TabFluidMech;
import fluidmech.common.machines.TileEntityReleaseValve;
import fluidmech.common.tiles.TileEntityReleaseValve;
public class BlockReleaseValve extends BlockAdvanced
{

2
src/minecraft/fluidmech/common/block/BlockSink.java
View file

@ -20,7 +20,7 @@ import universalelectricity.prefab.block.BlockAdvanced;
import universalelectricity.prefab.tile.TileEntityAdvanced;
import fluidmech.client.render.BlockRenderHelper;
import fluidmech.common.TabFluidMech;
import fluidmech.common.machines.TileEntitySink;
import fluidmech.common.tiles.TileEntitySink;
public class BlockSink extends BlockAdvanced
{

2
src/minecraft/fluidmech/common/block/BlockTank.java
View file

@ -18,7 +18,7 @@ import net.minecraftforge.liquids.LiquidStack;
import universalelectricity.prefab.block.BlockAdvanced;
import fluidmech.client.render.BlockRenderHelper;
import fluidmech.common.TabFluidMech;
import fluidmech.common.machines.TileEntityTank;
import fluidmech.common.tiles.TileEntityTank;
public class BlockTank extends BlockAdvanced
{

70
src/minecraft/fluidmech/common/machines/TileEntityReleaseValve.java → src/minecraft/fluidmech/common/tiles/TileEntityReleaseValve.java
View file

@ -1,10 +1,11 @@
package fluidmech.common.machines;
package fluidmech.common.tiles;
import fluidmech.common.machines.pipes.TileEntityPipe;
import hydraulic.api.ColorCode;
import hydraulic.api.IColorCoded;
import hydraulic.api.IPipeConnection;
import hydraulic.api.IReadOut;
import hydraulic.fluidnetwork.IFluidNetworkPart;
import hydraulic.helpers.connectionHelper;
import hydraulic.prefab.tile.TileEntityFluidDevice;
@ -25,8 +26,8 @@ public class TileEntityReleaseValve extends TileEntityFluidDevice implements IPi
public boolean[] allowed = new boolean[ColorCode.values().length - 1];
public TileEntity[] connected = new TileEntity[6];
private List<TileEntityPipe> output = new ArrayList<TileEntityPipe>();
private List<ITankContainer> input = new ArrayList<ITankContainer>();
private List<IFluidNetworkPart> output = new ArrayList<IFluidNetworkPart>();
private ITankContainer[] input = new ITankContainer[6];
public boolean isPowered = false;
@ -56,20 +57,20 @@ public class TileEntityReleaseValve extends TileEntityFluidDevice implements IPi
if (!this.worldObj.isRemote && !isPowered && this.ticks % 20 == 0)
{
validateNBuildList();
this.validateNBuildList();
// start the draining process
if (this.input.size() > 0 && this.output.size() > 0)
for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS)
{
for (ITankContainer drainedTank : input)
ITankContainer drainedTank = input[dir.ordinal()];
if (drainedTank != null)
{
LiquidStack stack = drainedTank.drain(ForgeDirection.UNKNOWN, LiquidContainerRegistry.BUCKET_VOLUME, false);
LiquidStack stack = drainedTank.drain(dir.getOpposite(), LiquidContainerRegistry.BUCKET_VOLUME, false);
if (stack != null && stack.amount > 0)
{
TileEntityPipe inputPipe = this.findValidPipe(stack);
IFluidNetworkPart inputPipe = this.findValidPipe(stack);
if (inputPipe != null)
{
ILiquidTank pipeVolume = inputPipe.getTanks(ForgeDirection.UNKNOWN)[0];
int ammountFilled = inputPipe.getNetwork().addFluidToNetwork(this, stack, true);
int ammountFilled = inputPipe.getNetwork().addFluidToNetwork((TileEntity) drainedTank, stack, true);
drainedTank.drain(ForgeDirection.UNKNOWN, ammountFilled, true);
}
}
@ -80,10 +81,10 @@ public class TileEntityReleaseValve extends TileEntityFluidDevice implements IPi
}
/** used to find a valid pipe for filling of the liquid type */
public TileEntityPipe findValidPipe(LiquidStack stack)
public IFluidNetworkPart findValidPipe(LiquidStack stack)
{
// find normal color selective pipe first
for (TileEntityPipe pipe : output)
for (IFluidNetworkPart pipe : output)
{
if (pipe.fill(ForgeDirection.UNKNOWN, stack, false) > 0)
{
@ -135,46 +136,35 @@ public class TileEntityReleaseValve extends TileEntityFluidDevice implements IPi
{
// cleanup
this.connected = connectionHelper.getSurroundingTileEntities(worldObj, xCoord, yCoord, zCoord);
this.input.clear();
this.input = new ITankContainer[6];
this.output.clear();
// read surroundings
for (int i = 0; i < 6; i++)
for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS)
{
ForgeDirection dir = ForgeDirection.getOrientation(i);
TileEntity ent = connected[i];
if (ent instanceof TileEntityPipe)
TileEntity tileEntity = connected[dir.ordinal()];
if (tileEntity instanceof IFluidNetworkPart)
{
TileEntityPipe pipe = (TileEntityPipe) ent;
ILiquidTank tank = pipe.getTanks(ForgeDirection.UNKNOWN)[0];
if (this.isRestricted() && this.canConnect(pipe.getColor()))
{
connected[i] = null;
}
else if (tank.getLiquid() != null && tank.getLiquid().amount >= tank.getCapacity())
{
connected[i] = null;
}
else
IFluidNetworkPart pipe = (IFluidNetworkPart) tileEntity;
if (this.canConnect(pipe.getColor()))
{
this.output.add(pipe);
}
}
else if (ent instanceof ITankContainer)
{
ILiquidTank[] tanks = ((ITankContainer) connected[i]).getTanks(dir);
for (int t = 0; t < tanks.length; t++)
else
{
LiquidStack ll = tanks[t].getLiquid();
if (ll != null && ll.amount > 0 && ll.amount > 0)
{
this.input.add((ITankContainer) ent);
break;
}
this.connected[dir.ordinal()] = null;
}
}
else if (tileEntity instanceof ITankContainer)
{
ITankContainer tank = (ITankContainer) tileEntity;
if (tank != null && tank.drain(dir.getOpposite(), LiquidContainerRegistry.BUCKET_VOLUME, false) != null)
{
this.input[dir.ordinal()] = (ITankContainer) tileEntity;
}
}
else
{
connected[i] = null;
connected[dir.ordinal()] = null;
}
}
}

2
src/minecraft/fluidmech/common/machines/TileEntitySink.java → src/minecraft/fluidmech/common/tiles/TileEntitySink.java
View file

@ -1,4 +1,4 @@
package fluidmech.common.machines;
package fluidmech.common.tiles;
import fluidmech.common.FluidMech;
import hydraulic.api.ColorCode;

2
src/minecraft/fluidmech/common/machines/TileEntityTank.java → src/minecraft/fluidmech/common/tiles/TileEntityTank.java
View file

@ -1,4 +1,4 @@
package fluidmech.common.machines;
package fluidmech.common.tiles;
import fluidmech.common.FluidMech;
import hydraulic.api.ColorCode;