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

Cleanup

Browse source
This commit is contained in:
Robert Seifert 2013-06-06 02:59:28 -04:00
parent 70d2105ddf
commit 2cd0cd9adc
25 changed files with 181 additions and 216 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/minecraft/dark/fluid/client/model/ModelLiquidTank.java
View file

@ -6,11 +6,10 @@
package dark.fluid.client.model;
import dark.fluid.common.machines.TileEntityTank;
import dark.fluid.common.pipes.TileEntityPipe;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.tileentity.TileEntity;
import dark.fluid.common.machines.TileEntityTank;
public class ModelLiquidTank extends ModelBase
{

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

@ -8,7 +8,6 @@ package dark.fluid.client.model;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
public class ModelTankSide extends ModelBase
{

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

@ -10,9 +10,7 @@ import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
import cpw.mods.fml.client.registry.RenderingRegistry;
import dark.fluid.client.model.ModelConstructionPump;
import dark.fluid.client.model.ModelLargePipe;
import dark.fluid.client.model.ModelPump;
import dark.fluid.client.model.ModelReleaseValve;
import dark.fluid.client.model.ModelSink;
import dark.fluid.client.model.ModelTankSide;
import dark.fluid.common.FluidMech;
@ -26,9 +24,7 @@ public class BlockRenderHelper implements ISimpleBlockRenderingHandler
private ModelPump modelPump = new ModelPump();
private ModelGearRod modelRod = new ModelGearRod();
private ModelGenerator modelGen = new ModelGenerator();
private ModelLargePipe SixPipe = new ModelLargePipe();
private ModelTankSide tank = new ModelTankSide();
private ModelReleaseValve valve = new ModelReleaseValve();
private ModelSink sink = new ModelSink();
private ModelConstructionPump conPump = new ModelConstructionPump();

159
src/minecraft/dark/fluid/client/render/ItemRenderHelper.java
View file

@ -8,103 +8,96 @@ import org.lwjgl.opengl.GL11;
import cpw.mods.fml.client.FMLClientHandler;
import dark.fluid.client.model.ModelLargePipe;
import dark.fluid.client.model.ModelLiquidTank;
import dark.fluid.client.model.ModelReleaseValve;
import dark.fluid.client.render.pipe.RenderPipe;
import dark.fluid.common.FluidMech;
import dark.mech.client.model.ModelGearRod;
import dark.mech.client.model.ModelGenerator;
/** special tanks to Mekanism github */
public class ItemRenderHelper implements IItemRenderer
{
private ModelGearRod modelRod = new ModelGearRod();
private ModelGenerator modelGen = new ModelGenerator();
private ModelLargePipe SixPipe = new ModelLargePipe();
private ModelLiquidTank tank = new ModelLiquidTank();
private ModelReleaseValve valve = new ModelReleaseValve();
private ModelLargePipe SixPipe = new ModelLargePipe();
private ModelReleaseValve valve = new ModelReleaseValve();
@Override
public boolean handleRenderType(ItemStack item, ItemRenderType type)
{
return true;
}
@Override
public boolean handleRenderType(ItemStack item, ItemRenderType type)
{
return true;
}
@Override
public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper)
{
return true;
}
@Override
public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper)
{
return true;
}
@Override
public void renderItem(ItemRenderType type, ItemStack item, Object... data)
{
if (item.itemID == FluidMech.blockPipe.blockID || item.itemID == FluidMech.blockGenPipe.blockID)
{
this.renderPipeItem((RenderBlocks) data[0], item, type == ItemRenderType.EQUIPPED);
}
if (item.itemID == FluidMech.blockReleaseValve.blockID)
{
this.renderReleaseValve((RenderBlocks) data[0], item.getItemDamage(), type == ItemRenderType.EQUIPPED);
}
@Override
public void renderItem(ItemRenderType type, ItemStack item, Object... data)
{
if (item.itemID == FluidMech.blockPipe.blockID || item.itemID == FluidMech.blockGenPipe.blockID)
{
this.renderPipeItem((RenderBlocks) data[0], item, type == ItemRenderType.EQUIPPED);
}
if (item.itemID == FluidMech.blockReleaseValve.blockID)
{
this.renderReleaseValve((RenderBlocks) data[0], item.getItemDamage(), type == ItemRenderType.EQUIPPED);
}
}
}
public void renderPipeItem(RenderBlocks renderer, ItemStack item, boolean equ)
{
GL11.glPushMatrix();
GL11.glBindTexture(GL11.GL_TEXTURE_2D, FMLClientHandler.instance().getClient().renderEngine.getTexture(RenderPipe.getPipeTexture(item.getItemDamage(),item.itemID == FluidMech.blockPipe.blockID)));
public void renderPipeItem(RenderBlocks renderer, ItemStack item, boolean equ)
{
if (!equ)
{
GL11.glTranslatef(0.5F, -0.5F, 0.5F);
SixPipe.renderRight();
SixPipe.renderLeft();
SixPipe.renderMiddle();
}
else
{
GL11.glTranslatef(0.5F, -0.5F, 0.5F);
SixPipe.renderFront();
SixPipe.renderBack();
SixPipe.renderMiddle();
}
GL11.glPushMatrix();
GL11.glBindTexture(GL11.GL_TEXTURE_2D, FMLClientHandler.instance().getClient().renderEngine.getTexture(RenderPipe.getPipeTexture(item.getItemDamage(), item.itemID == FluidMech.blockPipe.blockID)));
GL11.glPopMatrix();
}
if (!equ)
{
GL11.glTranslatef(0.5F, -0.5F, 0.5F);
SixPipe.renderRight();
SixPipe.renderLeft();
SixPipe.renderMiddle();
}
else
{
GL11.glTranslatef(0.5F, -0.5F, 0.5F);
SixPipe.renderFront();
SixPipe.renderBack();
SixPipe.renderMiddle();
}
public void renderReleaseValve(RenderBlocks renderer, int meta, boolean equ)
{
GL11.glPushMatrix();
GL11.glBindTexture(GL11.GL_TEXTURE_2D, FMLClientHandler.instance().getClient().renderEngine.getTexture(RenderPipe.getPipeTexture(15,false)));
if (!equ)
{
GL11.glTranslatef(0.5F, -0.5F, 0.5F);
SixPipe.renderRight();
SixPipe.renderLeft();
SixPipe.renderMiddle();
}
else
{
GL11.glTranslatef(0.5F, -0.5F, 0.5F);
SixPipe.renderFront();
SixPipe.renderBack();
SixPipe.renderMiddle();
}
GL11.glPopMatrix();
}
GL11.glBindTexture(GL11.GL_TEXTURE_2D, FMLClientHandler.instance().getClient().renderEngine.getTexture(FluidMech.MODEL_TEXTURE_DIRECTORY + "ReleaseValve.png"));
GL11.glRotatef(180f, 0f, 0f, 1f);
if (!equ)
{
GL11.glTranslatef(0, -2.0F, 0);
}
else
{
GL11.glTranslatef(0, -2.0F, 0);
}
valve.render();
GL11.glPopMatrix();
}
public void renderReleaseValve(RenderBlocks renderer, int meta, boolean equ)
{
GL11.glPushMatrix();
GL11.glBindTexture(GL11.GL_TEXTURE_2D, FMLClientHandler.instance().getClient().renderEngine.getTexture(RenderPipe.getPipeTexture(15, false)));
if (!equ)
{
GL11.glTranslatef(0.5F, -0.5F, 0.5F);
SixPipe.renderRight();
SixPipe.renderLeft();
SixPipe.renderMiddle();
}
else
{
GL11.glTranslatef(0.5F, -0.5F, 0.5F);
SixPipe.renderFront();
SixPipe.renderBack();
SixPipe.renderMiddle();
}
GL11.glBindTexture(GL11.GL_TEXTURE_2D, FMLClientHandler.instance().getClient().renderEngine.getTexture(FluidMech.MODEL_TEXTURE_DIRECTORY + "ReleaseValve.png"));
GL11.glRotatef(180f, 0f, 0f, 1f);
if (!equ)
{
GL11.glTranslatef(0, -2.0F, 0);
}
else
{
GL11.glTranslatef(0, -2.0F, 0);
}
valve.render();
GL11.glPopMatrix();
}
}

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

