Added fluid models (#3543)

src/main/java/appeng/container/implementations/ContainerUpgradeable.java

@@ -289,7 +289,7 @@ public class ContainerUpgradeable extends AEBaseContainer implements IOptionalSl
 		return this.fzMode;
 	}
 
-	void setFuzzyMode( final FuzzyMode fzMode )
+	protected void setFuzzyMode( final FuzzyMode fzMode )
 	{
 		this.fzMode = fzMode;
 	}
@@ -324,7 +324,7 @@ public class ContainerUpgradeable extends AEBaseContainer implements IOptionalSl
 		this.schedulingMode = schedulingMode;
 	}
 
-	IUpgradeableHost getUpgradeable()
+	protected IUpgradeableHost getUpgradeable()
 	{
 		return this.upgradeable;
 	}

src/main/java/appeng/core/sync/GuiBridge.java

@@ -62,9 +62,6 @@ import appeng.container.implementations.ContainerCraftingCPU;
 import appeng.container.implementations.ContainerCraftingStatus;
 import appeng.container.implementations.ContainerCraftingTerm;
 import appeng.container.implementations.ContainerDrive;
-import appeng.container.implementations.ContainerFluidIO;
-import appeng.container.implementations.ContainerFluidStorageBus;
-import appeng.container.implementations.ContainerFluidTerminal;
 import appeng.container.implementations.ContainerFormationPlane;
 import appeng.container.implementations.ContainerGrinder;
 import appeng.container.implementations.ContainerIOPort;
@@ -89,7 +86,11 @@ import appeng.container.implementations.ContainerUpgradeable;
 import appeng.container.implementations.ContainerVibrationChamber;
 import appeng.container.implementations.ContainerWireless;
 import appeng.container.implementations.ContainerWirelessTerm;
+import appeng.fluids.container.ContainerFluidIO;
+import appeng.fluids.container.ContainerFluidStorageBus;
+import appeng.fluids.container.ContainerFluidTerminal;
 import appeng.fluids.parts.PartFluidStorageBus;
+import appeng.fluids.parts.PartFluidTerminal;
 import appeng.fluids.parts.PartSharedFluidBus;
 import appeng.helpers.IInterfaceHost;
 import appeng.helpers.IPriorityHost;
@@ -99,7 +100,6 @@ import appeng.parts.automation.PartFormationPlane;
 import appeng.parts.automation.PartLevelEmitter;
 import appeng.parts.misc.PartStorageBus;
 import appeng.parts.reporting.PartCraftingTerminal;
-import appeng.parts.reporting.PartFluidTerminal;
 import appeng.parts.reporting.PartInterfaceTerminal;
 import appeng.parts.reporting.PartPatternTerminal;
 import appeng.tile.crafting.TileCraftingTile;

src/main/java/appeng/core/sync/packets/PacketMEFluidInventoryUpdate.java

@@ -40,10 +40,10 @@ import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
 import appeng.api.storage.data.IAEFluidStack;
-import appeng.client.gui.implementations.GuiFluidTerminal;
 import appeng.core.AELog;
 import appeng.core.sync.AppEngPacket;
 import appeng.core.sync.network.INetworkInfo;
+import appeng.fluids.client.gui.GuiFluidTerminal;
 import appeng.util.item.AEFluidStack;
 
 

src/main/java/appeng/core/sync/packets/PacketTargetFluidStack.java

@@ -24,10 +24,10 @@ import io.netty.buffer.Unpooled;
 
 import net.minecraft.entity.player.EntityPlayer;
 
-import appeng.container.implementations.ContainerFluidTerminal;
 import appeng.core.AELog;
 import appeng.core.sync.AppEngPacket;
 import appeng.core.sync.network.INetworkInfo;
+import appeng.fluids.container.ContainerFluidTerminal;
 import appeng.util.item.AEFluidStack;
 
 

src/main/java/appeng/core/sync/packets/PacketValueConfig.java

