From 6feb8863404b364cd23567148c99d9c54f30fe48 Mon Sep 17 00:00:00 2001 From: Robert Seifert Date: Tue, 11 Jun 2013 20:45:04 -0400 Subject: [PATCH] Massive package and class rework --- .../dark/{library => core}/DarkMain.java | 2 +- .../{hydraulic => core}/api/ColorCode.java | 18 ++--------- .../{hydraulic => core}/api/IColorCoded.java | 2 +- .../api/faction}/IFactionObject.java | 6 ++-- .../api => core/api/hydraulic}/IDrain.java | 2 +- .../api/network}/INetworkPart.java | 8 ++--- .../api/network}/ITileConnector.java | 2 +- .../api/network/fluid}/INetworkFluidPart.java | 4 ++- .../api/network/fluid}/INetworkPipe.java | 2 +- .../api/presure}/IPsiReciever.java | 4 ++- .../api/terminal}/IScroll.java | 2 +- .../api/terminal}/ISpecialAccess.java | 2 +- .../api/terminal}/ITerminal.java | 3 +- .../api => core/api/thermal}/IHeatObject.java | 2 +- .../api/thermal}/IHeatProducer.java | 2 +- .../api => core/api/tools}/IReadOut.java | 2 +- .../faction}/FactionCreationEvent.java | 2 +- .../faction}/FactionInstance.java | 6 ++-- .../dark/core/faction/FactionMain.java | 6 ++++ .../core => core/faction}/FactionManager.java | 6 ++-- .../{ => core}/faction/entity/CharStats.java | 2 +- .../{ => core}/faction/entity/EntityNpc.java | 25 ++++----------- .../hydraulic/helpers/EntityBlock.java | 2 +- .../hydraulic/helpers/FluidHelper.java | 2 +- .../helpers}/FluidRestrictionHandler.java | 19 ++++++++++- .../hydraulic/helpers/LiquidRenderer.java | 4 +-- .../hydraulic/helpers/RenderEntityBlock.java | 2 +- .../hydraulic/helpers/TankHelper.java | 2 +- .../network/NetworkFluidContainers.java} | 20 ++++++------ .../hydraulic/network/NetworkPathFinder.java} | 11 +++---- .../network/NetworkTileEntities.java} | 20 ++++++------ .../network/fluid}/FluidPressurePack.java | 2 +- .../fluid}/HydraulicNetworkHelper.java | 13 ++++---- .../network/fluid/NetworkFluidTiles.java} | 32 +++++++++---------- .../network/fluid/NetworkPipes.java} | 17 +++++----- .../{library => core/power}/PowerSystems.java | 2 +- .../helpers/ConnectionHelper.java | 2 +- .../helpers/ItemFindingHelper.java | 2 +- .../dark/{library => }/helpers/MetaGroup.java | 2 +- .../dark/{library => }/helpers/Pair.java | 2 +- .../helpers/PlayerMsgHelper.java | 2 +- .../dark/{library => }/helpers/Time.java | 2 +- src/minecraft/dark/hydraulic/Credits | 1 - src/minecraft/dark/hydraulic/INFO.java | 15 --------- .../dark/library/effects/FXBeam.java | 2 +- .../dark/library/gui/GuiButtonArrow.java | 2 +- .../dark/library/gui/GuiGlobalList.java | 4 +-- .../machine/TileEntityRunnableMachine.java | 2 +- .../machine/crafting/AutoCraftingManager.java | 2 +- .../terminal/ContainerTerminal.java | 2 +- .../terminal/TileEntityTerminal.java | 8 ++--- .../terminal/commands/CommandHelp.java | 6 ++-- .../terminal/commands/CommandRegistry.java | 4 +-- .../terminal/commands/CommandUser.java | 6 ++-- .../terminal/commands/TerminalCommand.java | 6 ++-- .../dark/library/npc/IAdvancedNpc.java | 11 ------- .../dark/library/npc/NPC_FORMATE.txt | 4 --- src/minecraft/dark/library/npc/TaskGroup.java | 30 ----------------- .../dark/library/orbit/NetworkOrbit.java | 2 +- .../tile/fluid}/TileEntityFluidDevice.java | 10 +++--- .../tile/fluid}/TileEntityFluidStorage.java | 9 +++--- 61 files changed, 167 insertions(+), 229 deletions(-) rename src/minecraft/dark/{library => core}/DarkMain.java (99%) rename src/minecraft/dark/{hydraulic => core}/api/ColorCode.java (71%) rename src/minecraft/dark/{hydraulic => core}/api/IColorCoded.java (88%) rename src/minecraft/dark/{faction/api => core/api/faction}/IFactionObject.java (64%) rename src/minecraft/dark/{hydraulic/api => core/api/hydraulic}/IDrain.java (98%) rename src/minecraft/dark/{hydraulic/api => core/api/network}/INetworkPart.java (68%) rename src/minecraft/dark/{hydraulic/api => core/api/network}/ITileConnector.java (89%) rename src/minecraft/dark/{hydraulic/api => core/api/network/fluid}/INetworkFluidPart.java (80%) rename src/minecraft/dark/{hydraulic/api => core/api/network/fluid}/INetworkPipe.java (97%) rename src/minecraft/dark/{hydraulic/api => core/api/presure}/IPsiReciever.java (83%) rename src/minecraft/dark/{library/access/interfaces => core/api/terminal}/IScroll.java (87%) rename src/minecraft/dark/{library/access/interfaces => core/api/terminal}/ISpecialAccess.java (96%) rename src/minecraft/dark/{library/access/interfaces => core/api/terminal}/ITerminal.java (88%) rename src/minecraft/dark/{hydraulic/api => core/api/thermal}/IHeatObject.java (95%) rename src/minecraft/dark/{hydraulic/api => core/api/thermal}/IHeatProducer.java (90%) rename src/minecraft/dark/{hydraulic/api => core/api/tools}/IReadOut.java (94%) rename src/minecraft/dark/{faction/core => core/faction}/FactionCreationEvent.java (59%) rename src/minecraft/dark/{faction/core => core/faction}/FactionInstance.java (96%) create mode 100644 src/minecraft/dark/core/faction/FactionMain.java rename src/minecraft/dark/{faction/core => core/faction}/FactionManager.java (88%) rename src/minecraft/dark/{ => core}/faction/entity/CharStats.java (89%) rename src/minecraft/dark/{ => core}/faction/entity/EntityNpc.java (82%) rename src/minecraft/dark/{ => core}/hydraulic/helpers/EntityBlock.java (98%) rename src/minecraft/dark/{ => core}/hydraulic/helpers/FluidHelper.java (99%) rename src/minecraft/dark/{hydraulic/api => core/hydraulic/helpers}/FluidRestrictionHandler.java (78%) rename src/minecraft/dark/{ => core}/hydraulic/helpers/LiquidRenderer.java (97%) rename src/minecraft/dark/{ => core}/hydraulic/helpers/RenderEntityBlock.java (99%) rename src/minecraft/dark/{ => core}/hydraulic/helpers/TankHelper.java (97%) rename src/minecraft/dark/{hydraulic/network/ContainerNetwork.java => core/hydraulic/network/NetworkFluidContainers.java} (88%) rename src/minecraft/dark/{hydraulic/network/PathfinderCheckerPipes.java => core/hydraulic/network/NetworkPathFinder.java} (82%) rename src/minecraft/dark/{hydraulic/network/TileNetwork.java => core/hydraulic/network/NetworkTileEntities.java} (89%) rename src/minecraft/dark/{hydraulic/network => core/hydraulic/network/fluid}/FluidPressurePack.java (93%) rename src/minecraft/dark/{hydraulic/network => core/hydraulic/network/fluid}/HydraulicNetworkHelper.java (67%) rename src/minecraft/dark/{hydraulic/network/FluidNetwork.java => core/hydraulic/network/fluid/NetworkFluidTiles.java} (90%) rename src/minecraft/dark/{hydraulic/network/PipeNetwork.java => core/hydraulic/network/fluid/NetworkPipes.java} (95%) rename src/minecraft/dark/{library => core/power}/PowerSystems.java (97%) rename src/minecraft/dark/{library => }/helpers/ConnectionHelper.java (98%) rename src/minecraft/dark/{library => }/helpers/ItemFindingHelper.java (99%) rename src/minecraft/dark/{library => }/helpers/MetaGroup.java (96%) rename src/minecraft/dark/{library => }/helpers/Pair.java (94%) rename src/minecraft/dark/{library => }/helpers/PlayerMsgHelper.java (97%) rename src/minecraft/dark/{library => }/helpers/Time.java (91%) delete mode 100644 src/minecraft/dark/hydraulic/Credits delete mode 100644 src/minecraft/dark/hydraulic/INFO.java rename src/minecraft/dark/library/{ => machine}/terminal/ContainerTerminal.java (95%) rename src/minecraft/dark/library/{ => machine}/terminal/TileEntityTerminal.java (97%) rename src/minecraft/dark/library/{ => machine}/terminal/commands/CommandHelp.java (93%) rename src/minecraft/dark/library/{ => machine}/terminal/commands/CommandRegistry.java (94%) rename src/minecraft/dark/library/{ => machine}/terminal/commands/CommandUser.java (94%) rename src/minecraft/dark/library/{ => machine}/terminal/commands/TerminalCommand.java (90%) delete mode 100644 src/minecraft/dark/library/npc/IAdvancedNpc.java delete mode 100644 src/minecraft/dark/library/npc/NPC_FORMATE.txt delete mode 100644 src/minecraft/dark/library/npc/TaskGroup.java rename src/minecraft/dark/{hydraulic/prefab/tile => prefab/tile/fluid}/TileEntityFluidDevice.java (86%) rename src/minecraft/dark/{hydraulic/prefab/tile => prefab/tile/fluid}/TileEntityFluidStorage.java (93%) diff --git a/src/minecraft/dark/library/DarkMain.java b/src/minecraft/dark/core/DarkMain.java similarity index 99% rename from src/minecraft/dark/library/DarkMain.java rename to src/minecraft/dark/core/DarkMain.java index 971c9bb9..de3f82d1 100644 --- a/src/minecraft/dark/library/DarkMain.java +++ b/src/minecraft/dark/core/DarkMain.java @@ -1,4 +1,4 @@ -package dark.library; +package dark.core; import java.io.File; import java.util.logging.Logger; diff --git a/src/minecraft/dark/hydraulic/api/ColorCode.java b/src/minecraft/dark/core/api/ColorCode.java similarity index 71% rename from src/minecraft/dark/hydraulic/api/ColorCode.java rename to src/minecraft/dark/core/api/ColorCode.java index 80b58ff2..1fb7ceca 100644 --- a/src/minecraft/dark/hydraulic/api/ColorCode.java +++ b/src/minecraft/dark/core/api/ColorCode.java @@ -1,4 +1,4 @@ -package dark.hydraulic.api; +package dark.core.api; import net.minecraftforge.liquids.LiquidStack; @@ -47,19 +47,5 @@ public enum ColorCode return NONE; } - /** - * checks to see if the liquidStack is valid for the given color - */ - public boolean isValidLiquid(LiquidStack stack) - { - if (stack == null) - { - return false; - } - if(!FluidRestrictionHandler.hasRestrictedStack(this.ordinal())) - { - return true; - } - return FluidRestrictionHandler.hasRestrictedStack(this.ordinal()) && FluidRestrictionHandler.getStackForColor(this).isLiquidEqual(stack); - } + } diff --git a/src/minecraft/dark/hydraulic/api/IColorCoded.java b/src/minecraft/dark/core/api/IColorCoded.java similarity index 88% rename from src/minecraft/dark/hydraulic/api/IColorCoded.java rename to src/minecraft/dark/core/api/IColorCoded.java index 9264f3af..bfec9f97 100644 --- a/src/minecraft/dark/hydraulic/api/IColorCoded.java +++ b/src/minecraft/dark/core/api/IColorCoded.java @@ -1,4 +1,4 @@ -package dark.hydraulic.api; +package dark.core.api; public interface IColorCoded diff --git a/src/minecraft/dark/faction/api/IFactionObject.java b/src/minecraft/dark/core/api/faction/IFactionObject.java similarity index 64% rename from src/minecraft/dark/faction/api/IFactionObject.java rename to src/minecraft/dark/core/api/faction/IFactionObject.java index 7b149035..dff2c7fe 100644 --- a/src/minecraft/dark/faction/api/IFactionObject.java +++ b/src/minecraft/dark/core/api/faction/IFactionObject.java @@ -1,13 +1,13 @@ -package dark.faction.api; +package dark.core.api.faction; -import dark.faction.core.FactionInstance; +import dark.core.faction.FactionInstance; public interface IFactionObject { /** * Gets the faction this is linked too. Will return Neutral rather than null */ - public FactionInstance getFactinon(); + public FactionInstance getFaction(); public boolean setFaction(FactionInstance faction, boolean override); } diff --git a/src/minecraft/dark/hydraulic/api/IDrain.java b/src/minecraft/dark/core/api/hydraulic/IDrain.java similarity index 98% rename from src/minecraft/dark/hydraulic/api/IDrain.java rename to src/minecraft/dark/core/api/hydraulic/IDrain.java index ad62dc34..8e077780 100644 --- a/src/minecraft/dark/hydraulic/api/IDrain.java +++ b/src/minecraft/dark/core/api/hydraulic/IDrain.java @@ -1,4 +1,4 @@ -package dark.hydraulic.api; +package dark.core.api.hydraulic; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.liquids.ITankContainer; diff --git a/src/minecraft/dark/hydraulic/api/INetworkPart.java b/src/minecraft/dark/core/api/network/INetworkPart.java similarity index 68% rename from src/minecraft/dark/hydraulic/api/INetworkPart.java rename to src/minecraft/dark/core/api/network/INetworkPart.java index 14e88f84..5a1d246c 100644 --- a/src/minecraft/dark/hydraulic/api/INetworkPart.java +++ b/src/minecraft/dark/core/api/network/INetworkPart.java @@ -1,6 +1,6 @@ -package dark.hydraulic.api; +package dark.core.api.network; -import dark.hydraulic.network.TileNetwork; +import dark.core.hydraulic.network.NetworkTileEntities; import net.minecraft.tileentity.TileEntity; public interface INetworkPart extends ITileConnector @@ -18,10 +18,10 @@ public interface INetworkPart extends ITileConnector /** * Gets the networkPart's primary network */ - public TileNetwork getTileNetwork(); + public NetworkTileEntities getTileNetwork(); /** * Sets the networkPart's primary network */ - public void setTileNetwork(TileNetwork fluidNetwok); + public void setTileNetwork(NetworkTileEntities fluidNetwok); } diff --git a/src/minecraft/dark/hydraulic/api/ITileConnector.java b/src/minecraft/dark/core/api/network/ITileConnector.java similarity index 89% rename from src/minecraft/dark/hydraulic/api/ITileConnector.java rename to src/minecraft/dark/core/api/network/ITileConnector.java index 533b3af5..6100719e 100644 --- a/src/minecraft/dark/hydraulic/api/ITileConnector.java +++ b/src/minecraft/dark/core/api/network/ITileConnector.java @@ -1,4 +1,4 @@ -package dark.hydraulic.api; +package dark.core.api.network; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; diff --git a/src/minecraft/dark/hydraulic/api/INetworkFluidPart.java b/src/minecraft/dark/core/api/network/fluid/INetworkFluidPart.java similarity index 80% rename from src/minecraft/dark/hydraulic/api/INetworkFluidPart.java rename to src/minecraft/dark/core/api/network/fluid/INetworkFluidPart.java index a8fcc56b..5764e6fd 100644 --- a/src/minecraft/dark/hydraulic/api/INetworkFluidPart.java +++ b/src/minecraft/dark/core/api/network/fluid/INetworkFluidPart.java @@ -1,5 +1,7 @@ -package dark.hydraulic.api; +package dark.core.api.network.fluid; +import dark.core.api.IColorCoded; +import dark.core.api.network.INetworkPart; import net.minecraftforge.liquids.ILiquidTank; import net.minecraftforge.liquids.ITankContainer; import net.minecraftforge.liquids.LiquidStack; diff --git a/src/minecraft/dark/hydraulic/api/INetworkPipe.java b/src/minecraft/dark/core/api/network/fluid/INetworkPipe.java similarity index 97% rename from src/minecraft/dark/hydraulic/api/INetworkPipe.java rename to src/minecraft/dark/core/api/network/fluid/INetworkPipe.java index 61c3903f..01cca97b 100644 --- a/src/minecraft/dark/hydraulic/api/INetworkPipe.java +++ b/src/minecraft/dark/core/api/network/fluid/INetworkPipe.java @@ -1,4 +1,4 @@ -package dark.hydraulic.api; +package dark.core.api.network.fluid; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.liquids.LiquidStack; diff --git a/src/minecraft/dark/hydraulic/api/IPsiReciever.java b/src/minecraft/dark/core/api/presure/IPsiReciever.java similarity index 83% rename from src/minecraft/dark/hydraulic/api/IPsiReciever.java rename to src/minecraft/dark/core/api/presure/IPsiReciever.java index 4a55edca..8a8e5217 100644 --- a/src/minecraft/dark/hydraulic/api/IPsiReciever.java +++ b/src/minecraft/dark/core/api/presure/IPsiReciever.java @@ -1,4 +1,6 @@ -package dark.hydraulic.api; +package dark.core.api.presure; + +import dark.core.api.network.ITileConnector; /** diff --git a/src/minecraft/dark/library/access/interfaces/IScroll.java b/src/minecraft/dark/core/api/terminal/IScroll.java similarity index 87% rename from src/minecraft/dark/library/access/interfaces/IScroll.java rename to src/minecraft/dark/core/api/terminal/IScroll.java index 16bb2932..22c144f0 100644 --- a/src/minecraft/dark/library/access/interfaces/IScroll.java +++ b/src/minecraft/dark/core/api/terminal/IScroll.java @@ -1,4 +1,4 @@ -package dark.library.access.interfaces; +package dark.core.api.terminal; public interface IScroll { diff --git a/src/minecraft/dark/library/access/interfaces/ISpecialAccess.java b/src/minecraft/dark/core/api/terminal/ISpecialAccess.java similarity index 96% rename from src/minecraft/dark/library/access/interfaces/ISpecialAccess.java rename to src/minecraft/dark/core/api/terminal/ISpecialAccess.java index fda2e3da..ede8c63d 100644 --- a/src/minecraft/dark/library/access/interfaces/ISpecialAccess.java +++ b/src/minecraft/dark/core/api/terminal/ISpecialAccess.java @@ -1,4 +1,4 @@ -package dark.library.access.interfaces; +package dark.core.api.terminal; import java.util.List; diff --git a/src/minecraft/dark/library/access/interfaces/ITerminal.java b/src/minecraft/dark/core/api/terminal/ITerminal.java similarity index 88% rename from src/minecraft/dark/library/access/interfaces/ITerminal.java rename to src/minecraft/dark/core/api/terminal/ITerminal.java index 8b78f444..115543f5 100644 --- a/src/minecraft/dark/library/access/interfaces/ITerminal.java +++ b/src/minecraft/dark/core/api/terminal/ITerminal.java @@ -1,8 +1,9 @@ -package dark.library.access.interfaces; +package dark.core.api.terminal; import java.util.List; + public interface ITerminal extends ISpecialAccess, IScroll { /** diff --git a/src/minecraft/dark/hydraulic/api/IHeatObject.java b/src/minecraft/dark/core/api/thermal/IHeatObject.java similarity index 95% rename from src/minecraft/dark/hydraulic/api/IHeatObject.java rename to src/minecraft/dark/core/api/thermal/IHeatObject.java index 05558a80..22777315 100644 --- a/src/minecraft/dark/hydraulic/api/IHeatObject.java +++ b/src/minecraft/dark/core/api/thermal/IHeatObject.java @@ -1,4 +1,4 @@ -package dark.hydraulic.api; +package dark.core.api.thermal; import net.minecraftforge.common.ForgeDirection; diff --git a/src/minecraft/dark/hydraulic/api/IHeatProducer.java b/src/minecraft/dark/core/api/thermal/IHeatProducer.java similarity index 90% rename from src/minecraft/dark/hydraulic/api/IHeatProducer.java rename to src/minecraft/dark/core/api/thermal/IHeatProducer.java index 16753223..ba246d2f 100644 --- a/src/minecraft/dark/hydraulic/api/IHeatProducer.java +++ b/src/minecraft/dark/core/api/thermal/IHeatProducer.java @@ -1,4 +1,4 @@ -package dark.hydraulic.api; +package dark.core.api.thermal; import net.minecraftforge.common.ForgeDirection; diff --git a/src/minecraft/dark/hydraulic/api/IReadOut.java b/src/minecraft/dark/core/api/tools/IReadOut.java similarity index 94% rename from src/minecraft/dark/hydraulic/api/IReadOut.java rename to src/minecraft/dark/core/api/tools/IReadOut.java index 08b44814..84e1ef4a 100644 --- a/src/minecraft/dark/hydraulic/api/IReadOut.java +++ b/src/minecraft/dark/core/api/tools/IReadOut.java @@ -1,4 +1,4 @@ -package dark.hydraulic.api; +package dark.core.api.tools; import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.common.ForgeDirection; diff --git a/src/minecraft/dark/faction/core/FactionCreationEvent.java b/src/minecraft/dark/core/faction/FactionCreationEvent.java similarity index 59% rename from src/minecraft/dark/faction/core/FactionCreationEvent.java rename to src/minecraft/dark/core/faction/FactionCreationEvent.java index 99d974e8..e4a5f421 100644 --- a/src/minecraft/dark/faction/core/FactionCreationEvent.java +++ b/src/minecraft/dark/core/faction/FactionCreationEvent.java @@ -1,4 +1,4 @@ -package dark.faction.core; +package dark.core.faction; public class FactionCreationEvent { diff --git a/src/minecraft/dark/faction/core/FactionInstance.java b/src/minecraft/dark/core/faction/FactionInstance.java similarity index 96% rename from src/minecraft/dark/faction/core/FactionInstance.java rename to src/minecraft/dark/core/faction/FactionInstance.java index a9431840..7b16df15 100644 --- a/src/minecraft/dark/faction/core/FactionInstance.java +++ b/src/minecraft/dark/core/faction/FactionInstance.java @@ -1,4 +1,4 @@ -package dark.faction.core; +package dark.core.faction; import java.util.ArrayList; import java.util.Date; @@ -6,11 +6,11 @@ import java.util.HashMap; import java.util.List; import net.minecraft.nbt.NBTTagCompound; +import dark.helpers.Pair; +import dark.helpers.Time; import dark.library.access.AccessLevel; import dark.library.access.GlobalAccessManager; import dark.library.access.UserAccess; -import dark.library.helpers.Pair; -import dark.library.helpers.Time; /** * Class used to track and manage a player/NPC faction diff --git a/src/minecraft/dark/core/faction/FactionMain.java b/src/minecraft/dark/core/faction/FactionMain.java new file mode 100644 index 00000000..dfb4939c --- /dev/null +++ b/src/minecraft/dark/core/faction/FactionMain.java @@ -0,0 +1,6 @@ +package dark.core.faction; + +public class FactionMain +{ + +} diff --git a/src/minecraft/dark/faction/core/FactionManager.java b/src/minecraft/dark/core/faction/FactionManager.java similarity index 88% rename from src/minecraft/dark/faction/core/FactionManager.java rename to src/minecraft/dark/core/faction/FactionManager.java index 53db01bb..05a5c424 100644 --- a/src/minecraft/dark/faction/core/FactionManager.java +++ b/src/minecraft/dark/core/faction/FactionManager.java @@ -1,10 +1,10 @@ -package dark.faction.core; +package dark.core.faction; import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import dark.faction.api.IFactionObject; +import dark.core.api.faction.IFactionObject; public class FactionManager { @@ -26,7 +26,7 @@ public class FactionManager } if (entity instanceof IFactionObject) { - return faction.isEqual(((IFactionObject) entity).getFactinon()); + return faction.isEqual(((IFactionObject) entity).getFaction()); } return false; } diff --git a/src/minecraft/dark/faction/entity/CharStats.java b/src/minecraft/dark/core/faction/entity/CharStats.java similarity index 89% rename from src/minecraft/dark/faction/entity/CharStats.java rename to src/minecraft/dark/core/faction/entity/CharStats.java index 526679aa..f8916c5f 100644 --- a/src/minecraft/dark/faction/entity/CharStats.java +++ b/src/minecraft/dark/core/faction/entity/CharStats.java @@ -1,4 +1,4 @@ -package dark.faction.entity; +package dark.core.faction.entity; public enum CharStats { diff --git a/src/minecraft/dark/faction/entity/EntityNpc.java b/src/minecraft/dark/core/faction/entity/EntityNpc.java similarity index 82% rename from src/minecraft/dark/faction/entity/EntityNpc.java rename to src/minecraft/dark/core/faction/entity/EntityNpc.java index fcbd1d59..b2680d98 100644 --- a/src/minecraft/dark/faction/entity/EntityNpc.java +++ b/src/minecraft/dark/core/faction/entity/EntityNpc.java @@ -1,23 +1,21 @@ -package dark.faction.entity; +package dark.core.faction.entity; import java.util.Random; import net.minecraft.entity.EntityCreature; -import net.minecraft.entity.EntityLiving; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import dark.faction.api.IFactionObject; -import dark.faction.core.FactionInstance; -import dark.faction.core.FactionManager; +import dark.core.api.faction.IFactionObject; +import dark.core.faction.FactionInstance; +import dark.core.faction.FactionManager; import dark.library.math.MathHelper; -import dark.library.npc.IAdvancedNpc; /** * NPC that simulate being players in an empire controlled environment * * @author Darkguardsman */ -public class EntityNpc extends EntityCreature implements IAdvancedNpc, IFactionObject +public class EntityNpc extends EntityCreature implements IFactionObject { protected Random random = new Random(); @@ -73,17 +71,6 @@ public class EntityNpc extends EntityCreature implements IAdvancedNpc, IFactionO return 10 + this.getStat(CharStats.endurance); } - @Override - public FactionInstance getFaction() - { - if(this.faction == null) - { - this.faction = FactionManager.loadFaction(this.factionName); - } - return this.faction; - } - - @Override public String getName() { return humanName; @@ -106,7 +93,7 @@ public class EntityNpc extends EntityCreature implements IAdvancedNpc, IFactionO } @Override - public FactionInstance getFactinon() + public FactionInstance getFaction() { if (this.faction == null || this.faction.isInvalid()) { diff --git a/src/minecraft/dark/hydraulic/helpers/EntityBlock.java b/src/minecraft/dark/core/hydraulic/helpers/EntityBlock.java similarity index 98% rename from src/minecraft/dark/hydraulic/helpers/EntityBlock.java rename to src/minecraft/dark/core/hydraulic/helpers/EntityBlock.java index 9248abc8..79ea0f5a 100644 --- a/src/minecraft/dark/hydraulic/helpers/EntityBlock.java +++ b/src/minecraft/dark/core/hydraulic/helpers/EntityBlock.java @@ -7,7 +7,7 @@ * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package dark.hydraulic.helpers; +package dark.core.hydraulic.helpers; import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/minecraft/dark/hydraulic/helpers/FluidHelper.java b/src/minecraft/dark/core/hydraulic/helpers/FluidHelper.java similarity index 99% rename from src/minecraft/dark/hydraulic/helpers/FluidHelper.java rename to src/minecraft/dark/core/hydraulic/helpers/FluidHelper.java index 094673dc..3a3c3099 100644 --- a/src/minecraft/dark/hydraulic/helpers/FluidHelper.java +++ b/src/minecraft/dark/core/hydraulic/helpers/FluidHelper.java @@ -1,4 +1,4 @@ -package dark.hydraulic.helpers; +package dark.core.hydraulic.helpers; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; diff --git a/src/minecraft/dark/hydraulic/api/FluidRestrictionHandler.java b/src/minecraft/dark/core/hydraulic/helpers/FluidRestrictionHandler.java similarity index 78% rename from src/minecraft/dark/hydraulic/api/FluidRestrictionHandler.java rename to src/minecraft/dark/core/hydraulic/helpers/FluidRestrictionHandler.java index 88b79797..d88e1c85 100644 --- a/src/minecraft/dark/hydraulic/api/FluidRestrictionHandler.java +++ b/src/minecraft/dark/core/hydraulic/helpers/FluidRestrictionHandler.java @@ -1,4 +1,4 @@ -package dark.hydraulic.api; +package dark.core.hydraulic.helpers; import net.minecraftforge.event.ForgeSubscribe; import net.minecraftforge.liquids.LiquidDictionary; @@ -8,6 +8,8 @@ import net.minecraftforge.liquids.LiquidStack; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; +import dark.core.api.ColorCode; + public class FluidRestrictionHandler { private static BiMap restrictedStacks = HashBiMap.create(); @@ -64,4 +66,19 @@ public class FluidRestrictionHandler { return restrictedStacks.get(color); } + /** + * checks to see if the liquidStack is valid for the given color + */ + public static boolean isValidLiquid(ColorCode color, LiquidStack stack) + { + if (stack == null) + { + return false; + } + if(!FluidRestrictionHandler.hasRestrictedStack(color.ordinal())) + { + return true; + } + return FluidRestrictionHandler.hasRestrictedStack(color.ordinal()) && FluidRestrictionHandler.getStackForColor(color).isLiquidEqual(stack); + } } diff --git a/src/minecraft/dark/hydraulic/helpers/LiquidRenderer.java b/src/minecraft/dark/core/hydraulic/helpers/LiquidRenderer.java similarity index 97% rename from src/minecraft/dark/hydraulic/helpers/LiquidRenderer.java rename to src/minecraft/dark/core/hydraulic/helpers/LiquidRenderer.java index fe628d5c..46f55eb0 100644 --- a/src/minecraft/dark/hydraulic/helpers/LiquidRenderer.java +++ b/src/minecraft/dark/core/hydraulic/helpers/LiquidRenderer.java @@ -5,7 +5,7 @@ * 1.0, or MMPL. Please check the contents of the license located in * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package dark.hydraulic.helpers; +package dark.core.hydraulic.helpers; import java.util.HashMap; @@ -22,7 +22,7 @@ import net.minecraftforge.liquids.LiquidStack; import org.lwjgl.opengl.GL11; -import dark.hydraulic.helpers.RenderEntityBlock.BlockInterface; +import dark.core.hydraulic.helpers.RenderEntityBlock.BlockInterface; /** * diff --git a/src/minecraft/dark/hydraulic/helpers/RenderEntityBlock.java b/src/minecraft/dark/core/hydraulic/helpers/RenderEntityBlock.java similarity index 99% rename from src/minecraft/dark/hydraulic/helpers/RenderEntityBlock.java rename to src/minecraft/dark/core/hydraulic/helpers/RenderEntityBlock.java index 4f81f5d1..7ccca73a 100644 --- a/src/minecraft/dark/hydraulic/helpers/RenderEntityBlock.java +++ b/src/minecraft/dark/core/hydraulic/helpers/RenderEntityBlock.java @@ -7,7 +7,7 @@ * http://www.mod-buildcraft.com/MMPL-1.0.txt */ -package dark.hydraulic.helpers; +package dark.core.hydraulic.helpers; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; diff --git a/src/minecraft/dark/hydraulic/helpers/TankHelper.java b/src/minecraft/dark/core/hydraulic/helpers/TankHelper.java similarity index 97% rename from src/minecraft/dark/hydraulic/helpers/TankHelper.java rename to src/minecraft/dark/core/hydraulic/helpers/TankHelper.java index 0b92555f..5fca6eef 100644 --- a/src/minecraft/dark/hydraulic/helpers/TankHelper.java +++ b/src/minecraft/dark/core/hydraulic/helpers/TankHelper.java @@ -1,4 +1,4 @@ -package dark.hydraulic.helpers; +package dark.core.hydraulic.helpers; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; diff --git a/src/minecraft/dark/hydraulic/network/ContainerNetwork.java b/src/minecraft/dark/core/hydraulic/network/NetworkFluidContainers.java similarity index 88% rename from src/minecraft/dark/hydraulic/network/ContainerNetwork.java rename to src/minecraft/dark/core/hydraulic/network/NetworkFluidContainers.java index 4f75c681..b03ceb50 100644 --- a/src/minecraft/dark/hydraulic/network/ContainerNetwork.java +++ b/src/minecraft/dark/core/hydraulic/network/NetworkFluidContainers.java @@ -1,16 +1,14 @@ -package dark.hydraulic.network; +package dark.core.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 net.minecraft.tileentity.TileEntity; import net.minecraftforge.liquids.LiquidStack; +import dark.core.api.ColorCode; +import dark.core.api.network.INetworkPart; +import dark.core.api.network.fluid.INetworkFluidPart; +import dark.core.hydraulic.network.fluid.NetworkFluidTiles; /** * Side note: the network should act like this when done {@link http @@ -20,10 +18,10 @@ import net.minecraftforge.liquids.LiquidStack; * @author Rseifert * */ -public class ContainerNetwork extends FluidNetwork +public class NetworkFluidContainers extends NetworkFluidTiles { - public ContainerNetwork(ColorCode color, INetworkPart... parts) + public NetworkFluidContainers(ColorCode color, INetworkPart... parts) { super(color, parts); } @@ -155,9 +153,9 @@ public class ContainerNetwork extends FluidNetwork } @Override - public void postMergeProcessing(TileNetwork network) + public void postMergeProcessing(NetworkTileEntities network) { - ContainerNetwork newNetwork = new ContainerNetwork(this.color); + NetworkFluidContainers newNetwork = new NetworkFluidContainers(this.color); newNetwork.getNetworkMemebers().addAll(this.getNetworkMemebers()); newNetwork.getNetworkMemebers().addAll(network.getNetworkMemebers()); diff --git a/src/minecraft/dark/hydraulic/network/PathfinderCheckerPipes.java b/src/minecraft/dark/core/hydraulic/network/NetworkPathFinder.java similarity index 82% rename from src/minecraft/dark/hydraulic/network/PathfinderCheckerPipes.java rename to src/minecraft/dark/core/hydraulic/network/NetworkPathFinder.java index 01c5806b..408d8ed2 100644 --- a/src/minecraft/dark/hydraulic/network/PathfinderCheckerPipes.java +++ b/src/minecraft/dark/core/hydraulic/network/NetworkPathFinder.java @@ -1,26 +1,25 @@ -package dark.hydraulic.network; +package dark.core.hydraulic.network; 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; import universalelectricity.core.path.IPathCallBack; import universalelectricity.core.path.Pathfinder; import universalelectricity.core.vector.Vector3; +import dark.core.api.network.INetworkPart; +import dark.core.api.network.fluid.INetworkPipe; /** * Check if a conductor connects with another. */ -public class PathfinderCheckerPipes extends Pathfinder +public class NetworkPathFinder extends Pathfinder { - public PathfinderCheckerPipes(final World world, final INetworkPart connectedBlockB, final INetworkPart splitPoint) + public NetworkPathFinder(final World world, final INetworkPart connectedBlockB, final INetworkPart splitPoint) { super(new IPathCallBack() { diff --git a/src/minecraft/dark/hydraulic/network/TileNetwork.java b/src/minecraft/dark/core/hydraulic/network/NetworkTileEntities.java similarity index 89% rename from src/minecraft/dark/hydraulic/network/TileNetwork.java rename to src/minecraft/dark/core/hydraulic/network/NetworkTileEntities.java index 1bd4c693..6cdf599a 100644 --- a/src/minecraft/dark/hydraulic/network/TileNetwork.java +++ b/src/minecraft/dark/core/hydraulic/network/NetworkTileEntities.java @@ -1,4 +1,4 @@ -package dark.hydraulic.network; +package dark.core.hydraulic.network; import java.util.ArrayList; @@ -11,14 +11,14 @@ 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; +import dark.core.api.network.INetworkPart; -public class TileNetwork +public class NetworkTileEntities { /* BLOCK THAT ACT AS FLUID CONVEYORS ** */ public final List networkMember = new ArrayList(); - public TileNetwork(INetworkPart... parts) + public NetworkTileEntities(INetworkPart... parts) { this.networkMember.addAll(Arrays.asList(parts)); } @@ -139,7 +139,7 @@ public class TileNetwork * @param network * @param part */ - public void merge(TileNetwork network, INetworkPart part) + public void merge(NetworkTileEntities network, INetworkPart part) { if (network != null && network != this && network.getClass().equals(this.getClass())) { @@ -155,7 +155,7 @@ public class TileNetwork * * @return false if the merge needs to be canceled */ - public boolean preMergeProcessing(TileNetwork network, INetworkPart part) + public boolean preMergeProcessing(NetworkTileEntities network, INetworkPart part) { return true; } @@ -164,9 +164,9 @@ public class TileNetwork * Finalizing the merge of two networks by creating the new network and importing all network * parts */ - public void postMergeProcessing(TileNetwork network) + public void postMergeProcessing(NetworkTileEntities network) { - TileNetwork newNetwork = new TileNetwork(); + NetworkTileEntities newNetwork = new NetworkTileEntities(); newNetwork.getNetworkMemebers().addAll(this.getNetworkMemebers()); newNetwork.getNetworkMemebers().addAll(network.getNetworkMemebers()); @@ -201,7 +201,7 @@ public class TileNetwork if (connectedBlockA != connectedBlockB && connectedBlockB instanceof INetworkPart) { - Pathfinder finder = new PathfinderCheckerPipes(world, (INetworkPart) connectedBlockB, splitPoint); + Pathfinder finder = new NetworkPathFinder(world, (INetworkPart) connectedBlockB, splitPoint); finder.init(new Vector3(connectedBlockA)); if (finder.results.size() > 0) @@ -222,7 +222,7 @@ public class TileNetwork else { /* NO LONGER CONNECTED ELSE WHERE SO SPLIT AND REFRESH */ - TileNetwork newNetwork = new TileNetwork(); + NetworkTileEntities newNetwork = new NetworkTileEntities(); int parts = 0; for (Vector3 node : finder.closedSet) { diff --git a/src/minecraft/dark/hydraulic/network/FluidPressurePack.java b/src/minecraft/dark/core/hydraulic/network/fluid/FluidPressurePack.java similarity index 93% rename from src/minecraft/dark/hydraulic/network/FluidPressurePack.java rename to src/minecraft/dark/core/hydraulic/network/fluid/FluidPressurePack.java index 573d59dc..f73adcf3 100644 --- a/src/minecraft/dark/hydraulic/network/FluidPressurePack.java +++ b/src/minecraft/dark/core/hydraulic/network/fluid/FluidPressurePack.java @@ -1,4 +1,4 @@ -package dark.hydraulic.network; +package dark.core.hydraulic.network.fluid; import net.minecraftforge.liquids.LiquidStack; diff --git a/src/minecraft/dark/hydraulic/network/HydraulicNetworkHelper.java b/src/minecraft/dark/core/hydraulic/network/fluid/HydraulicNetworkHelper.java similarity index 67% rename from src/minecraft/dark/hydraulic/network/HydraulicNetworkHelper.java rename to src/minecraft/dark/core/hydraulic/network/fluid/HydraulicNetworkHelper.java index a810c479..fdf5d5f8 100644 --- a/src/minecraft/dark/hydraulic/network/HydraulicNetworkHelper.java +++ b/src/minecraft/dark/core/hydraulic/network/fluid/HydraulicNetworkHelper.java @@ -1,12 +1,13 @@ -package dark.hydraulic.network; +package dark.core.hydraulic.network.fluid; -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; import universalelectricity.core.vector.Vector3; import universalelectricity.core.vector.VectorHelper; +import dark.core.api.hydraulic.IDrain; +import dark.core.api.network.INetworkPart; +import dark.core.hydraulic.network.NetworkTileEntities; public class HydraulicNetworkHelper { @@ -23,12 +24,12 @@ public class HydraulicNetworkHelper if (checkTile instanceof INetworkPart) { - TileNetwork network = ((INetworkPart) checkTile).getTileNetwork(); + NetworkTileEntities network = ((INetworkPart) checkTile).getTileNetwork(); - if (network != null && network instanceof FluidNetwork) + if (network != null && network instanceof NetworkFluidTiles) { network.removeEntity(tileEntity); - for (ITankContainer tank : ((FluidNetwork) network).connectedTanks) + for (ITankContainer tank : ((NetworkFluidTiles) network).connectedTanks) { if (tank instanceof IDrain) { diff --git a/src/minecraft/dark/hydraulic/network/FluidNetwork.java b/src/minecraft/dark/core/hydraulic/network/fluid/NetworkFluidTiles.java similarity index 90% rename from src/minecraft/dark/hydraulic/network/FluidNetwork.java rename to src/minecraft/dark/core/hydraulic/network/fluid/NetworkFluidTiles.java index 62b0611d..380b2290 100644 --- a/src/minecraft/dark/hydraulic/network/FluidNetwork.java +++ b/src/minecraft/dark/core/hydraulic/network/fluid/NetworkFluidTiles.java @@ -1,4 +1,4 @@ -package dark.hydraulic.network; +package dark.core.hydraulic.network.fluid; import java.util.ArrayList; @@ -7,7 +7,6 @@ import java.util.List; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import net.minecraftforge.liquids.ILiquidTank; import net.minecraftforge.liquids.ITankContainer; import net.minecraftforge.liquids.LiquidContainerRegistry; import net.minecraftforge.liquids.LiquidDictionary; @@ -15,13 +14,14 @@ import net.minecraftforge.liquids.LiquidStack; 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; +import dark.core.api.ColorCode; +import dark.core.api.network.INetworkPart; +import dark.core.api.network.fluid.INetworkFluidPart; +import dark.core.hydraulic.helpers.FluidHelper; +import dark.core.hydraulic.network.NetworkPathFinder; +import dark.core.hydraulic.network.NetworkTileEntities; -public class FluidNetwork extends TileNetwork +public class NetworkFluidTiles extends NetworkTileEntities { /* MACHINES THAT ARE FLUID BASED AND CONNECTED BUT NOT PART OF THE NETWORK ** */ public final List connectedTanks = new ArrayList(); @@ -32,7 +32,7 @@ public class FluidNetwork extends TileNetwork public ColorCode color = ColorCode.NONE; protected boolean loadedLiquids = false; - public FluidNetwork(ColorCode color, INetworkPart... parts) + public NetworkFluidTiles(ColorCode color, INetworkPart... parts) { super(parts); this.color = color; @@ -210,7 +210,7 @@ public class FluidNetwork extends TileNetwork if (connectedBlockA != connectedBlockB && connectedBlockB instanceof INetworkPart) { - Pathfinder finder = new PathfinderCheckerPipes(world, (INetworkPart) connectedBlockB, splitPoint); + Pathfinder finder = new NetworkPathFinder(world, (INetworkPart) connectedBlockB, splitPoint); finder.init(new Vector3(connectedBlockA)); if (finder.results.size() > 0) @@ -231,7 +231,7 @@ public class FluidNetwork extends TileNetwork else { /* NO LONGER CONNECTED ELSE WHERE SO SPLIT AND REFRESH */ - PipeNetwork newNetwork = new PipeNetwork(this.color); + NetworkPipes newNetwork = new NetworkPipes(this.color); int parts = 0; for (Vector3 node : finder.closedSet) { @@ -257,11 +257,11 @@ public class FluidNetwork extends TileNetwork } @Override - public boolean preMergeProcessing(TileNetwork net, INetworkPart part) + public boolean preMergeProcessing(NetworkTileEntities net, INetworkPart part) { - if (net instanceof FluidNetwork && ((FluidNetwork) net).color == this.color) + if (net instanceof NetworkFluidTiles && ((NetworkFluidTiles) net).color == this.color) { - FluidNetwork network = (FluidNetwork) net; + NetworkFluidTiles network = (NetworkFluidTiles) net; this.balanceColletiveTank(true); network.balanceColletiveTank(true); @@ -287,9 +287,9 @@ public class FluidNetwork extends TileNetwork } @Override - public void postMergeProcessing(TileNetwork network) + public void postMergeProcessing(NetworkTileEntities network) { - FluidNetwork newNetwork = new FluidNetwork(this.color); + NetworkFluidTiles newNetwork = new NetworkFluidTiles(this.color); newNetwork.getNetworkMemebers().addAll(this.getNetworkMemebers()); newNetwork.getNetworkMemebers().addAll(network.getNetworkMemebers()); diff --git a/src/minecraft/dark/hydraulic/network/PipeNetwork.java b/src/minecraft/dark/core/hydraulic/network/fluid/NetworkPipes.java similarity index 95% rename from src/minecraft/dark/hydraulic/network/PipeNetwork.java rename to src/minecraft/dark/core/hydraulic/network/fluid/NetworkPipes.java index e8f9ede9..241172ff 100644 --- a/src/minecraft/dark/hydraulic/network/PipeNetwork.java +++ b/src/minecraft/dark/core/hydraulic/network/fluid/NetworkPipes.java @@ -1,4 +1,4 @@ -package dark.hydraulic.network; +package dark.core.hydraulic.network.fluid; import java.util.HashMap; @@ -10,10 +10,11 @@ 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; +import dark.core.api.ColorCode; +import dark.core.api.network.INetworkPart; +import dark.core.api.network.fluid.INetworkPipe; +import dark.core.hydraulic.helpers.FluidRestrictionHandler; +import dark.helpers.ConnectionHelper; /** * Side note: the network should act like this when done {@link http @@ -23,7 +24,7 @@ import dark.library.helpers.ConnectionHelper; * @author Rseifert * */ -public class PipeNetwork extends FluidNetwork +public class NetworkPipes extends NetworkFluidTiles { /* MACHINES THAT USE THE PRESSURE SYSTEM TO DO WORK ** */ @@ -36,7 +37,7 @@ public class PipeNetwork extends FluidNetwork /* IS IT PROCESSING AN ADD LIQUID EVENT */ private boolean processingRequest = false; - public PipeNetwork(ColorCode color, INetworkPart... parts) + public NetworkPipes(ColorCode color, INetworkPart... parts) { super(color, parts); } @@ -202,7 +203,7 @@ public class PipeNetwork extends FluidNetwork LiquidStack prevCombined = this.combinedStorage().getLiquid(); LiquidStack stack = sta.copy(); - if (!this.processingRequest && stack != null && color.isValidLiquid(stack)) + if (!this.processingRequest && stack != null && FluidRestrictionHandler.isValidLiquid(color,stack)) { this.processingRequest = true; diff --git a/src/minecraft/dark/library/PowerSystems.java b/src/minecraft/dark/core/power/PowerSystems.java similarity index 97% rename from src/minecraft/dark/library/PowerSystems.java rename to src/minecraft/dark/core/power/PowerSystems.java index 2eb54502..64b77917 100644 --- a/src/minecraft/dark/library/PowerSystems.java +++ b/src/minecraft/dark/core/power/PowerSystems.java @@ -1,4 +1,4 @@ -package dark.library; +package dark.core.power; import cpw.mods.fml.common.Loader; diff --git a/src/minecraft/dark/library/helpers/ConnectionHelper.java b/src/minecraft/dark/helpers/ConnectionHelper.java similarity index 98% rename from src/minecraft/dark/library/helpers/ConnectionHelper.java rename to src/minecraft/dark/helpers/ConnectionHelper.java index cf5c75ad..140aad1a 100644 --- a/src/minecraft/dark/library/helpers/ConnectionHelper.java +++ b/src/minecraft/dark/helpers/ConnectionHelper.java @@ -1,4 +1,4 @@ -package dark.library.helpers; +package dark.helpers; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; diff --git a/src/minecraft/dark/library/helpers/ItemFindingHelper.java b/src/minecraft/dark/helpers/ItemFindingHelper.java similarity index 99% rename from src/minecraft/dark/library/helpers/ItemFindingHelper.java rename to src/minecraft/dark/helpers/ItemFindingHelper.java index 1acf7852..9d8c57aa 100644 --- a/src/minecraft/dark/library/helpers/ItemFindingHelper.java +++ b/src/minecraft/dark/helpers/ItemFindingHelper.java @@ -1,4 +1,4 @@ -package dark.library.helpers; +package dark.helpers; import java.util.ArrayList; import java.util.List; diff --git a/src/minecraft/dark/library/helpers/MetaGroup.java b/src/minecraft/dark/helpers/MetaGroup.java similarity index 96% rename from src/minecraft/dark/library/helpers/MetaGroup.java rename to src/minecraft/dark/helpers/MetaGroup.java index a6b2ea2a..cae755c4 100644 --- a/src/minecraft/dark/library/helpers/MetaGroup.java +++ b/src/minecraft/dark/helpers/MetaGroup.java @@ -1,4 +1,4 @@ -package dark.library.helpers; +package dark.helpers; /** * Used by machines that only rotate to 4 directions diff --git a/src/minecraft/dark/library/helpers/Pair.java b/src/minecraft/dark/helpers/Pair.java similarity index 94% rename from src/minecraft/dark/library/helpers/Pair.java rename to src/minecraft/dark/helpers/Pair.java index c6035fa0..258d9fb1 100644 --- a/src/minecraft/dark/library/helpers/Pair.java +++ b/src/minecraft/dark/helpers/Pair.java @@ -1,4 +1,4 @@ -package dark.library.helpers; +package dark.helpers; public class Pair { diff --git a/src/minecraft/dark/library/helpers/PlayerMsgHelper.java b/src/minecraft/dark/helpers/PlayerMsgHelper.java similarity index 97% rename from src/minecraft/dark/library/helpers/PlayerMsgHelper.java rename to src/minecraft/dark/helpers/PlayerMsgHelper.java index f23b153f..92a4ae34 100644 --- a/src/minecraft/dark/library/helpers/PlayerMsgHelper.java +++ b/src/minecraft/dark/helpers/PlayerMsgHelper.java @@ -1,4 +1,4 @@ -package dark.library.helpers; +package dark.helpers; import java.util.Iterator; import java.util.List; diff --git a/src/minecraft/dark/library/helpers/Time.java b/src/minecraft/dark/helpers/Time.java similarity index 91% rename from src/minecraft/dark/library/helpers/Time.java rename to src/minecraft/dark/helpers/Time.java index 74f10b0b..fa767d0a 100644 --- a/src/minecraft/dark/library/helpers/Time.java +++ b/src/minecraft/dark/helpers/Time.java @@ -1,4 +1,4 @@ -package dark.library.helpers; +package dark.helpers; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/src/minecraft/dark/hydraulic/Credits b/src/minecraft/dark/hydraulic/Credits deleted file mode 100644 index 75d1264e..00000000 --- a/src/minecraft/dark/hydraulic/Credits +++ /dev/null @@ -1 +0,0 @@ -Most of the workings of hydraulics is credited to universal electric and its creator Calclavia. hydraulics though is not a fully copy but a revised version of UE to function for Liquid Systems. \ No newline at end of file diff --git a/src/minecraft/dark/hydraulic/INFO.java b/src/minecraft/dark/hydraulic/INFO.java deleted file mode 100644 index d0fd2a77..00000000 --- a/src/minecraft/dark/hydraulic/INFO.java +++ /dev/null @@ -1,15 +0,0 @@ -package dark.hydraulic; - -public class INFO -{ - /** - * I would place a txt file here but the reob would just ignore it - * - * Anyways if you use the hydraulics system to make your mod more compatible with fluid - * mechanics you only need the api file. However, if you wish to make your own pipes you need - * the core folder as well. As well you will need to register your mod threw the Hydraulics - * class to activate it. - * - * - */ -} diff --git a/src/minecraft/dark/library/effects/FXBeam.java b/src/minecraft/dark/library/effects/FXBeam.java index 4bb15026..8be129b0 100644 --- a/src/minecraft/dark/library/effects/FXBeam.java +++ b/src/minecraft/dark/library/effects/FXBeam.java @@ -12,7 +12,7 @@ import net.minecraft.world.World; import org.lwjgl.opengl.GL11; import universalelectricity.core.vector.Vector3; -import dark.library.DarkMain; +import dark.core.DarkMain; /** * Based off Thaumcraft's Beam Renderer. diff --git a/src/minecraft/dark/library/gui/GuiButtonArrow.java b/src/minecraft/dark/library/gui/GuiButtonArrow.java index 41779e3c..a747a6f2 100644 --- a/src/minecraft/dark/library/gui/GuiButtonArrow.java +++ b/src/minecraft/dark/library/gui/GuiButtonArrow.java @@ -5,7 +5,7 @@ import net.minecraft.client.gui.GuiButton; import org.lwjgl.opengl.GL11; -import dark.library.DarkMain; +import dark.core.DarkMain; public class GuiButtonArrow extends GuiButton { diff --git a/src/minecraft/dark/library/gui/GuiGlobalList.java b/src/minecraft/dark/library/gui/GuiGlobalList.java index 5be7d59a..f356c913 100644 --- a/src/minecraft/dark/library/gui/GuiGlobalList.java +++ b/src/minecraft/dark/library/gui/GuiGlobalList.java @@ -17,9 +17,9 @@ import org.lwjgl.opengl.GL11; import universalelectricity.core.vector.Vector2; import universalelectricity.prefab.GuiBase; import universalelectricity.prefab.vector.Region2; -import dark.library.DarkMain; +import dark.core.DarkMain; +import dark.core.api.terminal.IScroll; import dark.library.access.UserAccess; -import dark.library.access.interfaces.IScroll; public class GuiGlobalList extends GuiBase implements IScroll { diff --git a/src/minecraft/dark/library/machine/TileEntityRunnableMachine.java b/src/minecraft/dark/library/machine/TileEntityRunnableMachine.java index f240b386..4ba32290 100644 --- a/src/minecraft/dark/library/machine/TileEntityRunnableMachine.java +++ b/src/minecraft/dark/library/machine/TileEntityRunnableMachine.java @@ -4,7 +4,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.oredict.OreDictionary; import calclavia.lib.TileEntityUniversalRunnable; -import dark.library.PowerSystems; +import dark.core.power.PowerSystems; public class TileEntityRunnableMachine extends TileEntityUniversalRunnable { diff --git a/src/minecraft/dark/library/machine/crafting/AutoCraftingManager.java b/src/minecraft/dark/library/machine/crafting/AutoCraftingManager.java index 97698ab4..35a202f7 100644 --- a/src/minecraft/dark/library/machine/crafting/AutoCraftingManager.java +++ b/src/minecraft/dark/library/machine/crafting/AutoCraftingManager.java @@ -18,7 +18,7 @@ import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; import cpw.mods.fml.relauncher.ReflectionHelper; -import dark.library.helpers.Pair; +import dark.helpers.Pair; /** * Rewrite of the imprinter crafting system into its own manageable class diff --git a/src/minecraft/dark/library/terminal/ContainerTerminal.java b/src/minecraft/dark/library/machine/terminal/ContainerTerminal.java similarity index 95% rename from src/minecraft/dark/library/terminal/ContainerTerminal.java rename to src/minecraft/dark/library/machine/terminal/ContainerTerminal.java index 7a521e04..44b8d39c 100644 --- a/src/minecraft/dark/library/terminal/ContainerTerminal.java +++ b/src/minecraft/dark/library/machine/terminal/ContainerTerminal.java @@ -1,4 +1,4 @@ -package dark.library.terminal; +package dark.library.machine.terminal; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/minecraft/dark/library/terminal/TileEntityTerminal.java b/src/minecraft/dark/library/machine/terminal/TileEntityTerminal.java similarity index 97% rename from src/minecraft/dark/library/terminal/TileEntityTerminal.java rename to src/minecraft/dark/library/machine/terminal/TileEntityTerminal.java index 258dce0b..6479bf59 100644 --- a/src/minecraft/dark/library/terminal/TileEntityTerminal.java +++ b/src/minecraft/dark/library/machine/terminal/TileEntityTerminal.java @@ -1,4 +1,4 @@ -package dark.library.terminal; +package dark.library.machine.terminal; import java.util.ArrayList; import java.util.HashSet; @@ -20,12 +20,12 @@ import com.google.common.io.ByteArrayDataInput; import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.network.PacketDispatcher; import cpw.mods.fml.common.network.Player; +import dark.core.api.terminal.ISpecialAccess; +import dark.core.api.terminal.ITerminal; import dark.library.access.AccessLevel; import dark.library.access.UserAccess; -import dark.library.access.interfaces.ISpecialAccess; -import dark.library.access.interfaces.ITerminal; import dark.library.machine.TileEntityRunnableMachine; -import dark.library.terminal.commands.CommandRegistry; +import dark.library.machine.terminal.commands.CommandRegistry; /** * diff --git a/src/minecraft/dark/library/terminal/commands/CommandHelp.java b/src/minecraft/dark/library/machine/terminal/commands/CommandHelp.java similarity index 93% rename from src/minecraft/dark/library/terminal/commands/CommandHelp.java rename to src/minecraft/dark/library/machine/terminal/commands/CommandHelp.java index 04f3435f..7c0b91d7 100644 --- a/src/minecraft/dark/library/terminal/commands/CommandHelp.java +++ b/src/minecraft/dark/library/machine/terminal/commands/CommandHelp.java @@ -1,12 +1,12 @@ -package dark.library.terminal.commands; +package dark.library.machine.terminal.commands; import java.util.ArrayList; import java.util.List; import net.minecraft.entity.player.EntityPlayer; -import dark.library.access.interfaces.ISpecialAccess; -import dark.library.access.interfaces.ITerminal; +import dark.core.api.terminal.ISpecialAccess; +import dark.core.api.terminal.ITerminal; public class CommandHelp extends TerminalCommand { diff --git a/src/minecraft/dark/library/terminal/commands/CommandRegistry.java b/src/minecraft/dark/library/machine/terminal/commands/CommandRegistry.java similarity index 94% rename from src/minecraft/dark/library/terminal/commands/CommandRegistry.java rename to src/minecraft/dark/library/machine/terminal/commands/CommandRegistry.java index 82f36a97..b012d76a 100644 --- a/src/minecraft/dark/library/terminal/commands/CommandRegistry.java +++ b/src/minecraft/dark/library/machine/terminal/commands/CommandRegistry.java @@ -1,11 +1,11 @@ -package dark.library.terminal.commands; +package dark.library.machine.terminal.commands; import java.util.ArrayList; import java.util.List; import net.minecraft.entity.player.EntityPlayer; -import dark.library.access.interfaces.ITerminal; +import dark.core.api.terminal.ITerminal; /** * * @author Calclavia, DarkGuardsman diff --git a/src/minecraft/dark/library/terminal/commands/CommandUser.java b/src/minecraft/dark/library/machine/terminal/commands/CommandUser.java similarity index 94% rename from src/minecraft/dark/library/terminal/commands/CommandUser.java rename to src/minecraft/dark/library/machine/terminal/commands/CommandUser.java index 60b63765..5c846045 100644 --- a/src/minecraft/dark/library/terminal/commands/CommandUser.java +++ b/src/minecraft/dark/library/machine/terminal/commands/CommandUser.java @@ -1,12 +1,12 @@ -package dark.library.terminal.commands; +package dark.library.machine.terminal.commands; import java.util.ArrayList; import java.util.List; import net.minecraft.entity.player.EntityPlayer; +import dark.core.api.terminal.ISpecialAccess; +import dark.core.api.terminal.ITerminal; import dark.library.access.AccessLevel; -import dark.library.access.interfaces.ISpecialAccess; -import dark.library.access.interfaces.ITerminal; public class CommandUser extends TerminalCommand { diff --git a/src/minecraft/dark/library/terminal/commands/TerminalCommand.java b/src/minecraft/dark/library/machine/terminal/commands/TerminalCommand.java similarity index 90% rename from src/minecraft/dark/library/terminal/commands/TerminalCommand.java rename to src/minecraft/dark/library/machine/terminal/commands/TerminalCommand.java index e2fc93fe..073cd090 100644 --- a/src/minecraft/dark/library/terminal/commands/TerminalCommand.java +++ b/src/minecraft/dark/library/machine/terminal/commands/TerminalCommand.java @@ -1,11 +1,11 @@ -package dark.library.terminal.commands; +package dark.library.machine.terminal.commands; import java.util.List; import net.minecraft.entity.player.EntityPlayer; -import dark.library.access.interfaces.ISpecialAccess; -import dark.library.access.interfaces.ITerminal; +import dark.core.api.terminal.ISpecialAccess; +import dark.core.api.terminal.ITerminal; /** * * @author Calclavia, DarkGuardsman diff --git a/src/minecraft/dark/library/npc/IAdvancedNpc.java b/src/minecraft/dark/library/npc/IAdvancedNpc.java deleted file mode 100644 index 1dc94f12..00000000 --- a/src/minecraft/dark/library/npc/IAdvancedNpc.java +++ /dev/null @@ -1,11 +0,0 @@ -package dark.library.npc; - -import dark.faction.core.FactionInstance; -import net.minecraft.entity.INpc; - -public interface IAdvancedNpc extends INpc -{ - public FactionInstance getFaction(); - - public String getName(); -} diff --git a/src/minecraft/dark/library/npc/NPC_FORMATE.txt b/src/minecraft/dark/library/npc/NPC_FORMATE.txt deleted file mode 100644 index 1ac462c8..00000000 --- a/src/minecraft/dark/library/npc/NPC_FORMATE.txt +++ /dev/null @@ -1,4 +0,0 @@ -TASK: Collection -From: tile.chest ore -To: tile.furnace 0 - diff --git a/src/minecraft/dark/library/npc/TaskGroup.java b/src/minecraft/dark/library/npc/TaskGroup.java deleted file mode 100644 index f4d6a1b9..00000000 --- a/src/minecraft/dark/library/npc/TaskGroup.java +++ /dev/null @@ -1,30 +0,0 @@ -package dark.library.npc; - -import universalelectricity.prefab.TranslationHelper; - -public enum TaskGroup -{ - /* Collection of items for ground or inventories */ - COLLECTION("collection"), - /* Defence of an area from NPCs or Players */ - DEFENCE("Guardsman"), - /* Attack of an area against NPCs or Players */ - OFFENCE("Soldier"), - /* Creation or repair of items/blocks */ - CRAFTING("Crafter"); - - public String unlocalizedName; - - private TaskGroup(String name) - { - this.unlocalizedName = name; - } - - /** - * Returns the localized name of a task for GUIs/etc - */ - public String getLocalizedName() - { - return TranslationHelper.getLocal("npc.task." + this.unlocalizedName); - } -} diff --git a/src/minecraft/dark/library/orbit/NetworkOrbit.java b/src/minecraft/dark/library/orbit/NetworkOrbit.java index 6f27f81f..a7fe902c 100644 --- a/src/minecraft/dark/library/orbit/NetworkOrbit.java +++ b/src/minecraft/dark/library/orbit/NetworkOrbit.java @@ -4,7 +4,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map.Entry; -import dark.library.helpers.Pair; +import dark.helpers.Pair; import dark.library.math.LinearAlg; import dark.library.math.Quaternion; diff --git a/src/minecraft/dark/hydraulic/prefab/tile/TileEntityFluidDevice.java b/src/minecraft/dark/prefab/tile/fluid/TileEntityFluidDevice.java similarity index 86% rename from src/minecraft/dark/hydraulic/prefab/tile/TileEntityFluidDevice.java rename to src/minecraft/dark/prefab/tile/fluid/TileEntityFluidDevice.java index 63556ebf..9e600d75 100644 --- a/src/minecraft/dark/hydraulic/prefab/tile/TileEntityFluidDevice.java +++ b/src/minecraft/dark/prefab/tile/fluid/TileEntityFluidDevice.java @@ -1,17 +1,15 @@ -package dark.hydraulic.prefab.tile; - +package dark.prefab.tile.fluid; 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; import net.minecraftforge.liquids.LiquidStack; import universalelectricity.prefab.tile.TileEntityAdvanced; +import dark.core.api.network.ITileConnector; +import dark.core.api.tools.IReadOut; +import dark.core.hydraulic.network.fluid.HydraulicNetworkHelper; public abstract class TileEntityFluidDevice extends TileEntityAdvanced implements IReadOut, ITileConnector { diff --git a/src/minecraft/dark/hydraulic/prefab/tile/TileEntityFluidStorage.java b/src/minecraft/dark/prefab/tile/fluid/TileEntityFluidStorage.java similarity index 93% rename from src/minecraft/dark/hydraulic/prefab/tile/TileEntityFluidStorage.java rename to src/minecraft/dark/prefab/tile/fluid/TileEntityFluidStorage.java index 0b7bf55f..21407d77 100644 --- a/src/minecraft/dark/hydraulic/prefab/tile/TileEntityFluidStorage.java +++ b/src/minecraft/dark/prefab/tile/fluid/TileEntityFluidStorage.java @@ -1,7 +1,5 @@ -package dark.hydraulic.prefab.tile; +package dark.prefab.tile.fluid; -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; @@ -12,6 +10,9 @@ import net.minecraftforge.liquids.LiquidContainerRegistry; import net.minecraftforge.liquids.LiquidDictionary; import net.minecraftforge.liquids.LiquidStack; import net.minecraftforge.liquids.LiquidTank; +import dark.core.api.IColorCoded; +import dark.core.hydraulic.helpers.FluidHelper; +import dark.core.hydraulic.helpers.FluidRestrictionHandler; public abstract class TileEntityFluidStorage extends TileEntityFluidDevice implements ITankContainer, IColorCoded { @@ -56,7 +57,7 @@ public abstract class TileEntityFluidStorage extends TileEntityFluidDevice imple { return 0; } - else if (!getColor().isValidLiquid(resource)) + else if (!FluidRestrictionHandler.isValidLiquid(getColor(),resource)) { return 0; }