@ -2,7 +2,6 @@ package dark.fluid.client.render;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
import org.lwjgl.opengl.GL11;
@ -12,58 +11,57 @@ import dark.fluid.common.FluidMech;
import dark.fluid.common.machines.TileEntityReleaseValve;
import dark.hydraulic.api.ColorCode;
public class RenderReleaseValve extends TileEntitySpecialRenderer
{
private ModelLargePipe SixPipe;
private ModelReleaseValve valve;
private TileEntity[] ents = new TileEntity[6];
private ModelLargePipe SixPipe;
private ModelReleaseValve valve;
private TileEntity[] ents = new TileEntity[6];
public RenderReleaseValve()
{
SixPipe = new ModelLargePipe();
valve = new ModelReleaseValve();
}
public RenderReleaseValve()
{
SixPipe = new ModelLargePipe();
valve = new ModelReleaseValve();
}
public void renderAModelAt(TileEntity te, double d, double d1, double d2, float f)
{
// Texture file
GL11.glPushMatrix();
GL11.glTranslatef((float) d + 0.5F, (float) d1 + 1.5F, (float) d2 + 0.5F);
GL11.glScalef(1.0F, -1F, -1F);
ForgeDirection dir = ForgeDirection.UNKNOWN;
if (te instanceof TileEntityReleaseValve)
{
ents = ((TileEntityReleaseValve) te).connected;
}
bindTextureByName(this.getPipeTexture(15));
if (ents[0] != null)
SixPipe.renderBottom();
if (ents[1] != null)
SixPipe.renderTop();
if (ents[3] != null)
SixPipe.renderFront();
if (ents[2] != null)
SixPipe.renderBack();
if (ents[5] != null)
SixPipe.renderRight();
if (ents[4] != null)
SixPipe.renderLeft();
SixPipe.renderMiddle();
bindTextureByName(FluidMech.MODEL_TEXTURE_DIRECTORY + "ReleaseValve.png");
if(ents[1] == null)valve.render();
GL11.glPopMatrix();
public void renderAModelAt(TileEntity te, double d, double d1, double d2, float f)
{
// Texture file
GL11.glPushMatrix();
GL11.glTranslatef((float) d + 0.5F, (float) d1 + 1.5F, (float) d2 + 0.5F);
GL11.glScalef(1.0F, -1F, -1F);
if (te instanceof TileEntityReleaseValve)
{
ents = ((TileEntityReleaseValve) te).connected;
}
bindTextureByName(RenderReleaseValve.getPipeTexture(15));
if (ents[0] != null)
SixPipe.renderBottom();
if (ents[1] != null)
SixPipe.renderTop();
if (ents[3] != null)
SixPipe.renderFront();
if (ents[2] != null)
SixPipe.renderBack();
if (ents[5] != null)
SixPipe.renderRight();
if (ents[4] != null)
SixPipe.renderLeft();
SixPipe.renderMiddle();
bindTextureByName(FluidMech.MODEL_TEXTURE_DIRECTORY + "ReleaseValve.png");
if (ents[1] == null)
valve.render();
GL11.glPopMatrix();
}
}
public static String getPipeTexture(int meta)
{
return FluidMech.MODEL_TEXTURE_DIRECTORY + "pipes/" + ColorCode.get(meta).getName() + "Pipe.png";
}
public static String getPipeTexture(int meta)
{
return FluidMech.MODEL_TEXTURE_DIRECTORY + "pipes/" + ColorCode.get(meta).getName() + "Pipe.png";
}
@Override
public void renderTileEntityAt(TileEntity tileEntity, double var2, double var4, double var6, float var8)
{
this.renderAModelAt(tileEntity, var2, var4, var6, var8);
}
@Override
public void renderTileEntityAt(TileEntity tileEntity, double var2, double var4, double var6, float var8)
{
this.renderAModelAt(tileEntity, var2, var4, var6, var8);
}
}

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

