From 2779c997833936530989a928d326f162390ee771 Mon Sep 17 00:00:00 2001 From: Rseifert Date: Wed, 20 Feb 2013 13:37:29 -0500 Subject: [PATCH] moved FM's Api into hydraulics --- .../fluidmech/client/render/RenderPipe.java | 2 +- .../client/render/RenderReleaseValve.java | 2 +- .../fluidmech/client/render/RenderTank.java | 4 ++-- src/minecraft/fluidmech/common/FluidMech.java | 7 ++++--- ...LiquidMechanics.java => TabFluidMech.java} | 6 +++--- .../common/block/BlockGenerator.java | 4 ++-- .../fluidmech/common/block/BlockPipe.java | 4 ++-- .../common/block/BlockPumpMachine.java | 7 ++++--- .../common/block/BlockReleaseValve.java | 4 ++-- .../fluidmech/common/block/BlockRod.java | 4 ++-- .../fluidmech/common/block/BlockSink.java | 8 ++++---- .../fluidmech/common/block/BlockTank.java | 7 ++++--- .../common/block/liquids/BlockMilk.java | 2 +- .../common/block/liquids/BlockOil.java | 2 +- .../common/block/liquids/BlockOilFlowing.java | 2 +- .../common/handlers/UpdateConverter.java | 4 ++-- .../fluidmech/common/item/ItemGuage.java | 4 ++-- .../fluidmech/common/item/ItemParts.java | 4 ++-- .../fluidmech/common/item/ItemValve.java | 4 ++-- .../tileentity/TileEntityGenerator.java | 4 ++-- .../common/tileentity/TileEntityPipe.java | 8 ++++---- .../common/tileentity/TileEntityPump.java | 10 +++++----- .../tileentity/TileEntityReleaseValve.java | 10 +++++----- .../common/tileentity/TileEntitySink.java | 4 ++-- .../common/tileentity/TileEntityTank.java | 10 +++++----- src/minecraft/hydraulic/Credits | 1 + .../hydraulic/core/HydraulicLoader.java | 14 ++++++------- .../core/helpers}/MetaGroup.java | 2 +- .../core}/helpers/connectionHelper.java | 2 +- .../core/implement}/ColorCode.java | 6 +++--- .../hydraulic/core/implement/IColorCoded.java | 1 - .../hydraulic/core/implement/IFluidPipe.java | 6 +++--- .../core/implement}/IPressure.java | 3 ++- .../core/{pressure => liquids}/FluidInfo.java | 2 +- .../{pressure => liquids}/FluidPacket.java | 2 +- .../Hydraulic.java} | 20 +++++++++---------- .../HydraulicNetwork.java} | 7 +++---- .../core}/liquids/LiquidData.java | 4 ++-- .../core}/liquids/LiquidHandler.java | 5 +++-- .../core/prefab}/LiquidFiniteFlowing.java | 2 +- .../core/prefab}/LiquidFiniteStill.java | 2 +- 41 files changed, 105 insertions(+), 101 deletions(-) rename src/minecraft/fluidmech/common/{TabLiquidMechanics.java => TabFluidMech.java} (75%) create mode 100644 src/minecraft/hydraulic/Credits rename src/minecraft/{fluidmech/common => hydraulic/core/helpers}/MetaGroup.java (96%) rename src/minecraft/{fluidmech/api => hydraulic/core}/helpers/connectionHelper.java (98%) rename src/minecraft/{fluidmech/api/helpers => hydraulic/core/implement}/ColorCode.java (93%) rename src/minecraft/{fluidmech/api/liquids => hydraulic/core/implement}/IPressure.java (87%) rename src/minecraft/hydraulic/core/{pressure => liquids}/FluidInfo.java (99%) rename src/minecraft/hydraulic/core/{pressure => liquids}/FluidPacket.java (96%) rename src/minecraft/hydraulic/core/{pressure/FluidPressure.java => liquids/Hydraulic.java} (84%) rename src/minecraft/hydraulic/core/{pressure/FluidPressureNetwork.java => liquids/HydraulicNetwork.java} (97%) rename src/minecraft/{fluidmech/api => hydraulic/core}/liquids/LiquidData.java (93%) rename src/minecraft/{fluidmech/api => hydraulic/core}/liquids/LiquidHandler.java (98%) rename src/minecraft/{fluidmech/api/liquids => hydraulic/core/prefab}/LiquidFiniteFlowing.java (99%) rename src/minecraft/{fluidmech/api/liquids => hydraulic/core/prefab}/LiquidFiniteStill.java (97%) diff --git a/src/minecraft/fluidmech/client/render/RenderPipe.java b/src/minecraft/fluidmech/client/render/RenderPipe.java index 71e0a5d53..7fc2890ff 100644 --- a/src/minecraft/fluidmech/client/render/RenderPipe.java +++ b/src/minecraft/fluidmech/client/render/RenderPipe.java @@ -1,11 +1,11 @@ package fluidmech.client.render; +import hydraulic.core.implement.ColorCode; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import org.lwjgl.opengl.GL11; -import fluidmech.api.helpers.ColorCode; import fluidmech.client.model.ModelLargePipe; import fluidmech.common.FluidMech; import fluidmech.common.tileentity.TileEntityPipe; diff --git a/src/minecraft/fluidmech/client/render/RenderReleaseValve.java b/src/minecraft/fluidmech/client/render/RenderReleaseValve.java index af0f8859c..ce9ce6eb8 100644 --- a/src/minecraft/fluidmech/client/render/RenderReleaseValve.java +++ b/src/minecraft/fluidmech/client/render/RenderReleaseValve.java @@ -1,12 +1,12 @@ package fluidmech.client.render; +import hydraulic.core.implement.ColorCode; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; import org.lwjgl.opengl.GL11; -import fluidmech.api.helpers.ColorCode; import fluidmech.client.model.ModelLargePipe; import fluidmech.client.model.ModelReleaseValve; import fluidmech.common.FluidMech; diff --git a/src/minecraft/fluidmech/client/render/RenderTank.java b/src/minecraft/fluidmech/client/render/RenderTank.java index ddf88c440..191cb5dcb 100644 --- a/src/minecraft/fluidmech/client/render/RenderTank.java +++ b/src/minecraft/fluidmech/client/render/RenderTank.java @@ -1,5 +1,7 @@ package fluidmech.client.render; +import hydraulic.core.helpers.connectionHelper; +import hydraulic.core.implement.ColorCode; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.liquids.LiquidContainerRegistry; @@ -7,8 +9,6 @@ import net.minecraftforge.liquids.LiquidStack; import org.lwjgl.opengl.GL11; -import fluidmech.api.helpers.ColorCode; -import fluidmech.api.helpers.connectionHelper; import fluidmech.client.model.ModelLiquidTank; import fluidmech.client.model.ModelLiquidTankCorner; import fluidmech.common.FluidMech; diff --git a/src/minecraft/fluidmech/common/FluidMech.java b/src/minecraft/fluidmech/common/FluidMech.java index c1adc061d..203d421c9 100644 --- a/src/minecraft/fluidmech/common/FluidMech.java +++ b/src/minecraft/fluidmech/common/FluidMech.java @@ -1,5 +1,8 @@ package fluidmech.common; +import hydraulic.core.implement.ColorCode; +import hydraulic.core.liquids.LiquidHandler; + import java.io.File; 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.network.NetworkMod; 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.BlockPipe; import fluidmech.common.block.BlockPumpMachine; @@ -174,7 +175,7 @@ public class FluidMech extends DummyModContainer { FMLog.info("Finalizing..."); proxy.postInit(); - TabLiquidMechanics.setItemStack(new ItemStack(blockPipe, 1, 4)); + TabFluidMech.setItemStack(new ItemStack(blockPipe, 1, 4)); // generator CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(this.blockGenerator, 1), new Object[] { "@T@", "OVO", "@T@", diff --git a/src/minecraft/fluidmech/common/TabLiquidMechanics.java b/src/minecraft/fluidmech/common/TabFluidMech.java similarity index 75% rename from src/minecraft/fluidmech/common/TabLiquidMechanics.java rename to src/minecraft/fluidmech/common/TabFluidMech.java index 5e189b129..dedf98692 100644 --- a/src/minecraft/fluidmech/common/TabLiquidMechanics.java +++ b/src/minecraft/fluidmech/common/TabFluidMech.java @@ -5,12 +5,12 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; 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; - public TabLiquidMechanics(String par2Str) + public TabFluidMech(String par2Str) { super(CreativeTabs.getNextID(), par2Str); } diff --git a/src/minecraft/fluidmech/common/block/BlockGenerator.java b/src/minecraft/fluidmech/common/block/BlockGenerator.java index c62420468..66c76def2 100644 --- a/src/minecraft/fluidmech/common/block/BlockGenerator.java +++ b/src/minecraft/fluidmech/common/block/BlockGenerator.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import fluidmech.client.render.BlockRenderHelper; import fluidmech.common.FluidMech; -import fluidmech.common.TabLiquidMechanics; +import fluidmech.common.TabFluidMech; import fluidmech.common.tileentity.TileEntityGenerator; import net.minecraft.block.material.Material; @@ -23,7 +23,7 @@ public class BlockGenerator extends universalelectricity.prefab.BlockMachine public BlockGenerator(int id) { super("lmGen", id, Material.iron); - this.setCreativeTab(TabLiquidMechanics.INSTANCE); + this.setCreativeTab(TabFluidMech.INSTANCE); this.setHardness(1f); this.setResistance(5f); } diff --git a/src/minecraft/fluidmech/common/block/BlockPipe.java b/src/minecraft/fluidmech/common/block/BlockPipe.java index 0078571fb..d11ed94be 100644 --- a/src/minecraft/fluidmech/common/block/BlockPipe.java +++ b/src/minecraft/fluidmech/common/block/BlockPipe.java @@ -3,7 +3,7 @@ package fluidmech.common.block; import java.util.List; import fluidmech.common.FluidMech; -import fluidmech.common.TabLiquidMechanics; +import fluidmech.common.TabFluidMech; import fluidmech.common.tileentity.TileEntityPipe; import net.minecraft.block.material.Material; @@ -18,7 +18,7 @@ public class BlockPipe extends BlockMachine { 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.setHardness(1f); this.setBlockName("lmPipe"); diff --git a/src/minecraft/fluidmech/common/block/BlockPumpMachine.java b/src/minecraft/fluidmech/common/block/BlockPumpMachine.java index dd789440f..7540abaf0 100644 --- a/src/minecraft/fluidmech/common/block/BlockPumpMachine.java +++ b/src/minecraft/fluidmech/common/block/BlockPumpMachine.java @@ -1,11 +1,12 @@ package fluidmech.common.block; +import hydraulic.core.helpers.MetaGroup; + import java.util.List; import fluidmech.client.render.BlockRenderHelper; import fluidmech.common.FluidMech; -import fluidmech.common.MetaGroup; -import fluidmech.common.TabLiquidMechanics; +import fluidmech.common.TabFluidMech; import fluidmech.common.tileentity.TileEntityPump; import net.minecraft.block.material.Material; @@ -25,7 +26,7 @@ public class BlockPumpMachine extends BlockMachine public BlockPumpMachine(int id) { - super("lmMachines", id, Material.iron, TabLiquidMechanics.INSTANCE); + super("lmMachines", id, Material.iron, TabFluidMech.INSTANCE); this.setHardness(1f); this.setResistance(5f); } diff --git a/src/minecraft/fluidmech/common/block/BlockReleaseValve.java b/src/minecraft/fluidmech/common/block/BlockReleaseValve.java index 0676ba27e..89a1a0e25 100644 --- a/src/minecraft/fluidmech/common/block/BlockReleaseValve.java +++ b/src/minecraft/fluidmech/common/block/BlockReleaseValve.java @@ -3,7 +3,7 @@ package fluidmech.common.block; import java.util.Random; import fluidmech.common.FluidMech; -import fluidmech.common.TabLiquidMechanics; +import fluidmech.common.TabFluidMech; import fluidmech.common.tileentity.TileEntityReleaseValve; import net.minecraft.block.material.Material; @@ -19,7 +19,7 @@ public class BlockReleaseValve extends BlockMachine { public BlockReleaseValve(int par1) { - super("eValve",par1, Material.iron,TabLiquidMechanics.INSTANCE); + super("eValve",par1, Material.iron,TabFluidMech.INSTANCE); this.setHardness(1f); this.setResistance(5f); this.setTextureFile(FluidMech.BLOCK_TEXTURE_FILE); diff --git a/src/minecraft/fluidmech/common/block/BlockRod.java b/src/minecraft/fluidmech/common/block/BlockRod.java index 3d94e9166..c30c5328d 100644 --- a/src/minecraft/fluidmech/common/block/BlockRod.java +++ b/src/minecraft/fluidmech/common/block/BlockRod.java @@ -2,7 +2,7 @@ package fluidmech.common.block; import fluidmech.client.render.BlockRenderHelper; import fluidmech.common.FluidMech; -import fluidmech.common.TabLiquidMechanics; +import fluidmech.common.TabFluidMech; import fluidmech.common.tileentity.TileEntityRod; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLiving; @@ -20,7 +20,7 @@ public class BlockRod extends universalelectricity.prefab.BlockMachine public BlockRod(int par1) { super("MechanicRod", par1, Material.iron); - this.setCreativeTab(TabLiquidMechanics.INSTANCE); + this.setCreativeTab(TabFluidMech.INSTANCE); this.setHardness(1f); this.setResistance(5f); } diff --git a/src/minecraft/fluidmech/common/block/BlockSink.java b/src/minecraft/fluidmech/common/block/BlockSink.java index 621e95b43..c8505a8c1 100644 --- a/src/minecraft/fluidmech/common/block/BlockSink.java +++ b/src/minecraft/fluidmech/common/block/BlockSink.java @@ -1,9 +1,9 @@ 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.common.MetaGroup; -import fluidmech.common.TabLiquidMechanics; +import fluidmech.common.TabFluidMech; import fluidmech.common.tileentity.TileEntitySink; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLiving; @@ -26,7 +26,7 @@ public class BlockSink extends BlockMachine { public BlockSink(int par1) { - super("lmSink", par1, Material.iron, TabLiquidMechanics.INSTANCE); + super("lmSink", par1, Material.iron, TabFluidMech.INSTANCE); this.setResistance(4f); this.setHardness(4f); } diff --git a/src/minecraft/fluidmech/common/block/BlockTank.java b/src/minecraft/fluidmech/common/block/BlockTank.java index 1c99281c2..05cbe6453 100644 --- a/src/minecraft/fluidmech/common/block/BlockTank.java +++ b/src/minecraft/fluidmech/common/block/BlockTank.java @@ -1,10 +1,11 @@ package fluidmech.common.block; +import hydraulic.core.liquids.LiquidHandler; + import java.util.List; -import fluidmech.api.liquids.LiquidHandler; import fluidmech.client.render.BlockRenderHelper; -import fluidmech.common.TabLiquidMechanics; +import fluidmech.common.TabFluidMech; import fluidmech.common.tileentity.TileEntityTank; import net.minecraft.block.material.Material; @@ -25,7 +26,7 @@ public class BlockTank extends BlockMachine public BlockTank(int id) { - super("lmTank", id, Material.rock, TabLiquidMechanics.INSTANCE); + super("lmTank", id, Material.rock, TabFluidMech.INSTANCE); this.setHardness(1f); this.setResistance(5f); } diff --git a/src/minecraft/fluidmech/common/block/liquids/BlockMilk.java b/src/minecraft/fluidmech/common/block/liquids/BlockMilk.java index 425aea232..66d429d17 100644 --- a/src/minecraft/fluidmech/common/block/liquids/BlockMilk.java +++ b/src/minecraft/fluidmech/common/block/liquids/BlockMilk.java @@ -1,6 +1,6 @@ package fluidmech.common.block.liquids; -import fluidmech.api.liquids.LiquidFiniteStill; +import hydraulic.core.prefab.LiquidFiniteStill; public class BlockMilk extends LiquidFiniteStill { diff --git a/src/minecraft/fluidmech/common/block/liquids/BlockOil.java b/src/minecraft/fluidmech/common/block/liquids/BlockOil.java index ad989cb82..e19ddea04 100644 --- a/src/minecraft/fluidmech/common/block/liquids/BlockOil.java +++ b/src/minecraft/fluidmech/common/block/liquids/BlockOil.java @@ -1,6 +1,6 @@ package fluidmech.common.block.liquids; -import fluidmech.api.liquids.LiquidFiniteStill; +import hydraulic.core.prefab.LiquidFiniteStill; public class BlockOil extends LiquidFiniteStill { diff --git a/src/minecraft/fluidmech/common/block/liquids/BlockOilFlowing.java b/src/minecraft/fluidmech/common/block/liquids/BlockOilFlowing.java index b95991484..7da978813 100644 --- a/src/minecraft/fluidmech/common/block/liquids/BlockOilFlowing.java +++ b/src/minecraft/fluidmech/common/block/liquids/BlockOilFlowing.java @@ -1,6 +1,6 @@ package fluidmech.common.block.liquids; -import fluidmech.api.liquids.LiquidFiniteFlowing; +import hydraulic.core.prefab.LiquidFiniteFlowing; public class BlockOilFlowing extends LiquidFiniteFlowing { diff --git a/src/minecraft/fluidmech/common/handlers/UpdateConverter.java b/src/minecraft/fluidmech/common/handlers/UpdateConverter.java index c7cfc6773..e5b98f42a 100644 --- a/src/minecraft/fluidmech/common/handlers/UpdateConverter.java +++ b/src/minecraft/fluidmech/common/handlers/UpdateConverter.java @@ -1,7 +1,7 @@ package fluidmech.common.handlers; -import fluidmech.api.helpers.ColorCode; -import fluidmech.api.liquids.LiquidHandler; +import hydraulic.core.implement.ColorCode; +import hydraulic.core.liquids.LiquidHandler; import fluidmech.common.tileentity.TileEntityPipe; import fluidmech.common.tileentity.TileEntityTank; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/minecraft/fluidmech/common/item/ItemGuage.java b/src/minecraft/fluidmech/common/item/ItemGuage.java index 83941afa4..448586508 100644 --- a/src/minecraft/fluidmech/common/item/ItemGuage.java +++ b/src/minecraft/fluidmech/common/item/ItemGuage.java @@ -5,7 +5,7 @@ import hydraulic.core.implement.IReadOut; import java.util.List; import fluidmech.common.FluidMech; -import fluidmech.common.TabLiquidMechanics; +import fluidmech.common.TabFluidMech; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -26,7 +26,7 @@ public class ItemGuage extends Item this.setHasSubtypes(true); this.setIconIndex(10); this.setItemName("lmTool"); - this.setCreativeTab(TabLiquidMechanics.INSTANCE); + this.setCreativeTab(TabFluidMech.INSTANCE); this.setMaxStackSize(1); this.setTextureFile(FluidMech.ITEM_TEXTURE_FILE); } diff --git a/src/minecraft/fluidmech/common/item/ItemParts.java b/src/minecraft/fluidmech/common/item/ItemParts.java index 659346ce4..38b197a00 100644 --- a/src/minecraft/fluidmech/common/item/ItemParts.java +++ b/src/minecraft/fluidmech/common/item/ItemParts.java @@ -3,7 +3,7 @@ package fluidmech.common.item; import java.util.List; import fluidmech.common.FluidMech; -import fluidmech.common.TabLiquidMechanics; +import fluidmech.common.TabFluidMech; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -42,7 +42,7 @@ public class ItemParts extends Item this.setMaxDamage(0); this.setMaxStackSize(64); this.setItemName("lmPart"); - this.setCreativeTab(TabLiquidMechanics.INSTANCE); + this.setCreativeTab(TabFluidMech.INSTANCE); } @Override diff --git a/src/minecraft/fluidmech/common/item/ItemValve.java b/src/minecraft/fluidmech/common/item/ItemValve.java index 1d3ae2f3a..818a3c07c 100644 --- a/src/minecraft/fluidmech/common/item/ItemValve.java +++ b/src/minecraft/fluidmech/common/item/ItemValve.java @@ -3,7 +3,7 @@ package fluidmech.common.item; import java.util.List; import fluidmech.common.FluidMech; -import fluidmech.common.TabLiquidMechanics; +import fluidmech.common.TabFluidMech; import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; @@ -26,7 +26,7 @@ public class ItemValve extends ItemBlock this.setHasSubtypes(true); this.setIconIndex(10); this.setItemName("Machine"); - this.setCreativeTab(TabLiquidMechanics.INSTANCE); + this.setCreativeTab(TabFluidMech.INSTANCE); } @Override diff --git a/src/minecraft/fluidmech/common/tileentity/TileEntityGenerator.java b/src/minecraft/fluidmech/common/tileentity/TileEntityGenerator.java index 80bb571ec..6b5430360 100644 --- a/src/minecraft/fluidmech/common/tileentity/TileEntityGenerator.java +++ b/src/minecraft/fluidmech/common/tileentity/TileEntityGenerator.java @@ -1,5 +1,7 @@ package fluidmech.common.tileentity; +import hydraulic.core.helpers.MetaGroup; +import hydraulic.core.helpers.connectionHelper; import hydraulic.core.implement.IReadOut; import java.util.EnumSet; @@ -19,10 +21,8 @@ import universalelectricity.prefab.tile.TileEntityElectricityProducer; import com.google.common.io.ByteArrayDataInput; -import fluidmech.api.helpers.connectionHelper; import fluidmech.api.mech.IForce; import fluidmech.common.FluidMech; -import fluidmech.common.MetaGroup; import fluidmech.common.block.BlockGenerator; diff --git a/src/minecraft/fluidmech/common/tileentity/TileEntityPipe.java b/src/minecraft/fluidmech/common/tileentity/TileEntityPipe.java index 1fa28a543..706554520 100644 --- a/src/minecraft/fluidmech/common/tileentity/TileEntityPipe.java +++ b/src/minecraft/fluidmech/common/tileentity/TileEntityPipe.java @@ -1,14 +1,14 @@ package fluidmech.common.tileentity; +import hydraulic.core.helpers.connectionHelper; +import hydraulic.core.implement.ColorCode; import hydraulic.core.implement.IPipe; +import hydraulic.core.implement.IPressure; import hydraulic.core.implement.IReadOut; +import hydraulic.core.liquids.LiquidHandler; 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 net.minecraft.block.Block; diff --git a/src/minecraft/fluidmech/common/tileentity/TileEntityPump.java b/src/minecraft/fluidmech/common/tileentity/TileEntityPump.java index 09902d824..bb3c6ddc5 100644 --- a/src/minecraft/fluidmech/common/tileentity/TileEntityPump.java +++ b/src/minecraft/fluidmech/common/tileentity/TileEntityPump.java @@ -1,6 +1,11 @@ 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.liquids.LiquidData; +import hydraulic.core.liquids.LiquidHandler; import java.util.EnumSet; @@ -23,12 +28,7 @@ import universalelectricity.prefab.tile.TileEntityElectricityReceiver; 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.MetaGroup; public class TileEntityPump extends TileEntityElectricityReceiver implements IPacketReceiver, IReadOut, IPressure { diff --git a/src/minecraft/fluidmech/common/tileentity/TileEntityReleaseValve.java b/src/minecraft/fluidmech/common/tileentity/TileEntityReleaseValve.java index 0bbdd9879..c49a3450a 100644 --- a/src/minecraft/fluidmech/common/tileentity/TileEntityReleaseValve.java +++ b/src/minecraft/fluidmech/common/tileentity/TileEntityReleaseValve.java @@ -1,16 +1,16 @@ package fluidmech.common.tileentity; +import hydraulic.core.helpers.connectionHelper; +import hydraulic.core.implement.ColorCode; import hydraulic.core.implement.IColorCoded; +import hydraulic.core.implement.IPressure; import hydraulic.core.implement.IReadOut; +import hydraulic.core.liquids.LiquidData; +import hydraulic.core.liquids.LiquidHandler; import java.util.ArrayList; 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 net.minecraft.entity.player.EntityPlayer; diff --git a/src/minecraft/fluidmech/common/tileentity/TileEntitySink.java b/src/minecraft/fluidmech/common/tileentity/TileEntitySink.java index 12aa934d9..65866b210 100644 --- a/src/minecraft/fluidmech/common/tileentity/TileEntitySink.java +++ b/src/minecraft/fluidmech/common/tileentity/TileEntitySink.java @@ -1,6 +1,8 @@ package fluidmech.common.tileentity; +import hydraulic.core.implement.ColorCode; import hydraulic.core.implement.IColorCoded; +import hydraulic.core.liquids.LiquidHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.INetworkManager; @@ -19,8 +21,6 @@ import universalelectricity.prefab.network.PacketManager; import com.google.common.io.ByteArrayDataInput; -import fluidmech.api.helpers.ColorCode; -import fluidmech.api.liquids.LiquidHandler; import fluidmech.common.FluidMech; public class TileEntitySink extends TileEntity implements IPacketReceiver, ITankContainer, IColorCoded diff --git a/src/minecraft/fluidmech/common/tileentity/TileEntityTank.java b/src/minecraft/fluidmech/common/tileentity/TileEntityTank.java index 32086d1bd..7d2ee5a3d 100644 --- a/src/minecraft/fluidmech/common/tileentity/TileEntityTank.java +++ b/src/minecraft/fluidmech/common/tileentity/TileEntityTank.java @@ -1,7 +1,12 @@ package fluidmech.common.tileentity; +import hydraulic.core.helpers.connectionHelper; +import hydraulic.core.implement.ColorCode; import hydraulic.core.implement.IColorCoded; +import hydraulic.core.implement.IPressure; import hydraulic.core.implement.IReadOut; +import hydraulic.core.liquids.LiquidData; +import hydraulic.core.liquids.LiquidHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.INetworkManager; @@ -20,11 +25,6 @@ import universalelectricity.prefab.network.PacketManager; 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.handlers.UpdateConverter; diff --git a/src/minecraft/hydraulic/Credits b/src/minecraft/hydraulic/Credits new file mode 100644 index 000000000..75d1264e6 --- /dev/null +++ b/src/minecraft/hydraulic/Credits @@ -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. \ No newline at end of file diff --git a/src/minecraft/hydraulic/core/HydraulicLoader.java b/src/minecraft/hydraulic/core/HydraulicLoader.java index e6b9d4c57..d941fc16a 100644 --- a/src/minecraft/hydraulic/core/HydraulicLoader.java +++ b/src/minecraft/hydraulic/core/HydraulicLoader.java @@ -1,9 +1,9 @@ package hydraulic.core; +import hydraulic.core.liquids.Hydraulic; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.ForgeSubscribe; import net.minecraftforge.event.world.WorldEvent; -import universalelectricity.core.electricity.Electricity; import cpw.mods.fml.common.FMLLog; @@ -17,10 +17,10 @@ public class HydraulicLoader { if (!isInitialized) { - Electricity.instance = new Electricity(); + Hydraulic.instance = new Hydraulic(); 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; } @@ -29,14 +29,14 @@ public class HydraulicLoader @ForgeSubscribe public void onWorldUnLoad(WorldEvent.Unload event) { - Electricity.instance = new Electricity(); - Electricity.instance.cleanUpNetworks(); + Hydraulic.instance = new Hydraulic(); + Hydraulic.instance.cleanUpNetworks(); } @ForgeSubscribe public void onWorldLoad(WorldEvent.Load event) { - Electricity.instance = new Electricity(); - Electricity.instance.cleanUpNetworks(); + Hydraulic.instance = new Hydraulic(); + Hydraulic.instance.cleanUpNetworks(); } } diff --git a/src/minecraft/fluidmech/common/MetaGroup.java b/src/minecraft/hydraulic/core/helpers/MetaGroup.java similarity index 96% rename from src/minecraft/fluidmech/common/MetaGroup.java rename to src/minecraft/hydraulic/core/helpers/MetaGroup.java index 24b056382..186cb542b 100644 --- a/src/minecraft/fluidmech/common/MetaGroup.java +++ b/src/minecraft/hydraulic/core/helpers/MetaGroup.java @@ -1,4 +1,4 @@ -package fluidmech.common; +package hydraulic.core.helpers; public class MetaGroup diff --git a/src/minecraft/fluidmech/api/helpers/connectionHelper.java b/src/minecraft/hydraulic/core/helpers/connectionHelper.java similarity index 98% rename from src/minecraft/fluidmech/api/helpers/connectionHelper.java rename to src/minecraft/hydraulic/core/helpers/connectionHelper.java index 35935326f..b8654d4cb 100644 --- a/src/minecraft/fluidmech/api/helpers/connectionHelper.java +++ b/src/minecraft/hydraulic/core/helpers/connectionHelper.java @@ -1,4 +1,4 @@ -package fluidmech.api.helpers; +package hydraulic.core.helpers; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; diff --git a/src/minecraft/fluidmech/api/helpers/ColorCode.java b/src/minecraft/hydraulic/core/implement/ColorCode.java similarity index 93% rename from src/minecraft/fluidmech/api/helpers/ColorCode.java rename to src/minecraft/hydraulic/core/implement/ColorCode.java index 337aaa346..b50f68d03 100644 --- a/src/minecraft/fluidmech/api/helpers/ColorCode.java +++ b/src/minecraft/hydraulic/core/implement/ColorCode.java @@ -1,7 +1,7 @@ -package fluidmech.api.helpers; +package hydraulic.core.implement; -import fluidmech.api.liquids.LiquidData; -import fluidmech.api.liquids.LiquidHandler; +import hydraulic.core.liquids.LiquidData; +import hydraulic.core.liquids.LiquidHandler; public enum ColorCode diff --git a/src/minecraft/hydraulic/core/implement/IColorCoded.java b/src/minecraft/hydraulic/core/implement/IColorCoded.java index 1fa385506..02e92dca4 100644 --- a/src/minecraft/hydraulic/core/implement/IColorCoded.java +++ b/src/minecraft/hydraulic/core/implement/IColorCoded.java @@ -1,6 +1,5 @@ package hydraulic.core.implement; -import fluidmech.api.helpers.ColorCode; public interface IColorCoded { diff --git a/src/minecraft/hydraulic/core/implement/IFluidPipe.java b/src/minecraft/hydraulic/core/implement/IFluidPipe.java index 1ffb44dc5..9a82ec9ee 100644 --- a/src/minecraft/hydraulic/core/implement/IFluidPipe.java +++ b/src/minecraft/hydraulic/core/implement/IFluidPipe.java @@ -1,6 +1,6 @@ package hydraulic.core.implement; -import hydraulic.core.pressure.FluidPressureNetwork; +import hydraulic.core.liquids.HydraulicNetwork; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.liquids.LiquidStack; @@ -17,9 +17,9 @@ public interface IFluidPipe /** * 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. diff --git a/src/minecraft/fluidmech/api/liquids/IPressure.java b/src/minecraft/hydraulic/core/implement/IPressure.java similarity index 87% rename from src/minecraft/fluidmech/api/liquids/IPressure.java rename to src/minecraft/hydraulic/core/implement/IPressure.java index c33c2b1b9..d9b2b25a3 100644 --- a/src/minecraft/fluidmech/api/liquids/IPressure.java +++ b/src/minecraft/hydraulic/core/implement/IPressure.java @@ -1,5 +1,6 @@ -package fluidmech.api.liquids; +package hydraulic.core.implement; +import hydraulic.core.liquids.LiquidData; import net.minecraftforge.common.ForgeDirection; public interface IPressure diff --git a/src/minecraft/hydraulic/core/pressure/FluidInfo.java b/src/minecraft/hydraulic/core/liquids/FluidInfo.java similarity index 99% rename from src/minecraft/hydraulic/core/pressure/FluidInfo.java rename to src/minecraft/hydraulic/core/liquids/FluidInfo.java index 5b8b85daa..371c6ea58 100644 --- a/src/minecraft/hydraulic/core/pressure/FluidInfo.java +++ b/src/minecraft/hydraulic/core/liquids/FluidInfo.java @@ -1,4 +1,4 @@ -package hydraulic.core.pressure; +package hydraulic.core.liquids; /** * An easy way to display information on electricity. diff --git a/src/minecraft/hydraulic/core/pressure/FluidPacket.java b/src/minecraft/hydraulic/core/liquids/FluidPacket.java similarity index 96% rename from src/minecraft/hydraulic/core/pressure/FluidPacket.java rename to src/minecraft/hydraulic/core/liquids/FluidPacket.java index 34eca20f5..f23c9082d 100644 --- a/src/minecraft/hydraulic/core/pressure/FluidPacket.java +++ b/src/minecraft/hydraulic/core/liquids/FluidPacket.java @@ -1,4 +1,4 @@ -package hydraulic.core.pressure; +package hydraulic.core.liquids; import net.minecraftforge.liquids.LiquidStack; diff --git a/src/minecraft/hydraulic/core/pressure/FluidPressure.java b/src/minecraft/hydraulic/core/liquids/Hydraulic.java similarity index 84% rename from src/minecraft/hydraulic/core/pressure/FluidPressure.java rename to src/minecraft/hydraulic/core/liquids/Hydraulic.java index d93ce2888..c13bcdbbe 100644 --- a/src/minecraft/hydraulic/core/pressure/FluidPressure.java +++ b/src/minecraft/hydraulic/core/liquids/Hydraulic.java @@ -1,4 +1,4 @@ -package hydraulic.core.pressure; +package hydraulic.core.liquids; import hydraulic.core.implement.IFluidPipe; @@ -16,11 +16,11 @@ import cpw.mods.fml.common.FMLLog; * 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 electricityNetworks = new ArrayList(); + private List electricityNetworks = new ArrayList(); /** * Registers a conductor into the UE electricity net. @@ -28,13 +28,13 @@ public class FluidPressure public void registerConductor(IFluidPipe newConductor) { this.cleanUpNetworks(); - FluidPressureNetwork newNetwork = new FluidPressureNetwork(newConductor); + HydraulicNetwork newNetwork = new HydraulicNetwork(newConductor); this.electricityNetworks.add(newNetwork); } public void unregister(TileEntity tileEntity) { - for (FluidPressureNetwork network : this.electricityNetworks) + for (HydraulicNetwork network : this.electricityNetworks) { network.stopProducing(tileEntity); network.stopRequesting(tileEntity); @@ -49,7 +49,7 @@ public class FluidPressure * @param networkB * - 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) { @@ -83,7 +83,7 @@ public class FluidPressure { try { - FluidPressureNetwork network = conductorA.getNetwork(); + HydraulicNetwork network = conductorA.getNetwork(); if (network != null) { @@ -125,7 +125,7 @@ public class FluidPressure while (it.hasNext()) { - FluidPressureNetwork network = (FluidPressureNetwork) it.next(); + HydraulicNetwork network = (HydraulicNetwork) it.next(); network.cleanConductors(); if (network.conductors.size() == 0) @@ -147,7 +147,7 @@ public class FluidPressure while (it.hasNext()) { - FluidPressureNetwork network = ((FluidPressureNetwork) it.next()); + HydraulicNetwork network = ((HydraulicNetwork) it.next()); network.resetConductors(); } } diff --git a/src/minecraft/hydraulic/core/pressure/FluidPressureNetwork.java b/src/minecraft/hydraulic/core/liquids/HydraulicNetwork.java similarity index 97% rename from src/minecraft/hydraulic/core/pressure/FluidPressureNetwork.java rename to src/minecraft/hydraulic/core/liquids/HydraulicNetwork.java index 751ab8073..129b67280 100644 --- a/src/minecraft/hydraulic/core/pressure/FluidPressureNetwork.java +++ b/src/minecraft/hydraulic/core/liquids/HydraulicNetwork.java @@ -1,4 +1,4 @@ -package hydraulic.core.pressure; +package hydraulic.core.liquids; import hydraulic.core.implement.IFluidPipe; @@ -15,9 +15,8 @@ import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.liquids.LiquidStack; import universalelectricity.core.vector.Vector3; import cpw.mods.fml.common.FMLLog; -import fluidmech.api.liquids.LiquidHandler; -public class FluidPressureNetwork +public class HydraulicNetwork { private final HashMap producers = new HashMap(); private final HashMap consumers = new HashMap(); @@ -26,7 +25,7 @@ public class FluidPressureNetwork public LiquidStack stack = new LiquidStack(0,0,0); - public FluidPressureNetwork(IFluidPipe conductor) + public HydraulicNetwork(IFluidPipe conductor) { this.addConductor(conductor); } diff --git a/src/minecraft/fluidmech/api/liquids/LiquidData.java b/src/minecraft/hydraulic/core/liquids/LiquidData.java similarity index 93% rename from src/minecraft/fluidmech/api/liquids/LiquidData.java rename to src/minecraft/hydraulic/core/liquids/LiquidData.java index 7c5630a97..4b1c30cba 100644 --- a/src/minecraft/fluidmech/api/liquids/LiquidData.java +++ b/src/minecraft/hydraulic/core/liquids/LiquidData.java @@ -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; public class LiquidData diff --git a/src/minecraft/fluidmech/api/liquids/LiquidHandler.java b/src/minecraft/hydraulic/core/liquids/LiquidHandler.java similarity index 98% rename from src/minecraft/fluidmech/api/liquids/LiquidHandler.java rename to src/minecraft/hydraulic/core/liquids/LiquidHandler.java index 95b3fcca4..32f6fcedd 100644 --- a/src/minecraft/fluidmech/api/liquids/LiquidHandler.java +++ b/src/minecraft/hydraulic/core/liquids/LiquidHandler.java @@ -1,4 +1,6 @@ -package fluidmech.api.liquids; +package hydraulic.core.liquids; + +import hydraulic.core.implement.ColorCode; import java.util.ArrayList; import java.util.List; @@ -12,7 +14,6 @@ import net.minecraftforge.event.ForgeSubscribe; import net.minecraftforge.liquids.LiquidDictionary; import net.minecraftforge.liquids.LiquidStack; import cpw.mods.fml.common.FMLLog; -import fluidmech.api.helpers.ColorCode; public class LiquidHandler { diff --git a/src/minecraft/fluidmech/api/liquids/LiquidFiniteFlowing.java b/src/minecraft/hydraulic/core/prefab/LiquidFiniteFlowing.java similarity index 99% rename from src/minecraft/fluidmech/api/liquids/LiquidFiniteFlowing.java rename to src/minecraft/hydraulic/core/prefab/LiquidFiniteFlowing.java index a08cc0d78..c847be483 100644 --- a/src/minecraft/fluidmech/api/liquids/LiquidFiniteFlowing.java +++ b/src/minecraft/hydraulic/core/prefab/LiquidFiniteFlowing.java @@ -1,4 +1,4 @@ -package fluidmech.api.liquids; +package hydraulic.core.prefab; import java.util.Random; diff --git a/src/minecraft/fluidmech/api/liquids/LiquidFiniteStill.java b/src/minecraft/hydraulic/core/prefab/LiquidFiniteStill.java similarity index 97% rename from src/minecraft/fluidmech/api/liquids/LiquidFiniteStill.java rename to src/minecraft/hydraulic/core/prefab/LiquidFiniteStill.java index d010e6a81..7c32afbc2 100644 --- a/src/minecraft/fluidmech/api/liquids/LiquidFiniteStill.java +++ b/src/minecraft/hydraulic/core/prefab/LiquidFiniteStill.java @@ -1,4 +1,4 @@ -package fluidmech.api.liquids; +package hydraulic.core.prefab; import net.minecraft.block.BlockStationary; import net.minecraft.block.material.Material;