tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Render Adjustment and package change

Browse source 
Package change was actual in the Dark-Lib however it effected the
imports.

As well i adjusted the render of the Tank and still have more to do for
it. Right now it only changes for tanks above it and bellow it.
This commit is contained in:
Robert Seifert 2013-06-03 23:16:05 -04:00
parent 24ed8116dc
commit 59d4ca5e6f
26 changed files with 363 additions and 166 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
models/Current_Models/Tank.tcn
View file

Binary file not shown.

155
models/Current_Models/TankSide.java Normal file
View file

@ -0,0 +1,155 @@
// Date: 6/3/2013 8:45:19 PM
// Template version 1.1
// Java generated by Techne
// Keep in mind that you still need to fill in some blanks
// - ZeuX
package net.minecraft.src;
public class ModelTankSide extends ModelBase
{
//fields
ModelRenderer rightSiding;
ModelRenderer leftSiding;
ModelRenderer topSiding;
ModelRenderer botSiding;
ModelRenderer botRightOut;
ModelRenderer botLeftOut;
ModelRenderer topRightOut;
ModelRenderer topLeftOut;
ModelRenderer leftSide;
ModelRenderer leftTopSide;
ModelRenderer leftBotSide;
ModelRenderer rightBotSide;
ModelRenderer rightSide;
ModelRenderer rightTopSide;
public ModelTankSide()
{
textureWidth = 128;
textureHeight = 128;
rightSiding = new ModelRenderer(this, 0, 19);
rightSiding.addBox(-7F, 11F, 7F, 2, 10, 1);
rightSiding.setRotationPoint(0F, 0F, 0F);
rightSiding.setTextureSize(128, 128);
rightSiding.mirror = true;
setRotation(rightSiding, 0F, 0F, 0F);
leftSiding = new ModelRenderer(this, 0, 19);
leftSiding.addBox(5F, 11F, 7F, 2, 10, 1);
leftSiding.setRotationPoint(0F, 0F, 0F);
leftSiding.setTextureSize(128, 128);
leftSiding.mirror = true;
setRotation(leftSiding, 0F, 0F, 0F);
topSiding = new ModelRenderer(this, 7, 8);
topSiding.addBox(-5F, 8F, 7F, 10, 3, 1);
topSiding.setRotationPoint(0F, 0F, 0F);
topSiding.setTextureSize(128, 128);
topSiding.mirror = true;
setRotation(topSiding, 0F, 0F, 0F);
botSiding = new ModelRenderer(this, 7, 8);
botSiding.addBox(-5F, 21F, 7F, 10, 3, 1);
botSiding.setRotationPoint(0F, 0F, 0F);
botSiding.setTextureSize(128, 128);
botSiding.mirror = true;
setRotation(botSiding, 0F, 0F, 0F);
botRightOut = new ModelRenderer(this, 0, 0);
botRightOut.addBox(-7F, 21F, 7F, 2, 3, 1);
botRightOut.setRotationPoint(0F, 0F, 0F);
botRightOut.setTextureSize(128, 128);
botRightOut.mirror = true;
setRotation(botRightOut, 0F, 0F, 0F);
botLeftOut = new ModelRenderer(this, 0, 0);
botLeftOut.addBox(5F, 21F, 7F, 2, 3, 1);
botLeftOut.setRotationPoint(0F, 0F, 0F);
botLeftOut.setTextureSize(128, 128);
botLeftOut.mirror = true;
setRotation(botLeftOut, 0F, 0F, 0F);
topRightOut = new ModelRenderer(this, 0, 0);
topRightOut.addBox(-7F, 8F, 7F, 2, 3, 1);
topRightOut.setRotationPoint(0F, 0F, 0F);
topRightOut.setTextureSize(128, 128);
topRightOut.mirror = true;
setRotation(topRightOut, 0F, 0F, 0F);
topLeftOut = new ModelRenderer(this, 0, 0);
topLeftOut.addBox(5F, 8F, 7F, 2, 3, 1);
topLeftOut.setRotationPoint(0F, 0F, 0F);
topLeftOut.setTextureSize(128, 128);
topLeftOut.mirror = true;
setRotation(topLeftOut, 0F, 0F, 0F);
leftSide = new ModelRenderer(this, 0, 19);
leftSide.addBox(7F, 11F, 7F, 1, 10, 1);
leftSide.setRotationPoint(0F, 0F, 0F);
leftSide.setTextureSize(128, 128);
leftSide.mirror = true;
setRotation(leftSide, 0F, 0F, 0F);
leftTopSide = new ModelRenderer(this, 0, 0);
leftTopSide.addBox(7F, 8F, 7F, 1, 3, 1);
leftTopSide.setRotationPoint(0F, 0F, 0F);
leftTopSide.setTextureSize(128, 128);
leftTopSide.mirror = true;
setRotation(leftTopSide, 0F, 0F, 0F);
leftBotSide = new ModelRenderer(this, 0, 0);
leftBotSide.addBox(7F, 21F, 7F, 1, 3, 1);
leftBotSide.setRotationPoint(0F, 0F, 0F);
leftBotSide.setTextureSize(128, 128);
leftBotSide.mirror = true;
setRotation(leftBotSide, 0F, 0F, 0F);
rightBotSide = new ModelRenderer(this, 0, 0);
rightBotSide.addBox(-8F, 21F, 7F, 1, 3, 1);
rightBotSide.setRotationPoint(0F, 0F, 0F);
rightBotSide.setTextureSize(128, 128);
rightBotSide.mirror = true;
setRotation(rightBotSide, 0F, 0F, 0F);
rightSide = new ModelRenderer(this, 0, 19);
rightSide.addBox(-8F, 11F, 7F, 1, 10, 1);
rightSide.setRotationPoint(0F, 0F, 0F);
rightSide.setTextureSize(128, 128);
rightSide.mirror = true;
setRotation(rightSide, 0F, 0F, 0F);
rightTopSide = new ModelRenderer(this, 0, 0);
rightTopSide.addBox(-8F, 8F, 7F, 1, 3, 1);
rightTopSide.setRotationPoint(0F, 0F, 0F);
rightTopSide.setTextureSize(128, 128);
rightTopSide.mirror = true;
setRotation(rightTopSide, 0F, 0F, 0F);
}
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
{
super.render(entity, f, f1, f2, f3, f4, f5);
setRotationAngles(f, f1, f2, f3, f4, f5);
rightSiding.render(f5);
leftSiding.render(f5);
topSiding.render(f5);
botSiding.render(f5);
botRightOut.render(f5);
botLeftOut.render(f5);
topRightOut.render(f5);
topLeftOut.render(f5);
leftSide.render(f5);
leftTopSide.render(f5);
leftBotSide.render(f5);
rightBotSide.render(f5);
rightSide.render(f5);
rightTopSide.render(f5);
}
private void setRotation(ModelRenderer model, float x, float y, float z)
{
model.rotateAngleX = x;
model.rotateAngleY = y;
model.rotateAngleZ = z;
}
public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5)
{
super.setRotationAngles(f, f1, f2, f3, f4, f5);
}
}

