From 15aa7a319a9bd15fc797e895c4ccc79b9030e2ce Mon Sep 17 00:00:00 2001 From: DarkGuardsman Date: Wed, 18 Sep 2013 06:56:36 -0400 Subject: [PATCH] Changes --- src/dark/fluid/client/ClientProxy.java | 1 - src/dark/fluid/common/BlockFM.java | 2 +- .../common/machines/BlockReleaseValve.java | 1 - src/dark/fluid/common/machines/BlockSink.java | 5 ++--- src/dark/fluid/common/pipes/BlockPipe.java | 1 - .../fluid/common/pipes/ItemBlockPipe.java | 1 - .../fluid/common/pump/BlockPumpMachine.java | 1 - .../pump/TileEntityConstructionPump.java | 19 +++---------------- .../common/pump/TileEntityStarterPump.java | 12 ++++++------ .../mech/common/machines/BlockGenerator.java | 1 - src/dark/mech/common/machines/BlockRod.java | 1 - .../machines/TileEntitySteamPiston.java | 5 +++-- 12 files changed, 15 insertions(+), 35 deletions(-) diff --git a/src/dark/fluid/client/ClientProxy.java b/src/dark/fluid/client/ClientProxy.java index f2bfdc61..42948ace 100644 --- a/src/dark/fluid/client/ClientProxy.java +++ b/src/dark/fluid/client/ClientProxy.java @@ -15,7 +15,6 @@ import dark.fluid.client.render.RenderTank; import dark.fluid.client.render.pipe.RenderPipe; import dark.fluid.common.CommonProxy; import dark.fluid.common.FMRecipeLoader; -import dark.fluid.common.FluidMech; import dark.fluid.common.machines.TileEntityReleaseValve; import dark.fluid.common.machines.TileEntitySink; import dark.fluid.common.machines.TileEntityTank; diff --git a/src/dark/fluid/common/BlockFM.java b/src/dark/fluid/common/BlockFM.java index 2d95a777..5f492b51 100644 --- a/src/dark/fluid/common/BlockFM.java +++ b/src/dark/fluid/common/BlockFM.java @@ -2,8 +2,8 @@ package dark.fluid.common; import net.minecraft.block.material.Material; import net.minecraftforge.common.Configuration; -import dark.core.prefab.BlockMachine; import dark.core.prefab.IExtraObjectInfo; +import dark.core.prefab.machine.BlockMachine; public abstract class BlockFM extends BlockMachine implements IExtraObjectInfo { diff --git a/src/dark/fluid/common/machines/BlockReleaseValve.java b/src/dark/fluid/common/machines/BlockReleaseValve.java index 2258f926..40551d06 100644 --- a/src/dark/fluid/common/machines/BlockReleaseValve.java +++ b/src/dark/fluid/common/machines/BlockReleaseValve.java @@ -14,7 +14,6 @@ import cpw.mods.fml.relauncher.SideOnly; import dark.core.prefab.helpers.Pair; import dark.fluid.common.BlockFM; import dark.fluid.common.FMRecipeLoader; -import dark.fluid.common.FluidMech; public class BlockReleaseValve extends BlockFM { diff --git a/src/dark/fluid/common/machines/BlockSink.java b/src/dark/fluid/common/machines/BlockSink.java index f0b2fe3e..7059daff 100644 --- a/src/dark/fluid/common/machines/BlockSink.java +++ b/src/dark/fluid/common/machines/BlockSink.java @@ -14,7 +14,6 @@ import universalelectricity.prefab.tile.TileEntityAdvanced; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import dark.core.prefab.helpers.FluidHelper; -import dark.core.prefab.helpers.MetaGroup; import dark.core.prefab.helpers.Pair; import dark.fluid.client.render.BlockRenderHelper; import dark.fluid.common.BlockFM; @@ -44,7 +43,7 @@ public class BlockSink extends BlockFM public boolean onUseWrench(World par1World, int x, int y, int z, EntityPlayer par5EntityPlayer, int side, float hitX, float hitY, float hitZ) { int meta = par1World.getBlockMetadata(x, y, z); - int metaGroup = MetaGroup.getGrouping(meta); + int metaGroup = meta % 4; if (meta == (metaGroup * 4) + 3) { @@ -66,7 +65,7 @@ public class BlockSink extends BlockFM int angle = MathHelper.floor_double((par5EntityLiving.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; TileEntity ent = world.getBlockTileEntity(x, y, z); - world.setBlockMetadataWithNotify(x, y, z, angle + MetaGroup.getGroupStartMeta(MetaGroup.getGrouping(meta)), 3); + world.setBlockMetadataWithNotify(x, y, z, angle * 4, 3); if (ent instanceof TileEntityAdvanced) { ((TileEntityAdvanced) world.getBlockTileEntity(x, y, z)).initiate(); diff --git a/src/dark/fluid/common/pipes/BlockPipe.java b/src/dark/fluid/common/pipes/BlockPipe.java index cdb45f89..5d5473e8 100644 --- a/src/dark/fluid/common/pipes/BlockPipe.java +++ b/src/dark/fluid/common/pipes/BlockPipe.java @@ -19,7 +19,6 @@ import dark.core.prefab.helpers.FluidHelper; import dark.core.prefab.helpers.Pair; import dark.fluid.common.BlockFM; import dark.fluid.common.FMRecipeLoader; -import dark.fluid.common.FluidMech; public class BlockPipe extends BlockFM { diff --git a/src/dark/fluid/common/pipes/ItemBlockPipe.java b/src/dark/fluid/common/pipes/ItemBlockPipe.java index a68578d2..872bc730 100644 --- a/src/dark/fluid/common/pipes/ItemBlockPipe.java +++ b/src/dark/fluid/common/pipes/ItemBlockPipe.java @@ -4,7 +4,6 @@ import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import dark.fluid.common.FMRecipeLoader; -import dark.fluid.common.FluidMech; public class ItemBlockPipe extends ItemBlock { diff --git a/src/dark/fluid/common/pump/BlockPumpMachine.java b/src/dark/fluid/common/pump/BlockPumpMachine.java index 0620132a..f3a57c02 100644 --- a/src/dark/fluid/common/pump/BlockPumpMachine.java +++ b/src/dark/fluid/common/pump/BlockPumpMachine.java @@ -16,7 +16,6 @@ import dark.core.prefab.helpers.Pair; import dark.fluid.client.render.BlockRenderHelper; import dark.fluid.common.BlockFM; import dark.fluid.common.FMRecipeLoader; -import dark.fluid.common.FluidMech; public class BlockPumpMachine extends BlockFM { diff --git a/src/dark/fluid/common/pump/TileEntityConstructionPump.java b/src/dark/fluid/common/pump/TileEntityConstructionPump.java index af82f543..522a43a5 100644 --- a/src/dark/fluid/common/pump/TileEntityConstructionPump.java +++ b/src/dark/fluid/common/pump/TileEntityConstructionPump.java @@ -18,7 +18,6 @@ import universalelectricity.core.vector.VectorHelper; import dark.api.fluid.IDrain; import dark.api.fluid.INetworkPipe; import dark.api.parts.ITileConnector; -import dark.core.prefab.helpers.MetaGroup; import dark.core.prefab.helpers.Pair; import dark.core.prefab.tilenetwork.fluid.FluidNetworkHelper; import dark.core.prefab.tilenetwork.fluid.NetworkFluidTiles; @@ -37,25 +36,13 @@ public class TileEntityConstructionPump extends TileEntityStarterPump implements } /** Gets the facing direction - * + * * @param input true for input side, false for output side * @return */ public ForgeDirection getFacing(boolean input) { - int meta = 0; - if (worldObj != null) - { - meta = MetaGroup.getFacingMeta(worldObj.getBlockMetadata(xCoord, yCoord, zCoord)); - } - if (input) - { - return ForgeDirection.getOrientation(meta); - } - else - { - return ForgeDirection.getOrientation(meta).getOpposite(); - } + return input ? this.getDirection() : this.getDirection().getOpposite(); } @Override @@ -79,7 +66,7 @@ public class TileEntityConstructionPump extends TileEntityStarterPump implements } /** Gets the nextDrain in the list - * + * * @param inputTile - input tile must be an instance of INetworkPipe * @param outputTile - output tile must be an instance of IFluidHandler * @param ignoreList - list of drains to ignore so that the next one is selected diff --git a/src/dark/fluid/common/pump/TileEntityStarterPump.java b/src/dark/fluid/common/pump/TileEntityStarterPump.java index 5c1841b2..06dab3e1 100644 --- a/src/dark/fluid/common/pump/TileEntityStarterPump.java +++ b/src/dark/fluid/common/pump/TileEntityStarterPump.java @@ -15,11 +15,11 @@ import dark.api.IToolReadOut; import dark.api.fluid.IDrain; import dark.api.parts.ITileConnector; import dark.core.common.ExternalModHandler; -import dark.core.prefab.TileEntityMachine; import dark.core.prefab.helpers.FluidHelper; import dark.core.prefab.helpers.Pair; +import dark.core.prefab.machine.TileEntityEnergyMachine; -public class TileEntityStarterPump extends TileEntityMachine implements IToolReadOut, ITileConnector +public class TileEntityStarterPump extends TileEntityEnergyMachine implements IToolReadOut, ITileConnector { private int currentWorldEdits, MAX_WORLD_EDITS_PER_PROCESS; @@ -65,7 +65,7 @@ public class TileEntityStarterPump extends TileEntityMachine implements IToolRea { this.currentWorldEdits = 0; - if (this.running) + if (this.isFunctioning()) { this.rotation = Math.max(Math.min(this.rotation + 1, 7), 0); @@ -91,7 +91,7 @@ public class TileEntityStarterPump extends TileEntityMachine implements IToolRea } /** Drains an area starting at the given location - * + * * @param world - world to drain in, most cases will be the TileEntities world * @param loc - origin to start the path finder with. If this is an instance of IDrain this * method will act different */ @@ -197,9 +197,9 @@ public class TileEntityStarterPump extends TileEntityMachine implements IToolRea } @Override - public boolean canRun() + public boolean canFunction() { - return super.canRun() && worldObj.isBlockIndirectlyGettingPowered(xCoord, yCoord, zCoord); + return super.canFunction() && worldObj.isBlockIndirectlyGettingPowered(xCoord, yCoord, zCoord); } @Override diff --git a/src/dark/mech/common/machines/BlockGenerator.java b/src/dark/mech/common/machines/BlockGenerator.java index 1f890efe..15a5cf4b 100644 --- a/src/dark/mech/common/machines/BlockGenerator.java +++ b/src/dark/mech/common/machines/BlockGenerator.java @@ -17,7 +17,6 @@ import dark.core.prefab.helpers.Pair; import dark.fluid.client.render.BlockRenderHelper; import dark.fluid.common.BlockFM; import dark.fluid.common.FMRecipeLoader; -import dark.fluid.common.FluidMech; public class BlockGenerator extends BlockFM { diff --git a/src/dark/mech/common/machines/BlockRod.java b/src/dark/mech/common/machines/BlockRod.java index 1912a2fb..f91cb09c 100644 --- a/src/dark/mech/common/machines/BlockRod.java +++ b/src/dark/mech/common/machines/BlockRod.java @@ -17,7 +17,6 @@ import dark.core.prefab.helpers.Pair; import dark.fluid.client.render.BlockRenderHelper; import dark.fluid.common.BlockFM; import dark.fluid.common.FMRecipeLoader; -import dark.fluid.common.FluidMech; public class BlockRod extends BlockFM { diff --git a/src/dark/mech/common/machines/TileEntitySteamPiston.java b/src/dark/mech/common/machines/TileEntitySteamPiston.java index 036ac119..d61aad5a 100644 --- a/src/dark/mech/common/machines/TileEntitySteamPiston.java +++ b/src/dark/mech/common/machines/TileEntitySteamPiston.java @@ -1,7 +1,8 @@ package dark.mech.common.machines; -import dark.core.prefab.TileEntityMachine; +import dark.core.prefab.machine.TileEntityEnergyMachine; -public class TileEntitySteamPiston extends TileEntityMachine + +public class TileEntitySteamPiston extends TileEntityEnergyMachine { }