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

moved FM's Api into hydraulics

Browse source
This commit is contained in:
Rseifert 2013-02-20 13:37:29 -05:00
parent 668fcf0fe9
commit 2779c99783
41 changed files with 105 additions and 101 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,11 +1,11 @@
package fluidmech.client.render; package fluidmech.client.render;
import hydraulic.core.implement.ColorCode;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import fluidmech.api.helpers.ColorCode;
import fluidmech.client.model.ModelLargePipe; import fluidmech.client.model.ModelLargePipe;
import fluidmech.common.FluidMech; import fluidmech.common.FluidMech;
import fluidmech.common.tileentity.TileEntityPipe; import fluidmech.common.tileentity.TileEntityPipe;

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

@ -1,12 +1,12 @@
package fluidmech.client.render; package fluidmech.client.render;
import hydraulic.core.implement.ColorCode;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ForgeDirection;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import fluidmech.api.helpers.ColorCode;
import fluidmech.client.model.ModelLargePipe; import fluidmech.client.model.ModelLargePipe;
import fluidmech.client.model.ModelReleaseValve; import fluidmech.client.model.ModelReleaseValve;
import fluidmech.common.FluidMech; import fluidmech.common.FluidMech;

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

@ -1,5 +1,7 @@
package fluidmech.client.render; package fluidmech.client.render;
import hydraulic.core.helpers.connectionHelper;
import hydraulic.core.implement.ColorCode;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.liquids.LiquidContainerRegistry; import net.minecraftforge.liquids.LiquidContainerRegistry;
@ -7,8 +9,6 @@ import net.minecraftforge.liquids.LiquidStack;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import fluidmech.api.helpers.ColorCode;
import fluidmech.api.helpers.connectionHelper;
import fluidmech.client.model.ModelLiquidTank; import fluidmech.client.model.ModelLiquidTank;
import fluidmech.client.model.ModelLiquidTankCorner; import fluidmech.client.model.ModelLiquidTankCorner;
import fluidmech.common.FluidMech; import fluidmech.common.FluidMech;

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