BIN
models/Current_Models/TankSide.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 513 B

221
src/minecraft/dark/fluid/client/model/ModelTankSide.java
View file

@ -12,138 +12,171 @@ import net.minecraft.entity.Entity;
public class ModelTankSide extends ModelBase
{
// fields
ModelRenderer backRightSiding;
ModelRenderer backLeftSiding;
ModelRenderer backTopSiding;
ModelRenderer backBotSiding;
ModelRenderer topLeft;
ModelRenderer topRight;
ModelRenderer botRight;
ModelRenderer botLeft;
ModelRenderer botSiding;
ModelRenderer botRightOut;
ModelRenderer botLeftOut;
ModelRenderer topSiding;
ModelRenderer topRightOut;
ModelRenderer topLeftOut;
ModelRenderer leftSiding;
ModelRenderer leftBotSide;
ModelRenderer leftTopSide;
ModelRenderer leftSide;
ModelRenderer rightSiding;
ModelRenderer rightBotSide;
ModelRenderer rightTopSide;
ModelRenderer rightSide;
public ModelTankSide()
{
textureWidth = 128;
textureHeight = 128;
backRightSiding = new ModelRenderer(this, 0, 19);
backRightSiding.addBox(-7F, 10F, 7F, 2, 12, 1);
backRightSiding.setRotationPoint(0F, 0F, 0F);
backRightSiding.setTextureSize(128, 128);
backRightSiding.mirror = true;
setRotation(backRightSiding, 0F, 0F, 0F);
backLeftSiding = new ModelRenderer(this, 0, 19);
backLeftSiding.addBox(5F, 10F, 7F, 2, 12, 1);
backLeftSiding.setRotationPoint(0F, 0F, 0F);
backLeftSiding.setTextureSize(128, 128);
backLeftSiding.mirror = true;
setRotation(backLeftSiding, 0F, 0F, 0F);
backTopSiding = new ModelRenderer(this, 7, 8);
backTopSiding.addBox(-4F, 8F, 7F, 8, 2, 1);
backTopSiding.setRotationPoint(0F, 0F, 0F);
backTopSiding.setTextureSize(128, 128);
backTopSiding.mirror = true;
setRotation(backTopSiding, 0F, 0F, 0F);
backBotSiding = new ModelRenderer(this, 7, 8);
backBotSiding.addBox(-4F, 22F, 7F, 8, 2, 1);
backBotSiding.setRotationPoint(0F, 0F, 0F);
backBotSiding.setTextureSize(128, 128);
backBotSiding.mirror = true;
setRotation(backBotSiding, 0F, 0F, 0F);
topLeft = new ModelRenderer(this, 0, 0);
topLeft.addBox(4F, 8F, 7F, 2, 2, 1);
topLeft.setRotationPoint(0F, 0F, 0F);
topLeft.setTextureSize(128, 128);
topLeft.mirror = true;
setRotation(topLeft, 0F, 0F, 0F);
topRight = new ModelRenderer(this, 0, 0);
topRight.addBox(-6F, 8F, 7F, 2, 2, 1);
topRight.setRotationPoint(0F, 0F, 0F);
topRight.setTextureSize(128, 128);
topRight.mirror = true;
setRotation(topRight, 0F, 0F, 0F);
botRight = new ModelRenderer(this, 0, 0);
botRight.addBox(-6F, 22F, 7F, 2, 2, 1);
botRight.setRotationPoint(0F, 0F, 0F);
botRight.setTextureSize(128, 128);
botRight.mirror = true;
setRotation(botRight, 0F, 0F, 0F);
botLeft = new ModelRenderer(this, 0, 0);
botLeft.addBox(4F, 22F, 7F, 2, 2, 1);
botLeft.setRotationPoint(0F, 0F, 0F);
botLeft.setTextureSize(128, 128);
botLeft.mirror = true;
setRotation(botLeft, 0F, 0F, 0F);
botRightOut = new ModelRenderer(this, 0, 0);
botRightOut.addBox(-7F, 22F, 7F, 2, 2, 1);
botRightOut.setRotationPoint(0F, 0F, 0F);
botRightOut.setTextureSize(128, 128);
botRightOut.mirror = true;
setRotation(botRightOut, 0F, 0F, 0F);
botLeftOut = new ModelRenderer(this, 0, 0);
botLeftOut.addBox(5F, 22F, 7F, 2, 2, 1);
botLeftOut.setRotationPoint(0F, 0F, 0F);
botLeftOut.setTextureSize(128, 128);
botLeftOut.mirror = true;
setRotation(botLeftOut, 0F, 0F, 0F);
topRightOut = new ModelRenderer(this, 0, 0);
topRightOut.addBox(-7F, 8F, 7F, 2, 2, 1);
topRightOut.setRotationPoint(0F, 0F, 0F);
topRightOut.setTextureSize(128, 128);
topRightOut.mirror = true;
setRotation(topRightOut, 0F, 0F, 0F);
topLeftOut = new ModelRenderer(this, 0, 0);
topLeftOut.addBox(5F, 8F, 7F, 2, 2, 1);
topLeftOut.setRotationPoint(0F, 0F, 0F);
topLeftOut.setTextureSize(128, 128);
topLeftOut.mirror = true;
setRotation(topLeftOut, 0F, 0F, 0F);
rightSiding = new ModelRenderer(this, 0, 19);
rightSiding.addBox(-7F, 11F, 7F, 2, 10, 1);
rightSiding.setRotationPoint(0F, 0F, 0F);
rightSiding.setTextureSize(128, 128);
rightSiding.mirror = true;
setRotation(rightSiding, 0F, 0F, 0F);
leftSiding = new ModelRenderer(this, 0, 19);
leftSiding.addBox(5F, 11F, 7F, 2, 10, 1);
leftSiding.setRotationPoint(0F, 0F, 0F);
leftSiding.setTextureSize(128, 128);
leftSiding.mirror = true;
setRotation(leftSiding, 0F, 0F, 0F);
topSiding = new ModelRenderer(this, 7, 8);
topSiding.addBox(-5F, 8F, 7F, 10, 3, 1);
topSiding.setRotationPoint(0F, 0F, 0F);
topSiding.setTextureSize(128, 128);
topSiding.mirror = true;
setRotation(topSiding, 0F, 0F, 0F);
botSiding = new ModelRenderer(this, 7, 8);
botSiding.addBox(-5F, 21F, 7F, 10, 3, 1);
botSiding.setRotationPoint(0F, 0F, 0F);
botSiding.setTextureSize(128, 128);
botSiding.mirror = true;
setRotation(botSiding, 0F, 0F, 0F);
botRightOut = new ModelRenderer(this, 0, 0);
botRightOut.addBox(-7F, 21F, 7F, 2, 3, 1);
botRightOut.setRotationPoint(0F, 0F, 0F);
botRightOut.setTextureSize(128, 128);
botRightOut.mirror = true;
setRotation(botRightOut, 0F, 0F, 0F);
botLeftOut = new ModelRenderer(this, 0, 0);
botLeftOut.addBox(5F, 21F, 7F, 2, 3, 1);
botLeftOut.setRotationPoint(0F, 0F, 0F);
botLeftOut.setTextureSize(128, 128);
botLeftOut.mirror = true;
setRotation(botLeftOut, 0F, 0F, 0F);
topRightOut = new ModelRenderer(this, 0, 0);
topRightOut.addBox(-7F, 8F, 7F, 2, 3, 1);
topRightOut.setRotationPoint(0F, 0F, 0F);
topRightOut.setTextureSize(128, 128);
topRightOut.mirror = true;
setRotation(topRightOut, 0F, 0F, 0F);
topLeftOut = new ModelRenderer(this, 0, 0);
topLeftOut.addBox(5F, 8F, 7F, 2, 3, 1);
topLeftOut.setRotationPoint(0F, 0F, 0F);
topLeftOut.setTextureSize(128, 128);
topLeftOut.mirror = true;
setRotation(topLeftOut, 0F, 0F, 0F);
leftSide = new ModelRenderer(this, 0, 19);
leftSide.addBox(7F, 11F, 7F, 1, 10, 1);
leftSide.setRotationPoint(0F, 0F, 0F);
leftSide.setTextureSize(128, 128);
leftSide.mirror = true;
setRotation(leftSide, 0F, 0F, 0F);
leftTopSide = new ModelRenderer(this, 0, 0);
leftTopSide.addBox(7F, 8F, 7F, 1, 3, 1);
leftTopSide.setRotationPoint(0F, 0F, 0F);
leftTopSide.setTextureSize(128, 128);
leftTopSide.mirror = true;
setRotation(leftTopSide, 0F, 0F, 0F);
leftBotSide = new ModelRenderer(this, 0, 0);
leftBotSide.addBox(7F, 21F, 7F, 1, 3, 1);
leftBotSide.setRotationPoint(0F, 0F, 0F);
leftBotSide.setTextureSize(128, 128);
leftBotSide.mirror = true;
setRotation(leftBotSide, 0F, 0F, 0F);
rightBotSide = new ModelRenderer(this, 0, 0);
rightBotSide.addBox(-8F, 21F, 7F, 1, 3, 1);
rightBotSide.setRotationPoint(0F, 0F, 0F);
rightBotSide.setTextureSize(128, 128);
rightBotSide.mirror = true;
setRotation(rightBotSide, 0F, 0F, 0F);
rightSide = new ModelRenderer(this, 0, 19);
rightSide.addBox(-8F, 11F, 7F, 1, 10, 1);
rightSide.setRotationPoint(0F, 0F, 0F);
rightSide.setTextureSize(128, 128);
rightSide.mirror = true;
setRotation(rightSide, 0F, 0F, 0F);
rightTopSide = new ModelRenderer(this, 0, 0);
rightTopSide.addBox(-8F, 8F, 7F, 1, 3, 1);
rightTopSide.setRotationPoint(0F, 0F, 0F);
rightTopSide.setTextureSize(128, 128);
rightTopSide.mirror = true;
setRotation(rightTopSide, 0F, 0F, 0F);
}
public void render(float f5, boolean left, boolean right, boolean bot, boolean top)
{
//tankBack.render(f5);
// tankBack.render(f5);
if (!top)
{
backTopSiding.render(f5);
topLeft.render(f5);
topRight.render(f5);
topSiding.render(f5);
topRightOut.render(f5);
topLeftOut.render(f5);
}
if (!bot)
{
backBotSiding.render(f5);
botRight.render(f5);
botLeft.render(f5);
botSiding.render(f5);
botRightOut.render(f5);
botLeftOut.render(f5);
}
if (!right)
{
backRightSiding.render(f5);
rightSiding.render(f5);
rightBotSide.render(f5);
rightTopSide.render(f5);
rightSide.render(f5);
if (top)
{
topRight.render(f5);
topRightOut.render(f5);
}
if (bot)
{
botRightOut.render(f5);
}
}
else
{
//tankBackRight.render(f5);
}
if (!left)
{
backLeftSiding.render(f5);
leftSiding.render(f5);
leftBotSide.render(f5);
leftTopSide.render(f5);
leftSide.render(f5);
if (top)
{
topLeftOut.render(f5);
}
if (bot)
{
botLeftOut.render(f5);
}
}
else
{
//tankBackLeft.render(f5);
}
}

2
src/minecraft/dark/fluid/client/render/RenderReleaseValve.java
View file

@ -1,6 +1,5 @@
package dark.fluid.client.render;
import hydraulic.api.ColorCode;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
@ -11,6 +10,7 @@ import dark.fluid.client.model.ModelLargePipe;
import dark.fluid.client.model.ModelReleaseValve;
import dark.fluid.common.FluidMech;
import dark.fluid.common.machines.TileEntityReleaseValve;
import dark.hydraulic.api.ColorCode;
public class RenderReleaseValve extends TileEntitySpecialRenderer

26
src/minecraft/dark/fluid/client/render/RenderTank.java
View file

@ -1,7 +1,5 @@
package dark.fluid.client.render;
import hydraulic.api.ColorCode;
import hydraulic.helpers.LiquidRenderer;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.liquids.ILiquidTank;
@ -12,6 +10,9 @@ import org.lwjgl.opengl.GL11;
import dark.fluid.client.model.ModelTankSide;
import dark.fluid.common.FluidMech;
import dark.fluid.common.machines.TileEntityTank;
import dark.hydraulic.api.ColorCode;
import dark.hydraulic.helpers.LiquidRenderer;
import dark.library.DarkMain;
public class RenderTank extends TileEntitySpecialRenderer
{
@ -31,6 +32,8 @@ public class RenderTank extends TileEntitySpecialRenderer
ILiquidTank tank = tileEntityTank.getTank();
LiquidStack liquid = tank.getLiquid();
int[] render = ((TileEntityTank) tileEntity).renderConnection;
ColorCode color = tileEntityTank.getColor();
boolean lre = false;
if (liquid != null && liquid.amount > 0)
@ -47,8 +50,8 @@ public class RenderTank extends TileEntitySpecialRenderer
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
bindTextureByName(LiquidRenderer.getLiquidSheet(liquid));
GL11.glTranslatef((float) x + 0.025F, (float) y, (float) z + 0.025F);
GL11.glScalef(0.87F, 0.999F, 0.87F);
GL11.glTranslatef((float) x, (float) y, (float) z);
GL11.glScalef(1.01F, 1F, 1.01F);
GL11.glCallList(displayList[(int) ((float) Math.min(liquid.amount, tank.getCapacity()) / (float) (tank.getCapacity()) * (LiquidRenderer.DISPLAY_STAGES - 1))]);
GL11.glPopAttrib();
@ -56,19 +59,22 @@ public class RenderTank extends TileEntitySpecialRenderer
lre = true;
}
}
bindTextureByName(FluidMech.MODEL_TEXTURE_DIRECTORY + "TankSide.png");
bindTextureByName(DarkMain.TEXTURE_DIRECTORY + "CobbleBack.png");
GL11.glPushMatrix();
GL11.glTranslatef((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F);
GL11.glScalef(1.0F, -1F, -1F);
model.render(0.0625F, false, false, false, false);
boolean bot = tileEntity.worldObj.getBlockTileEntity(tileEntity.xCoord, tileEntity.yCoord + 1, tileEntity.zCoord) instanceof TileEntityTank;
boolean top = tileEntity.worldObj.getBlockTileEntity(tileEntity.xCoord, tileEntity.yCoord - 1, tileEntity.zCoord) instanceof TileEntityTank;
model.render(0.0625F, false, false, top, bot);
GL11.glRotatef(90f, 0f, 1f, 0f);
model.render(0.0625F, false, false, false, false);
model.render(0.0625F, false, false, top, bot);
GL11.glRotatef(180f, 0f, 1f, 0f);
model.render(0.0625F, false, false, false, false);
model.render(0.0625F, false, false, top, bot);
GL11.glRotatef(270f, 0f, 1f, 0f);
model.render(0.0625F, false, false, false, false);
model.render(0.0625F, false, false, top, bot);
GL11.glPopMatrix();
}

