diff --git a/src/dark/core/client/renders/RenderBlockEntity.java b/src/dark/core/client/renders/RenderBlockEntity.java index 44b58bb1d..8ce510ec1 100644 --- a/src/dark/core/client/renders/RenderBlockEntity.java +++ b/src/dark/core/client/renders/RenderBlockEntity.java @@ -11,7 +11,7 @@ import net.minecraft.world.World; import org.lwjgl.opengl.GL11; import universalelectricity.core.vector.Vector3; -import dark.core.prefab.entity.EntityBlock; +import dark.core.prefab.EntityBlock; public class RenderBlockEntity extends Render { diff --git a/src/dark/core/common/DarkMain.java b/src/dark/core/common/DarkMain.java index 6a0ea5459..a7dae5776 100644 --- a/src/dark/core/common/DarkMain.java +++ b/src/dark/core/common/DarkMain.java @@ -55,9 +55,9 @@ import dark.core.common.machines.BlockSolarPanel; import dark.core.common.transmit.BlockWire; import dark.core.common.transmit.ItemBlockWire; 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.items.ItemBlockHolder; import dark.core.prefab.machine.BlockMulti; import dark.core.registration.ModObjectRegistry; diff --git a/src/dark/core/common/blocks/BlockOre.java b/src/dark/core/common/blocks/BlockOre.java index 4fb52c77c..f0f6d81f4 100644 --- a/src/dark/core/common/blocks/BlockOre.java +++ b/src/dark/core/common/blocks/BlockOre.java @@ -23,7 +23,7 @@ import cpw.mods.fml.relauncher.SideOnly; import dark.core.common.CoreRecipeLoader; import dark.core.common.DarkMain; import dark.core.common.items.EnumMaterial; -import dark.core.prefab.IExtraInfo.IExtraBlockInfo; +import dark.core.interfaces.IExtraInfo.IExtraBlockInfo; import dark.core.prefab.ModPrefab; public class BlockOre extends Block implements IExtraBlockInfo diff --git a/src/dark/core/common/items/ItemColoredDust.java b/src/dark/core/common/items/ItemColoredDust.java index ccf88b92e..490f45f42 100644 --- a/src/dark/core/common/items/ItemColoredDust.java +++ b/src/dark/core/common/items/ItemColoredDust.java @@ -9,8 +9,8 @@ import net.minecraft.util.Icon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import dark.core.common.DarkMain; +import dark.core.prefab.ItemBasic; import dark.core.prefab.ModPrefab; -import dark.core.prefab.items.ItemBasic; public class ItemColoredDust extends ItemBasic { diff --git a/src/dark/core/common/items/ItemCommonTool.java b/src/dark/core/common/items/ItemCommonTool.java index 187cd2315..c6dd70f68 100644 --- a/src/dark/core/common/items/ItemCommonTool.java +++ b/src/dark/core/common/items/ItemCommonTool.java @@ -39,7 +39,7 @@ import com.google.common.collect.Multimap; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import dark.core.common.DarkMain; -import dark.core.prefab.IExtraInfo.IExtraItemInfo; +import dark.core.interfaces.IExtraInfo.IExtraItemInfo; import dark.core.prefab.ModPrefab; /** Flexible tool class that uses NBT to store damage and effect rather than metadata. Metadata diff --git a/src/dark/core/common/items/ItemOreDirv.java b/src/dark/core/common/items/ItemOreDirv.java index 8cb80f12f..e83b14df1 100644 --- a/src/dark/core/common/items/ItemOreDirv.java +++ b/src/dark/core/common/items/ItemOreDirv.java @@ -11,9 +11,9 @@ import net.minecraftforge.oredict.OreDictionary; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import dark.core.common.DarkMain; -import dark.core.prefab.IExtraInfo.IExtraItemInfo; +import dark.core.interfaces.IExtraInfo.IExtraItemInfo; +import dark.core.prefab.ItemBasic; import dark.core.prefab.ModPrefab; -import dark.core.prefab.items.ItemBasic; /** A series of items that are derived from a basic material * diff --git a/src/dark/core/common/items/ItemParts.java b/src/dark/core/common/items/ItemParts.java index 3de7ac252..5467a592b 100644 --- a/src/dark/core/common/items/ItemParts.java +++ b/src/dark/core/common/items/ItemParts.java @@ -11,9 +11,9 @@ import net.minecraftforge.oredict.OreDictionary; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import dark.core.common.DarkMain; -import dark.core.prefab.IExtraInfo.IExtraItemInfo; +import dark.core.interfaces.IExtraInfo.IExtraItemInfo; +import dark.core.prefab.ItemBasic; import dark.core.prefab.ModPrefab; -import dark.core.prefab.items.ItemBasic; /** A meta data item containing parts of various crafting recipes. These parts do not do anything but * allow new crafting recipes to be created. diff --git a/src/dark/core/common/items/ItemReadoutTools.java b/src/dark/core/common/items/ItemReadoutTools.java index 803df460c..478f83cd2 100644 --- a/src/dark/core/common/items/ItemReadoutTools.java +++ b/src/dark/core/common/items/ItemReadoutTools.java @@ -24,9 +24,9 @@ import cpw.mods.fml.relauncher.SideOnly; import dark.api.IToolReadOut; 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.items.ItemBasic; public class ItemReadoutTools extends ItemBasic { diff --git a/src/dark/core/common/items/ItemWrench.java b/src/dark/core/common/items/ItemWrench.java index a6cf0bcc8..ca8d4c7bf 100644 --- a/src/dark/core/common/items/ItemWrench.java +++ b/src/dark/core/common/items/ItemWrench.java @@ -10,9 +10,9 @@ import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.oredict.OreDictionary; import buildcraft.api.tools.IToolWrench; import dark.core.common.DarkMain; -import dark.core.prefab.IExtraInfo.IExtraItemInfo; +import dark.core.interfaces.IExtraInfo.IExtraItemInfo; +import dark.core.prefab.ItemBasic; import dark.core.prefab.ModPrefab; -import dark.core.prefab.items.ItemBasic; public class ItemWrench extends ItemBasic implements IToolWrench, IExtraItemInfo { diff --git a/src/dark/core/common/transmit/ItemBlockWire.java b/src/dark/core/common/transmit/ItemBlockWire.java index cb76c6b43..a3d28d426 100644 --- a/src/dark/core/common/transmit/ItemBlockWire.java +++ b/src/dark/core/common/transmit/ItemBlockWire.java @@ -2,7 +2,7 @@ package dark.core.common.transmit; import net.minecraft.util.Icon; import dark.core.common.CoreRecipeLoader; -import dark.core.prefab.items.ItemBlockHolder; +import dark.core.prefab.ItemBlockHolder; public class ItemBlockWire extends ItemBlockHolder { diff --git a/src/dark/core/prefab/damage/IDamageableTile.java b/src/dark/core/interfaces/IDamageableTile.java similarity index 94% rename from src/dark/core/prefab/damage/IDamageableTile.java rename to src/dark/core/interfaces/IDamageableTile.java index d46d4fda5..c4ac9ef23 100644 --- a/src/dark/core/prefab/damage/IDamageableTile.java +++ b/src/dark/core/interfaces/IDamageableTile.java @@ -1,8 +1,7 @@ -package dark.core.prefab.damage; +package dark.core.interfaces; import net.minecraft.potion.PotionEffect; import net.minecraft.util.DamageSource; -import dark.core.interfaces.IBlockActivated; /** Used by tiles that want to pretend to be living objects. Will require the use of this interface * as well spawning a EntityTileDamage entity as its location. Then entity if larger than the tile diff --git a/src/dark/core/prefab/IExtraInfo.java b/src/dark/core/interfaces/IExtraInfo.java similarity index 98% rename from src/dark/core/prefab/IExtraInfo.java rename to src/dark/core/interfaces/IExtraInfo.java index 656423488..e43f127a9 100644 --- a/src/dark/core/prefab/IExtraInfo.java +++ b/src/dark/core/interfaces/IExtraInfo.java @@ -1,4 +1,4 @@ -package dark.core.prefab; +package dark.core.interfaces; import java.util.List; import java.util.Set; diff --git a/src/dark/core/prefab/IMultiBlock.java b/src/dark/core/interfaces/IMultiBlock.java similarity index 90% rename from src/dark/core/prefab/IMultiBlock.java rename to src/dark/core/interfaces/IMultiBlock.java index 22e147fe5..589862e36 100644 --- a/src/dark/core/prefab/IMultiBlock.java +++ b/src/dark/core/interfaces/IMultiBlock.java @@ -1,8 +1,7 @@ -package dark.core.prefab; +package dark.core.interfaces; import net.minecraft.tileentity.TileEntity; import universalelectricity.core.vector.Vector3; -import dark.core.interfaces.IBlockActivated; /** Interface to be applied to tile entity blocks that occupies more than one block space. Useful for * large machines. diff --git a/src/dark/core/prefab/entity/EntityBlock.java b/src/dark/core/prefab/EntityBlock.java similarity index 98% rename from src/dark/core/prefab/entity/EntityBlock.java rename to src/dark/core/prefab/EntityBlock.java index c4a780334..99b223d4d 100644 --- a/src/dark/core/prefab/entity/EntityBlock.java +++ b/src/dark/core/prefab/EntityBlock.java @@ -1,4 +1,4 @@ -package dark.core.prefab.entity; +package dark.core.prefab; import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/dark/core/prefab/entity/EntityFakeBlock.java b/src/dark/core/prefab/EntityFakeBlock.java similarity index 98% rename from src/dark/core/prefab/entity/EntityFakeBlock.java rename to src/dark/core/prefab/EntityFakeBlock.java index 65de0dc2e..8beb19627 100644 --- a/src/dark/core/prefab/entity/EntityFakeBlock.java +++ b/src/dark/core/prefab/EntityFakeBlock.java @@ -1,4 +1,4 @@ -package dark.core.prefab.entity; +package dark.core.prefab; import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/dark/core/prefab/entity/EntityTileDamage.java b/src/dark/core/prefab/EntityTileDamage.java similarity index 98% rename from src/dark/core/prefab/entity/EntityTileDamage.java rename to src/dark/core/prefab/EntityTileDamage.java index 2bb8aa017..492e73b86 100644 --- a/src/dark/core/prefab/entity/EntityTileDamage.java +++ b/src/dark/core/prefab/EntityTileDamage.java @@ -1,4 +1,4 @@ -package dark.core.prefab.entity; +package dark.core.prefab; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -20,7 +20,7 @@ import com.google.common.io.ByteArrayDataOutput; import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import dark.core.prefab.damage.IDamageableTile; +import dark.core.interfaces.IDamageableTile; /** Entity designed to take damage and apply it to the tile from an Entity. Simulates the tile is * alive and can be harmed by normal AIs without additional code. diff --git a/src/dark/core/prefab/FluidSelectiveTank.java b/src/dark/core/prefab/FluidSelectiveTank.java deleted file mode 100644 index b851b15cf..000000000 --- a/src/dark/core/prefab/FluidSelectiveTank.java +++ /dev/null @@ -1,60 +0,0 @@ -package dark.core.prefab; - -import java.util.ArrayList; -import java.util.List; - -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidTank; - -/** Selective fluid version of the FluidTank - * - * @author DarkGuardsman */ -public class FluidSelectiveTank extends FluidTank -{ - protected List fluidList = new ArrayList(); - - public FluidSelectiveTank(int capacity) - { - super(capacity); - } - - public FluidSelectiveTank(FluidStack stack, int capacity) - { - super(stack, capacity); - } - - public FluidSelectiveTank(Fluid fluid, int amount, int capacity) - { - super(fluid, amount, capacity); - } - - public FluidSelectiveTank setFluidList(List fluid) - { - this.fluidList = fluid; - return this; - } - - public FluidSelectiveTank addFluidToList(Fluid fluid) - { - if (fluid != null) - { - this.getList().add(fluid); - } - return this; - } - - public List getList() - { - if (this.fluidList == null) - { - this.fluidList = new ArrayList(); - } - return this.fluidList; - } - - public boolean canAcceptFluid(Fluid fluid) - { - return fluid != null && this.getList().contains(fluid); - } -} diff --git a/src/dark/core/prefab/items/ItemBasic.java b/src/dark/core/prefab/ItemBasic.java similarity index 96% rename from src/dark/core/prefab/items/ItemBasic.java rename to src/dark/core/prefab/ItemBasic.java index 998acc8c8..c52ff3a7b 100644 --- a/src/dark/core/prefab/items/ItemBasic.java +++ b/src/dark/core/prefab/ItemBasic.java @@ -1,4 +1,4 @@ -package dark.core.prefab.items; +package dark.core.prefab; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.item.Item; diff --git a/src/dark/core/prefab/items/ItemBlockHolder.java b/src/dark/core/prefab/ItemBlockHolder.java similarity index 95% rename from src/dark/core/prefab/items/ItemBlockHolder.java rename to src/dark/core/prefab/ItemBlockHolder.java index 61c19c95e..d504afacf 100644 --- a/src/dark/core/prefab/items/ItemBlockHolder.java +++ b/src/dark/core/prefab/ItemBlockHolder.java @@ -1,4 +1,4 @@ -package dark.core.prefab.items; +package dark.core.prefab; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; diff --git a/src/dark/core/prefab/damage/TileDamageSource.java b/src/dark/core/prefab/TileDamageSource.java similarity index 97% rename from src/dark/core/prefab/damage/TileDamageSource.java rename to src/dark/core/prefab/TileDamageSource.java index c3f2d06b8..b9a75434d 100644 --- a/src/dark/core/prefab/damage/TileDamageSource.java +++ b/src/dark/core/prefab/TileDamageSource.java @@ -1,4 +1,4 @@ -package dark.core.prefab.damage; +package dark.core.prefab; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; diff --git a/src/dark/core/prefab/machine/BlockMachine.java b/src/dark/core/prefab/machine/BlockMachine.java index f6a544b01..c6def2b83 100644 --- a/src/dark/core/prefab/machine/BlockMachine.java +++ b/src/dark/core/prefab/machine/BlockMachine.java @@ -21,7 +21,7 @@ import cpw.mods.fml.relauncher.SideOnly; import dark.api.parts.INetworkPart; import dark.core.common.DarkMain; import dark.core.interfaces.IBlockActivated; -import dark.core.prefab.IExtraInfo.IExtraBlockInfo; +import dark.core.interfaces.IExtraInfo.IExtraBlockInfo; import dark.core.prefab.ModPrefab; import dark.core.registration.ModObjectRegistry.BlockBuildData; diff --git a/src/dark/core/prefab/machine/BlockMulti.java b/src/dark/core/prefab/machine/BlockMulti.java index 12ec350fb..08dd391df 100644 --- a/src/dark/core/prefab/machine/BlockMulti.java +++ b/src/dark/core/prefab/machine/BlockMulti.java @@ -22,7 +22,7 @@ import com.builtbroken.common.Pair; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import dark.core.common.DarkMain; -import dark.core.prefab.IExtraInfo.IExtraBlockInfo; +import dark.core.interfaces.IExtraInfo.IExtraBlockInfo; import dark.core.prefab.ModPrefab; public class BlockMulti extends BlockContainer implements IExtraBlockInfo diff --git a/src/dark/core/prefab/machine/TileEntityMachine.java b/src/dark/core/prefab/machine/TileEntityMachine.java index 4d9cdd26c..134f473d2 100644 --- a/src/dark/core/prefab/machine/TileEntityMachine.java +++ b/src/dark/core/prefab/machine/TileEntityMachine.java @@ -19,9 +19,9 @@ import dark.api.IDisableable; import dark.core.common.DarkMain; import dark.core.interfaces.IExternalInv; import dark.core.interfaces.IInvBox; +import dark.core.interfaces.IExtraInfo.IExtraTileEntityInfo; import dark.core.network.ISimplePacketReceiver; import dark.core.network.PacketHandler; -import dark.core.prefab.IExtraInfo.IExtraTileEntityInfo; public abstract class TileEntityMachine extends TileEntityInv implements ISidedInventory, IExternalInv, IDisableable, ISimplePacketReceiver, IRotatable, IExtraTileEntityInfo { diff --git a/src/dark/core/prefab/machine/TileEntityMulti.java b/src/dark/core/prefab/machine/TileEntityMulti.java index 4bea5e687..81551927e 100644 --- a/src/dark/core/prefab/machine/TileEntityMulti.java +++ b/src/dark/core/prefab/machine/TileEntityMulti.java @@ -12,8 +12,8 @@ import universalelectricity.prefab.network.IPacketReceiver; import com.google.common.io.ByteArrayDataInput; +import dark.core.interfaces.IMultiBlock; import dark.core.network.PacketHandler; -import dark.core.prefab.IMultiBlock; /** This is a multiblock to be used for blocks that are bigger than one block. * diff --git a/src/dark/core/registration/ClientRegistryProxy.java b/src/dark/core/registration/ClientRegistryProxy.java index 43ced3fbe..851c1f074 100644 --- a/src/dark/core/registration/ClientRegistryProxy.java +++ b/src/dark/core/registration/ClientRegistryProxy.java @@ -13,7 +13,7 @@ import com.builtbroken.common.Pair; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import dark.core.prefab.IExtraInfo.IExtraBlockInfo; +import dark.core.interfaces.IExtraInfo.IExtraBlockInfo; @SideOnly(Side.CLIENT) public class ClientRegistryProxy extends RegistryProxy diff --git a/src/dark/core/registration/ModObjectRegistry.java b/src/dark/core/registration/ModObjectRegistry.java index bca34707c..ebce8ea2a 100644 --- a/src/dark/core/registration/ModObjectRegistry.java +++ b/src/dark/core/registration/ModObjectRegistry.java @@ -22,9 +22,9 @@ import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.registry.GameRegistry; import dark.core.common.DarkMain; -import dark.core.prefab.IExtraInfo; -import dark.core.prefab.IExtraInfo.IExtraBlockInfo; -import dark.core.prefab.IExtraInfo.IExtraItemInfo; +import dark.core.interfaces.IExtraInfo; +import dark.core.interfaces.IExtraInfo.IExtraBlockInfo; +import dark.core.interfaces.IExtraInfo.IExtraItemInfo; import dark.core.prefab.machine.BlockMachine; /** Handler to make registering all parts of a mod's objects that are loaded into the game by forge