diff --git a/src/minecraft/hydraulic/Credits b/src/minecraft/dark/hydraulic/Credits similarity index 100% rename from src/minecraft/hydraulic/Credits rename to src/minecraft/dark/hydraulic/Credits diff --git a/src/minecraft/hydraulic/INFO.java b/src/minecraft/dark/hydraulic/INFO.java similarity index 94% rename from src/minecraft/hydraulic/INFO.java rename to src/minecraft/dark/hydraulic/INFO.java index 174b0e01..d0fd2a77 100644 --- a/src/minecraft/hydraulic/INFO.java +++ b/src/minecraft/dark/hydraulic/INFO.java @@ -1,4 +1,4 @@ -package hydraulic; +package dark.hydraulic; public class INFO { diff --git a/src/minecraft/hydraulic/api/ColorCode.java b/src/minecraft/dark/hydraulic/api/ColorCode.java similarity index 98% rename from src/minecraft/hydraulic/api/ColorCode.java rename to src/minecraft/dark/hydraulic/api/ColorCode.java index 54992315..80b58ff2 100644 --- a/src/minecraft/hydraulic/api/ColorCode.java +++ b/src/minecraft/dark/hydraulic/api/ColorCode.java @@ -1,4 +1,4 @@ -package hydraulic.api; +package dark.hydraulic.api; import net.minecraftforge.liquids.LiquidStack; diff --git a/src/minecraft/hydraulic/api/FluidRestrictionHandler.java b/src/minecraft/dark/hydraulic/api/FluidRestrictionHandler.java similarity index 98% rename from src/minecraft/hydraulic/api/FluidRestrictionHandler.java rename to src/minecraft/dark/hydraulic/api/FluidRestrictionHandler.java index fd1217c5..88b79797 100644 --- a/src/minecraft/hydraulic/api/FluidRestrictionHandler.java +++ b/src/minecraft/dark/hydraulic/api/FluidRestrictionHandler.java @@ -1,4 +1,4 @@ -package hydraulic.api; +package dark.hydraulic.api; import net.minecraftforge.event.ForgeSubscribe; import net.minecraftforge.liquids.LiquidDictionary; diff --git a/src/minecraft/hydraulic/api/IColorCoded.java b/src/minecraft/dark/hydraulic/api/IColorCoded.java similarity index 88% rename from src/minecraft/hydraulic/api/IColorCoded.java rename to src/minecraft/dark/hydraulic/api/IColorCoded.java index 92ced5bc..9264f3af 100644 --- a/src/minecraft/hydraulic/api/IColorCoded.java +++ b/src/minecraft/dark/hydraulic/api/IColorCoded.java @@ -1,4 +1,4 @@ -package hydraulic.api; +package dark.hydraulic.api; public interface IColorCoded diff --git a/src/minecraft/hydraulic/api/IDrain.java b/src/minecraft/dark/hydraulic/api/IDrain.java similarity index 98% rename from src/minecraft/hydraulic/api/IDrain.java rename to src/minecraft/dark/hydraulic/api/IDrain.java index 4fb3852f..ad62dc34 100644 --- a/src/minecraft/hydraulic/api/IDrain.java +++ b/src/minecraft/dark/hydraulic/api/IDrain.java @@ -1,4 +1,4 @@ -package hydraulic.api; +package dark.hydraulic.api; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.liquids.ITankContainer; diff --git a/src/minecraft/hydraulic/api/IHeatProducer.java b/src/minecraft/dark/hydraulic/api/IHeatProducer.java similarity index 91% rename from src/minecraft/hydraulic/api/IHeatProducer.java rename to src/minecraft/dark/hydraulic/api/IHeatProducer.java index 19eb6e30..16753223 100644 --- a/src/minecraft/hydraulic/api/IHeatProducer.java +++ b/src/minecraft/dark/hydraulic/api/IHeatProducer.java @@ -1,4 +1,4 @@ -package hydraulic.api; +package dark.hydraulic.api; import net.minecraftforge.common.ForgeDirection; diff --git a/src/minecraft/hydraulic/api/INetworkFluidPart.java b/src/minecraft/dark/hydraulic/api/INetworkFluidPart.java similarity index 94% rename from src/minecraft/hydraulic/api/INetworkFluidPart.java rename to src/minecraft/dark/hydraulic/api/INetworkFluidPart.java index 01471264..a8fcc56b 100644 --- a/src/minecraft/hydraulic/api/INetworkFluidPart.java +++ b/src/minecraft/dark/hydraulic/api/INetworkFluidPart.java @@ -1,4 +1,4 @@ -package hydraulic.api; +package dark.hydraulic.api; import net.minecraftforge.liquids.ILiquidTank; import net.minecraftforge.liquids.ITankContainer; diff --git a/src/minecraft/hydraulic/api/INetworkPart.java b/src/minecraft/dark/hydraulic/api/INetworkPart.java similarity index 87% rename from src/minecraft/hydraulic/api/INetworkPart.java rename to src/minecraft/dark/hydraulic/api/INetworkPart.java index 3da143c6..14e88f84 100644 --- a/src/minecraft/hydraulic/api/INetworkPart.java +++ b/src/minecraft/dark/hydraulic/api/INetworkPart.java @@ -1,6 +1,6 @@ -package hydraulic.api; +package dark.hydraulic.api; -import hydraulic.network.TileNetwork; +import dark.hydraulic.network.TileNetwork; import net.minecraft.tileentity.TileEntity; public interface INetworkPart extends ITileConnector diff --git a/src/minecraft/hydraulic/api/INetworkPipe.java b/src/minecraft/dark/hydraulic/api/INetworkPipe.java similarity index 97% rename from src/minecraft/hydraulic/api/INetworkPipe.java rename to src/minecraft/dark/hydraulic/api/INetworkPipe.java index e1d5c44a..61c3903f 100644 --- a/src/minecraft/hydraulic/api/INetworkPipe.java +++ b/src/minecraft/dark/hydraulic/api/INetworkPipe.java @@ -1,4 +1,4 @@ -package hydraulic.api; +package dark.hydraulic.api; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.liquids.LiquidStack; diff --git a/src/minecraft/hydraulic/api/IPsiReciever.java b/src/minecraft/dark/hydraulic/api/IPsiReciever.java similarity index 93% rename from src/minecraft/hydraulic/api/IPsiReciever.java rename to src/minecraft/dark/hydraulic/api/IPsiReciever.java index de9c8b29..4a55edca 100644 --- a/src/minecraft/hydraulic/api/IPsiReciever.java +++ b/src/minecraft/dark/hydraulic/api/IPsiReciever.java @@ -1,4 +1,4 @@ -package hydraulic.api; +package dark.hydraulic.api; /** diff --git a/src/minecraft/hydraulic/api/IReadOut.java b/src/minecraft/dark/hydraulic/api/IReadOut.java similarity index 94% rename from src/minecraft/hydraulic/api/IReadOut.java rename to src/minecraft/dark/hydraulic/api/IReadOut.java index 441886be..08b44814 100644 --- a/src/minecraft/hydraulic/api/IReadOut.java +++ b/src/minecraft/dark/hydraulic/api/IReadOut.java @@ -1,4 +1,4 @@ -package hydraulic.api; +package dark.hydraulic.api; import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.common.ForgeDirection; diff --git a/src/minecraft/hydraulic/api/ITileConnector.java b/src/minecraft/dark/hydraulic/api/ITileConnector.java similarity index 90% rename from src/minecraft/hydraulic/api/ITileConnector.java rename to src/minecraft/dark/hydraulic/api/ITileConnector.java index eed0bee7..533b3af5 100644 --- a/src/minecraft/hydraulic/api/ITileConnector.java +++ b/src/minecraft/dark/hydraulic/api/ITileConnector.java @@ -1,4 +1,4 @@ -package hydraulic.api; +package dark.hydraulic.api; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; diff --git a/src/minecraft/hydraulic/helpers/EntityBlock.java b/src/minecraft/dark/hydraulic/helpers/EntityBlock.java similarity index 98% rename from src/minecraft/hydraulic/helpers/EntityBlock.java rename to src/minecraft/dark/hydraulic/helpers/EntityBlock.java index ad016900..9248abc8 100644 --- a/src/minecraft/hydraulic/helpers/EntityBlock.java +++ b/src/minecraft/dark/hydraulic/helpers/EntityBlock.java @@ -7,7 +7,7 @@ * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package hydraulic.helpers; +package dark.hydraulic.helpers; import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/minecraft/hydraulic/helpers/FluidHelper.java b/src/minecraft/dark/hydraulic/helpers/FluidHelper.java similarity index 99% rename from src/minecraft/hydraulic/helpers/FluidHelper.java rename to src/minecraft/dark/hydraulic/helpers/FluidHelper.java index 9806e94c..094673dc 100644 --- a/src/minecraft/hydraulic/helpers/FluidHelper.java +++ b/src/minecraft/dark/hydraulic/helpers/FluidHelper.java @@ -1,4 +1,4 @@ -package hydraulic.helpers; +package dark.hydraulic.helpers; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; diff --git a/src/minecraft/hydraulic/helpers/LiquidRenderer.java b/src/minecraft/dark/hydraulic/helpers/LiquidRenderer.java similarity index 98% rename from src/minecraft/hydraulic/helpers/LiquidRenderer.java rename to src/minecraft/dark/hydraulic/helpers/LiquidRenderer.java index 2ed8d26e..fe628d5c 100644 --- a/src/minecraft/hydraulic/helpers/LiquidRenderer.java +++ b/src/minecraft/dark/hydraulic/helpers/LiquidRenderer.java @@ -5,9 +5,8 @@ * 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package hydraulic.helpers; +package dark.hydraulic.helpers; -import hydraulic.helpers.RenderEntityBlock.BlockInterface; import java.util.HashMap; import java.util.Map; @@ -23,6 +22,8 @@ import net.minecraftforge.liquids.LiquidStack; import org.lwjgl.opengl.GL11; +import dark.hydraulic.helpers.RenderEntityBlock.BlockInterface; + /** * * @author CovertJaguar diff --git a/src/minecraft/hydraulic/helpers/RenderEntityBlock.java b/src/minecraft/dark/hydraulic/helpers/RenderEntityBlock.java similarity index 99% rename from src/minecraft/hydraulic/helpers/RenderEntityBlock.java rename to src/minecraft/dark/hydraulic/helpers/RenderEntityBlock.java index ea5fc1d1..4f81f5d1 100644 --- a/src/minecraft/hydraulic/helpers/RenderEntityBlock.java +++ b/src/minecraft/dark/hydraulic/helpers/RenderEntityBlock.java @@ -7,7 +7,7 @@ * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package hydraulic.helpers; +package dark.hydraulic.helpers; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; diff --git a/src/minecraft/hydraulic/helpers/TankHelper.java b/src/minecraft/dark/hydraulic/helpers/TankHelper.java similarity index 98% rename from src/minecraft/hydraulic/helpers/TankHelper.java rename to src/minecraft/dark/hydraulic/helpers/TankHelper.java index 5a569f18..0b92555f 100644 --- a/src/minecraft/hydraulic/helpers/TankHelper.java +++ b/src/minecraft/dark/hydraulic/helpers/TankHelper.java @@ -1,4 +1,4 @@ -package hydraulic.helpers; +package dark.hydraulic.helpers; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; diff --git a/src/minecraft/hydraulic/network/ContainerNetwork.java b/src/minecraft/dark/hydraulic/network/ContainerNetwork.java similarity index 96% rename from src/minecraft/hydraulic/network/ContainerNetwork.java rename to src/minecraft/dark/hydraulic/network/ContainerNetwork.java index 3dd3356f..4f75c681 100644 --- a/src/minecraft/hydraulic/network/ContainerNetwork.java +++ b/src/minecraft/dark/hydraulic/network/ContainerNetwork.java @@ -1,13 +1,14 @@ -package hydraulic.network; +package dark.hydraulic.network; import java.util.ArrayList; import java.util.List; +import dark.hydraulic.api.ColorCode; +import dark.hydraulic.api.INetworkFluidPart; +import dark.hydraulic.api.INetworkPart; + import universalelectricity.core.vector.Vector2; import universalelectricity.core.vector.Vector3; -import hydraulic.api.ColorCode; -import hydraulic.api.INetworkFluidPart; -import hydraulic.api.INetworkPart; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.liquids.LiquidStack; diff --git a/src/minecraft/hydraulic/network/FluidNetwork.java b/src/minecraft/dark/hydraulic/network/FluidNetwork.java similarity index 98% rename from src/minecraft/hydraulic/network/FluidNetwork.java rename to src/minecraft/dark/hydraulic/network/FluidNetwork.java index ed972286..62b0611d 100644 --- a/src/minecraft/hydraulic/network/FluidNetwork.java +++ b/src/minecraft/dark/hydraulic/network/FluidNetwork.java @@ -1,9 +1,5 @@ -package hydraulic.network; +package dark.hydraulic.network; -import hydraulic.api.ColorCode; -import hydraulic.api.INetworkFluidPart; -import hydraulic.api.INetworkPart; -import hydraulic.helpers.FluidHelper; import java.util.ArrayList; import java.util.Iterator; @@ -20,6 +16,10 @@ import net.minecraftforge.liquids.LiquidTank; import universalelectricity.core.path.Pathfinder; import universalelectricity.core.vector.Vector3; import cpw.mods.fml.common.FMLLog; +import dark.hydraulic.api.ColorCode; +import dark.hydraulic.api.INetworkFluidPart; +import dark.hydraulic.api.INetworkPart; +import dark.hydraulic.helpers.FluidHelper; public class FluidNetwork extends TileNetwork { diff --git a/src/minecraft/hydraulic/network/FluidPressurePack.java b/src/minecraft/dark/hydraulic/network/FluidPressurePack.java similarity index 95% rename from src/minecraft/hydraulic/network/FluidPressurePack.java rename to src/minecraft/dark/hydraulic/network/FluidPressurePack.java index c9a7953d..573d59dc 100644 --- a/src/minecraft/hydraulic/network/FluidPressurePack.java +++ b/src/minecraft/dark/hydraulic/network/FluidPressurePack.java @@ -1,4 +1,4 @@ -package hydraulic.network; +package dark.hydraulic.network; import net.minecraftforge.liquids.LiquidStack; diff --git a/src/minecraft/hydraulic/network/HydraulicNetworkHelper.java b/src/minecraft/dark/hydraulic/network/HydraulicNetworkHelper.java similarity index 90% rename from src/minecraft/hydraulic/network/HydraulicNetworkHelper.java rename to src/minecraft/dark/hydraulic/network/HydraulicNetworkHelper.java index ed695265..a810c479 100644 --- a/src/minecraft/hydraulic/network/HydraulicNetworkHelper.java +++ b/src/minecraft/dark/hydraulic/network/HydraulicNetworkHelper.java @@ -1,7 +1,7 @@ -package hydraulic.network; +package dark.hydraulic.network; -import hydraulic.api.IDrain; -import hydraulic.api.INetworkPart; +import dark.hydraulic.api.IDrain; +import dark.hydraulic.api.INetworkPart; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.liquids.ITankContainer; diff --git a/src/minecraft/hydraulic/network/PathfinderCheckerPipes.java b/src/minecraft/dark/hydraulic/network/PathfinderCheckerPipes.java similarity index 93% rename from src/minecraft/hydraulic/network/PathfinderCheckerPipes.java rename to src/minecraft/dark/hydraulic/network/PathfinderCheckerPipes.java index 93bb06e3..01c5806b 100644 --- a/src/minecraft/hydraulic/network/PathfinderCheckerPipes.java +++ b/src/minecraft/dark/hydraulic/network/PathfinderCheckerPipes.java @@ -1,12 +1,13 @@ -package hydraulic.network; +package dark.hydraulic.network; -import hydraulic.api.INetworkPart; -import hydraulic.api.INetworkPipe; import java.util.Arrays; import java.util.HashSet; import java.util.Set; +import dark.hydraulic.api.INetworkPart; +import dark.hydraulic.api.INetworkPipe; + import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; diff --git a/src/minecraft/hydraulic/network/PipeNetwork.java b/src/minecraft/dark/hydraulic/network/PipeNetwork.java similarity index 98% rename from src/minecraft/hydraulic/network/PipeNetwork.java rename to src/minecraft/dark/hydraulic/network/PipeNetwork.java index be9012e4..e8f9ede9 100644 --- a/src/minecraft/hydraulic/network/PipeNetwork.java +++ b/src/minecraft/dark/hydraulic/network/PipeNetwork.java @@ -1,8 +1,5 @@ -package hydraulic.network; +package dark.hydraulic.network; -import hydraulic.api.ColorCode; -import hydraulic.api.INetworkPart; -import hydraulic.api.INetworkPipe; import java.util.HashMap; import java.util.Iterator; @@ -13,6 +10,9 @@ import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.liquids.ILiquidTank; import net.minecraftforge.liquids.ITankContainer; import net.minecraftforge.liquids.LiquidStack; +import dark.hydraulic.api.ColorCode; +import dark.hydraulic.api.INetworkPart; +import dark.hydraulic.api.INetworkPipe; import dark.library.helpers.ConnectionHelper; /** diff --git a/src/minecraft/hydraulic/network/TileNetwork.java b/src/minecraft/dark/hydraulic/network/TileNetwork.java similarity index 98% rename from src/minecraft/hydraulic/network/TileNetwork.java rename to src/minecraft/dark/hydraulic/network/TileNetwork.java index 9b846da1..1bd4c693 100644 --- a/src/minecraft/hydraulic/network/TileNetwork.java +++ b/src/minecraft/dark/hydraulic/network/TileNetwork.java @@ -1,6 +1,5 @@ -package hydraulic.network; +package dark.hydraulic.network; -import hydraulic.api.INetworkPart; import java.util.ArrayList; import java.util.Arrays; @@ -12,6 +11,7 @@ import net.minecraft.world.World; import universalelectricity.core.path.Pathfinder; import universalelectricity.core.vector.Vector3; import cpw.mods.fml.common.FMLLog; +import dark.hydraulic.api.INetworkPart; public class TileNetwork { diff --git a/src/minecraft/hydraulic/prefab/tile/TileEntityFluidDevice.java b/src/minecraft/dark/hydraulic/prefab/tile/TileEntityFluidDevice.java similarity index 86% rename from src/minecraft/hydraulic/prefab/tile/TileEntityFluidDevice.java rename to src/minecraft/dark/hydraulic/prefab/tile/TileEntityFluidDevice.java index a1a6cd9c..63556ebf 100644 --- a/src/minecraft/hydraulic/prefab/tile/TileEntityFluidDevice.java +++ b/src/minecraft/dark/hydraulic/prefab/tile/TileEntityFluidDevice.java @@ -1,11 +1,12 @@ -package hydraulic.prefab.tile; +package dark.hydraulic.prefab.tile; -import hydraulic.api.ITileConnector; -import hydraulic.api.IReadOut; -import hydraulic.network.HydraulicNetworkHelper; import java.util.Random; +import dark.hydraulic.api.IReadOut; +import dark.hydraulic.api.ITileConnector; +import dark.hydraulic.network.HydraulicNetworkHelper; + import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.liquids.ITankContainer; diff --git a/src/minecraft/hydraulic/prefab/tile/TileEntityFluidStorage.java b/src/minecraft/dark/hydraulic/prefab/tile/TileEntityFluidStorage.java similarity index 96% rename from src/minecraft/hydraulic/prefab/tile/TileEntityFluidStorage.java rename to src/minecraft/dark/hydraulic/prefab/tile/TileEntityFluidStorage.java index e497bdc1..0b7bf55f 100644 --- a/src/minecraft/hydraulic/prefab/tile/TileEntityFluidStorage.java +++ b/src/minecraft/dark/hydraulic/prefab/tile/TileEntityFluidStorage.java @@ -1,7 +1,7 @@ -package hydraulic.prefab.tile; +package dark.hydraulic.prefab.tile; -import hydraulic.api.IColorCoded; -import hydraulic.helpers.FluidHelper; +import dark.hydraulic.api.IColorCoded; +import dark.hydraulic.helpers.FluidHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity;