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

Clean up and import changes

Browse source
This commit is contained in:
DarkGuardsman 2013-12-18 16:01:20 -05:00
parent bcb2dc9611
commit da08059eb9
21 changed files with 62 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,10 +1,11 @@
package dark.api.fluid;
import com.dark.tile.network.INetworkPart;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler;
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/FluidCraftingHandler.java
View file

@ -13,8 +13,8 @@ import net.minecraftforge.fluids.FluidStack;
import com.builtbroken.common.Pair;
import com.builtbroken.common.Triple;
import com.dark.fluid.FluidHelper;
import dark.core.prefab.fluids.FluidHelper;
import dark.core.prefab.tilenetwork.fluid.FluidRecipeInfo.SimpleFluidRecipe;
/** Handles all kinds of process involving mixing Fluids with other fluids and/or Items, Blocks,

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

@ -3,13 +3,14 @@ package dark.core.prefab.tilenetwork.fluid;
import java.util.ArrayList;
import java.util.List;
import com.dark.fluid.FluidHelper;
import com.dark.prefab.tile.network.NetworkUpdateHandler;
import com.dark.tile.network.INetworkPart;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidHandler;
import dark.api.fluid.INetworkFluidPart;
import dark.api.tilenetwork.INetworkPart;
import dark.core.prefab.fluids.FluidHelper;
import dark.core.prefab.tilenetwork.NetworkUpdateHandler;
/** Basically the same as network Fluid tiles class with the only difference being in how it stores
* the fluid. When it goes to sort the fluid it will use the fluid properties to adjust its position

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

@ -4,6 +4,12 @@ import java.util.EnumSet;
import java.util.HashMap;
import java.util.Iterator;
import com.dark.fluid.FluidHelper;
import com.dark.prefab.tile.network.NetworkTileEntities;
import com.dark.prefab.tile.network.NetworkUpdateHandler;
import com.dark.tile.network.INetworkPart;
import com.dark.tile.network.ITileNetwork;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
@ -13,11 +19,6 @@ import net.minecraftforge.fluids.FluidTank;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler;
import dark.api.fluid.INetworkFluidPart;
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;
public class NetworkFluidTiles extends NetworkTileEntities
{

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

@ -3,15 +3,16 @@ package dark.core.prefab.tilenetwork.fluid;
import java.util.EnumSet;
import java.util.Map.Entry;
import com.dark.fluid.FluidHelper;
import com.dark.prefab.tile.network.NetworkUpdateHandler;
import com.dark.tile.network.INetworkPart;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidHandler;
import dark.api.fluid.INetworkPipe;
import dark.api.tilenetwork.INetworkPart;
import dark.core.prefab.fluids.FluidHelper;
import dark.core.prefab.tilenetwork.NetworkUpdateHandler;
/** Extension on the fluid container network to provide a more advanced reaction to fluid passing
* threw each pipe. As well this doubled as a pressure network for those machines that support the

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

@ -12,7 +12,9 @@ import org.modstats.ModstatInfo;
import universalelectricity.prefab.TranslationHelper;
import com.dark.DarkCore;
import com.dark.ModObjectRegistry;
import com.dark.CoreRegistry;
import com.dark.IndustryCreativeTab;
import com.dark.prefab.ItemBlockHolder;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.Mod;
@ -25,8 +27,6 @@ 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.DMCreativeTab;
import dark.core.prefab.ItemBlockHolder;
import dark.core.prefab.ModPrefab;
import dark.fluid.common.machines.BlockReleaseValve;
import dark.fluid.common.machines.BlockSink;
@ -106,7 +106,7 @@ public class FluidMech extends ModPrefab
FMLog.info(" Loaded: " + TranslationHelper.loadLanguages(LANGUAGE_PATH, LANGUAGES_SUPPORTED) + " Languages.");
if (FMRecipeLoader.blockPipe instanceof BlockPipe)
{
DMCreativeTab.tabHydraulic().setIconItemStack(FluidPartsMaterial.IRON.getStack());
IndustryCreativeTab.tabHydraulic().setIconItemStack(FluidPartsMaterial.IRON.getStack());
}
}
@ -132,16 +132,16 @@ public class FluidMech extends ModPrefab
}
CONFIGURATION.load();
FMRecipeLoader.blockWasteLiquid = ModObjectRegistry.createNewFluidBlock(FluidMech.MOD_ID, FluidMech.CONFIGURATION, new Fluid(WASTE_FLUID_NAME).setUnlocalizedName("fluid.waste.name").setDensity(1300).setViscosity(1800));
FMRecipeLoader.blockOilLiquid = ModObjectRegistry.createNewFluidBlock(FluidMech.MOD_ID, FluidMech.CONFIGURATION, new Fluid(OIL_FLUID_NAME).setUnlocalizedName("fluid.oil.name").setDensity(1500).setViscosity(4700));
FMRecipeLoader.blockWasteLiquid = CoreRegistry.createNewFluidBlock(FluidMech.MOD_ID, FluidMech.CONFIGURATION, new Fluid(WASTE_FLUID_NAME).setUnlocalizedName("fluid.waste.name").setDensity(1300).setViscosity(1800));
FMRecipeLoader.blockOilLiquid = CoreRegistry.createNewFluidBlock(FluidMech.MOD_ID, FluidMech.CONFIGURATION, new Fluid(OIL_FLUID_NAME).setUnlocalizedName("fluid.oil.name").setDensity(1500).setViscosity(4700));
FMRecipeLoader.blockPipe = ModObjectRegistry.createNewBlock("FMBlockPipe", FluidMech.MOD_ID, BlockPipe.class, ItemBlockPipe.class);
FMRecipeLoader.blockPumpMachine = ModObjectRegistry.createNewBlock("FMBlockPump", FluidMech.MOD_ID, BlockPumpMachine.class, ItemBlockHolder.class);
FMRecipeLoader.blockReleaseValve = ModObjectRegistry.createNewBlock("FMBlockReleaseValve", FluidMech.MOD_ID, BlockReleaseValve.class, ItemBlockHolder.class);
FMRecipeLoader.blockTank = ModObjectRegistry.createNewBlock("FMBlockTank", FluidMech.MOD_ID, BlockTank.class, ItemBlockPipe.class);
FMRecipeLoader.blockSink = ModObjectRegistry.createNewBlock("FMBlockSink", FluidMech.MOD_ID, BlockSink.class, ItemBlockHolder.class);
FMRecipeLoader.blockDrain = ModObjectRegistry.createNewBlock("FMBlockDrain", FluidMech.MOD_ID, BlockDrain.class, ItemBlockHolder.class);
FMRecipeLoader.blockConPump = ModObjectRegistry.createNewBlock("FMBlockConstructionPump", FluidMech.MOD_ID, BlockConstructionPump.class, ItemBlockHolder.class);
FMRecipeLoader.blockPipe = CoreRegistry.createNewBlock("FMBlockPipe", FluidMech.MOD_ID, BlockPipe.class, ItemBlockPipe.class);
FMRecipeLoader.blockPumpMachine = CoreRegistry.createNewBlock("FMBlockPump", FluidMech.MOD_ID, BlockPumpMachine.class, ItemBlockHolder.class);
FMRecipeLoader.blockReleaseValve = CoreRegistry.createNewBlock("FMBlockReleaseValve", FluidMech.MOD_ID, BlockReleaseValve.class, ItemBlockHolder.class);
FMRecipeLoader.blockTank = CoreRegistry.createNewBlock("FMBlockTank", FluidMech.MOD_ID, BlockTank.class, ItemBlockPipe.class);
FMRecipeLoader.blockSink = CoreRegistry.createNewBlock("FMBlockSink", FluidMech.MOD_ID, BlockSink.class, ItemBlockHolder.class);
FMRecipeLoader.blockDrain = CoreRegistry.createNewBlock("FMBlockDrain", FluidMech.MOD_ID, BlockDrain.class, ItemBlockHolder.class);
FMRecipeLoader.blockConPump = CoreRegistry.createNewBlock("FMBlockConstructionPump", FluidMech.MOD_ID, BlockConstructionPump.class, ItemBlockHolder.class);
CONFIGURATION.save();
}

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

@ -1,7 +1,8 @@
package dark.fluid.common.machines;
import com.dark.IndustryCreativeTab;
import net.minecraft.block.material.Material;
import dark.core.DMCreativeTab;
import dark.core.prefab.machine.BlockMachine;
import dark.fluid.common.FluidMech;
@ -11,6 +12,6 @@ public abstract class BlockFM extends BlockMachine
public BlockFM(String name, Material material)
{
super(FluidMech.CONFIGURATION, name, material);
this.setCreativeTab(DMCreativeTab.tabHydraulic());
this.setCreativeTab(IndustryCreativeTab.tabHydraulic());
}
}

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

@ -13,10 +13,10 @@ import net.minecraft.world.World;
import universalelectricity.prefab.tile.TileEntityAdvanced;
import com.builtbroken.common.Pair;
import com.dark.fluid.FluidHelper;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.core.prefab.fluids.FluidHelper;
import dark.fluid.client.render.BlockRenderHelper;
public class BlockSink extends BlockFM

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

@ -15,11 +15,11 @@ import net.minecraftforge.common.Configuration;
import universalelectricity.core.vector.Vector3;
import com.builtbroken.common.Pair;
import com.dark.fluid.FluidHelper;
import com.dark.helpers.ItemWorldHelper;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.core.helpers.ItemWorldHelper;
import dark.core.prefab.fluids.FluidHelper;
import dark.fluid.client.render.BlockRenderHelper;
import dark.fluid.common.FluidPartsMaterial;
import dark.fluid.common.pipes.ItemBlockPipe;

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

@ -1,5 +1,8 @@
package dark.fluid.common.machines;
import com.dark.helpers.ConnectionHelper;
import com.dark.tile.network.ITileConnector;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
@ -8,8 +11,6 @@ import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidHandler;
import dark.api.IToolReadOut;
import dark.api.fluid.INetworkPipe;
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

@ -12,10 +12,10 @@ import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import universalelectricity.prefab.network.IPacketReceiver;
import com.dark.network.PacketHandler;
import com.google.common.io.ByteArrayDataInput;
import dark.api.ColorCode;
import dark.core.network.PacketHandler;
import dark.fluid.common.prefab.TileEntityFluidStorage;
import dark.machines.DarkMain;

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

@ -1,10 +1,11 @@
package dark.fluid.common.machines;
import com.dark.tile.network.INetworkPart;
import com.dark.tile.network.ITileNetwork;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
import dark.api.fluid.INetworkFluidPart;
import dark.api.tilenetwork.INetworkPart;
import dark.api.tilenetwork.ITileNetwork;
import dark.core.prefab.tilenetwork.fluid.NetworkFluidContainers;
import dark.fluid.common.prefab.TileEntityFluidNetworkTile;

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

@ -1,5 +1,8 @@
package dark.fluid.common.pipes;
import com.dark.tile.network.ITileConnector;
import com.dark.tile.network.ITileNetwork;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.fluids.Fluid;
@ -9,8 +12,6 @@ import universalelectricity.core.vector.Vector3;
import dark.api.ColorCode;
import dark.api.ColorCode.IColorCoded;
import dark.api.fluid.INetworkPipe;
import dark.api.tilenetwork.ITileConnector;
import dark.api.tilenetwork.ITileNetwork;
import dark.core.prefab.tilenetwork.fluid.NetworkPipes;
import dark.fluid.common.FluidPartsMaterial;
import dark.fluid.common.prefab.TileEntityFluidNetworkTile;

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

@ -2,12 +2,13 @@ package dark.fluid.common.prefab;
import java.util.Random;
import com.dark.prefab.tile.network.NetworkTileEntities;
import com.dark.tile.network.ITileConnector;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraftforge.common.ForgeDirection;
import universalelectricity.prefab.tile.TileEntityAdvanced;
import dark.api.IToolReadOut;
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

@ -22,6 +22,10 @@ import org.bouncycastle.util.Arrays;
import universalelectricity.core.vector.Vector3;
import com.dark.network.ISimplePacketReceiver;
import com.dark.network.PacketHandler;
import com.dark.tile.network.INetworkPart;
import com.dark.tile.network.ITileNetwork;
import com.google.common.io.ByteArrayDataInput;
import cpw.mods.fml.common.network.Player;
@ -29,10 +33,6 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.api.FluidMasterList;
import dark.api.fluid.INetworkFluidPart;
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.DarkMain;

3
src/dark/fluid/common/prefab/TileEntityFluidStorage.java
View file

@ -1,5 +1,7 @@
package dark.fluid.common.prefab;
import com.dark.fluid.FluidHelper;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.common.ForgeDirection;
@ -11,7 +13,6 @@ import net.minecraftforge.fluids.FluidTank;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler;
import dark.api.ColorCode.IColorCoded;
import dark.core.prefab.fluids.FluidHelper;
public abstract class TileEntityFluidStorage extends TileEntityFluidDevice implements IFluidHandler, IColorCoded
{

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

@ -18,10 +18,10 @@ import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import com.builtbroken.common.Pair;
import com.dark.prefab.tile.network.NetworkTileEntities;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.core.prefab.tilenetwork.NetworkTileEntities;
import dark.fluid.client.render.BlockRenderHelper;
import dark.fluid.common.FMRecipeLoader;
import dark.fluid.common.FluidMech;

3
src/dark/fluid/common/pump/LiquidPathFinder.java
View file

@ -8,12 +8,13 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
import com.dark.fluid.FluidHelper;
import net.minecraft.world.World;
import net.minecraft.world.chunk.Chunk;
import net.minecraftforge.common.ForgeDirection;
import universalelectricity.core.vector.Vector2;
import universalelectricity.core.vector.Vector3;
import dark.core.prefab.fluids.FluidHelper;
/** A simpler path Finder used to find drainable or fillable tiles
*

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

@ -19,10 +19,10 @@ import universalelectricity.core.vector.Vector3;
import universalelectricity.core.vector.VectorHelper;
import com.builtbroken.common.Pair;
import com.dark.tile.network.ITileConnector;
import dark.api.fluid.IDrain;
import dark.api.fluid.INetworkPipe;
import dark.api.tilenetwork.ITileConnector;
import dark.core.prefab.tilenetwork.fluid.NetworkFluidTiles;
public class TileEntityConstructionPump extends TileEntityStarterPump implements IFluidHandler, ITileConnector

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

@ -18,9 +18,9 @@ import net.minecraftforge.fluids.IFluidHandler;
import universalelectricity.core.vector.Vector3;
import com.builtbroken.common.Pair;
import com.dark.fluid.FluidHelper;
import dark.api.fluid.IDrain;
import dark.core.prefab.fluids.FluidHelper;
import dark.fluid.common.prefab.TileEntityFluidDevice;
public class TileEntityDrain extends TileEntityFluidDevice implements IFluidHandler, IDrain

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

@ -13,11 +13,11 @@ import net.minecraftforge.fluids.IFluidHandler;
import universalelectricity.core.vector.Vector3;
import com.builtbroken.common.Pair;
import com.dark.fluid.FluidHelper;
import com.dark.tile.network.ITileConnector;
import dark.api.IToolReadOut;
import dark.api.fluid.IDrain;
import dark.api.tilenetwork.ITileConnector;
import dark.core.prefab.fluids.FluidHelper;
import dark.core.prefab.machine.TileEntityEnergyMachine;
public class TileEntityStarterPump extends TileEntityEnergyMachine implements IToolReadOut, ITileConnector