From 68d725912bffbd367e6a1bbceeb8c41d32cc1e92 Mon Sep 17 00:00:00 2001 From: Robert Date: Sat, 9 Nov 2013 12:39:33 -0500 Subject: [PATCH] Package changes --- src/dark/api/reciepes/MachineRecipeHandler.java | 2 +- src/dark/core/common/DarkMain.java | 2 +- src/dark/core/common/RecipeLoader.java | 2 +- src/dark/core/common/items/ItemReadoutTools.java | 2 +- src/dark/core/common/machines/TileEntityInfFluid.java | 2 +- src/dark/core/{prefab => }/helpers/AutoCraftingManager.java | 2 +- src/dark/core/{prefab => }/helpers/ConnectionHelper.java | 2 +- src/dark/core/{prefab => }/helpers/EntityDictionary.java | 2 +- src/dark/core/{prefab => }/helpers/ItemWorldHelper.java | 2 +- src/dark/core/{prefab => }/helpers/MathHelper.java | 2 +- src/dark/core/{prefab => }/helpers/PacketDataWatcher.java | 2 +- src/dark/core/{prefab => }/helpers/PlayerMsgHelper.java | 2 +- src/dark/core/{prefab => }/helpers/RayTraceHelper.java | 2 +- src/dark/core/network/PacketManagerTile.java | 2 +- src/dark/core/prefab/ModPrefab.java | 2 +- src/dark/core/prefab/{gas => fluids}/EnumGas.java | 2 +- src/dark/core/prefab/{helpers => fluids}/FluidHelper.java | 3 ++- src/dark/core/prefab/{gas => fluids}/Gas.java | 2 +- src/dark/core/prefab/{gas => fluids}/GasTank.java | 6 ++++-- 19 files changed, 23 insertions(+), 20 deletions(-) rename src/dark/core/{prefab => }/helpers/AutoCraftingManager.java (99%) rename src/dark/core/{prefab => }/helpers/ConnectionHelper.java (98%) rename src/dark/core/{prefab => }/helpers/EntityDictionary.java (99%) rename src/dark/core/{prefab => }/helpers/ItemWorldHelper.java (99%) rename src/dark/core/{prefab => }/helpers/MathHelper.java (99%) rename src/dark/core/{prefab => }/helpers/PacketDataWatcher.java (98%) rename src/dark/core/{prefab => }/helpers/PlayerMsgHelper.java (97%) rename src/dark/core/{prefab => }/helpers/RayTraceHelper.java (99%) rename src/dark/core/prefab/{gas => fluids}/EnumGas.java (98%) rename src/dark/core/prefab/{helpers => fluids}/FluidHelper.java (99%) rename src/dark/core/prefab/{gas => fluids}/Gas.java (90%) rename src/dark/core/prefab/{gas => fluids}/GasTank.java (84%) diff --git a/src/dark/api/reciepes/MachineRecipeHandler.java b/src/dark/api/reciepes/MachineRecipeHandler.java index 0421b56b..7267cda8 100644 --- a/src/dark/api/reciepes/MachineRecipeHandler.java +++ b/src/dark/api/reciepes/MachineRecipeHandler.java @@ -20,7 +20,7 @@ import dark.core.common.CoreRecipeLoader; import dark.core.common.items.EnumMaterial; import dark.core.common.items.EnumOrePart; import dark.core.common.items.ItemOreDirv; -import dark.core.prefab.helpers.AutoCraftingManager; +import dark.core.helpers.AutoCraftingManager; /** Recipes for ore processor machines * diff --git a/src/dark/core/common/DarkMain.java b/src/dark/core/common/DarkMain.java index 66abe298..610fb212 100644 --- a/src/dark/core/common/DarkMain.java +++ b/src/dark/core/common/DarkMain.java @@ -54,10 +54,10 @@ import dark.core.common.machines.BlockDebug; import dark.core.common.machines.BlockSolarPanel; import dark.core.common.transmit.BlockWire; import dark.core.common.transmit.ItemBlockWire; +import dark.core.helpers.PacketDataWatcher; import dark.core.network.PacketHandler; import dark.core.prefab.ItemBlockHolder; import dark.core.prefab.ModPrefab; -import dark.core.prefab.helpers.PacketDataWatcher; import dark.core.prefab.machine.BlockMulti; import dark.core.registration.ModObjectRegistry; diff --git a/src/dark/core/common/RecipeLoader.java b/src/dark/core/common/RecipeLoader.java index 9737421f..3f8ea612 100644 --- a/src/dark/core/common/RecipeLoader.java +++ b/src/dark/core/common/RecipeLoader.java @@ -10,7 +10,7 @@ import com.builtbroken.common.Pair; import com.builtbroken.common.Triple; import cpw.mods.fml.common.registry.GameRegistry; -import dark.core.prefab.helpers.AutoCraftingManager; +import dark.core.helpers.AutoCraftingManager; /** Recipe system to make it easier to load recipes for a mod * diff --git a/src/dark/core/common/items/ItemReadoutTools.java b/src/dark/core/common/items/ItemReadoutTools.java index 478f83cd..b14c9c33 100644 --- a/src/dark/core/common/items/ItemReadoutTools.java +++ b/src/dark/core/common/items/ItemReadoutTools.java @@ -26,7 +26,7 @@ import dark.api.IToolReadOut.EnumTools; import dark.core.common.DarkMain; import dark.core.prefab.ItemBasic; import dark.core.prefab.ModPrefab; -import dark.core.prefab.helpers.FluidHelper; +import dark.core.prefab.fluids.FluidHelper; public class ItemReadoutTools extends ItemBasic { diff --git a/src/dark/core/common/machines/TileEntityInfFluid.java b/src/dark/core/common/machines/TileEntityInfFluid.java index b606553b..687da376 100644 --- a/src/dark/core/common/machines/TileEntityInfFluid.java +++ b/src/dark/core/common/machines/TileEntityInfFluid.java @@ -17,7 +17,7 @@ import universalelectricity.core.vector.Vector3; import com.builtbroken.common.lang.TextHelper.TextColor; -import dark.core.prefab.helpers.FluidHelper; +import dark.core.prefab.fluids.FluidHelper; public class TileEntityInfFluid extends TileEntity implements IFluidHandler, IDebugTile { diff --git a/src/dark/core/prefab/helpers/AutoCraftingManager.java b/src/dark/core/helpers/AutoCraftingManager.java similarity index 99% rename from src/dark/core/prefab/helpers/AutoCraftingManager.java rename to src/dark/core/helpers/AutoCraftingManager.java index 72c0e515..2ed9abbf 100644 --- a/src/dark/core/prefab/helpers/AutoCraftingManager.java +++ b/src/dark/core/helpers/AutoCraftingManager.java @@ -1,4 +1,4 @@ -package dark.core.prefab.helpers; +package dark.core.helpers; import java.util.ArrayList; import java.util.List; diff --git a/src/dark/core/prefab/helpers/ConnectionHelper.java b/src/dark/core/helpers/ConnectionHelper.java similarity index 98% rename from src/dark/core/prefab/helpers/ConnectionHelper.java rename to src/dark/core/helpers/ConnectionHelper.java index 28189f92..1b5cd8f5 100644 --- a/src/dark/core/prefab/helpers/ConnectionHelper.java +++ b/src/dark/core/helpers/ConnectionHelper.java @@ -1,4 +1,4 @@ -package dark.core.prefab.helpers; +package dark.core.helpers; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; diff --git a/src/dark/core/prefab/helpers/EntityDictionary.java b/src/dark/core/helpers/EntityDictionary.java similarity index 99% rename from src/dark/core/prefab/helpers/EntityDictionary.java rename to src/dark/core/helpers/EntityDictionary.java index 519bfd3c..3bcca26d 100644 --- a/src/dark/core/prefab/helpers/EntityDictionary.java +++ b/src/dark/core/helpers/EntityDictionary.java @@ -1,4 +1,4 @@ -package dark.core.prefab.helpers; +package dark.core.helpers; import java.util.HashMap; import java.util.List; diff --git a/src/dark/core/prefab/helpers/ItemWorldHelper.java b/src/dark/core/helpers/ItemWorldHelper.java similarity index 99% rename from src/dark/core/prefab/helpers/ItemWorldHelper.java rename to src/dark/core/helpers/ItemWorldHelper.java index b80c09a2..1b006705 100644 --- a/src/dark/core/prefab/helpers/ItemWorldHelper.java +++ b/src/dark/core/helpers/ItemWorldHelper.java @@ -1,4 +1,4 @@ -package dark.core.prefab.helpers; +package dark.core.helpers; import java.util.ArrayList; import java.util.List; diff --git a/src/dark/core/prefab/helpers/MathHelper.java b/src/dark/core/helpers/MathHelper.java similarity index 99% rename from src/dark/core/prefab/helpers/MathHelper.java rename to src/dark/core/helpers/MathHelper.java index 36ca3129..91665979 100644 --- a/src/dark/core/prefab/helpers/MathHelper.java +++ b/src/dark/core/helpers/MathHelper.java @@ -1,4 +1,4 @@ -package dark.core.prefab.helpers; +package dark.core.helpers; import java.util.Random; diff --git a/src/dark/core/prefab/helpers/PacketDataWatcher.java b/src/dark/core/helpers/PacketDataWatcher.java similarity index 98% rename from src/dark/core/prefab/helpers/PacketDataWatcher.java rename to src/dark/core/helpers/PacketDataWatcher.java index 10a6ce6f..cc256149 100644 --- a/src/dark/core/prefab/helpers/PacketDataWatcher.java +++ b/src/dark/core/helpers/PacketDataWatcher.java @@ -1,4 +1,4 @@ -package dark.core.prefab.helpers; +package dark.core.helpers; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/dark/core/prefab/helpers/PlayerMsgHelper.java b/src/dark/core/helpers/PlayerMsgHelper.java similarity index 97% rename from src/dark/core/prefab/helpers/PlayerMsgHelper.java rename to src/dark/core/helpers/PlayerMsgHelper.java index b9682204..fa6c932a 100644 --- a/src/dark/core/prefab/helpers/PlayerMsgHelper.java +++ b/src/dark/core/helpers/PlayerMsgHelper.java @@ -1,4 +1,4 @@ -package dark.core.prefab.helpers; +package dark.core.helpers; import java.util.Iterator; import java.util.List; diff --git a/src/dark/core/prefab/helpers/RayTraceHelper.java b/src/dark/core/helpers/RayTraceHelper.java similarity index 99% rename from src/dark/core/prefab/helpers/RayTraceHelper.java rename to src/dark/core/helpers/RayTraceHelper.java index 159620fa..8c373157 100644 --- a/src/dark/core/prefab/helpers/RayTraceHelper.java +++ b/src/dark/core/helpers/RayTraceHelper.java @@ -1,4 +1,4 @@ -package dark.core.prefab.helpers; +package dark.core.helpers; import java.util.List; diff --git a/src/dark/core/network/PacketManagerTile.java b/src/dark/core/network/PacketManagerTile.java index 4da1a22a..f5d1ee8a 100644 --- a/src/dark/core/network/PacketManagerTile.java +++ b/src/dark/core/network/PacketManagerTile.java @@ -10,7 +10,7 @@ import universalelectricity.prefab.network.IPacketReceiver; import com.google.common.io.ByteArrayDataInput; import cpw.mods.fml.common.network.Player; -import dark.core.prefab.helpers.PacketDataWatcher; +import dark.core.helpers.PacketDataWatcher; public class PacketManagerTile implements IPacketManager { diff --git a/src/dark/core/prefab/ModPrefab.java b/src/dark/core/prefab/ModPrefab.java index 2ec67cbd..ead5333b 100644 --- a/src/dark/core/prefab/ModPrefab.java +++ b/src/dark/core/prefab/ModPrefab.java @@ -22,7 +22,7 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.registry.TickRegistry; import cpw.mods.fml.relauncher.Side; import dark.core.common.ExternalModHandler; -import dark.core.prefab.helpers.FluidHelper; +import dark.core.prefab.fluids.FluidHelper; import dark.core.prefab.tilenetwork.NetworkUpdateHandler; import dark.core.registration.ModObjectRegistry; import dark.core.save.SaveManager; diff --git a/src/dark/core/prefab/gas/EnumGas.java b/src/dark/core/prefab/fluids/EnumGas.java similarity index 98% rename from src/dark/core/prefab/gas/EnumGas.java rename to src/dark/core/prefab/fluids/EnumGas.java index 78a26791..56311361 100644 --- a/src/dark/core/prefab/gas/EnumGas.java +++ b/src/dark/core/prefab/fluids/EnumGas.java @@ -1,4 +1,4 @@ -package dark.core.prefab.gas; +package dark.core.prefab.fluids; import com.builtbroken.common.science.ChemElement; import com.builtbroken.common.science.ChemicalCompound; diff --git a/src/dark/core/prefab/helpers/FluidHelper.java b/src/dark/core/prefab/fluids/FluidHelper.java similarity index 99% rename from src/dark/core/prefab/helpers/FluidHelper.java rename to src/dark/core/prefab/fluids/FluidHelper.java index 4b94cdb6..41ab0b34 100644 --- a/src/dark/core/prefab/helpers/FluidHelper.java +++ b/src/dark/core/prefab/fluids/FluidHelper.java @@ -1,4 +1,4 @@ -package dark.core.prefab.helpers; +package dark.core.prefab.fluids; import java.util.ArrayList; import java.util.HashMap; @@ -27,6 +27,7 @@ import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; import dark.api.ColorCode; +import dark.core.helpers.AutoCraftingManager; public class FluidHelper { diff --git a/src/dark/core/prefab/gas/Gas.java b/src/dark/core/prefab/fluids/Gas.java similarity index 90% rename from src/dark/core/prefab/gas/Gas.java rename to src/dark/core/prefab/fluids/Gas.java index ebb11ddc..8a5aa7f0 100644 --- a/src/dark/core/prefab/gas/Gas.java +++ b/src/dark/core/prefab/fluids/Gas.java @@ -1,4 +1,4 @@ -package dark.core.prefab.gas; +package dark.core.prefab.fluids; import net.minecraftforge.fluids.Fluid; diff --git a/src/dark/core/prefab/gas/GasTank.java b/src/dark/core/prefab/fluids/GasTank.java similarity index 84% rename from src/dark/core/prefab/gas/GasTank.java rename to src/dark/core/prefab/fluids/GasTank.java index f8ed755f..f22a5e2b 100644 --- a/src/dark/core/prefab/gas/GasTank.java +++ b/src/dark/core/prefab/fluids/GasTank.java @@ -1,10 +1,12 @@ -package dark.core.prefab.gas; +package dark.core.prefab.fluids; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; -/** Version of the fluid tank that is restricted to gases only */ +/** Version of the fluid tank that is restricted to gases only + * + * @author DarkGuardsman */ public class GasTank extends FluidTank {