@@ -44,7 +44,6 @@ import appeng.container.implementations.ContainerCellWorkbench;
 import appeng.container.implementations.ContainerCraftConfirm;
 import appeng.container.implementations.ContainerCraftingCPU;
 import appeng.container.implementations.ContainerCraftingStatus;
-import appeng.container.implementations.ContainerFluidStorageBus;
 import appeng.container.implementations.ContainerLevelEmitter;
 import appeng.container.implementations.ContainerNetworkTool;
 import appeng.container.implementations.ContainerPatternTerm;
@@ -54,6 +53,7 @@ import appeng.container.implementations.ContainerSecurityStation;
 import appeng.container.implementations.ContainerStorageBus;
 import appeng.core.sync.AppEngPacket;
 import appeng.core.sync.network.INetworkInfo;
+import appeng.fluids.container.ContainerFluidStorageBus;
 import appeng.helpers.IMouseWheelItem;
 
 

src/main/java/appeng/fluids/client/gui/GuiFluidIO.java

@@ -16,14 +16,15 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.client.gui.implementations;
+package appeng.fluids.client.gui;
 
 
 import net.minecraft.entity.player.InventoryPlayer;
 
 import appeng.api.implementations.IUpgradeableHost;
-import appeng.container.implementations.ContainerFluidIO;
+import appeng.client.gui.implementations.GuiUpgradeable;
 import appeng.core.localization.GuiText;
+import appeng.fluids.container.ContainerFluidIO;
 import appeng.fluids.parts.PartFluidImportBus;
 
 

src/main/java/appeng/fluids/client/gui/GuiFluidStorageBus.java

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.client.gui.implementations;
+package appeng.fluids.client.gui;
 
 
 import java.io.IOException;
@@ -31,9 +31,9 @@ import appeng.api.config.ActionItems;
 import appeng.api.config.FuzzyMode;
 import appeng.api.config.Settings;
 import appeng.api.config.StorageFilter;
+import appeng.client.gui.implementations.GuiUpgradeable;
 import appeng.client.gui.widgets.GuiImgButton;
 import appeng.client.gui.widgets.GuiTabButton;
-import appeng.container.implementations.ContainerFluidStorageBus;
 import appeng.core.AELog;
 import appeng.core.localization.GuiText;
 import appeng.core.sync.GuiBridge;
@@ -41,6 +41,7 @@ import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.PacketConfigButton;
 import appeng.core.sync.packets.PacketSwitchGuis;
 import appeng.core.sync.packets.PacketValueConfig;
+import appeng.fluids.container.ContainerFluidStorageBus;
 import appeng.fluids.parts.PartFluidStorageBus;
 
 

src/main/java/appeng/fluids/client/gui/GuiFluidTerminal.java

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.client.gui.implementations;
+package appeng.fluids.client.gui;
 
 
 import java.io.IOException;
@@ -47,15 +47,15 @@ import appeng.client.gui.widgets.MEGuiTextField;
 import appeng.client.me.FluidRepo;
 import appeng.client.me.SlotFluidME;
 import appeng.client.me.InternalFluidSlotME;
-import appeng.container.implementations.ContainerFluidTerminal;
 import appeng.container.slot.ISlotFluid;
 import appeng.core.AELog;
 import appeng.core.localization.GuiText;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.PacketInventoryAction;
 import appeng.core.sync.packets.PacketValueConfig;
+import appeng.fluids.container.ContainerFluidTerminal;
+import appeng.fluids.parts.PartFluidTerminal;
 import appeng.helpers.InventoryAction;
-import appeng.parts.reporting.PartFluidTerminal;
 import appeng.util.IConfigManagerHost;
 import appeng.util.Platform;
 import appeng.util.item.AEFluidStack;

src/main/java/appeng/fluids/container/ContainerFluidIO.java

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.container.implementations;
+package appeng.fluids.container;
 
 
 import net.minecraft.entity.player.InventoryPlayer;
@@ -26,6 +26,7 @@ import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
 import net.minecraftforge.items.IItemHandler;
 
 import appeng.api.implementations.IUpgradeableHost;