@ -3,17 +3,14 @@ package dark.fluid.client.render;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.liquids.ILiquidTank;
import net.minecraftforge.liquids.LiquidStack;
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
{

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

@ -1,8 +1,8 @@
package dark.fluid.client.render.pipe;
import dark.fluid.common.pipes.TileEntityPipe;
import net.minecraftforge.common.ForgeDirection;
import universalelectricity.core.vector.Vector3;
import dark.fluid.common.pipes.TileEntityPipe;
/**
* Class for TileEntity Renders that extend the pipe class to use instead of extending

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

@ -8,6 +8,7 @@ import net.minecraftforge.liquids.LiquidStack;
import org.lwjgl.opengl.GL11;
import universalelectricity.core.vector.Vector3;
import dark.fluid.client.model.ModelLargePipe;
import dark.fluid.common.FluidMech;
import dark.fluid.common.pipes.TileEntityGenericPipe;
@ -16,8 +17,6 @@ import dark.fluid.common.pipes.addon.IPipeExtention;
import dark.hydraulic.api.ColorCode;
import dark.hydraulic.api.FluidRestrictionHandler;
import universalelectricity.core.vector.Vector3;
public class RenderPipe extends TileEntitySpecialRenderer
{
private ModelLargePipe SixPipe;
@ -103,7 +102,7 @@ public class RenderPipe extends TileEntitySpecialRenderer
{
bool = false;
}
bindTextureByName(this.getPipeTexture(meta, bool));
bindTextureByName(RenderPipe.getPipeTexture(meta, bool));
if (side[0])
{
SixPipe.renderBottom();

7
src/minecraft/dark/fluid/client/render/pipe/RenderPipeWindow.java
View file

@ -1,14 +1,13 @@
package dark.fluid.client.render.pipe;
import dark.fluid.client.model.ModelLargePipe;
import dark.fluid.common.pipes.TileEntityPipe;
import net.minecraftforge.common.ForgeDirection;
import universalelectricity.core.vector.Vector3;
import dark.fluid.client.model.ModelLargePipe;
import dark.fluid.common.pipes.TileEntityPipe;
public class RenderPipeWindow implements IPipeExtentionRender
{
private ModelLargePipe SixPipe;
private boolean[] renderSide = new boolean[6];
public RenderPipeWindow()
{
@ -18,7 +17,7 @@ public class RenderPipeWindow implements IPipeExtentionRender
@Override
public void renderAModelAt(RenderPipe renderPipe, TileEntityPipe pipe, Vector3 location, float size, ForgeDirection facingDirection)
{
renderPipe.bindTextureForPipe(renderPipe.getPipeTexture(0,false));
renderPipe.bindTextureForPipe(RenderPipe.getPipeTexture(0,false));
this.render(facingDirection.ordinal());
System.out.println("Rendered Window Pipe");

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

@ -1,6 +1,5 @@
package dark.fluid.common;
import java.io.File;
import java.util.Arrays;
import java.util.logging.Logger;
@ -39,8 +38,8 @@ import cpw.mods.fml.common.network.NetworkMod;
import cpw.mods.fml.common.registry.GameRegistry;
import dark.fluid.common.fluids.BlockWasteLiquid;
import dark.fluid.common.item.ItemParts;
import dark.fluid.common.item.ItemTools;
import dark.fluid.common.item.ItemParts.Parts;
import dark.fluid.common.item.ItemTools;
import dark.fluid.common.machines.BlockReleaseValve;
import dark.fluid.common.machines.BlockSink;
import dark.fluid.common.machines.BlockTank;
@ -69,7 +68,6 @@ import dark.mech.common.machines.BlockRod;
import dark.mech.common.machines.TileEntityGenerator;
import dark.mech.common.machines.TileEntityRod;
@ModstatInfo(prefix = "fluidmech")
@Mod(modid = FluidMech.MOD_ID, name = FluidMech.MOD_NAME, version = FluidMech.VERSION, dependencies = "after:BasicComponents", useMetadata = true)
@NetworkMod(channels = { FluidMech.CHANNEL }, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketManager.class)
@ -161,21 +159,21 @@ public class FluidMech extends DummyModContainer
CONFIGURATION.load();
/* BLOCK DECLARATION -- CONFIG LOADER */
blockGenPipe = new BlockPipe(this.CONFIGURATION.getBlock("Pipes", BLOCK_ID_PREFIX).getInt());
blockMachine = new BlockPumpMachine(this.CONFIGURATION.getBlock("Machines", BLOCK_ID_PREFIX + 1).getInt());
blockRod = new BlockRod(this.CONFIGURATION.getBlock("Mechanical Rod", BLOCK_ID_PREFIX + 3).getInt());
blockGenerator = new BlockGenerator((this.CONFIGURATION.getBlock("Generator", BLOCK_ID_PREFIX + 4).getInt()));
blockReleaseValve = new BlockReleaseValve((this.CONFIGURATION.getBlock("Release Valve", BLOCK_ID_PREFIX + 5).getInt()));
blockTank = new BlockTank(this.CONFIGURATION.getBlock("Tank", BLOCK_ID_PREFIX + 6).getInt());
blockWasteLiquid = new BlockWasteLiquid(this.CONFIGURATION.getBlock("WasteLiquid", BLOCK_ID_PREFIX + 7).getInt());
blockSink = new BlockSink(this.CONFIGURATION.getBlock("Sink", BLOCK_ID_PREFIX + 8).getInt());
blockDrain = new BlockDrain(this.CONFIGURATION.getBlock("Drain", BLOCK_ID_PREFIX + 9).getInt());
blockConPump = new BlockConstructionPump(this.CONFIGURATION.getBlock("ConstructionPump", BLOCK_ID_PREFIX + 10).getInt());
blockPipe = new BlockPipe(this.CONFIGURATION.getBlock("RestrictedPipes", BLOCK_ID_PREFIX + 11).getInt());
blockGenPipe = new BlockPipe(FluidMech.CONFIGURATION.getBlock("Pipes", BLOCK_ID_PREFIX).getInt());
blockMachine = new BlockPumpMachine(FluidMech.CONFIGURATION.getBlock("Machines", BLOCK_ID_PREFIX + 1).getInt());
blockRod = new BlockRod(FluidMech.CONFIGURATION.getBlock("Mechanical Rod", BLOCK_ID_PREFIX + 3).getInt());
blockGenerator = new BlockGenerator((FluidMech.CONFIGURATION.getBlock("Generator", BLOCK_ID_PREFIX + 4).getInt()));
blockReleaseValve = new BlockReleaseValve((FluidMech.CONFIGURATION.getBlock("Release Valve", BLOCK_ID_PREFIX + 5).getInt()));
blockTank = new BlockTank(FluidMech.CONFIGURATION.getBlock("Tank", BLOCK_ID_PREFIX + 6).getInt());
blockWasteLiquid = new BlockWasteLiquid(FluidMech.CONFIGURATION.getBlock("WasteLiquid", BLOCK_ID_PREFIX + 7).getInt());
blockSink = new BlockSink(FluidMech.CONFIGURATION.getBlock("Sink", BLOCK_ID_PREFIX + 8).getInt());
blockDrain = new BlockDrain(FluidMech.CONFIGURATION.getBlock("Drain", BLOCK_ID_PREFIX + 9).getInt());
blockConPump = new BlockConstructionPump(FluidMech.CONFIGURATION.getBlock("ConstructionPump", BLOCK_ID_PREFIX + 10).getInt());
blockPipe = new BlockPipe(FluidMech.CONFIGURATION.getBlock("RestrictedPipes", BLOCK_ID_PREFIX + 11).getInt());
/* ITEM DECLARATION -- COFNGI LOADER */
itemParts = new ItemParts(this.CONFIGURATION.getItem("Parts", ITEM_ID_PREFIX).getInt());
itemGauge = new ItemTools(this.CONFIGURATION.getItem("PipeGuage", ITEM_ID_PREFIX + 3).getInt());
itemParts = new ItemParts(FluidMech.CONFIGURATION.getItem("Parts", ITEM_ID_PREFIX).getInt());
itemGauge = new ItemTools(FluidMech.CONFIGURATION.getItem("PipeGuage", ITEM_ID_PREFIX + 3).getInt());
if (CONFIGURATION.hasChanged())
{
CONFIGURATION.save();
@ -233,7 +231,6 @@ public class FluidMech extends DummyModContainer
/* LANG LOADING */
FMLog.info(" Loaded: " + TranslationHelper.loadLanguages(LANGUAGE_PATH, LANGUAGES_SUPPORTED) + " Languages.");
/* ORE DIRECTORY REGISTER */
OreDictionary.registerOre("bronzeTube", new ItemStack(itemParts, 1, Parts.Bronze.ordinal()));
@ -266,7 +263,7 @@ public class FluidMech extends DummyModContainer
// generator
CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(this.blockGenerator, 1), new Object[] { "@T@", "OVO", "@T@", 'T', new ItemStack(FluidMech.blockRod, 1), '@', "plateSteel", 'O', "basicCircuit", 'V', "motor" }));
// pipe gauge
GameRegistry.addRecipe(new ItemStack(this.itemGauge, 1, 0), new Object[] { "TVT", " T ", 'V', new ItemStack(itemParts, 1, Parts.Valve.ordinal()), 'T', new ItemStack(itemParts, 1, Parts.Iron.ordinal()) });
GameRegistry.addRecipe(new ItemStack(FluidMech.itemGauge, 1, 0), new Object[] { "TVT", " T ", 'V', new ItemStack(itemParts, 1, Parts.Valve.ordinal()), 'T', new ItemStack(itemParts, 1, Parts.Iron.ordinal()) });
// iron tube
GameRegistry.addRecipe(new ItemStack(itemParts, 4, Parts.Iron.ordinal()), new Object[] { "@@@", '@', Item.ingotIron });
// bronze tube

