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

Import changes

Browse source
This commit is contained in:
DarkGuardsman 2013-12-04 11:48:30 -05:00
parent 8e232535fd
commit 6d785adf35
23 changed files with 37 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/dark/api/fluid/INetworkFluidPart.java
View file

@ -4,7 +4,7 @@ import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler;
import dark.api.parts.INetworkPart;
import dark.api.tilenetwork.INetworkPart;
/** Interface used by part that are members of a fluid tile network. Parts in the network will act as
* one entity and will be controlled by the network. This means the network need the part to access

2
src/dark/core/prefab/tilenetwork/fluid/NetworkFluidContainers.java
View file

@ -7,7 +7,7 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidHandler;
import dark.api.fluid.INetworkFluidPart;
import dark.api.parts.INetworkPart;
import dark.api.tilenetwork.INetworkPart;
import dark.core.prefab.fluids.FluidHelper;
import dark.core.prefab.tilenetwork.NetworkUpdateHandler;

4
src/dark/core/prefab/tilenetwork/fluid/NetworkFluidTiles.java
View file

@ -12,8 +12,8 @@ import net.minecraftforge.fluids.FluidTank;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler;
import dark.api.fluid.INetworkFluidPart;
import dark.api.parts.INetworkPart;
import dark.api.parts.ITileNetwork;
import dark.api.tilenetwork.INetworkPart;
import dark.api.tilenetwork.ITileNetwork;
import dark.core.prefab.fluids.FluidHelper;
import dark.core.prefab.tilenetwork.NetworkTileEntities;
import dark.core.prefab.tilenetwork.NetworkUpdateHandler;

2
src/dark/core/prefab/tilenetwork/fluid/NetworkPipes.java
View file

@ -6,7 +6,7 @@ import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler;
import dark.api.fluid.INetworkPipe;
import dark.api.parts.INetworkPart;
import dark.api.tilenetwork.INetworkPart;
import dark.core.helpers.ConnectionHelper;
import dark.core.prefab.fluids.FluidHelper;
import dark.core.prefab.tilenetwork.NetworkUpdateHandler;

2
src/dark/fluid/client/render/RenderConstructionPump.java
View file

@ -7,11 +7,11 @@ import org.lwjgl.opengl.GL11;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.core.client.renders.RenderTileMachine;
import dark.core.prefab.ModPrefab;
import dark.fluid.client.model.ModelConstructionPump;
import dark.fluid.common.FluidMech;
import dark.fluid.common.pump.TileEntityConstructionPump;
import dark.machines.client.renders.RenderTileMachine;
@SideOnly(Side.CLIENT)
public class RenderConstructionPump extends RenderTileMachine

2
src/dark/fluid/client/render/RenderFurnace.java
View file

@ -7,10 +7,10 @@ import org.lwjgl.opengl.GL11;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.core.client.renders.RenderTileMachine;
import dark.core.prefab.ModPrefab;
import dark.fluid.client.model.ModelFurnace;
import dark.fluid.common.FluidMech;
import dark.machines.client.renders.RenderTileMachine;
@SideOnly(Side.CLIENT)
public class RenderFurnace extends RenderTileMachine

2
src/dark/fluid/client/render/RenderGearPiston.java
View file

@ -7,10 +7,10 @@ import org.lwjgl.opengl.GL11;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.core.client.renders.RenderTileMachine;
import dark.core.prefab.ModPrefab;
import dark.fluid.client.model.ModelGearPiston;
import dark.fluid.common.FluidMech;
import dark.machines.client.renders.RenderTileMachine;
import dark.mech.common.machines.TileEntitySteamPiston;
@SideOnly(Side.CLIENT)

2
src/dark/fluid/client/render/RenderPipe.java
View file

@ -7,13 +7,13 @@ import org.lwjgl.opengl.GL11;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.core.client.renders.RenderTileMachine;
import dark.core.prefab.ModPrefab;
import dark.fluid.client.model.ModelLargePipe;
import dark.fluid.common.FluidMech;
import dark.fluid.common.FluidPartsMaterial;
import dark.fluid.common.pipes.EnumPipeType;
import dark.fluid.common.pipes.TileEntityPipe;
import dark.machines.client.renders.RenderTileMachine;
@SideOnly(Side.CLIENT)
public class RenderPipe extends RenderTileMachine

2
src/dark/fluid/client/render/RenderPump.java
View file

@ -7,11 +7,11 @@ import org.lwjgl.opengl.GL11;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.core.client.renders.RenderTileMachine;
import dark.core.prefab.ModPrefab;
import dark.fluid.client.model.ModelPump;
import dark.fluid.common.FluidMech;
import dark.fluid.common.pump.TileEntityStarterPump;
import dark.machines.client.renders.RenderTileMachine;
@SideOnly(Side.CLIENT)
public class RenderPump extends RenderTileMachine

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

@ -8,12 +8,12 @@ import org.lwjgl.opengl.GL11;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.api.ColorCode;
import dark.core.client.renders.RenderTileMachine;
import dark.core.prefab.ModPrefab;
import dark.fluid.client.model.ModelLargePipe;
import dark.fluid.client.model.ModelReleaseValve;
import dark.fluid.common.FluidMech;
import dark.fluid.common.machines.TileEntityReleaseValve;
import dark.machines.client.renders.RenderTileMachine;
@SideOnly(Side.CLIENT)
public class RenderReleaseValve extends RenderTileMachine

2
src/dark/fluid/client/render/RenderSink.java
View file

@ -8,11 +8,11 @@ import org.lwjgl.opengl.GL11;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.core.client.renders.RenderTileMachine;
import dark.core.prefab.ModPrefab;
import dark.fluid.client.model.ModelSink;
import dark.fluid.common.FluidMech;
import dark.fluid.common.machines.TileEntitySink;
import dark.machines.client.renders.RenderTileMachine;
@SideOnly(Side.CLIENT)
public class RenderSink extends RenderTileMachine

4
src/dark/fluid/client/render/RenderTank.java
View file

@ -10,10 +10,10 @@ import org.lwjgl.opengl.GL11;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.api.ColorCode;
import dark.core.client.renders.RenderBlockFluid;
import dark.core.client.renders.RenderTileMachine;
import dark.fluid.client.model.ModelTankSide;
import dark.fluid.common.machines.TileEntityTank;
import dark.machines.client.renders.RenderBlockFluid;
import dark.machines.client.renders.RenderTileMachine;
@SideOnly(Side.CLIENT)
public class RenderTank extends RenderTileMachine

12
src/dark/fluid/common/FMRecipeLoader.java
View file

@ -7,12 +7,12 @@ import net.minecraftforge.oredict.ShapedOreRecipe;
import net.minecraftforge.oredict.ShapelessOreRecipe;
import cpw.mods.fml.common.registry.GameRegistry;
import dark.api.ColorCode;
import dark.core.common.CoreRecipeLoader;
import dark.core.common.RecipeLoader;
import dark.core.common.items.EnumMaterial;
import dark.core.common.items.EnumOrePart;
import dark.core.common.items.ItemParts;
import dark.core.common.items.ItemParts.Parts;
import dark.machines.common.CoreRecipeLoader;
import dark.machines.common.RecipeLoader;
import dark.machines.common.items.EnumMaterial;
import dark.machines.common.items.EnumOrePart;
import dark.machines.common.items.ItemParts;
import dark.machines.common.items.ItemParts.Parts;
public class FMRecipeLoader extends RecipeLoader
{

6
src/dark/fluid/common/FluidMech.java
View file

@ -21,11 +21,9 @@ import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.network.NetworkMod;
import dark.core.common.DMCreativeTab;
import dark.core.common.DarkMain;
import dark.core.ModObjectRegistry;
import dark.core.prefab.ItemBlockHolder;
import dark.core.prefab.ModPrefab;
import dark.core.registration.ModObjectRegistry;
import dark.fluid.common.machines.BlockReleaseValve;
import dark.fluid.common.machines.BlockSink;
import dark.fluid.common.machines.BlockTank;
@ -34,6 +32,8 @@ import dark.fluid.common.pipes.ItemBlockPipe;
import dark.fluid.common.pump.BlockConstructionPump;
import dark.fluid.common.pump.BlockDrain;
import dark.fluid.common.pump.BlockPumpMachine;
import dark.machines.common.DMCreativeTab;
import dark.machines.common.DarkMain;
@ModstatInfo(prefix = "fluidmech")
@Mod(modid = FluidMech.MOD_ID, name = FluidMech.MOD_NAME, version = FluidMech.VERSION, dependencies = "after:DarkCore", useMetadata = true)

4
src/dark/fluid/common/machines/BlockFM.java
View file

@ -1,10 +1,10 @@
package dark.fluid.common.machines;
import net.minecraft.block.material.Material;
import dark.core.common.DMCreativeTab;
import dark.core.ModObjectRegistry.BlockBuildData;
import dark.core.prefab.machine.BlockMachine;
import dark.core.registration.ModObjectRegistry.BlockBuildData;
import dark.fluid.common.FluidMech;
import dark.machines.common.DMCreativeTab;
public abstract class BlockFM extends BlockMachine
{

2
src/dark/fluid/common/machines/TileEntityReleaseValve.java
View file

@ -15,7 +15,7 @@ import dark.api.ColorCode;
import dark.api.ColorCode.IColorCoded;
import dark.api.IToolReadOut;
import dark.api.fluid.INetworkPipe;
import dark.api.parts.ITileConnector;
import dark.api.tilenetwork.ITileConnector;
import dark.core.helpers.ConnectionHelper;
import dark.core.prefab.tilenetwork.fluid.NetworkPipes;
import dark.fluid.common.prefab.TileEntityFluidDevice;

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

@ -15,9 +15,9 @@ import universalelectricity.prefab.network.IPacketReceiver;
import com.google.common.io.ByteArrayDataInput;
import dark.api.ColorCode;
import dark.core.common.DarkMain;
import dark.core.network.PacketHandler;
import dark.fluid.common.prefab.TileEntityFluidStorage;
import dark.machines.common.DarkMain;
public class TileEntitySink extends TileEntityFluidStorage implements IPacketReceiver
{

2
src/dark/fluid/common/machines/TileEntityTank.java
View file

@ -1,6 +1,6 @@
package dark.fluid.common.machines;
import dark.api.parts.ITileNetwork;
import dark.api.tilenetwork.ITileNetwork;
import dark.core.prefab.tilenetwork.fluid.NetworkFluidContainers;
import dark.fluid.common.prefab.TileEntityFluidNetworkTile;

2
src/dark/fluid/common/pipes/TileEntityPipe.java
View file

@ -9,7 +9,7 @@ import universalelectricity.core.vector.Vector3;
import dark.api.ColorCode;
import dark.api.ColorCode.IColorCoded;
import dark.api.fluid.INetworkPipe;
import dark.api.parts.ITileNetwork;
import dark.api.tilenetwork.ITileNetwork;
import dark.core.prefab.tilenetwork.fluid.NetworkPipes;
import dark.fluid.common.FluidPartsMaterial;
import dark.fluid.common.prefab.TileEntityFluidNetworkTile;

2
src/dark/fluid/common/prefab/TileEntityFluidDevice.java
View file

@ -6,7 +6,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraftforge.common.ForgeDirection;
import universalelectricity.prefab.tile.TileEntityAdvanced;
import dark.api.IToolReadOut;
import dark.api.parts.ITileConnector;
import dark.api.tilenetwork.ITileConnector;
import dark.core.prefab.tilenetwork.NetworkTileEntities;
public abstract class TileEntityFluidDevice extends TileEntityAdvanced implements IToolReadOut, ITileConnector

8
src/dark/fluid/common/prefab/TileEntityFluidNetworkTile.java
View file

@ -27,15 +27,15 @@ import com.google.common.io.ByteArrayDataInput;
import cpw.mods.fml.common.network.Player;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.api.fluid.FluidMasterList;
import dark.api.FluidMasterList;
import dark.api.fluid.INetworkFluidPart;
import dark.api.parts.INetworkPart;
import dark.api.parts.ITileNetwork;
import dark.core.common.DarkMain;
import dark.api.tilenetwork.INetworkPart;
import dark.api.tilenetwork.ITileNetwork;
import dark.core.network.ISimplePacketReceiver;
import dark.core.network.PacketHandler;
import dark.core.prefab.tilenetwork.fluid.NetworkFluidTiles;
import dark.fluid.common.FluidPartsMaterial;
import dark.machines.common.DarkMain;
public abstract class TileEntityFluidNetworkTile extends TileEntityFluidDevice implements INetworkFluidPart, ISimplePacketReceiver
{

2
src/dark/fluid/common/pump/TileEntityConstructionPump.java
View file

@ -20,7 +20,7 @@ import com.builtbroken.common.Pair;
import dark.api.fluid.IDrain;
import dark.api.fluid.INetworkPipe;
import dark.api.parts.ITileConnector;
import dark.api.tilenetwork.ITileConnector;
import dark.core.prefab.tilenetwork.fluid.NetworkFluidTiles;
public class TileEntityConstructionPump extends TileEntityStarterPump implements IFluidHandler, ITileConnector

4
src/dark/fluid/common/pump/TileEntityStarterPump.java
View file

@ -16,10 +16,10 @@ import com.builtbroken.common.Pair;
import dark.api.IToolReadOut;
import dark.api.fluid.IDrain;
import dark.api.parts.ITileConnector;
import dark.core.common.ExternalModHandler;
import dark.api.tilenetwork.ITileConnector;
import dark.core.prefab.fluids.FluidHelper;
import dark.core.prefab.machine.TileEntityEnergyMachine;
import dark.machines.common.ExternalModHandler;
public class TileEntityStarterPump extends TileEntityEnergyMachine implements IToolReadOut, ITileConnector
{