4
src/minecraft/dark/fluid/client/render/pipe/RenderPipe.java
View file

@ -1,7 +1,5 @@
package dark.fluid.client.render.pipe;
import hydraulic.api.ColorCode;
import hydraulic.api.FluidRestrictionHandler;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
@ -15,6 +13,8 @@ import dark.fluid.common.FluidMech;
import dark.fluid.common.pipes.TileEntityGenericPipe;
import dark.fluid.common.pipes.TileEntityPipe;
import dark.fluid.common.pipes.addon.IPipeExtention;
import dark.hydraulic.api.ColorCode;
import dark.hydraulic.api.FluidRestrictionHandler;
import universalelectricity.core.vector.Vector3;

4
src/minecraft/dark/fluid/common/FluidMech.java
View file

@ -1,7 +1,5 @@
package dark.fluid.common;
import hydraulic.api.ColorCode;
import hydraulic.api.FluidRestrictionHandler;
import java.io.File;
import java.util.Arrays;
@ -63,6 +61,8 @@ import dark.fluid.common.pump.BlockPumpMachine;
import dark.fluid.common.pump.TileEntityConstructionPump;
import dark.fluid.common.pump.TileEntityDrain;
import dark.fluid.common.pump.TileEntityStarterPump;
import dark.hydraulic.api.ColorCode;
import dark.hydraulic.api.FluidRestrictionHandler;
import dark.library.DarkMain;
import dark.mech.common.machines.BlockGenerator;
import dark.mech.common.machines.BlockRod;