3
src/minecraft/dark/fluid/common/item/ItemParts.java
View file

@ -2,10 +2,9 @@ package dark.fluid.common.item;
import java.util.List;
import dark.fluid.common.TabFluidMech;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack;
import dark.fluid.common.TabFluidMech;
/**
* A metadata item containing parts of various machines in Liquid Mechanics Mod.

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

@ -3,15 +3,14 @@ package dark.fluid.common.item;
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;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import dark.fluid.common.TabFluidMech;
import dark.hydraulic.api.IReadOut;
public class ItemTools extends ItemBasic
{

5
src/minecraft/dark/fluid/common/machines/BlockReleaseValve.java
View file

@ -2,9 +2,6 @@ package dark.fluid.common.machines;
import java.util.Random;
import dark.fluid.common.FluidMech;
import dark.fluid.common.TabFluidMech;
import net.minecraft.block.material.Material;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
@ -12,6 +9,8 @@ import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import universalelectricity.prefab.block.BlockAdvanced;
import dark.fluid.common.FluidMech;
import dark.fluid.common.TabFluidMech;
public class BlockReleaseValve extends BlockAdvanced
{

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

@ -3,13 +3,6 @@ package dark.fluid.common.machines;
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;
import net.minecraft.entity.player.EntityPlayer;
@ -22,6 +15,11 @@ import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.liquids.LiquidContainerRegistry;
import net.minecraftforge.liquids.LiquidStack;
import universalelectricity.prefab.block.BlockAdvanced;
import dark.fluid.client.render.BlockRenderHelper;
import dark.fluid.common.TabFluidMech;
import dark.hydraulic.api.FluidRestrictionHandler;
import dark.hydraulic.api.INetworkPart;
import dark.hydraulic.helpers.FluidHelper;
public class BlockTank extends BlockAdvanced
{

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

@ -3,11 +3,6 @@ package dark.fluid.common.pipes;
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;
import net.minecraft.creativetab.CreativeTabs;
@ -17,6 +12,10 @@ import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import net.minecraftforge.liquids.ILiquidTank;
import universalelectricity.prefab.block.BlockAdvanced;
import dark.fluid.common.FluidMech;
import dark.fluid.common.TabFluidMech;
import dark.hydraulic.api.FluidRestrictionHandler;
import dark.hydraulic.api.INetworkPipe;
public class BlockPipe extends BlockAdvanced
{

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

@ -1,9 +1,9 @@
package dark.fluid.common.pipes;
import dark.fluid.common.FluidMech;
import net.minecraft.block.Block;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import dark.fluid.common.FluidMech;
public class ItemBlockPipe extends ItemBlock
{

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

@ -1,15 +1,14 @@
package dark.fluid.common.pipes;
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;
import net.minecraftforge.liquids.LiquidContainerRegistry;
import net.minecraftforge.liquids.LiquidStack;
import universalelectricity.core.vector.Vector3;
import universalelectricity.core.vector.VectorHelper;
import dark.hydraulic.api.ColorCode;
import dark.hydraulic.helpers.FluidHelper;
import dark.hydraulic.network.PipeNetwork;
public class TileEntityGenericPipe extends TileEntityPipe
{

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

@ -1,9 +1,9 @@
package dark.fluid.common.pipes.addon;
import dark.fluid.common.pipes.TileEntityPipe;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.common.ForgeDirection;
import universalelectricity.prefab.network.IPacketReceiver;
import dark.fluid.common.pipes.TileEntityPipe;
public interface IPipeExtention extends IPacketReceiver
{

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

@ -3,11 +3,6 @@ package dark.fluid.common.pump;
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;
import net.minecraft.creativetab.CreativeTabs;
@ -22,6 +17,10 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import universalelectricity.prefab.block.BlockAdvanced;
import dark.fluid.client.render.BlockRenderHelper;
import dark.fluid.common.FluidMech;
import dark.fluid.common.TabFluidMech;
import dark.hydraulic.network.HydraulicNetworkHelper;
public class BlockConstructionPump extends BlockAdvanced
{

4
src/minecraft/dark/fluid/common/pump/BlockDrain.java
View file

@ -1,7 +1,5 @@
package dark.fluid.common.pump;
import dark.fluid.common.FluidMech;
import dark.fluid.common.TabFluidMech;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.entity.EntityLiving;
@ -14,6 +12,8 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import universalelectricity.prefab.block.BlockAdvanced;
import dark.fluid.common.FluidMech;
import dark.fluid.common.TabFluidMech;
public class BlockDrain extends BlockAdvanced
{

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

@ -6,13 +6,12 @@ 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;
import universalelectricity.core.vector.Vector2;
import universalelectricity.core.vector.Vector3;
import dark.hydraulic.helpers.FluidHelper;
/**
* A simpler pathfinder based on Calclavia's PathFinder from UE api

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

@ -9,12 +9,6 @@ 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;
import net.minecraft.tileentity.TileEntity;
@ -27,6 +21,10 @@ import net.minecraftforge.liquids.LiquidStack;
import universalelectricity.core.vector.Vector2;
import universalelectricity.core.vector.Vector3;
import universalelectricity.core.vector.VectorHelper;
import dark.hydraulic.api.IDrain;
import dark.hydraulic.api.INetworkPipe;
import dark.hydraulic.helpers.FluidHelper;
import dark.hydraulic.prefab.tile.TileEntityFluidDevice;
public class TileEntityDrain extends TileEntityFluidDevice implements ITankContainer, IDrain
{

2
src/minecraft/dark/mech/client/model/ModelGenerator.java
View file

@ -6,10 +6,10 @@
package dark.mech.client.model;
import dark.mech.common.machines.TileEntityGenerator;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.tileentity.TileEntity;
import dark.mech.common.machines.TileEntityGenerator;
public class ModelGenerator extends ModelBase
{

7
src/minecraft/dark/mech/common/machines/BlockGenerator.java
View file

@ -2,10 +2,6 @@ package dark.mech.common.machines;
import java.util.ArrayList;
import dark.fluid.client.render.BlockRenderHelper;
import dark.fluid.common.FluidMech;
import dark.fluid.common.TabFluidMech;
import net.minecraft.block.material.Material;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.player.EntityPlayer;
@ -15,6 +11,9 @@ import net.minecraft.util.MathHelper;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import universalelectricity.prefab.block.BlockAdvanced;
import dark.fluid.client.render.BlockRenderHelper;
import dark.fluid.common.FluidMech;
import dark.fluid.common.TabFluidMech;
public class BlockGenerator extends BlockAdvanced
{

6
src/minecraft/dark/mech/common/machines/BlockRod.java
View file

@ -1,8 +1,5 @@
package dark.mech.common.machines;
import dark.fluid.client.render.BlockRenderHelper;
import dark.fluid.common.FluidMech;
import dark.fluid.common.TabFluidMech;
import net.minecraft.block.material.Material;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.player.EntityPlayer;
@ -13,6 +10,9 @@ import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import universalelectricity.prefab.block.BlockAdvanced;
import dark.fluid.client.render.BlockRenderHelper;
import dark.fluid.common.FluidMech;
import dark.fluid.common.TabFluidMech;
public class BlockRod extends BlockAdvanced
{