Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

cleanup

Browse source
This commit is contained in:
DarkGuardsman 2013-07-22 00:35:42 -04:00
parent 2763a6c964
commit b5b4373672
24 changed files with 59 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/minecraft/dark/api/fluid/INetworkFluidPart.java
View file

@ -3,8 +3,8 @@ package dark.api.fluid;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidHandler;
import net.minecraftforge.fluids.IFluidTank;
import dark.core.api.IColorCoded;
import dark.core.api.INetworkPart;
import dark.api.IColorCoded;
import dark.api.INetworkPart;
public interface INetworkFluidPart extends IColorCoded, IFluidHandler, INetworkPart
{

2
src/minecraft/dark/core/network/fluid/HydraulicNetworkHelper.java
View file

@ -5,8 +5,8 @@ import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.fluids.IFluidHandler;
import universalelectricity.core.vector.Vector3;
import universalelectricity.core.vector.VectorHelper;
import dark.api.INetworkPart;
import dark.api.fluid.IDrain;
import dark.core.api.INetworkPart;
import dark.core.tile.network.NetworkTileEntities;
public class HydraulicNetworkHelper

4
src/minecraft/dark/core/network/fluid/NetworkFluidContainers.java
View file

@ -6,9 +6,9 @@ import java.util.List;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
import dark.api.ColorCode;
import dark.api.INetworkPart;
import dark.api.fluid.INetworkFluidPart;
import dark.core.api.ColorCode;
import dark.core.api.INetworkPart;
import dark.core.tile.network.NetworkTileEntities;
/** Side note: the network should act like this when done {@link http

6
src/minecraft/dark/core/network/fluid/NetworkFluidTiles.java
View file

@ -13,13 +13,13 @@ import net.minecraftforge.fluids.FluidTank;
import net.minecraftforge.fluids.IFluidHandler;
import universalelectricity.core.path.Pathfinder;
import universalelectricity.core.vector.Vector3;
import dark.api.ColorCode;
import dark.api.INetworkPart;
import dark.api.fluid.INetworkFluidPart;
import dark.core.api.ColorCode;
import dark.core.api.INetworkPart;
import dark.core.hydraulic.helpers.FluidHelper;
import dark.core.tile.network.NetworkPathFinder;
import dark.core.tile.network.NetworkTileEntities;
import dark.helpers.ConnectionHelper;
import dark.helpers.FluidHelper;
public class NetworkFluidTiles extends NetworkTileEntities
{

8
src/minecraft/dark/core/network/fluid/NetworkPipes.java
View file

@ -9,13 +9,13 @@ import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler;
import dark.api.ColorCode;
import dark.api.INetworkPart;
import dark.api.fluid.INetworkPipe;
import dark.core.api.ColorCode;
import dark.core.api.INetworkPart;
import dark.core.hydraulic.helpers.FluidHelper;
import dark.core.hydraulic.helpers.FluidRestrictionHandler;
import dark.core.tile.network.NetworkTileEntities;
import dark.helpers.ConnectionHelper;
import dark.helpers.FluidHelper;
import dark.helpers.FluidRestrictionHandler;
/** Side note: the network should act like this when done {@link http
* ://www.e4training.com/hydraulic_calculators/B1.htm} as well as stay compatible with the forge

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

@ -7,7 +7,7 @@ import org.lwjgl.opengl.GL11;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.core.api.ColorCode;
import dark.api.ColorCode;
import dark.core.render.RenderMachine;
import dark.fluid.client.model.ModelLargePipe;
import dark.fluid.client.model.ModelReleaseValve;

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

@ -9,7 +9,7 @@ import org.lwjgl.opengl.GL11;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.core.api.ColorCode;
import dark.api.ColorCode;
import dark.core.render.FluidBlockRenderer;
import dark.core.render.RenderMachine;
import dark.fluid.client.model.ModelTankSide;

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

@ -10,13 +10,13 @@ import org.lwjgl.opengl.GL11;
import universalelectricity.core.vector.Vector3;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.core.api.ColorCode;
import dark.core.hydraulic.helpers.FluidRestrictionHandler;
import dark.api.ColorCode;
import dark.core.render.RenderMachine;
import dark.fluid.client.model.ModelLargePipe;
import dark.fluid.common.FluidMech;
import dark.fluid.common.pipes.TileEntityPipe;
import dark.fluid.common.pipes.addon.IPipeExtention;
import dark.helpers.FluidRestrictionHandler;
@SideOnly(Side.CLIENT)
public class RenderPipe extends RenderMachine

2
src/minecraft/dark/fluid/common/BlockFM.java
View file

@ -1,7 +1,7 @@
package dark.fluid.common;
import net.minecraft.block.material.Material;
import dark.library.machine.BlockMachine;
import dark.prefab.machine.BlockMachine;
public abstract class BlockFM extends BlockMachine
{

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

@ -34,8 +34,8 @@ 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 dark.api.ColorCode;
import dark.core.ModPrefab;
import dark.core.api.ColorCode;
import dark.fluid.common.item.ItemParts;
import dark.fluid.common.item.ItemParts.Parts;
import dark.fluid.common.item.ItemTools;
@ -61,7 +61,7 @@ import dark.mech.common.machines.BlockGenerator;
import dark.mech.common.machines.BlockRod;
@ModstatInfo(prefix = "fluidmech")
@Mod(modid = FluidMech.MOD_ID, name = FluidMech.MOD_NAME, version = FluidMech.VERSION, useMetadata = true)
@Mod(modid = FluidMech.MOD_ID, name = FluidMech.MOD_NAME, version = FluidMech.VERSION,dependencies = "after:DarkCore", useMetadata = true)
@NetworkMod(channels = { FluidMech.CHANNEL }, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketManager.class)
public class FluidMech extends ModPrefab
{

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

@ -9,8 +9,8 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ChatMessageComponent;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import dark.core.api.IToolReadOut;
import dark.core.api.IToolReadOut.EnumTools;
import dark.api.IToolReadOut;
import dark.api.IToolReadOut.EnumTools;
import dark.fluid.common.FluidMech;
public class ItemTools extends ItemBasic

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

@ -13,12 +13,12 @@ import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidStack;
import dark.core.api.INetworkPart;
import dark.core.hydraulic.helpers.FluidHelper;
import dark.core.hydraulic.helpers.FluidRestrictionHandler;
import dark.api.INetworkPart;
import dark.fluid.client.render.BlockRenderHelper;
import dark.fluid.common.BlockFM;
import dark.library.machine.AutoCraftingManager;
import dark.helpers.FluidHelper;
import dark.helpers.FluidRestrictionHandler;
import dark.prefab.machine.AutoCraftingManager;
public class BlockTank extends BlockFM
{

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

@ -10,11 +10,11 @@ import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidHandler;
import dark.api.ColorCode;
import dark.api.IColorCoded;
import dark.api.ITileConnector;
import dark.api.IToolReadOut;
import dark.api.fluid.INetworkPipe;
import dark.core.api.ColorCode;
import dark.core.api.IColorCoded;
import dark.core.api.ITileConnector;
import dark.core.api.IToolReadOut;
import dark.core.network.fluid.NetworkPipes;
import dark.fluid.common.prefab.TileEntityFluidDevice;
import dark.helpers.ConnectionHelper;

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

@ -14,7 +14,7 @@ import universalelectricity.prefab.network.PacketManager;
import com.google.common.io.ByteArrayDataInput;
import dark.core.api.ColorCode;
import dark.api.ColorCode;
import dark.fluid.common.FluidMech;
import dark.fluid.common.prefab.TileEntityFluidStorage;

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

@ -31,17 +31,17 @@ import com.google.common.io.ByteArrayDataInput;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.api.ColorCode;
import dark.api.IColorCoded;
import dark.api.IToolReadOut;
import dark.api.fluid.INetworkFluidPart;
import dark.api.fluid.INetworkPipe;
import dark.core.api.ColorCode;
import dark.core.api.IColorCoded;
import dark.core.api.IToolReadOut;
import dark.core.hydraulic.helpers.FluidRestrictionHandler;
import dark.core.network.fluid.NetworkFluidContainers;
import dark.core.network.fluid.NetworkFluidTiles;
import dark.core.tile.network.NetworkTileEntities;
import dark.fluid.common.FluidMech;
import dark.fluid.common.prefab.TileEntityFluidStorage;
import dark.helpers.FluidRestrictionHandler;
public class TileEntityTank extends TileEntityFluidStorage implements IFluidHandler, IToolReadOut, IColorCoded, INetworkFluidPart, IPacketReceiver
{

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

@ -12,9 +12,9 @@ import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.fluids.IFluidTank;
import dark.api.fluid.INetworkPipe;
import dark.core.hydraulic.helpers.FluidRestrictionHandler;
import dark.fluid.common.BlockFM;
import dark.fluid.common.FluidMech;
import dark.helpers.FluidRestrictionHandler;
public class BlockPipe extends BlockFM
{

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

@ -7,7 +7,7 @@ import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidStack;
import universalelectricity.core.vector.Vector3;
import universalelectricity.core.vector.VectorHelper;
import dark.core.api.ColorCode;
import dark.api.ColorCode;
import dark.core.network.fluid.NetworkPipes;
public class TileEntityGenericPipe extends TileEntityPipe

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

@ -33,16 +33,16 @@ import com.google.common.io.ByteArrayDataInput;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.api.ColorCode;
import dark.api.IColorCoded;
import dark.api.ITileConnector;
import dark.api.IToolReadOut;
import dark.api.fluid.INetworkPipe;
import dark.core.api.ColorCode;
import dark.core.api.IColorCoded;
import dark.core.api.ITileConnector;
import dark.core.api.IToolReadOut;
import dark.core.hydraulic.helpers.FluidRestrictionHandler;
import dark.core.network.fluid.NetworkPipes;
import dark.core.tile.network.NetworkTileEntities;
import dark.fluid.common.FluidMech;
import dark.fluid.common.pipes.addon.IPipeExtention;
import dark.helpers.FluidRestrictionHandler;
public class TileEntityPipe extends TileEntityAdvanced implements IFluidHandler, IToolReadOut, IColorCoded, INetworkPipe, IPacketReceiver
{

4
src/minecraft/dark/fluid/common/prefab/TileEntityFluidDevice.java
View file

@ -3,8 +3,8 @@ package dark.fluid.common.prefab;
import java.util.Random;
import universalelectricity.prefab.tile.TileEntityAdvanced;
import dark.core.api.ITileConnector;
import dark.core.api.IToolReadOut;
import dark.api.ITileConnector;
import dark.api.IToolReadOut;
import dark.core.network.fluid.HydraulicNetworkHelper;
public abstract class TileEntityFluidDevice extends TileEntityAdvanced implements IToolReadOut, ITileConnector

6
src/minecraft/dark/fluid/common/prefab/TileEntityFluidStorage.java
View file

@ -11,9 +11,9 @@ import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTank;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler;
import dark.core.api.IColorCoded;
import dark.core.hydraulic.helpers.FluidHelper;
import dark.core.hydraulic.helpers.FluidRestrictionHandler;
import dark.api.IColorCoded;
import dark.helpers.FluidHelper;
import dark.helpers.FluidRestrictionHandler;
public abstract class TileEntityFluidStorage extends TileEntityFluidDevice implements IFluidHandler, IColorCoded
{

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

@ -10,7 +10,7 @@ import net.minecraft.world.chunk.Chunk;
import net.minecraftforge.common.ForgeDirection;
import universalelectricity.core.vector.Vector2;
import universalelectricity.core.vector.Vector3;
import dark.core.hydraulic.helpers.FluidHelper;
import dark.helpers.FluidHelper;
/** A simpler pathfinder based on Calclavia's PathFinder from UE api */
public class LiquidPathFinder

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

@ -10,14 +10,14 @@ import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler;
import universalelectricity.core.vector.Vector3;
import universalelectricity.core.vector.VectorHelper;
import dark.api.ITileConnector;
import dark.api.fluid.INetworkPipe;
import dark.core.api.ITileConnector;
import dark.core.network.fluid.HydraulicNetworkHelper;
import dark.core.network.fluid.NetworkFluidTiles;
import dark.helpers.MetaGroup;
import dark.library.machine.TileEntityRunnableMachine;
import dark.prefab.machine.TileEntityMachine;
public class TileEntityConstructionPump extends TileEntityRunnableMachine implements IFluidHandler, ITileConnector
public class TileEntityConstructionPump extends TileEntityMachine implements IFluidHandler, ITileConnector
{
/* LIQUID FLOW CONNECTION SIDES */
/** Internal tank for interaction but not real storage */

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

@ -21,8 +21,8 @@ import universalelectricity.core.vector.Vector3;
import universalelectricity.core.vector.VectorHelper;
import dark.api.fluid.IDrain;
import dark.api.fluid.INetworkPipe;
import dark.core.hydraulic.helpers.FluidHelper;
import dark.fluid.common.prefab.TileEntityFluidDevice;
import dark.helpers.FluidHelper;
public class TileEntityDrain extends TileEntityFluidDevice implements IFluidHandler, IDrain
{

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

@ -14,16 +14,16 @@ import universalelectricity.prefab.network.IPacketReceiver;
import com.google.common.io.ByteArrayDataInput;
import dark.core.api.ColorCode;
import dark.core.api.IColorCoded;
import dark.core.api.ITileConnector;
import dark.core.api.IToolReadOut;
import dark.core.hydraulic.helpers.FluidHelper;
import dark.core.hydraulic.helpers.FluidRestrictionHandler;
import dark.api.ColorCode;
import dark.api.IColorCoded;
import dark.api.ITileConnector;
import dark.api.IToolReadOut;
import dark.helpers.FluidHelper;
import dark.helpers.FluidRestrictionHandler;
import dark.helpers.MetaGroup;
import dark.library.machine.TileEntityRunnableMachine;
import dark.prefab.machine.TileEntityMachine;
public class TileEntityStarterPump extends TileEntityRunnableMachine implements IPacketReceiver, IToolReadOut, ITileConnector
public class TileEntityStarterPump extends TileEntityMachine implements IPacketReceiver, IToolReadOut, ITileConnector
{
public final static float WATTS_PER_TICK = 20;
private double percentPumped = 0.0;