2
src/minecraft/dark/fluid/common/item/ItemTools.java
View file

@ -1,10 +1,10 @@
package dark.fluid.common.item;
import hydraulic.api.IReadOut;
import java.util.List;
import dark.fluid.common.TabFluidMech;
import dark.hydraulic.api.IReadOut;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;

2
src/minecraft/dark/fluid/common/machines/BlockSink.java
View file

@ -1,6 +1,5 @@
package dark.fluid.common.machines;
import hydraulic.helpers.FluidHelper;
import net.minecraft.block.material.Material;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.player.EntityPlayer;
@ -19,6 +18,7 @@ import universalelectricity.prefab.block.BlockAdvanced;
import universalelectricity.prefab.tile.TileEntityAdvanced;
import dark.fluid.client.render.BlockRenderHelper;
import dark.fluid.common.TabFluidMech;
import dark.hydraulic.helpers.FluidHelper;
import dark.library.helpers.MetaGroup;
public class BlockSink extends BlockAdvanced

8
src/minecraft/dark/fluid/common/machines/BlockTank.java
View file

@ -1,14 +1,14 @@
package dark.fluid.common.machines;
import hydraulic.api.FluidRestrictionHandler;
import hydraulic.api.INetworkPart;
import hydraulic.api.INetworkPipe;
import hydraulic.helpers.FluidHelper;
import java.util.List;
import dark.fluid.client.render.BlockRenderHelper;
import dark.fluid.common.TabFluidMech;
import dark.hydraulic.api.FluidRestrictionHandler;
import dark.hydraulic.api.INetworkPart;
import dark.hydraulic.api.INetworkPipe;
import dark.hydraulic.helpers.FluidHelper;
import net.minecraft.block.material.Material;
import net.minecraft.creativetab.CreativeTabs;

