From 208078dee691d479a05e815f2710d936899ce43b Mon Sep 17 00:00:00 2001 From: Robert Date: Mon, 9 Dec 2013 12:23:30 -0500 Subject: [PATCH] cleanup & formatting --- .../tilenetwork/fluid/NetworkFluidTiles.java | 3 +-- .../prefab/tilenetwork/fluid/NetworkPipes.java | 17 +++++++++-------- .../fluid/client/render/BlockRenderHelper.java | 3 +-- .../fluid/client/render/ItemTankRenderer.java | 1 - src/dark/fluid/common/machines/BlockTank.java | 4 +--- .../fluid/common/machines/TileEntityTank.java | 3 +-- src/dark/fluid/common/pipes/ItemBlockPipe.java | 5 +++-- src/dark/fluid/common/pipes/TileEntityPipe.java | 2 +- .../prefab/TileEntityFluidNetworkTile.java | 2 +- .../common/pump/TileEntityConstructionPump.java | 2 +- .../common/pump/TileEntityStarterPump.java | 1 - .../common/machines/TileEntitySteamPiston.java | 5 +++-- 12 files changed, 22 insertions(+), 26 deletions(-) diff --git a/src/dark/core/prefab/tilenetwork/fluid/NetworkFluidTiles.java b/src/dark/core/prefab/tilenetwork/fluid/NetworkFluidTiles.java index a106b8843..61b85eb04 100644 --- a/src/dark/core/prefab/tilenetwork/fluid/NetworkFluidTiles.java +++ b/src/dark/core/prefab/tilenetwork/fluid/NetworkFluidTiles.java @@ -2,9 +2,7 @@ package dark.core.prefab.tilenetwork.fluid; import java.util.EnumSet; import java.util.HashMap; -import java.util.HashSet; import java.util.Iterator; -import java.util.Set; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; @@ -252,6 +250,7 @@ public class NetworkFluidTiles extends NetworkTileEntities newNetwork.getMembers().addAll(this.getMembers()); newNetwork.getMembers().addAll(network.getMembers()); newNetwork.onCreated(); + newNetwork.save(); } else { diff --git a/src/dark/core/prefab/tilenetwork/fluid/NetworkPipes.java b/src/dark/core/prefab/tilenetwork/fluid/NetworkPipes.java index 949812b68..594cf68cc 100644 --- a/src/dark/core/prefab/tilenetwork/fluid/NetworkPipes.java +++ b/src/dark/core/prefab/tilenetwork/fluid/NetworkPipes.java @@ -6,11 +6,9 @@ import java.util.Map.Entry; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; import dark.api.fluid.INetworkPipe; import dark.api.tilenetwork.INetworkPart; -import dark.core.helpers.ConnectionHelper; import dark.core.prefab.fluids.FluidHelper; import dark.core.prefab.tilenetwork.NetworkUpdateHandler; @@ -85,13 +83,16 @@ public class NetworkPipes extends NetworkFluidTiles { for (ForgeDirection dir : entry.getValue()) { - int fill = tankContainer.fill(dir, stack, false); - - if (fill > mostFill) + if (tankContainer.canFill(dir, sta.getFluid())) { - tankToFill = tankContainer; - mostFill = fill; - fillDir = dir; + int fill = tankContainer.fill(dir, stack, false); + + if (fill > mostFill) + { + tankToFill = tankContainer; + mostFill = fill; + fillDir = dir; + } } } } diff --git a/src/dark/fluid/client/render/BlockRenderHelper.java b/src/dark/fluid/client/render/BlockRenderHelper.java index d568d48c9..e60c6aa70 100644 --- a/src/dark/fluid/client/render/BlockRenderHelper.java +++ b/src/dark/fluid/client/render/BlockRenderHelper.java @@ -16,7 +16,6 @@ import dark.core.prefab.ModPrefab; import dark.fluid.client.model.ModelConstructionPump; import dark.fluid.client.model.ModelPump; import dark.fluid.client.model.ModelSink; -import dark.fluid.client.model.ModelTankSide; import dark.fluid.common.FMRecipeLoader; import dark.fluid.common.FluidMech; import dark.mech.client.model.ModelGearRod; @@ -53,7 +52,7 @@ public class BlockRenderHelper implements ISimpleBlockRenderingHandler FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation(FluidMech.instance.DOMAIN, ModPrefab.MODEL_DIRECTORY + "Sink.png")); sink.render(0.0565F); } - else if (FMRecipeLoader.blockRod != null && block.blockID == FMRecipeLoader.blockRod.blockID) + else if (FMRecipeLoader.blockRod != null && block.blockID == FMRecipeLoader.blockRod.blockID) { GL11.glTranslatef(0.0F, 1.5F, 0.0F); GL11.glRotatef(180f, 0f, 0f, 1f); diff --git a/src/dark/fluid/client/render/ItemTankRenderer.java b/src/dark/fluid/client/render/ItemTankRenderer.java index 5c4689a31..98fa3269b 100644 --- a/src/dark/fluid/client/render/ItemTankRenderer.java +++ b/src/dark/fluid/client/render/ItemTankRenderer.java @@ -16,7 +16,6 @@ import dark.fluid.client.model.ModelTankSide; import dark.fluid.common.FMRecipeLoader; import dark.fluid.common.FluidMech; import dark.fluid.common.machines.BlockTank; -import dark.machines.CoreRecipeLoader; import dark.machines.client.renders.RenderBlockFluid; @SideOnly(Side.CLIENT) diff --git a/src/dark/fluid/common/machines/BlockTank.java b/src/dark/fluid/common/machines/BlockTank.java index f048c34fd..2f090e157 100644 --- a/src/dark/fluid/common/machines/BlockTank.java +++ b/src/dark/fluid/common/machines/BlockTank.java @@ -4,8 +4,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import universalelectricity.core.vector.Vector3; - import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -14,6 +12,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.common.Configuration; +import universalelectricity.core.vector.Vector3; import com.builtbroken.common.Pair; @@ -25,7 +24,6 @@ import dark.fluid.client.render.BlockRenderHelper; import dark.fluid.common.FluidPartsMaterial; import dark.fluid.common.pipes.ItemBlockPipe; import dark.fluid.common.pipes.TileEntityPipe; -import dark.machines.machines.ItemBlockEnergyStorage; public class BlockTank extends BlockFM { diff --git a/src/dark/fluid/common/machines/TileEntityTank.java b/src/dark/fluid/common/machines/TileEntityTank.java index c5ac51750..8c366164c 100644 --- a/src/dark/fluid/common/machines/TileEntityTank.java +++ b/src/dark/fluid/common/machines/TileEntityTank.java @@ -2,11 +2,9 @@ package dark.fluid.common.machines; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; -import universalelectricity.core.vector.Vector3; import dark.api.fluid.INetworkFluidPart; import dark.api.tilenetwork.INetworkPart; import dark.api.tilenetwork.ITileNetwork; -import dark.api.tilenetwork.ITileConnector.Connection; import dark.core.prefab.tilenetwork.fluid.NetworkFluidContainers; import dark.fluid.common.prefab.TileEntityFluidNetworkTile; @@ -36,6 +34,7 @@ public class TileEntityTank extends TileEntityFluidNetworkTile } } + @Override public void validateConnectionSide(TileEntity tileEntity, ForgeDirection side) { if (!this.worldObj.isRemote) diff --git a/src/dark/fluid/common/pipes/ItemBlockPipe.java b/src/dark/fluid/common/pipes/ItemBlockPipe.java index 18f0f3b0d..3026b4e05 100644 --- a/src/dark/fluid/common/pipes/ItemBlockPipe.java +++ b/src/dark/fluid/common/pipes/ItemBlockPipe.java @@ -57,7 +57,7 @@ public class ItemBlockPipe extends ItemBlock { ItemStack itemStack = new ItemStack(FMRecipeLoader.blockTank); FluidStack stack = ((TileEntityTank) entity).getTankInfo()[0].fluid; - + if (itemStack.getTagCompound() == null) { itemStack.setTagCompound(new NBTTagCompound()); @@ -86,6 +86,7 @@ public class ItemBlockPipe extends ItemBlock } } + @Override public int getItemStackLimit(ItemStack stack) { if (stack.getTagCompound() != null && stack.getTagCompound().hasKey("fluid")) @@ -112,7 +113,7 @@ public class ItemBlockPipe extends ItemBlock ((TileEntityFluidNetworkTile) tile).setSubID(stack.getItemDamage()); if (stack.getTagCompound() != null && stack.getTagCompound().hasKey("fluid")) { - ((TileEntityFluidNetworkTile) tile).fillTankContent(0, FluidStack.loadFluidStackFromNBT(stack.getTagCompound().getCompoundTag("fluid")), true); + ((TileEntityFluidNetworkTile) tile).fill(ForgeDirection.UNKNOWN, FluidStack.loadFluidStackFromNBT(stack.getTagCompound().getCompoundTag("fluid")), true); } } return true; diff --git a/src/dark/fluid/common/pipes/TileEntityPipe.java b/src/dark/fluid/common/pipes/TileEntityPipe.java index fbed4924e..0a9fc8dde 100644 --- a/src/dark/fluid/common/pipes/TileEntityPipe.java +++ b/src/dark/fluid/common/pipes/TileEntityPipe.java @@ -133,7 +133,7 @@ public class TileEntityPipe extends TileEntityFluidNetworkTile implements IColor } /** Calculates flow rate based on viscosity & temp of the fluid as all other factors are know - * + * * @param fluid - fluidStack * @param temp = tempature of the fluid * @param pressure - pressure difference of were the fluid is flowing too. diff --git a/src/dark/fluid/common/prefab/TileEntityFluidNetworkTile.java b/src/dark/fluid/common/prefab/TileEntityFluidNetworkTile.java index bf2b5f7e5..340eee40e 100644 --- a/src/dark/fluid/common/prefab/TileEntityFluidNetworkTile.java +++ b/src/dark/fluid/common/prefab/TileEntityFluidNetworkTile.java @@ -40,7 +40,7 @@ import dark.machines.DarkMain; public abstract class TileEntityFluidNetworkTile extends TileEntityFluidDevice implements INetworkFluidPart, ISimplePacketReceiver { private int updateTick = 1; - public static int refreshRate = 40; + public static int refreshRate = 10; protected FluidTank tank; protected FluidTankInfo[] internalTanksInfo = new FluidTankInfo[1]; protected List connectedBlocks = new ArrayList(); diff --git a/src/dark/fluid/common/pump/TileEntityConstructionPump.java b/src/dark/fluid/common/pump/TileEntityConstructionPump.java index 5b3c2bebf..59431d775 100644 --- a/src/dark/fluid/common/pump/TileEntityConstructionPump.java +++ b/src/dark/fluid/common/pump/TileEntityConstructionPump.java @@ -89,7 +89,7 @@ public class TileEntityConstructionPump extends TileEntityStarterPump implements { for (Entry> entry : ((NetworkFluidTiles) ((INetworkPipe) inputTile).getTileNetwork()).connctedFluidHandlers.entrySet()) { - + if (entry.getKey() instanceof IDrain && !ignoreList.contains(entry.getKey())) { drain = (IDrain) entry.getKey(); diff --git a/src/dark/fluid/common/pump/TileEntityStarterPump.java b/src/dark/fluid/common/pump/TileEntityStarterPump.java index 0ed6dc146..101112ffd 100644 --- a/src/dark/fluid/common/pump/TileEntityStarterPump.java +++ b/src/dark/fluid/common/pump/TileEntityStarterPump.java @@ -17,7 +17,6 @@ import com.builtbroken.common.Pair; import dark.api.IToolReadOut; import dark.api.fluid.IDrain; import dark.api.tilenetwork.ITileConnector; -import dark.core.ExternalModHandler; import dark.core.prefab.fluids.FluidHelper; import dark.core.prefab.machine.TileEntityEnergyMachine; diff --git a/src/dark/mech/common/machines/TileEntitySteamPiston.java b/src/dark/mech/common/machines/TileEntitySteamPiston.java index 5ac42f3c5..2606ec064 100644 --- a/src/dark/mech/common/machines/TileEntitySteamPiston.java +++ b/src/dark/mech/common/machines/TileEntitySteamPiston.java @@ -2,6 +2,7 @@ package dark.mech.common.machines; import dark.core.prefab.machine.TileEntityEnergyMachine; -public class TileEntitySteamPiston extends TileEntityEnergyMachine { - +public class TileEntitySteamPiston extends TileEntityEnergyMachine +{ + }