+import appeng.container.implementations.ContainerUpgradeable;
 import appeng.container.slot.OptionalSlotFakeFluid;
 import appeng.container.slot.SlotFakeFluid;
 

src/main/java/appeng/fluids/container/ContainerFluidStorageBus.java

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.container.implementations;
+package appeng.fluids.container;
 
 
 import java.util.Iterator;
@@ -37,6 +37,7 @@ import appeng.api.storage.channels.IFluidStorageChannel;
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.api.storage.data.IItemList;
 import appeng.container.guisync.GuiSync;
+import appeng.container.implementations.ContainerUpgradeable;
 import appeng.container.slot.OptionalSlotFakeFluid;
 import appeng.container.slot.SlotFakeFluid;
 import appeng.container.slot.SlotRestrictedInput;

src/main/java/appeng/fluids/container/ContainerFluidTerminal.java

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.container.implementations;
+package appeng.fluids.container;
 
 
 import java.io.IOException;
@@ -63,9 +63,9 @@ import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.PacketMEFluidInventoryUpdate;
 import appeng.core.sync.packets.PacketTargetFluidStack;
 import appeng.core.sync.packets.PacketValueConfig;
+import appeng.fluids.parts.PartFluidTerminal;
 import appeng.helpers.InventoryAction;
 import appeng.me.helpers.ChannelPowerSrc;
-import appeng.parts.reporting.PartFluidTerminal;
 import appeng.util.ConfigManager;
 import appeng.util.IConfigManagerHost;
 import appeng.util.Platform;

src/main/java/appeng/fluids/parts/PartFluidTerminal.java

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.parts.reporting;
+package appeng.fluids.parts;
 
 
 import net.minecraft.entity.player.EntityPlayer;
@@ -28,6 +28,7 @@ import appeng.core.AppEng;
 import appeng.core.sync.GuiBridge;
 import appeng.items.parts.PartModels;
 import appeng.parts.PartModel;
+import appeng.parts.reporting.AbstractPartTerminal;
 
 
 /**
@@ -39,9 +40,9 @@ public class PartFluidTerminal extends AbstractPartTerminal
 {
 
 	@PartModels
-	public static final ResourceLocation MODEL_OFF = new ResourceLocation( AppEng.MOD_ID, "part/crafting_terminal_off" );
+	public static final ResourceLocation MODEL_OFF = new ResourceLocation( AppEng.MOD_ID, "part/fluid_terminal_off" );
 	@PartModels
-	public static final ResourceLocation MODEL_ON = new ResourceLocation( AppEng.MOD_ID, "part/crafting_terminal_on" );
+	public static final ResourceLocation MODEL_ON = new ResourceLocation( AppEng.MOD_ID, "part/fluid_terminal_on" );
 
 	public static final IPartModel MODELS_OFF = new PartModel( MODEL_BASE, MODEL_OFF, MODEL_STATUS_OFF );
 	public static final IPartModel MODELS_ON = new PartModel( MODEL_BASE, MODEL_ON, MODEL_STATUS_ON );

src/main/java/appeng/items/parts/PartType.java

@@ -44,6 +44,7 @@ import appeng.core.localization.GuiText;
 import appeng.fluids.parts.PartFluidExportBus;
 import appeng.fluids.parts.PartFluidImportBus;
 import appeng.fluids.parts.PartFluidStorageBus;
+import appeng.fluids.parts.PartFluidTerminal;
 import appeng.integration.IntegrationRegistry;
 import appeng.integration.IntegrationType;
 import appeng.parts.automation.PartAnnihilationPlane;
@@ -73,7 +74,6 @@ import appeng.parts.p2p.PartP2PTunnelME;
 import appeng.parts.reporting.PartConversionMonitor;
 import appeng.parts.reporting.PartCraftingTerminal;
 import appeng.parts.reporting.PartDarkPanel;
-import appeng.parts.reporting.PartFluidTerminal;
 import appeng.parts.reporting.PartInterfaceTerminal;
 import appeng.parts.reporting.PartPanel;
 import appeng.parts.reporting.PartPatternTerminal;