14
src/minecraft/dark/fluid/common/machines/TileEntityReleaseValve.java
View file

@ -1,12 +1,5 @@
package dark.fluid.common.machines;
import hydraulic.api.ColorCode;
import hydraulic.api.IColorCoded;
import hydraulic.api.INetworkPipe;
import hydraulic.api.ITileConnector;
import hydraulic.api.IReadOut;
import hydraulic.network.PipeNetwork;
import hydraulic.prefab.tile.TileEntityFluidDevice;
import java.util.ArrayList;
import java.util.List;
@ -18,6 +11,13 @@ import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.liquids.ITankContainer;
import net.minecraftforge.liquids.LiquidContainerRegistry;
import net.minecraftforge.liquids.LiquidStack;
import dark.hydraulic.api.ColorCode;
import dark.hydraulic.api.IColorCoded;
import dark.hydraulic.api.INetworkPipe;
import dark.hydraulic.api.IReadOut;
import dark.hydraulic.api.ITileConnector;
import dark.hydraulic.network.PipeNetwork;
import dark.hydraulic.prefab.tile.TileEntityFluidDevice;
import dark.library.helpers.ConnectionHelper;
public class TileEntityReleaseValve extends TileEntityFluidDevice implements ITileConnector, IReadOut

6
src/minecraft/dark/fluid/common/machines/TileEntitySink.java
View file