@ -1,5 +1,8 @@
package fluidmech.common; package fluidmech.common;
import hydraulic.core.implement.ColorCode;
import hydraulic.core.liquids.LiquidHandler;
import java.io.File; import java.io.File;
import java.util.logging.Logger; import java.util.logging.Logger;
@ -29,8 +32,6 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.network.NetworkMod; import cpw.mods.fml.common.network.NetworkMod;
import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry;
import fluidmech.api.helpers.ColorCode;
import fluidmech.api.liquids.LiquidHandler;
import fluidmech.common.block.BlockGenerator; import fluidmech.common.block.BlockGenerator;
import fluidmech.common.block.BlockPipe; import fluidmech.common.block.BlockPipe;
import fluidmech.common.block.BlockPumpMachine; import fluidmech.common.block.BlockPumpMachine;
@ -174,7 +175,7 @@ public class FluidMech extends DummyModContainer
{ {
FMLog.info("Finalizing..."); FMLog.info("Finalizing...");
proxy.postInit(); proxy.postInit();
TabLiquidMechanics.setItemStack(new ItemStack(blockPipe, 1, 4)); TabFluidMech.setItemStack(new ItemStack(blockPipe, 1, 4));
// generator // generator
CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(this.blockGenerator, 1), new Object[] { CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(this.blockGenerator, 1), new Object[] {
"@T@", "OVO", "@T@", "@T@", "OVO", "@T@",

6
src/minecraft/fluidmech/common/TabLiquidMechanics.java → src/minecraft/fluidmech/common/TabFluidMech.java
View file

@ -5,12 +5,12 @@ import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.common.registry.LanguageRegistry;
public class TabLiquidMechanics extends CreativeTabs public class TabFluidMech extends CreativeTabs
{ {
public static final TabLiquidMechanics INSTANCE = new TabLiquidMechanics("fluidMechanics"); public static final TabFluidMech INSTANCE = new TabFluidMech("fluidMechanics");
private static ItemStack itemStack; private static ItemStack itemStack;
public TabLiquidMechanics(String par2Str) public TabFluidMech(String par2Str)
{ {
super(CreativeTabs.getNextID(), par2Str); super(CreativeTabs.getNextID(), par2Str);
} }

4
src/minecraft/fluidmech/common/block/BlockGenerator.java
View file

@ -4,7 +4,7 @@ import java.util.ArrayList;
import fluidmech.client.render.BlockRenderHelper; import fluidmech.client.render.BlockRenderHelper;
import fluidmech.common.FluidMech; import fluidmech.common.FluidMech;
import fluidmech.common.TabLiquidMechanics; import fluidmech.common.TabFluidMech;
import fluidmech.common.tileentity.TileEntityGenerator; import fluidmech.common.tileentity.TileEntityGenerator;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
@ -23,7 +23,7 @@ public class BlockGenerator extends universalelectricity.prefab.BlockMachine
public BlockGenerator(int id) public BlockGenerator(int id)
{ {
super("lmGen", id, Material.iron); super("lmGen", id, Material.iron);
this.setCreativeTab(TabLiquidMechanics.INSTANCE); this.setCreativeTab(TabFluidMech.INSTANCE);
this.setHardness(1f); this.setHardness(1f);
this.setResistance(5f); this.setResistance(5f);
} }

4
src/minecraft/fluidmech/common/block/BlockPipe.java
View file

@ -3,7 +3,7 @@ package fluidmech.common.block;
import java.util.List; import java.util.List;
import fluidmech.common.FluidMech; import fluidmech.common.FluidMech;
import fluidmech.common.TabLiquidMechanics; import fluidmech.common.TabFluidMech;
import fluidmech.common.tileentity.TileEntityPipe; import fluidmech.common.tileentity.TileEntityPipe;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
@ -18,7 +18,7 @@ public class BlockPipe extends BlockMachine
{ {
public BlockPipe(int id) public BlockPipe(int id)
{ {
super("Pipe", id, Material.iron, TabLiquidMechanics.INSTANCE); super("Pipe", id, Material.iron, TabFluidMech.INSTANCE);
this.setBlockBounds(0.30F, 0.30F, 0.30F, 0.70F, 0.70F, 0.70F); this.setBlockBounds(0.30F, 0.30F, 0.30F, 0.70F, 0.70F, 0.70F);
this.setHardness(1f); this.setHardness(1f);
this.setBlockName("lmPipe"); this.setBlockName("lmPipe");

7
src/minecraft/fluidmech/common/block/BlockPumpMachine.java
View file

@ -1,11 +1,12 @@
package fluidmech.common.block; package fluidmech.common.block;
import hydraulic.core.helpers.MetaGroup;
import java.util.List; import java.util.List;
import fluidmech.client.render.BlockRenderHelper; import fluidmech.client.render.BlockRenderHelper;
import fluidmech.common.FluidMech; import fluidmech.common.FluidMech;
import fluidmech.common.MetaGroup; import fluidmech.common.TabFluidMech;
import fluidmech.common.TabLiquidMechanics;
import fluidmech.common.tileentity.TileEntityPump; import fluidmech.common.tileentity.TileEntityPump;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
@ -25,7 +26,7 @@ public class BlockPumpMachine extends BlockMachine
public BlockPumpMachine(int id) public BlockPumpMachine(int id)
{ {
super("lmMachines", id, Material.iron, TabLiquidMechanics.INSTANCE); super("lmMachines", id, Material.iron, TabFluidMech.INSTANCE);
this.setHardness(1f); this.setHardness(1f);
this.setResistance(5f); this.setResistance(5f);
} }

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

@ -3,7 +3,7 @@ package fluidmech.common.block;
import java.util.Random; import java.util.Random;
import fluidmech.common.FluidMech; import fluidmech.common.FluidMech;
import fluidmech.common.TabLiquidMechanics; import fluidmech.common.TabFluidMech;
import fluidmech.common.tileentity.TileEntityReleaseValve; import fluidmech.common.tileentity.TileEntityReleaseValve;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
@ -19,7 +19,7 @@ public class BlockReleaseValve extends BlockMachine
{ {
public BlockReleaseValve(int par1) public BlockReleaseValve(int par1)
{ {
super("eValve",par1, Material.iron,TabLiquidMechanics.INSTANCE); super("eValve",par1, Material.iron,TabFluidMech.INSTANCE);
this.setHardness(1f); this.setHardness(1f);
this.setResistance(5f); this.setResistance(5f);
this.setTextureFile(FluidMech.BLOCK_TEXTURE_FILE); this.setTextureFile(FluidMech.BLOCK_TEXTURE_FILE);

4
src/minecraft/fluidmech/common/block/BlockRod.java
View file

@ -2,7 +2,7 @@ package fluidmech.common.block;
import fluidmech.client.render.BlockRenderHelper; import fluidmech.client.render.BlockRenderHelper;
import fluidmech.common.FluidMech; import fluidmech.common.FluidMech;
import fluidmech.common.TabLiquidMechanics; import fluidmech.common.TabFluidMech;
import fluidmech.common.tileentity.TileEntityRod; import fluidmech.common.tileentity.TileEntityRod;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLiving;
@ -20,7 +20,7 @@ public class BlockRod extends universalelectricity.prefab.BlockMachine
public BlockRod(int par1) public BlockRod(int par1)
{ {
super("MechanicRod", par1, Material.iron); super("MechanicRod", par1, Material.iron);
this.setCreativeTab(TabLiquidMechanics.INSTANCE); this.setCreativeTab(TabFluidMech.INSTANCE);
this.setHardness(1f); this.setHardness(1f);
this.setResistance(5f); this.setResistance(5f);
} }

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

@ -1,9 +1,9 @@
package fluidmech.common.block; package fluidmech.common.block;
import fluidmech.api.liquids.LiquidHandler; import hydraulic.core.helpers.MetaGroup;
import hydraulic.core.liquids.LiquidHandler;
import fluidmech.client.render.BlockRenderHelper; import fluidmech.client.render.BlockRenderHelper;
import fluidmech.common.MetaGroup; import fluidmech.common.TabFluidMech;
import fluidmech.common.TabLiquidMechanics;
import fluidmech.common.tileentity.TileEntitySink; import fluidmech.common.tileentity.TileEntitySink;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLiving;
@ -26,7 +26,7 @@ public class BlockSink extends BlockMachine
{ {
public BlockSink(int par1) public BlockSink(int par1)
{ {
super("lmSink", par1, Material.iron, TabLiquidMechanics.INSTANCE); super("lmSink", par1, Material.iron, TabFluidMech.INSTANCE);
this.setResistance(4f); this.setResistance(4f);
this.setHardness(4f); this.setHardness(4f);
} }

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

@ -1,10 +1,11 @@
package fluidmech.common.block; package fluidmech.common.block;
import hydraulic.core.liquids.LiquidHandler;
import java.util.List; import java.util.List;
import fluidmech.api.liquids.LiquidHandler;
import fluidmech.client.render.BlockRenderHelper; import fluidmech.client.render.BlockRenderHelper;
import fluidmech.common.TabLiquidMechanics; import fluidmech.common.TabFluidMech;
import fluidmech.common.tileentity.TileEntityTank; import fluidmech.common.tileentity.TileEntityTank;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
@ -25,7 +26,7 @@ public class BlockTank extends BlockMachine
public BlockTank(int id) public BlockTank(int id)
{ {
super("lmTank", id, Material.rock, TabLiquidMechanics.INSTANCE); super("lmTank", id, Material.rock, TabFluidMech.INSTANCE);
this.setHardness(1f); this.setHardness(1f);
this.setResistance(5f); this.setResistance(5f);
} }

2
src/minecraft/fluidmech/common/block/liquids/BlockMilk.java
View file

@ -1,6 +1,6 @@
package fluidmech.common.block.liquids; package fluidmech.common.block.liquids;
import fluidmech.api.liquids.LiquidFiniteStill; import hydraulic.core.prefab.LiquidFiniteStill;
public class BlockMilk extends LiquidFiniteStill public class BlockMilk extends LiquidFiniteStill
{ {

2
src/minecraft/fluidmech/common/block/liquids/BlockOil.java
View file

@ -1,6 +1,6 @@
package fluidmech.common.block.liquids; package fluidmech.common.block.liquids;
import fluidmech.api.liquids.LiquidFiniteStill; import hydraulic.core.prefab.LiquidFiniteStill;
public class BlockOil extends LiquidFiniteStill public class BlockOil extends LiquidFiniteStill
{ {

2
src/minecraft/fluidmech/common/block/liquids/BlockOilFlowing.java
View file

@ -1,6 +1,6 @@
package fluidmech.common.block.liquids; package fluidmech.common.block.liquids;
import fluidmech.api.liquids.LiquidFiniteFlowing; import hydraulic.core.prefab.LiquidFiniteFlowing;
public class BlockOilFlowing extends LiquidFiniteFlowing public class BlockOilFlowing extends LiquidFiniteFlowing
{ {

4
src/minecraft/fluidmech/common/handlers/UpdateConverter.java
View file

@ -1,7 +1,7 @@
package fluidmech.common.handlers; package fluidmech.common.handlers;
import fluidmech.api.helpers.ColorCode; import hydraulic.core.implement.ColorCode;
import fluidmech.api.liquids.LiquidHandler; import hydraulic.core.liquids.LiquidHandler;
import fluidmech.common.tileentity.TileEntityPipe; import fluidmech.common.tileentity.TileEntityPipe;
import fluidmech.common.tileentity.TileEntityTank; import fluidmech.common.tileentity.TileEntityTank;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;

4
src/minecraft/fluidmech/common/item/ItemGuage.java
View file

@ -5,7 +5,7 @@ import hydraulic.core.implement.IReadOut;
import java.util.List; import java.util.List;
import fluidmech.common.FluidMech; import fluidmech.common.FluidMech;
import fluidmech.common.TabLiquidMechanics; import fluidmech.common.TabFluidMech;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
@ -26,7 +26,7 @@ public class ItemGuage extends Item
this.setHasSubtypes(true); this.setHasSubtypes(true);
this.setIconIndex(10); this.setIconIndex(10);
this.setItemName("lmTool"); this.setItemName("lmTool");
this.setCreativeTab(TabLiquidMechanics.INSTANCE); this.setCreativeTab(TabFluidMech.INSTANCE);
this.setMaxStackSize(1); this.setMaxStackSize(1);
this.setTextureFile(FluidMech.ITEM_TEXTURE_FILE); this.setTextureFile(FluidMech.ITEM_TEXTURE_FILE);
} }

4
src/minecraft/fluidmech/common/item/ItemParts.java
View file

@ -3,7 +3,7 @@ package fluidmech.common.item;
import java.util.List; import java.util.List;
import fluidmech.common.FluidMech; import fluidmech.common.FluidMech;
import fluidmech.common.TabLiquidMechanics; import fluidmech.common.TabFluidMech;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item; import net.minecraft.item.Item;
@ -42,7 +42,7 @@ public class ItemParts extends Item
this.setMaxDamage(0); this.setMaxDamage(0);
this.setMaxStackSize(64); this.setMaxStackSize(64);
this.setItemName("lmPart"); this.setItemName("lmPart");
this.setCreativeTab(TabLiquidMechanics.INSTANCE); this.setCreativeTab(TabFluidMech.INSTANCE);
} }
@Override @Override

4
src/minecraft/fluidmech/common/item/ItemValve.java
View file

@ -3,7 +3,7 @@ package fluidmech.common.item;
import java.util.List; import java.util.List;
import fluidmech.common.FluidMech; import fluidmech.common.FluidMech;
import fluidmech.common.TabLiquidMechanics; import fluidmech.common.TabFluidMech;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
@ -26,7 +26,7 @@ public class ItemValve extends ItemBlock
this.setHasSubtypes(true); this.setHasSubtypes(true);
this.setIconIndex(10); this.setIconIndex(10);
this.setItemName("Machine"); this.setItemName("Machine");
this.setCreativeTab(TabLiquidMechanics.INSTANCE); this.setCreativeTab(TabFluidMech.INSTANCE);
} }
@Override @Override

4
src/minecraft/fluidmech/common/tileentity/TileEntityGenerator.java
View file

@ -1,5 +1,7 @@
package fluidmech.common.tileentity; package fluidmech.common.tileentity;
import hydraulic.core.helpers.MetaGroup;
import hydraulic.core.helpers.connectionHelper;
import hydraulic.core.implement.IReadOut; import hydraulic.core.implement.IReadOut;
import java.util.EnumSet; import java.util.EnumSet;
@ -19,10 +21,8 @@ import universalelectricity.prefab.tile.TileEntityElectricityProducer;
import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataInput;
import fluidmech.api.helpers.connectionHelper;
import fluidmech.api.mech.IForce; import fluidmech.api.mech.IForce;
import fluidmech.common.FluidMech; import fluidmech.common.FluidMech;
import fluidmech.common.MetaGroup;
import fluidmech.common.block.BlockGenerator; import fluidmech.common.block.BlockGenerator;

8
src/minecraft/fluidmech/common/tileentity/TileEntityPipe.java
View file

@ -1,14 +1,14 @@
package fluidmech.common.tileentity; package fluidmech.common.tileentity;
import hydraulic.core.helpers.connectionHelper;
import hydraulic.core.implement.ColorCode;
import hydraulic.core.implement.IPipe; import hydraulic.core.implement.IPipe;
import hydraulic.core.implement.IPressure;
import hydraulic.core.implement.IReadOut; import hydraulic.core.implement.IReadOut;
import hydraulic.core.liquids.LiquidHandler;
import java.util.Random; import java.util.Random;
import fluidmech.api.helpers.ColorCode;
import fluidmech.api.helpers.connectionHelper;
import fluidmech.api.liquids.IPressure;
import fluidmech.api.liquids.LiquidHandler;
import fluidmech.common.handlers.UpdateConverter; import fluidmech.common.handlers.UpdateConverter;
import net.minecraft.block.Block; import net.minecraft.block.Block;

10
src/minecraft/fluidmech/common/tileentity/TileEntityPump.java
View file

@ -1,6 +1,11 @@
package fluidmech.common.tileentity; package fluidmech.common.tileentity;
import hydraulic.core.helpers.MetaGroup;
import hydraulic.core.implement.ColorCode;
import hydraulic.core.implement.IPressure;
import hydraulic.core.implement.IReadOut; import hydraulic.core.implement.IReadOut;
import hydraulic.core.liquids.LiquidData;
import hydraulic.core.liquids.LiquidHandler;
import java.util.EnumSet; import java.util.EnumSet;
@ -23,12 +28,7 @@ import universalelectricity.prefab.tile.TileEntityElectricityReceiver;
import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataInput;
import fluidmech.api.helpers.ColorCode;
import fluidmech.api.liquids.IPressure;
import fluidmech.api.liquids.LiquidData;
import fluidmech.api.liquids.LiquidHandler;
import fluidmech.common.FluidMech; import fluidmech.common.FluidMech;
import fluidmech.common.MetaGroup;
public class TileEntityPump extends TileEntityElectricityReceiver implements IPacketReceiver, IReadOut, IPressure public class TileEntityPump extends TileEntityElectricityReceiver implements IPacketReceiver, IReadOut, IPressure
{ {

10
src/minecraft/fluidmech/common/tileentity/TileEntityReleaseValve.java
View file

@ -1,16 +1,16 @@
package fluidmech.common.tileentity; package fluidmech.common.tileentity;
import hydraulic.core.helpers.connectionHelper;
import hydraulic.core.implement.ColorCode;
import hydraulic.core.implement.IColorCoded; import hydraulic.core.implement.IColorCoded;
import hydraulic.core.implement.IPressure;
import hydraulic.core.implement.IReadOut; import hydraulic.core.implement.IReadOut;
import hydraulic.core.liquids.LiquidData;
import hydraulic.core.liquids.LiquidHandler;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import fluidmech.api.helpers.ColorCode;
import fluidmech.api.helpers.connectionHelper;
import fluidmech.api.liquids.IPressure;
import fluidmech.api.liquids.LiquidData;
import fluidmech.api.liquids.LiquidHandler;
import fluidmech.common.block.BlockReleaseValve; import fluidmech.common.block.BlockReleaseValve;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;

4
src/minecraft/fluidmech/common/tileentity/TileEntitySink.java
View file

@ -1,6 +1,8 @@
package fluidmech.common.tileentity; package fluidmech.common.tileentity;
import hydraulic.core.implement.ColorCode;
import hydraulic.core.implement.IColorCoded; import hydraulic.core.implement.IColorCoded;
import hydraulic.core.liquids.LiquidHandler;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.INetworkManager; import net.minecraft.network.INetworkManager;
@ -19,8 +21,6 @@ import universalelectricity.prefab.network.PacketManager;
import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataInput;
import fluidmech.api.helpers.ColorCode;
import fluidmech.api.liquids.LiquidHandler;
import fluidmech.common.FluidMech; import fluidmech.common.FluidMech;
public class TileEntitySink extends TileEntity implements IPacketReceiver, ITankContainer, IColorCoded public class TileEntitySink extends TileEntity implements IPacketReceiver, ITankContainer, IColorCoded

10
src/minecraft/fluidmech/common/tileentity/TileEntityTank.java
View file

@ -1,7 +1,12 @@
package fluidmech.common.tileentity; package fluidmech.common.tileentity;
import hydraulic.core.helpers.connectionHelper;
import hydraulic.core.implement.ColorCode;
import hydraulic.core.implement.IColorCoded; import hydraulic.core.implement.IColorCoded;
import hydraulic.core.implement.IPressure;
import hydraulic.core.implement.IReadOut; import hydraulic.core.implement.IReadOut;
import hydraulic.core.liquids.LiquidData;
import hydraulic.core.liquids.LiquidHandler;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.INetworkManager; import net.minecraft.network.INetworkManager;
@ -20,11 +25,6 @@ import universalelectricity.prefab.network.PacketManager;
import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataInput;
import fluidmech.api.helpers.ColorCode;
import fluidmech.api.helpers.connectionHelper;
import fluidmech.api.liquids.IPressure;
import fluidmech.api.liquids.LiquidData;
import fluidmech.api.liquids.LiquidHandler;
import fluidmech.common.FluidMech; import fluidmech.common.FluidMech;
import fluidmech.common.handlers.UpdateConverter; import fluidmech.common.handlers.UpdateConverter;

1
src/minecraft/hydraulic/Credits Normal file
View file

@ -0,0 +1 @@
Most of the workings of hydraulics is credited to universal electric and its creator Calclavia. hydraulics though is not a fully copy but a revised version of UE to function for Liquid Systems.

14
src/minecraft/hydraulic/core/HydraulicLoader.java
View file

@ -1,9 +1,9 @@
package hydraulic.core; package hydraulic.core;
import hydraulic.core.liquids.Hydraulic;
import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.ForgeSubscribe; import net.minecraftforge.event.ForgeSubscribe;
import net.minecraftforge.event.world.WorldEvent; import net.minecraftforge.event.world.WorldEvent;
import universalelectricity.core.electricity.Electricity;
import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.FMLLog;
@ -17,10 +17,10 @@ public class HydraulicLoader
{ {
if (!isInitialized) if (!isInitialized)
{ {
Electricity.instance = new Electricity(); Hydraulic.instance = new Hydraulic();
MinecraftForge.EVENT_BUS.register(this); MinecraftForge.EVENT_BUS.register(this);
FMLLog.finest("Universal Electricity v" + UniversalElectricity.VERSION + " successfully loaded!"); FMLLog.finest("Hydraulics v" + UniversalElectricity.VERSION + " loaded without error!");
isInitialized = true; isInitialized = true;
} }
@ -29,14 +29,14 @@ public class HydraulicLoader
@ForgeSubscribe @ForgeSubscribe
public void onWorldUnLoad(WorldEvent.Unload event) public void onWorldUnLoad(WorldEvent.Unload event)
{ {
Electricity.instance = new Electricity(); Hydraulic.instance = new Hydraulic();
Electricity.instance.cleanUpNetworks(); Hydraulic.instance.cleanUpNetworks();
} }
@ForgeSubscribe @ForgeSubscribe
public void onWorldLoad(WorldEvent.Load event) public void onWorldLoad(WorldEvent.Load event)
{ {
Electricity.instance = new Electricity(); Hydraulic.instance = new Hydraulic();
Electricity.instance.cleanUpNetworks(); Hydraulic.instance.cleanUpNetworks();
} }
} }

2
src/minecraft/fluidmech/common/MetaGroup.java → src/minecraft/hydraulic/core/helpers/MetaGroup.java
View file

@ -1,4 +1,4 @@
package fluidmech.common; package hydraulic.core.helpers;
public class MetaGroup public class MetaGroup

2
src/minecraft/fluidmech/api/helpers/connectionHelper.java → src/minecraft/hydraulic/core/helpers/connectionHelper.java
View file

@ -1,4 +1,4 @@
package fluidmech.api.helpers; package hydraulic.core.helpers;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World; import net.minecraft.world.World;

6
src/minecraft/fluidmech/api/helpers/ColorCode.java → src/minecraft/hydraulic/core/implement/ColorCode.java
View file

@ -1,7 +1,7 @@
package fluidmech.api.helpers; package hydraulic.core.implement;
import fluidmech.api.liquids.LiquidData; import hydraulic.core.liquids.LiquidData;
import fluidmech.api.liquids.LiquidHandler; import hydraulic.core.liquids.LiquidHandler;
public enum ColorCode public enum ColorCode

1
src/minecraft/hydraulic/core/implement/IColorCoded.java
View file

@ -1,6 +1,5 @@
package hydraulic.core.implement; package hydraulic.core.implement;
import fluidmech.api.helpers.ColorCode;
public interface IColorCoded public interface IColorCoded
{ {

6
src/minecraft/hydraulic/core/implement/IFluidPipe.java
View file

@ -1,6 +1,6 @@
package hydraulic.core.implement; package hydraulic.core.implement;
import hydraulic.core.pressure.FluidPressureNetwork; import hydraulic.core.liquids.HydraulicNetwork;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.liquids.LiquidStack; import net.minecraftforge.liquids.LiquidStack;
@ -17,9 +17,9 @@ public interface IFluidPipe
/** /**
* The Fluid network that this pipe is part of * The Fluid network that this pipe is part of
*/ */
public FluidPressureNetwork getNetwork(); public HydraulicNetwork getNetwork();
public void setNetwork(FluidPressureNetwork network); public void setNetwork(HydraulicNetwork network);
/** /**
* The UE tile entities that this conductor is connected to. * The UE tile entities that this conductor is connected to.

3
src/minecraft/fluidmech/api/liquids/IPressure.java → src/minecraft/hydraulic/core/implement/IPressure.java
View file

@ -1,5 +1,6 @@
package fluidmech.api.liquids; package hydraulic.core.implement;
import hydraulic.core.liquids.LiquidData;
import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ForgeDirection;
public interface IPressure public interface IPressure

2
src/minecraft/hydraulic/core/pressure/FluidInfo.java → src/minecraft/hydraulic/core/liquids/FluidInfo.java
View file

@ -1,4 +1,4 @@
package hydraulic.core.pressure; package hydraulic.core.liquids;
/** /**
* An easy way to display information on electricity. * An easy way to display information on electricity.

2
src/minecraft/hydraulic/core/pressure/FluidPacket.java → src/minecraft/hydraulic/core/liquids/FluidPacket.java
View file

@ -1,4 +1,4 @@
package hydraulic.core.pressure; package hydraulic.core.liquids;
import net.minecraftforge.liquids.LiquidStack; import net.minecraftforge.liquids.LiquidStack;

20
src/minecraft/hydraulic/core/pressure/FluidPressure.java → src/minecraft/hydraulic/core/liquids/Hydraulic.java
View file

@ -1,4 +1,4 @@
package hydraulic.core.pressure; package hydraulic.core.liquids;
import hydraulic.core.implement.IFluidPipe; import hydraulic.core.implement.IFluidPipe;
@ -16,11 +16,11 @@ import cpw.mods.fml.common.FMLLog;
* based on Calclavia's UE Electric Network stuff * based on Calclavia's UE Electric Network stuff
* *
*/ */
public class FluidPressure public class Hydraulic
{ {
public static FluidPressure instance = new FluidPressure(); public static Hydraulic instance = new Hydraulic();
private List<FluidPressureNetwork> electricityNetworks = new ArrayList<FluidPressureNetwork>(); private List<HydraulicNetwork> electricityNetworks = new ArrayList<HydraulicNetwork>();
/** /**
* Registers a conductor into the UE electricity net. * Registers a conductor into the UE electricity net.
@ -28,13 +28,13 @@ public class FluidPressure
public void registerConductor(IFluidPipe newConductor) public void registerConductor(IFluidPipe newConductor)
{ {
this.cleanUpNetworks(); this.cleanUpNetworks();
FluidPressureNetwork newNetwork = new FluidPressureNetwork(newConductor); HydraulicNetwork newNetwork = new HydraulicNetwork(newConductor);
this.electricityNetworks.add(newNetwork); this.electricityNetworks.add(newNetwork);
} }
public void unregister(TileEntity tileEntity) public void unregister(TileEntity tileEntity)
{ {
for (FluidPressureNetwork network : this.electricityNetworks) for (HydraulicNetwork network : this.electricityNetworks)
{ {
network.stopProducing(tileEntity); network.stopProducing(tileEntity);
network.stopRequesting(tileEntity); network.stopRequesting(tileEntity);
@ -49,7 +49,7 @@ public class FluidPressure
* @param networkB * @param networkB
* - The network to be merged. This network will be deleted. * - The network to be merged. This network will be deleted.
*/ */
public void mergeConnection(FluidPressureNetwork networkA, FluidPressureNetwork networkB) public void mergeConnection(HydraulicNetwork networkA, HydraulicNetwork networkB)
{ {
if (networkA != networkB) if (networkA != networkB)
{ {
@ -83,7 +83,7 @@ public class FluidPressure
{ {
try try
{ {
FluidPressureNetwork network = conductorA.getNetwork(); HydraulicNetwork network = conductorA.getNetwork();
if (network != null) if (network != null)
{ {
@ -125,7 +125,7 @@ public class FluidPressure
while (it.hasNext()) while (it.hasNext())
{ {
FluidPressureNetwork network = (FluidPressureNetwork) it.next(); HydraulicNetwork network = (HydraulicNetwork) it.next();
network.cleanConductors(); network.cleanConductors();
if (network.conductors.size() == 0) if (network.conductors.size() == 0)
@ -147,7 +147,7 @@ public class FluidPressure
while (it.hasNext()) while (it.hasNext())
{ {
FluidPressureNetwork network = ((FluidPressureNetwork) it.next()); HydraulicNetwork network = ((HydraulicNetwork) it.next());
network.resetConductors(); network.resetConductors();
} }
} }

7
src/minecraft/hydraulic/core/pressure/FluidPressureNetwork.java → src/minecraft/hydraulic/core/liquids/HydraulicNetwork.java
View file

@ -1,4 +1,4 @@
package hydraulic.core.pressure; package hydraulic.core.liquids;
import hydraulic.core.implement.IFluidPipe; import hydraulic.core.implement.IFluidPipe;
@ -15,9 +15,8 @@ import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.liquids.LiquidStack; import net.minecraftforge.liquids.LiquidStack;
import universalelectricity.core.vector.Vector3; import universalelectricity.core.vector.Vector3;
import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.FMLLog;
import fluidmech.api.liquids.LiquidHandler;
public class FluidPressureNetwork public class HydraulicNetwork
{ {
private final HashMap<TileEntity, FluidPacket> producers = new HashMap<TileEntity, FluidPacket>(); private final HashMap<TileEntity, FluidPacket> producers = new HashMap<TileEntity, FluidPacket>();
private final HashMap<TileEntity, FluidPacket> consumers = new HashMap<TileEntity, FluidPacket>(); private final HashMap<TileEntity, FluidPacket> consumers = new HashMap<TileEntity, FluidPacket>();
@ -26,7 +25,7 @@ public class FluidPressureNetwork
public LiquidStack stack = new LiquidStack(0,0,0); public LiquidStack stack = new LiquidStack(0,0,0);
public FluidPressureNetwork(IFluidPipe conductor) public HydraulicNetwork(IFluidPipe conductor)
{ {
this.addConductor(conductor); this.addConductor(conductor);
} }

4
src/minecraft/fluidmech/api/liquids/LiquidData.java → src/minecraft/hydraulic/core/liquids/LiquidData.java
View file

@ -1,6 +1,6 @@
package fluidmech.api.liquids; package hydraulic.core.liquids;
import fluidmech.api.helpers.ColorCode; import hydraulic.core.implement.ColorCode;
import net.minecraftforge.liquids.LiquidStack; import net.minecraftforge.liquids.LiquidStack;
public class LiquidData public class LiquidData

5
src/minecraft/fluidmech/api/liquids/LiquidHandler.java → src/minecraft/hydraulic/core/liquids/LiquidHandler.java
View file

@ -1,4 +1,6 @@
package fluidmech.api.liquids; package hydraulic.core.liquids;
import hydraulic.core.implement.ColorCode;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -12,7 +14,6 @@ import net.minecraftforge.event.ForgeSubscribe;
import net.minecraftforge.liquids.LiquidDictionary; import net.minecraftforge.liquids.LiquidDictionary;
import net.minecraftforge.liquids.LiquidStack; import net.minecraftforge.liquids.LiquidStack;
import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.FMLLog;
import fluidmech.api.helpers.ColorCode;
public class LiquidHandler public class LiquidHandler
{ {

2
src/minecraft/fluidmech/api/liquids/LiquidFiniteFlowing.java → src/minecraft/hydraulic/core/prefab/LiquidFiniteFlowing.java
View file

@ -1,4 +1,4 @@
package fluidmech.api.liquids; package hydraulic.core.prefab;
import java.util.Random; import java.util.Random;

2
src/minecraft/fluidmech/api/liquids/LiquidFiniteStill.java → src/minecraft/hydraulic/core/prefab/LiquidFiniteStill.java
View file

@ -1,4 +1,4 @@
package fluidmech.api.liquids; package hydraulic.core.prefab;
import net.minecraft.block.BlockStationary; import net.minecraft.block.BlockStationary;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;