From 8677d4e5b25525460883de4114951ed78ad3eff6 Mon Sep 17 00:00:00 2001 From: DarkGuardsman Date: Thu, 29 Aug 2013 17:23:42 -0400 Subject: [PATCH] changed block registration to custom system --- src/dark/api/fluid/INetworkFluidPart.java | 4 +- .../network/fluid/HydraulicNetworkHelper.java | 2 +- .../network/fluid/NetworkFluidContainers.java | 4 +- .../core/network/fluid/NetworkFluidTiles.java | 4 +- src/dark/core/network/fluid/NetworkPipes.java | 4 +- .../client/render/RenderReleaseValve.java | 2 +- src/dark/fluid/client/render/RenderTank.java | 2 +- .../fluid/client/render/pipe/RenderPipe.java | 2 +- src/dark/fluid/common/BlockFM.java | 2 +- src/dark/fluid/common/FMRecipeLoader.java | 2 +- src/dark/fluid/common/FluidMech.java | 60 ++++++++----------- src/dark/fluid/common/machines/BlockTank.java | 2 +- .../machines/TileEntityReleaseValve.java | 8 +-- .../fluid/common/machines/TileEntitySink.java | 2 +- .../machines/TileEntitySteamPiston.java | 2 +- .../fluid/common/machines/TileEntityTank.java | 6 +- .../common/pipes/TileEntityGenericPipe.java | 2 +- .../fluid/common/pipes/TileEntityPipe.java | 8 +-- .../common/prefab/TileEntityFluidDevice.java | 4 +- .../common/prefab/TileEntityFluidStorage.java | 2 +- .../pump/TileEntityConstructionPump.java | 2 +- .../common/pump/TileEntityStarterPump.java | 6 +- 22 files changed, 61 insertions(+), 71 deletions(-) diff --git a/src/dark/api/fluid/INetworkFluidPart.java b/src/dark/api/fluid/INetworkFluidPart.java index 352e2492d..38d602cac 100644 --- a/src/dark/api/fluid/INetworkFluidPart.java +++ b/src/dark/api/fluid/INetworkFluidPart.java @@ -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.api.IColorCoded; -import dark.api.INetworkPart; +import dark.interfaces.IColorCoded; +import dark.interfaces.INetworkPart; public interface INetworkFluidPart extends IColorCoded, IFluidHandler, INetworkPart { diff --git a/src/dark/core/network/fluid/HydraulicNetworkHelper.java b/src/dark/core/network/fluid/HydraulicNetworkHelper.java index af99a9a97..9a07f0668 100644 --- a/src/dark/core/network/fluid/HydraulicNetworkHelper.java +++ b/src/dark/core/network/fluid/HydraulicNetworkHelper.java @@ -4,8 +4,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; import universalelectricity.core.vector.Vector3; import universalelectricity.core.vector.VectorHelper; -import dark.api.INetworkPart; import dark.core.tile.network.NetworkTileEntities; +import dark.interfaces.INetworkPart; public class HydraulicNetworkHelper { diff --git a/src/dark/core/network/fluid/NetworkFluidContainers.java b/src/dark/core/network/fluid/NetworkFluidContainers.java index 9973330fc..00b99628d 100644 --- a/src/dark/core/network/fluid/NetworkFluidContainers.java +++ b/src/dark/core/network/fluid/NetworkFluidContainers.java @@ -7,10 +7,10 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; -import dark.api.ColorCode; -import dark.api.INetworkPart; import dark.api.fluid.INetworkFluidPart; import dark.core.tile.network.NetworkTileEntities; +import dark.interfaces.ColorCode; +import dark.interfaces.INetworkPart; /** 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 diff --git a/src/dark/core/network/fluid/NetworkFluidTiles.java b/src/dark/core/network/fluid/NetworkFluidTiles.java index 820b7a2a2..e576e5596 100644 --- a/src/dark/core/network/fluid/NetworkFluidTiles.java +++ b/src/dark/core/network/fluid/NetworkFluidTiles.java @@ -18,8 +18,6 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.IFluidHandler; import universalelectricity.core.vector.Vector3; -import dark.api.ColorCode; -import dark.api.INetworkPart; import dark.api.fluid.AdvancedFluidEvent; import dark.api.fluid.AdvancedFluidEvent.FluidMergeEvent; import dark.api.fluid.INetworkFluidPart; @@ -28,6 +26,8 @@ import dark.core.helpers.Pair; import dark.core.tile.network.NetworkTileEntities; import dark.fluid.common.machines.TileEntityTank; import dark.fluid.common.pipes.TileEntityPipe; +import dark.interfaces.ColorCode; +import dark.interfaces.INetworkPart; public class NetworkFluidTiles extends NetworkTileEntities { diff --git a/src/dark/core/network/fluid/NetworkPipes.java b/src/dark/core/network/fluid/NetworkPipes.java index a36c32998..cb63df2fc 100644 --- a/src/dark/core/network/fluid/NetworkPipes.java +++ b/src/dark/core/network/fluid/NetworkPipes.java @@ -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.helpers.ConnectionHelper; import dark.core.helpers.FluidHelper; import dark.core.helpers.FluidRestrictionHandler; import dark.core.tile.network.NetworkTileEntities; +import dark.interfaces.ColorCode; +import dark.interfaces.INetworkPart; /** 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 diff --git a/src/dark/fluid/client/render/RenderReleaseValve.java b/src/dark/fluid/client/render/RenderReleaseValve.java index 1708b4c91..18ac1e4ee 100644 --- a/src/dark/fluid/client/render/RenderReleaseValve.java +++ b/src/dark/fluid/client/render/RenderReleaseValve.java @@ -7,12 +7,12 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import dark.api.ColorCode; import dark.client.renders.RenderMachine; 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.interfaces.ColorCode; @SideOnly(Side.CLIENT) public class RenderReleaseValve extends RenderMachine diff --git a/src/dark/fluid/client/render/RenderTank.java b/src/dark/fluid/client/render/RenderTank.java index b4ff0b975..e77248114 100644 --- a/src/dark/fluid/client/render/RenderTank.java +++ b/src/dark/fluid/client/render/RenderTank.java @@ -9,12 +9,12 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import dark.api.ColorCode; import dark.client.renders.FluidBlockRenderer; import dark.client.renders.RenderMachine; import dark.fluid.client.model.ModelTankSide; import dark.fluid.common.FluidMech; import dark.fluid.common.machines.TileEntityTank; +import dark.interfaces.ColorCode; @SideOnly(Side.CLIENT) public class RenderTank extends RenderMachine diff --git a/src/dark/fluid/client/render/pipe/RenderPipe.java b/src/dark/fluid/client/render/pipe/RenderPipe.java index 23d392ef8..490f9f0b7 100644 --- a/src/dark/fluid/client/render/pipe/RenderPipe.java +++ b/src/dark/fluid/client/render/pipe/RenderPipe.java @@ -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.api.ColorCode; import dark.client.renders.RenderMachine; import dark.core.helpers.FluidRestrictionHandler; 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.interfaces.ColorCode; @SideOnly(Side.CLIENT) public class RenderPipe extends RenderMachine diff --git a/src/dark/fluid/common/BlockFM.java b/src/dark/fluid/common/BlockFM.java index c6f4e0636..54c682f44 100644 --- a/src/dark/fluid/common/BlockFM.java +++ b/src/dark/fluid/common/BlockFM.java @@ -1,7 +1,7 @@ package dark.fluid.common; import net.minecraft.block.material.Material; -import dark.core.blocks.BlockMachine; +import dark.prefab.BlockMachine; public abstract class BlockFM extends BlockMachine { diff --git a/src/dark/fluid/common/FMRecipeLoader.java b/src/dark/fluid/common/FMRecipeLoader.java index c1f132363..e3448d2f1 100644 --- a/src/dark/fluid/common/FMRecipeLoader.java +++ b/src/dark/fluid/common/FMRecipeLoader.java @@ -5,11 +5,11 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.ShapedOreRecipe; import cpw.mods.fml.common.registry.GameRegistry; -import dark.api.ColorCode; import dark.core.CoreRecipeLoader; import dark.core.RecipeLoader; import dark.core.items.ItemParts.Parts; import dark.fluid.common.machines.BlockFluid; +import dark.interfaces.ColorCode; public class FMRecipeLoader extends RecipeLoader { diff --git a/src/dark/fluid/common/FluidMech.java b/src/dark/fluid/common/FluidMech.java index df72a6387..7c3409bf0 100644 --- a/src/dark/fluid/common/FluidMech.java +++ b/src/dark/fluid/common/FluidMech.java @@ -1,7 +1,9 @@ package dark.fluid.common; import java.io.File; +import java.util.ArrayList; import java.util.Arrays; +import java.util.List; import java.util.logging.Logger; import net.minecraft.creativetab.CreativeTabs; @@ -26,9 +28,11 @@ 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.core.CoreRecipeLoader; import dark.core.DarkMain; -import dark.core.ModPrefab; +import dark.core.BlockRegistry.BlockData; import dark.core.items.ItemBlockHolder; +import dark.core.items.ItemBlockOre; import dark.fluid.common.machines.BlockBoiler; import dark.fluid.common.machines.BlockFluid; import dark.fluid.common.machines.BlockReleaseValve; @@ -52,6 +56,7 @@ import dark.fluid.common.pump.TileEntityDrain; import dark.fluid.common.pump.TileEntityStarterPump; import dark.mech.common.machines.BlockGenerator; import dark.mech.common.machines.BlockRod; +import dark.prefab.ModPrefab; @ModstatInfo(prefix = "fluidmech") @Mod(modid = FluidMech.MOD_ID, name = FluidMech.MOD_NAME, version = DarkMain.VERSION, dependencies = "after:DarkCore", useMetadata = true) @@ -95,19 +100,7 @@ public class FluidMech extends ModPrefab super.preInit(event); /* BLOCK REGISTER CALLS */ - GameRegistry.registerBlock(FMRecipeLoader.blockPipe, ItemBlockPipe.class, "lmPipe"); - GameRegistry.registerBlock(FMRecipeLoader.blockGenPipe, ItemBlockPipe.class, "lmGenPipe"); - GameRegistry.registerBlock(FMRecipeLoader.blockReleaseValve, ItemBlockHolder.class, "eValve"); - GameRegistry.registerBlock(FMRecipeLoader.blockRod, "mechRod"); - GameRegistry.registerBlock(FMRecipeLoader.blockGenerator, "lmGen"); - GameRegistry.registerBlock(FMRecipeLoader.blockMachine, ItemBlockHolder.class, "lmMachines"); - GameRegistry.registerBlock(FMRecipeLoader.blockTank, ItemBlockHolder.class, "lmTank"); - GameRegistry.registerBlock(FMRecipeLoader.blockSink, "lmSink"); - GameRegistry.registerBlock(FMRecipeLoader.blockDrain, "lmDrain"); - GameRegistry.registerBlock(FMRecipeLoader.blockConPump, "lmConPump"); - GameRegistry.registerBlock(FMRecipeLoader.blockHeater, "SPHeater"); - GameRegistry.registerBlock(FMRecipeLoader.blockPiston, "SPPiston"); - GameRegistry.registerBlock(FMRecipeLoader.blockBoiler, "SPBoiler"); + proxy.preInit(); } @@ -116,24 +109,8 @@ public class FluidMech extends ModPrefab public void init(FMLInitializationEvent event) { super.init(event); - /* LOGGER */ - FMLog.info("Loading..."); proxy.Init(); - /* TILE ENTITY REGISTER CALLS */ - GameRegistry.registerTileEntity(TileEntityPipe.class, "FluidPipe"); - GameRegistry.registerTileEntity(TileEntityGenericPipe.class, "ColoredPipe"); - GameRegistry.registerTileEntity(TileEntityStarterPump.class, "starterPump"); - GameRegistry.registerTileEntity(TileEntityReleaseValve.class, "ReleaseValve"); - GameRegistry.registerTileEntity(TileEntityTank.class, "FluidTank"); - GameRegistry.registerTileEntity(TileEntitySink.class, "FluidSink"); - GameRegistry.registerTileEntity(TileEntityDrain.class, "FluidDrain"); - GameRegistry.registerTileEntity(TileEntityConstructionPump.class, "ConstructionPump"); - - GameRegistry.registerTileEntity(TileEntityBoiler.class, "FMSteamBoiler"); - //GameRegistry.registerTileEntity(TileEntityFireBox.class, "FMFireBox"); - GameRegistry.registerTileEntity(TileEntitySteamPiston.class, "FMSteamPiston"); - /* LANG LOADING */ FMLog.info(" Loaded: " + TranslationHelper.loadLanguages(LANGUAGE_PATH, LANGUAGES_SUPPORTED) + " Languages."); @@ -143,8 +120,6 @@ public class FluidMech extends ModPrefab public void postInit(FMLPostInitializationEvent event) { super.postInit(event); - /* LOGGER */ - FMLog.info("Finalizing..."); proxy.postInit(); /* /******** RECIPES ************* */ @@ -154,8 +129,9 @@ public class FluidMech extends ModPrefab } @Override - public void loadConfig() + public List getBlocks() { + List dataList = new ArrayList(); if (recipeLoader == null) { recipeLoader = new FMRecipeLoader(); @@ -188,9 +164,23 @@ public class FluidMech extends ModPrefab FMRecipeLoader.blockPiston = new BlockSteamPiston(getNextID()); FMRecipeLoader.blockBoiler = new BlockBoiler(getNextID()); + dataList.add(new BlockData(FMRecipeLoader.blockPipe, ItemBlockPipe.class, "lmPipe").addTileEntity(TileEntityPipe.class, "FluidPipe")); + dataList.add(new BlockData(FMRecipeLoader.blockGenPipe, ItemBlockPipe.class, "lmGenPipe").addTileEntity(TileEntityGenericPipe.class, "ColoredPipe")); + dataList.add(new BlockData(FMRecipeLoader.blockReleaseValve, ItemBlockHolder.class, "eValve").addTileEntity(TileEntityReleaseValve.class, "ReleaseValve")); + dataList.add(new BlockData(FMRecipeLoader.blockRod, "mechRod")); + dataList.add(new BlockData(FMRecipeLoader.blockGenerator, "mechGenerator")); + dataList.add(new BlockData(FMRecipeLoader.blockMachine, ItemBlockHolder.class, "lmMachines").addTileEntity(TileEntityStarterPump.class, "starterPump")); + dataList.add(new BlockData(FMRecipeLoader.blockTank, ItemBlockHolder.class, "lmTank").addTileEntity(TileEntityTank.class, "FluidTank")); + dataList.add(new BlockData(FMRecipeLoader.blockSink, "lmSink").addTileEntity(TileEntitySink.class, "FluidSink")); + dataList.add(new BlockData(FMRecipeLoader.blockDrain, "lmDrain").addTileEntity(TileEntityDrain.class, "FluidDrain")); + dataList.add(new BlockData(FMRecipeLoader.blockConPump, "lmConPump").addTileEntity(TileEntityConstructionPump.class, "ConstructionPump")); + dataList.add(new BlockData(FMRecipeLoader.blockHeater, "SPHeater")); + dataList.add(new BlockData(FMRecipeLoader.blockPiston, "SPPiston").addTileEntity(TileEntitySteamPiston.class, "FMSteamPiston")); + dataList.add(new BlockData(FMRecipeLoader.blockBoiler, "SPBoiler").addTileEntity(TileEntityBoiler.class, "FMSteamBoiler")); + /* ITEM DECLARATION */ CONFIGURATION.save(); - + return dataList; } @Override @@ -211,7 +201,7 @@ public class FluidMech extends ModPrefab } - public static final CreativeTabs TabFluidMech = new CreativeTabs("Fluid Mechanics") + public static final CreativeTabs TabFluidMech = new CreativeTabs("Hydraulics") { public ItemStack getIconItemStack() { diff --git a/src/dark/fluid/common/machines/BlockTank.java b/src/dark/fluid/common/machines/BlockTank.java index 734a557d3..7900a13dc 100644 --- a/src/dark/fluid/common/machines/BlockTank.java +++ b/src/dark/fluid/common/machines/BlockTank.java @@ -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.api.INetworkPart; import dark.core.helpers.AutoCraftingManager; import dark.core.helpers.FluidHelper; import dark.core.helpers.FluidRestrictionHandler; import dark.fluid.client.render.BlockRenderHelper; import dark.fluid.common.BlockFM; +import dark.interfaces.INetworkPart; public class BlockTank extends BlockFM { diff --git a/src/dark/fluid/common/machines/TileEntityReleaseValve.java b/src/dark/fluid/common/machines/TileEntityReleaseValve.java index 5edb8270b..e38c4066d 100644 --- a/src/dark/fluid/common/machines/TileEntityReleaseValve.java +++ b/src/dark/fluid/common/machines/TileEntityReleaseValve.java @@ -10,14 +10,14 @@ 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.helpers.ConnectionHelper; import dark.core.network.fluid.NetworkPipes; import dark.fluid.common.prefab.TileEntityFluidDevice; +import dark.interfaces.ColorCode; +import dark.interfaces.IColorCoded; +import dark.interfaces.ITileConnector; +import dark.interfaces.IToolReadOut; public class TileEntityReleaseValve extends TileEntityFluidDevice implements ITileConnector, IToolReadOut { diff --git a/src/dark/fluid/common/machines/TileEntitySink.java b/src/dark/fluid/common/machines/TileEntitySink.java index e5373b81b..120402786 100644 --- a/src/dark/fluid/common/machines/TileEntitySink.java +++ b/src/dark/fluid/common/machines/TileEntitySink.java @@ -15,9 +15,9 @@ import universalelectricity.prefab.network.PacketManager; import com.google.common.io.ByteArrayDataInput; -import dark.api.ColorCode; import dark.fluid.common.FluidMech; import dark.fluid.common.prefab.TileEntityFluidStorage; +import dark.interfaces.ColorCode; public class TileEntitySink extends TileEntityFluidStorage implements IPacketReceiver { diff --git a/src/dark/fluid/common/machines/TileEntitySteamPiston.java b/src/dark/fluid/common/machines/TileEntitySteamPiston.java index 9b84f3644..723b8d2e3 100644 --- a/src/dark/fluid/common/machines/TileEntitySteamPiston.java +++ b/src/dark/fluid/common/machines/TileEntitySteamPiston.java @@ -1,7 +1,7 @@ package dark.fluid.common.machines; -import dark.core.blocks.TileEntityMachine; import dark.fluid.common.FluidMech; +import dark.prefab.TileEntityMachine; public class TileEntitySteamPiston extends TileEntityMachine { diff --git a/src/dark/fluid/common/machines/TileEntityTank.java b/src/dark/fluid/common/machines/TileEntityTank.java index f78006e9e..c70d56f72 100644 --- a/src/dark/fluid/common/machines/TileEntityTank.java +++ b/src/dark/fluid/common/machines/TileEntityTank.java @@ -29,9 +29,6 @@ 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.helpers.FluidRestrictionHandler; @@ -40,6 +37,9 @@ 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.interfaces.ColorCode; +import dark.interfaces.IColorCoded; +import dark.interfaces.IToolReadOut; public class TileEntityTank extends TileEntityFluidStorage implements IFluidHandler, IToolReadOut, IColorCoded, INetworkFluidPart, IPacketReceiver { diff --git a/src/dark/fluid/common/pipes/TileEntityGenericPipe.java b/src/dark/fluid/common/pipes/TileEntityGenericPipe.java index 9d7b23a84..ee5c6d4d3 100644 --- a/src/dark/fluid/common/pipes/TileEntityGenericPipe.java +++ b/src/dark/fluid/common/pipes/TileEntityGenericPipe.java @@ -7,8 +7,8 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import universalelectricity.core.vector.Vector3; import universalelectricity.core.vector.VectorHelper; -import dark.api.ColorCode; import dark.core.network.fluid.NetworkPipes; +import dark.interfaces.ColorCode; public class TileEntityGenericPipe extends TileEntityPipe { diff --git a/src/dark/fluid/common/pipes/TileEntityPipe.java b/src/dark/fluid/common/pipes/TileEntityPipe.java index 489aa3891..8b7c18517 100644 --- a/src/dark/fluid/common/pipes/TileEntityPipe.java +++ b/src/dark/fluid/common/pipes/TileEntityPipe.java @@ -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.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.interfaces.ColorCode; +import dark.interfaces.IColorCoded; +import dark.interfaces.ITileConnector; +import dark.interfaces.IToolReadOut; public class TileEntityPipe extends TileEntityAdvanced implements IFluidHandler, IToolReadOut, IColorCoded, INetworkPipe, IPacketReceiver { diff --git a/src/dark/fluid/common/prefab/TileEntityFluidDevice.java b/src/dark/fluid/common/prefab/TileEntityFluidDevice.java index a0ad4c324..d8b4a746c 100644 --- a/src/dark/fluid/common/prefab/TileEntityFluidDevice.java +++ b/src/dark/fluid/common/prefab/TileEntityFluidDevice.java @@ -5,9 +5,9 @@ import java.util.Random; import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.common.ForgeDirection; import universalelectricity.prefab.tile.TileEntityAdvanced; -import dark.api.ITileConnector; -import dark.api.IToolReadOut; import dark.core.network.fluid.HydraulicNetworkHelper; +import dark.interfaces.ITileConnector; +import dark.interfaces.IToolReadOut; public abstract class TileEntityFluidDevice extends TileEntityAdvanced implements IToolReadOut, ITileConnector { diff --git a/src/dark/fluid/common/prefab/TileEntityFluidStorage.java b/src/dark/fluid/common/prefab/TileEntityFluidStorage.java index 44bef3919..62624a433 100644 --- a/src/dark/fluid/common/prefab/TileEntityFluidStorage.java +++ b/src/dark/fluid/common/prefab/TileEntityFluidStorage.java @@ -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.api.IColorCoded; import dark.core.helpers.FluidHelper; import dark.core.helpers.FluidRestrictionHandler; +import dark.interfaces.IColorCoded; public abstract class TileEntityFluidStorage extends TileEntityFluidDevice implements IFluidHandler, IColorCoded { diff --git a/src/dark/fluid/common/pump/TileEntityConstructionPump.java b/src/dark/fluid/common/pump/TileEntityConstructionPump.java index 5b56f90fc..105fab780 100644 --- a/src/dark/fluid/common/pump/TileEntityConstructionPump.java +++ b/src/dark/fluid/common/pump/TileEntityConstructionPump.java @@ -14,13 +14,13 @@ 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.IDrain; import dark.api.fluid.INetworkPipe; import dark.core.helpers.MetaGroup; import dark.core.helpers.Pair; import dark.core.network.fluid.HydraulicNetworkHelper; import dark.core.network.fluid.NetworkFluidTiles; +import dark.interfaces.ITileConnector; public class TileEntityConstructionPump extends TileEntityStarterPump implements IFluidHandler, ITileConnector { diff --git a/src/dark/fluid/common/pump/TileEntityStarterPump.java b/src/dark/fluid/common/pump/TileEntityStarterPump.java index d151193ae..acc34b1a0 100644 --- a/src/dark/fluid/common/pump/TileEntityStarterPump.java +++ b/src/dark/fluid/common/pump/TileEntityStarterPump.java @@ -11,13 +11,13 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; import universalelectricity.core.vector.Vector3; -import dark.api.ITileConnector; -import dark.api.IToolReadOut; import dark.api.fluid.IDrain; -import dark.core.blocks.TileEntityMachine; import dark.core.helpers.FluidHelper; import dark.core.helpers.Pair; import dark.fluid.common.FluidMech; +import dark.interfaces.ITileConnector; +import dark.interfaces.IToolReadOut; +import dark.prefab.TileEntityMachine; public class TileEntityStarterPump extends TileEntityMachine implements IToolReadOut, ITileConnector {