@ -1,8 +1,5 @@
package dark.fluid.common.machines;
import hydraulic.api.ColorCode;
import hydraulic.api.IColorCoded;
import hydraulic.prefab.tile.TileEntityFluidStorage;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.Packet;
@ -16,6 +13,9 @@ import universalelectricity.prefab.network.PacketManager;
import com.google.common.io.ByteArrayDataInput;
import dark.fluid.common.FluidMech;
import dark.hydraulic.api.ColorCode;
import dark.hydraulic.api.IColorCoded;
import dark.hydraulic.prefab.tile.TileEntityFluidStorage;
public class TileEntitySink extends TileEntityFluidStorage implements IPacketReceiver, ITankContainer, IColorCoded
{

18
src/minecraft/dark/fluid/common/machines/TileEntityTank.java
View file

@ -1,14 +1,5 @@
package dark.fluid.common.machines;
import hydraulic.api.ColorCode;
import hydraulic.api.IColorCoded;
import hydraulic.api.INetworkFluidPart;
import hydraulic.api.INetworkPipe;
import hydraulic.api.IReadOut;
import hydraulic.network.ContainerNetwork;
import hydraulic.network.FluidNetwork;
import hydraulic.network.TileNetwork;
import hydraulic.prefab.tile.TileEntityFluidDevice;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.INetworkManager;
@ -33,6 +24,15 @@ import com.google.common.io.ByteArrayDataInput;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.fluid.common.FluidMech;
import dark.hydraulic.api.ColorCode;
import dark.hydraulic.api.IColorCoded;
import dark.hydraulic.api.INetworkFluidPart;
import dark.hydraulic.api.INetworkPipe;
import dark.hydraulic.api.IReadOut;
import dark.hydraulic.network.ContainerNetwork;
import dark.hydraulic.network.FluidNetwork;
import dark.hydraulic.network.TileNetwork;
import dark.hydraulic.prefab.tile.TileEntityFluidDevice;
public class TileEntityTank extends TileEntityFluidDevice implements ITankContainer, IReadOut, IColorCoded, INetworkFluidPart, IPacketReceiver
{

4
src/minecraft/dark/fluid/common/pipes/BlockPipe.java
View file

@ -1,12 +1,12 @@
package dark.fluid.common.pipes;
import hydraulic.api.FluidRestrictionHandler;
import hydraulic.api.INetworkPipe;
import java.util.List;
import dark.fluid.common.FluidMech;
import dark.fluid.common.TabFluidMech;
import dark.hydraulic.api.FluidRestrictionHandler;
import dark.hydraulic.api.INetworkPipe;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;

6
src/minecraft/dark/fluid/common/pipes/TileEntityGenericPipe.java
View file

@ -1,8 +1,8 @@
package dark.fluid.common.pipes;
import hydraulic.api.ColorCode;
import hydraulic.helpers.FluidHelper;
import hydraulic.network.PipeNetwork;
import dark.hydraulic.api.ColorCode;
import dark.hydraulic.helpers.FluidHelper;
import dark.hydraulic.network.PipeNetwork;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.liquids.ILiquidTank;

16
src/minecraft/dark/fluid/common/pipes/TileEntityPipe.java
View file

@ -1,13 +1,5 @@
package dark.fluid.common.pipes;
import hydraulic.api.ColorCode;
import hydraulic.api.IColorCoded;
import hydraulic.api.INetworkPipe;
import hydraulic.api.ITileConnector;
import hydraulic.api.IReadOut;
import hydraulic.helpers.FluidHelper;
import hydraulic.network.PipeNetwork;
import hydraulic.network.TileNetwork;
import java.io.IOException;
import java.util.Random;
@ -40,6 +32,14 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.fluid.common.FluidMech;
import dark.fluid.common.pipes.addon.IPipeExtention;
import dark.hydraulic.api.ColorCode;
import dark.hydraulic.api.IColorCoded;
import dark.hydraulic.api.INetworkPipe;
import dark.hydraulic.api.IReadOut;
import dark.hydraulic.api.ITileConnector;
import dark.hydraulic.helpers.FluidHelper;
import dark.hydraulic.network.PipeNetwork;
import dark.hydraulic.network.TileNetwork;
public class TileEntityPipe extends TileEntityAdvanced implements ITankContainer, IReadOut, IColorCoded, INetworkPipe, IPacketReceiver
{

2
src/minecraft/dark/fluid/common/pipes/addon/TileEntityPipeWindow.java
View file

@ -1,6 +1,5 @@
package dark.fluid.common.pipes.addon;
import hydraulic.network.PipeNetwork;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.INetworkManager;
@ -11,6 +10,7 @@ import com.google.common.io.ByteArrayDataInput;
import dark.fluid.client.render.pipe.RenderPipeWindow;
import dark.fluid.common.pipes.TileEntityPipe;
import dark.hydraulic.network.PipeNetwork;
public class TileEntityPipeWindow extends TileEntityPipeExtention
{

3
src/minecraft/dark/fluid/common/pipes/tele/INetworkConnector.java
View file

@ -1,9 +1,10 @@
package dark.fluid.common.pipes.tele;
import hydraulic.api.INetworkPipe;
import java.util.List;
import dark.hydraulic.api.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

2
src/minecraft/dark/fluid/common/pump/BlockConstructionPump.java
View file

@ -1,12 +1,12 @@
package dark.fluid.common.pump;
import hydraulic.network.HydraulicNetworkHelper;
import java.util.List;
import dark.fluid.client.render.BlockRenderHelper;
import dark.fluid.common.FluidMech;
import dark.fluid.common.TabFluidMech;
import dark.hydraulic.network.HydraulicNetworkHelper;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;

3
src/minecraft/dark/fluid/common/pump/LiquidPathFinder.java
View file

@ -1,12 +1,13 @@
package dark.fluid.common.pump;
import hydraulic.helpers.FluidHelper;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Random;
import dark.hydraulic.helpers.FluidHelper;
import net.minecraft.world.World;
import net.minecraft.world.chunk.Chunk;
import net.minecraftforge.common.ForgeDirection;

8
src/minecraft/dark/fluid/common/pump/TileEntityConstructionPump.java
View file

@ -1,9 +1,5 @@
package dark.fluid.common.pump;
import hydraulic.api.INetworkPipe;
import hydraulic.api.ITileConnector;
import hydraulic.network.FluidNetwork;
import hydraulic.network.HydraulicNetworkHelper;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.liquids.ILiquidTank;
@ -14,6 +10,10 @@ import net.minecraftforge.liquids.LiquidTank;
import universalelectricity.core.electricity.ElectricityPack;
import universalelectricity.core.vector.Vector3;
import universalelectricity.core.vector.VectorHelper;
import dark.hydraulic.api.INetworkPipe;
import dark.hydraulic.api.ITileConnector;
import dark.hydraulic.network.FluidNetwork;
import dark.hydraulic.network.HydraulicNetworkHelper;
import dark.library.helpers.MetaGroup;
import dark.library.machine.TileEntityRunnableMachine;

9
src/minecraft/dark/fluid/common/pump/TileEntityDrain.java
View file

@ -1,9 +1,5 @@
package dark.fluid.common.pump;
import hydraulic.api.IDrain;
import hydraulic.api.INetworkPipe;
import hydraulic.helpers.FluidHelper;
import hydraulic.prefab.tile.TileEntityFluidDevice;
import java.util.ArrayList;
import java.util.Collections;
@ -13,6 +9,11 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map.Entry;
import dark.hydraulic.api.IDrain;
import dark.hydraulic.api.INetworkPipe;
import dark.hydraulic.helpers.FluidHelper;
import dark.hydraulic.prefab.tile.TileEntityFluidDevice;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;

10
src/minecraft/dark/fluid/common/pump/TileEntityStarterPump.java
View file

@ -1,10 +1,5 @@
package dark.fluid.common.pump;
import hydraulic.api.ColorCode;
import hydraulic.api.IColorCoded;
import hydraulic.api.ITileConnector;
import hydraulic.api.IReadOut;
import hydraulic.helpers.FluidHelper;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.Packet250CustomPayload;
@ -20,6 +15,11 @@ import universalelectricity.prefab.network.IPacketReceiver;
import com.google.common.io.ByteArrayDataInput;
import dark.hydraulic.api.ColorCode;
import dark.hydraulic.api.IColorCoded;
import dark.hydraulic.api.IReadOut;
import dark.hydraulic.api.ITileConnector;
import dark.hydraulic.helpers.FluidHelper;
import dark.library.helpers.MetaGroup;
import dark.library.machine.TileEntityRunnableMachine;

2
src/minecraft/dark/mech/common/machines/TileEntityGenerator.java
View file

@ -1,6 +1,5 @@
package dark.mech.common.machines;
import hydraulic.api.IReadOut;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.Packet250CustomPayload;
@ -19,6 +18,7 @@ import universalelectricity.prefab.tile.TileEntityElectrical;
import com.google.common.io.ByteArrayDataInput;
import dark.fluid.api.mech.IForce;
import dark.hydraulic.api.IReadOut;
import dark.library.helpers.ConnectionHelper;
import dark.library.helpers.MetaGroup;

2
src/minecraft/dark/mech/common/machines/TileEntityRod.java
View file

@ -1,6 +1,5 @@
package dark.mech.common.machines;
import hydraulic.api.IReadOut;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.Packet;
@ -15,6 +14,7 @@ import com.google.common.io.ByteArrayDataInput;
import dark.fluid.api.mech.IForce;
import dark.fluid.common.FluidMech;
import dark.hydraulic.api.IReadOut;
public class TileEntityRod extends TileEntity implements IPacketReceiver, IForce, IReadOut