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 14:06:09 -05:00
parent 6d785adf35
commit 3fbcb21bde
6 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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.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;
import dark.core.basics.EnumMaterial;
import dark.core.basics.EnumOrePart;
import dark.core.basics.ItemParts;
import dark.core.basics.ItemParts.Parts;
import dark.core.prefab.RecipeLoader;
import dark.machines.CoreRecipeLoader;
public class FMRecipeLoader extends RecipeLoader
{

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

@ -21,6 +21,7 @@ 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.ModObjectRegistry;
import dark.core.prefab.ItemBlockHolder;
import dark.core.prefab.ModPrefab;
@ -32,8 +33,7 @@ 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;
import dark.machines.DarkMain;
@ModstatInfo(prefix = "fluidmech")
@Mod(modid = FluidMech.MOD_ID, name = FluidMech.MOD_NAME, version = FluidMech.VERSION, dependencies = "after:DarkCore", useMetadata = true)

2
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.DMCreativeTab;
import dark.core.ModObjectRegistry.BlockBuildData;
import dark.core.prefab.machine.BlockMachine;
import dark.fluid.common.FluidMech;
import dark.machines.common.DMCreativeTab;
public abstract class BlockFM extends BlockMachine
{

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

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

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

@ -35,7 +35,7 @@ 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;
import dark.machines.DarkMain;
public abstract class TileEntityFluidNetworkTile extends TileEntityFluidDevice implements INetworkFluidPart, ISimplePacketReceiver
{

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

@ -17,9 +17,9 @@ import com.builtbroken.common.Pair;
import dark.api.IToolReadOut;
import dark.api.fluid.IDrain;
import dark.api.tilenetwork.ITileConnector;
import dark.core.ExternalModHandler;
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
{