Render Performance Improvements (#4721)

* Return a fixed bounding box for frustrum culling of AE tile entity renderers to prevent Forge from re-retrieving the TE from the world and calculating the collision box (very costly for cables).

* Changed dynamic cable bus lighting to be based on block states to improved rendering speed and fix optifine issues. (Potential fix for #4716).

src/api/java/appeng/api/networking/GridNotification.java

@@ -28,4 +28,9 @@ public enum GridNotification {
      * the visible connections for this node have changed, useful for cable.
      */
     CONNECTIONS_CHANGED,
+
+    /**
+     * the owner of the grid node has changed, and the node needs to be re-saved
+     */
+    OWNER_CHANGED
 }

src/api/java/appeng/api/networking/IGridBlock.java

@@ -87,7 +87,8 @@ public interface IGridBlock {
     AEColor getGridColor();
 
     /**
-     * Notifies your IGridBlock that changes were made to your connections
+     * Called by the {@link IGridNode} to notify its {@link IGridBlock} about
+     * events.
      */
     void onGridNotification(@Nonnull GridNotification notification);
 

src/main/java/appeng/block/networking/CableBusBlock.java

@@ -39,6 +39,8 @@ import net.minecraft.item.BlockItemUseContext;
 import net.minecraft.item.DyeColor;
 import net.minecraft.item.ItemGroup;
 import net.minecraft.item.ItemStack;
+import net.minecraft.state.IntegerProperty;
+import net.minecraft.state.StateContainer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ActionResultType;
 import net.minecraft.util.Direction;
@@ -82,8 +84,12 @@ public class CableBusBlock extends AEBaseTileBlock<CableBusTileEntity> implement
 
     private static final ICableBusContainer NULL_CABLE_BUS = new NullCableBusContainer();
 
+    private static final IntegerProperty LIGHT_LEVEL = IntegerProperty.create("light_level", 0, 15);
+
     public CableBusBlock() {
-        super(defaultProps(AEMaterials.GLASS).notSolid().noDrops().variableOpacity());
+        super(defaultProps(AEMaterials.GLASS).notSolid().noDrops().variableOpacity()
+                .setLightLevel(state -> state.get(LIGHT_LEVEL)));
+        setDefaultState(getDefaultState().with(LIGHT_LEVEL, 0));
     }
 
     @Override
@@ -126,11 +132,9 @@ public class CableBusBlock extends AEBaseTileBlock<CableBusTileEntity> implement
     }
 
     @Override
-    public int getLightValue(final BlockState state, final IBlockReader world, final BlockPos pos) {
-        if (state.getBlock() != this) {
-            return state.getBlock().getLightValue(state, world, pos);
-        }
-        return this.cb(world, pos).getLightValue();
+    protected void fillStateContainer(StateContainer.Builder<Block, BlockState> builder) {
+        super.fillStateContainer(builder);
+        builder.add(LIGHT_LEVEL);
     }
 
     @Override
@@ -386,4 +390,13 @@ public class CableBusBlock extends AEBaseTileBlock<CableBusTileEntity> implement
         }
     }
 
+    @Override
+    protected BlockState updateBlockStateFromTileEntity(BlockState currentState, CableBusTileEntity te) {
+        if (currentState.getBlock() != this) {
+            return currentState;
+        }
+        int lightLevel = te.getCableBus().getLightValue();
+        return super.updateBlockStateFromTileEntity(currentState, te).with(LIGHT_LEVEL, lightLevel);
+    }
+
 }

src/main/java/appeng/client/gui/AEBaseScreen.java

@@ -70,7 +70,6 @@ import appeng.client.gui.widgets.Scrollbar;
 import appeng.client.me.InternalSlotME;
 import appeng.client.me.SlotDisconnected;
 import appeng.client.me.SlotME;
-import appeng.client.render.FluidStackSizeRenderer;
 import appeng.client.render.StackSizeRenderer;
 import appeng.container.AEBaseContainer;
 import appeng.container.slot.AppEngCraftingSlot;
@@ -79,7 +78,6 @@ import appeng.container.slot.AppEngSlot.CalculatedValidity;
 import appeng.container.slot.CraftingTermSlot;
 import appeng.container.slot.DisabledSlot;
 import appeng.container.slot.FakeSlot;
-import appeng.container.slot.IMEFluidSlot;
 import appeng.container.slot.IOptionalSlot;
 import appeng.container.slot.InaccessibleSlot;
 import appeng.container.slot.OutputSlot;
@@ -90,6 +88,8 @@ import appeng.core.AppEng;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.InventoryActionPacket;
 import appeng.core.sync.packets.SwapSlotsPacket;
+import appeng.fluids.client.render.FluidStackSizeRenderer;
+import appeng.fluids.container.slots.IMEFluidSlot;
 import appeng.helpers.InventoryAction;
 
 public abstract class AEBaseScreen<T extends AEBaseContainer> extends ContainerScreen<T> {

src/main/java/appeng/client/me/FluidRepo.java

@@ -37,8 +37,8 @@ import appeng.client.gui.widgets.IScrollSource;
 import appeng.client.gui.widgets.ISortSource;
 import appeng.core.AEConfig;
 import appeng.core.Api;
+import appeng.fluids.util.FluidSorters;
 import appeng.util.Platform;
-import appeng.util.fluid.FluidSorters;
 import appeng.util.prioritylist.IPartitionList;
 
 public class FluidRepo {

src/main/java/appeng/client/me/SlotFluidME.java

@@ -27,7 +27,7 @@ import net.minecraft.inventory.container.Slot;
 import net.minecraft.item.ItemStack;
 
 import appeng.api.storage.data.IAEFluidStack;
-import appeng.container.slot.IMEFluidSlot;
+import appeng.fluids.container.slots.IMEFluidSlot;
 
 public class SlotFluidME extends Slot implements IMEFluidSlot {
 

src/main/java/appeng/client/render/DummyFluidDispatcherBakedModel.java

@@ -45,7 +45,7 @@ import net.minecraftforge.client.model.ItemLayerModel;
 import net.minecraftforge.fluids.FluidAttributes;
 import net.minecraftforge.fluids.FluidStack;
 
-import appeng.items.misc.FluidDummyItem;
+import appeng.fluids.items.FluidDummyItem;
 
 /**
  * This baked model class is used as a dispatcher to redirect the renderer to

src/main/java/appeng/core/Registration.java

@@ -100,12 +100,6 @@ import appeng.client.gui.implementations.CraftingCPUScreen;
 import appeng.client.gui.implementations.CraftingStatusScreen;
 import appeng.client.gui.implementations.CraftingTermScreen;
 import appeng.client.gui.implementations.DriveScreen;
-import appeng.client.gui.implementations.FluidFormationPlaneScreen;
-import appeng.client.gui.implementations.FluidIOScreen;
-import appeng.client.gui.implementations.FluidInterfaceScreen;
-import appeng.client.gui.implementations.FluidLevelEmitterScreen;
-import appeng.client.gui.implementations.FluidStorageBusScreen;
-import appeng.client.gui.implementations.FluidTerminalScreen;
 import appeng.client.gui.implementations.FormationPlaneScreen;
 import appeng.client.gui.implementations.GrinderScreen;
 import appeng.client.gui.implementations.IOPortScreen;
@@ -165,12 +159,6 @@ import appeng.container.implementations.CraftingCPUContainer;
 import appeng.container.implementations.CraftingStatusContainer;
 import appeng.container.implementations.CraftingTermContainer;
 import appeng.container.implementations.DriveContainer;
-import appeng.container.implementations.FluidFormationPlaneContainer;
-import appeng.container.implementations.FluidIOContainer;
-import appeng.container.implementations.FluidInterfaceContainer;
-import appeng.container.implementations.FluidLevelEmitterContainer;
-import appeng.container.implementations.FluidStorageBusContainer;
-import appeng.container.implementations.FluidTerminalContainer;
 import appeng.container.implementations.FormationPlaneContainer;
 import appeng.container.implementations.GrinderContainer;
 import appeng.container.implementations.IOPortContainer;
@@ -198,12 +186,24 @@ import appeng.container.implementations.WirelessTermContainer;
 import appeng.core.features.registries.P2PTunnelRegistry;
 import appeng.core.features.registries.PartModels;
 import appeng.core.features.registries.cell.BasicCellHandler;
-import appeng.core.features.registries.cell.BasicFluidCellGuiHandler;
 import appeng.core.features.registries.cell.BasicItemCellGuiHandler;
 import appeng.core.features.registries.cell.CreativeCellHandler;
 import appeng.core.localization.GuiText;
 import appeng.core.stats.AdvancementTriggers;
 import appeng.core.stats.AeStats;
+import appeng.fluids.client.gui.FluidFormationPlaneScreen;
+import appeng.fluids.client.gui.FluidIOScreen;
+import appeng.fluids.client.gui.FluidInterfaceScreen;
+import appeng.fluids.client.gui.FluidLevelEmitterScreen;
+import appeng.fluids.client.gui.FluidStorageBusScreen;
+import appeng.fluids.client.gui.FluidTerminalScreen;
+import appeng.fluids.container.FluidFormationPlaneContainer;
+import appeng.fluids.container.FluidIOContainer;
+import appeng.fluids.container.FluidInterfaceContainer;
+import appeng.fluids.container.FluidLevelEmitterContainer;
+import appeng.fluids.container.FluidStorageBusContainer;
+import appeng.fluids.container.FluidTerminalContainer;
+import appeng.fluids.registries.BasicFluidCellGuiHandler;
 import appeng.items.parts.FacadeItem;
 import appeng.me.cache.CraftingGridCache;
 import appeng.me.cache.EnergyGridCache;

src/main/java/appeng/core/api/ApiStorage.java

@@ -47,10 +47,10 @@ import appeng.api.storage.data.IAEItemStack;
 import appeng.api.storage.data.IAEStack;
 import appeng.api.storage.data.IItemList;
 import appeng.crafting.CraftingLink;
-import appeng.items.misc.FluidDummyItem;
+import appeng.fluids.items.FluidDummyItem;
+import appeng.fluids.util.AEFluidStack;
+import appeng.fluids.util.FluidList;
 import appeng.util.Platform;
-import appeng.util.fluid.AEFluidStack;
-import appeng.util.fluid.FluidList;
 import appeng.util.item.AEItemStack;
 import appeng.util.item.ItemList;
 

src/main/java/appeng/core/api/definitions/ApiBlocks.java

@@ -22,6 +22,7 @@ import static appeng.block.AEBaseBlock.defaultProps;
 
 import net.minecraft.block.AbstractBlock;
 import net.minecraft.block.Block;
+import net.minecraft.block.Blocks;
 import net.minecraft.block.DispenserBlock;
 import net.minecraft.block.SlabBlock;
 import net.minecraft.block.SoundType;
@@ -51,7 +52,6 @@ import appeng.block.grindstone.GrinderBlock;
 import appeng.block.misc.CellWorkbenchBlock;
 import appeng.block.misc.ChargerBlock;
 import appeng.block.misc.CondenserBlock;
-import appeng.block.misc.FluidInterfaceBlock;
 import appeng.block.misc.InscriberBlock;
 import appeng.block.misc.InscriberRendering;
 import appeng.block.misc.InterfaceBlock;
@@ -123,6 +123,8 @@ import appeng.decorative.solid.QuartzPillarBlock;
 import appeng.decorative.solid.SkyStoneBlock;
 import appeng.decorative.solid.SkyStoneBlock.SkystoneType;
 import appeng.entity.TinyTNTPrimedEntity;
+import appeng.fluids.block.FluidInterfaceBlock;
+import appeng.fluids.tile.FluidInterfaceTileEntity;
 import appeng.hooks.TinyTNTDispenseItemBehavior;
 import appeng.tile.crafting.CraftingMonitorTileEntity;
 import appeng.tile.crafting.CraftingStorageTileEntity;
@@ -134,7 +136,6 @@ import appeng.tile.grindstone.GrinderTileEntity;
 import appeng.tile.misc.CellWorkbenchTileEntity;
 import appeng.tile.misc.ChargerTileEntity;
 import appeng.tile.misc.CondenserTileEntity;
-import appeng.tile.misc.FluidInterfaceTileEntity;
 import appeng.tile.misc.InscriberTileEntity;
 import appeng.tile.misc.InterfaceTileEntity;
 import appeng.tile.misc.LightDetectorTileEntity;

src/main/java/appeng/core/api/definitions/ApiItems.java

@@ -39,7 +39,6 @@ import appeng.bootstrap.FeatureFactory;
 import appeng.bootstrap.IItemRendering;
 import appeng.bootstrap.ItemRenderingCustomizer;
 import appeng.bootstrap.components.IClientSetupComponent;
-import appeng.client.render.FluidDummyItemColor;
 import appeng.core.AppEng;
 import appeng.core.features.ActivityState;
 import appeng.core.features.ColoredItemDefinition;
@@ -50,17 +49,18 @@ import appeng.debug.EraserItem;
 import appeng.debug.MeteoritePlacerItem;
 import appeng.debug.ReplicatorCardItem;
 import appeng.entity.GrowingCrystalEntity;
+import appeng.fluids.items.BasicFluidStorageCell;
+import appeng.fluids.items.FluidDummyItem;
+import appeng.fluids.items.FluidDummyItemColor;
 import appeng.hooks.BlockToolDispenseItemBehavior;
 import appeng.hooks.MatterCannonDispenseItemBehavior;
 import appeng.items.materials.MaterialType;
 import appeng.items.misc.CrystalSeedItem;
 import appeng.items.misc.CrystalSeedRendering;
 import appeng.items.misc.EncodedPatternItem;
-import appeng.items.misc.FluidDummyItem;
 import appeng.items.misc.PaintBallItem;
 import appeng.items.misc.PaintBallItemRendering;
 import appeng.items.parts.FacadeItem;
-import appeng.items.storage.BasicFluidStorageCell;
 import appeng.items.storage.BasicStorageCellItem;
 import appeng.items.storage.CreativeStorageCellItem;
 import appeng.items.storage.SpatialStorageCellItem;

src/main/java/appeng/core/api/definitions/ApiParts.java

@@ -33,24 +33,25 @@ import appeng.core.features.ActivityState;
 import appeng.core.features.ColoredItemDefinition;
 import appeng.core.features.ItemStackSrc;
 import appeng.core.features.registries.PartModels;
+import appeng.fluids.parts.FluidAnnihilationPlanePart;
+import appeng.fluids.parts.FluidExportBusPart;
+import appeng.fluids.parts.FluidFormationPlanePart;
+import appeng.fluids.parts.FluidImportBusPart;
+import appeng.fluids.parts.FluidInterfacePart;
+import appeng.fluids.parts.FluidLevelEmitterPart;
+import appeng.fluids.parts.FluidStorageBusPart;
+import appeng.fluids.parts.FluidTerminalPart;
 import appeng.items.parts.ColoredPartItem;
 import appeng.items.parts.PartItem;
 import appeng.items.parts.PartItemRendering;
 import appeng.items.parts.PartModelsHelper;
 import appeng.parts.automation.AnnihilationPlanePart;
 import appeng.parts.automation.ExportBusPart;
-import appeng.parts.automation.FluidAnnihilationPlanePart;
-import appeng.parts.automation.FluidExportBusPart;
-import appeng.parts.automation.FluidFormationPlanePart;
-import appeng.parts.automation.FluidImportBusPart;
-import appeng.parts.automation.FluidLevelEmitterPart;
 import appeng.parts.automation.FormationPlanePart;
 import appeng.parts.automation.IdentityAnnihilationPlanePart;
 import appeng.parts.automation.ImportBusPart;
 import appeng.parts.automation.LevelEmitterPart;
 import appeng.parts.misc.CableAnchorPart;
-import appeng.parts.misc.FluidInterfacePart;
-import appeng.parts.misc.FluidStorageBusPart;
 import appeng.parts.misc.InterfacePart;
 import appeng.parts.misc.InvertedToggleBusPart;
 import appeng.parts.misc.StorageBusPart;
@@ -70,7 +71,6 @@ import appeng.parts.p2p.RedstoneP2PTunnelPart;
 import appeng.parts.reporting.ConversionMonitorPart;
 import appeng.parts.reporting.CraftingTerminalPart;
 import appeng.parts.reporting.DarkPanelPart;
-import appeng.parts.reporting.FluidTerminalPart;
 import appeng.parts.reporting.InterfaceTerminalPart;
 import appeng.parts.reporting.PanelPart;
 import appeng.parts.reporting.PatternTerminalPart;

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

@@ -38,8 +38,6 @@ import appeng.container.implementations.CellWorkbenchContainer;
 import appeng.container.implementations.CraftConfirmContainer;
 import appeng.container.implementations.CraftingCPUContainer;
 import appeng.container.implementations.CraftingStatusContainer;
-import appeng.container.implementations.FluidLevelEmitterContainer;
-import appeng.container.implementations.FluidStorageBusContainer;
 import appeng.container.implementations.LevelEmitterContainer;
 import appeng.container.implementations.NetworkToolContainer;
 import appeng.container.implementations.PatternTermContainer;
@@ -49,6 +47,8 @@ import appeng.container.implementations.SecurityStationContainer;
 import appeng.container.implementations.StorageBusContainer;
 import appeng.core.sync.BasePacket;
 import appeng.core.sync.network.INetworkInfo;
+import appeng.fluids.container.FluidLevelEmitterContainer;
+import appeng.fluids.container.FluidStorageBusContainer;
 import appeng.helpers.IMouseWheelItem;
 
 public class ConfigValuePacket extends BasePacket {

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

@@ -29,10 +29,10 @@ import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.network.PacketBuffer;
 
 import appeng.api.storage.data.IAEFluidStack;
-import appeng.container.interfaces.IFluidSyncContainer;
 import appeng.core.sync.BasePacket;
 import appeng.core.sync.network.INetworkInfo;
-import appeng.util.fluid.AEFluidStack;
+import appeng.fluids.container.IFluidSyncContainer;
+import appeng.fluids.util.AEFluidStack;
 
 public class FluidSlotPacket extends BasePacket {
     private final Map<Integer, IAEFluidStack> list;

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

@@ -37,10 +37,10 @@ import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.fml.network.NetworkDirection;
 
 import appeng.api.storage.data.IAEFluidStack;
-import appeng.client.gui.implementations.FluidTerminalScreen;
 import appeng.core.sync.BasePacket;
 import appeng.core.sync.network.INetworkInfo;
-import appeng.util.fluid.AEFluidStack;
+import appeng.fluids.client.gui.FluidTerminalScreen;
+import appeng.fluids.util.AEFluidStack;
 
 /**
  * @author BrockWS

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

@@ -23,11 +23,11 @@ import io.netty.buffer.Unpooled;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.network.PacketBuffer;
 
-import appeng.container.implementations.FluidTerminalContainer;
 import appeng.core.AELog;
 import appeng.core.sync.BasePacket;
 import appeng.core.sync.network.INetworkInfo;
-import appeng.util.fluid.AEFluidStack;
+import appeng.fluids.container.FluidTerminalContainer;
+import appeng.fluids.util.AEFluidStack;
 
 /**
  * @author BrockWS

src/main/java/appeng/fluids/block/FluidInterfaceBlock.java

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.block.misc;
+package appeng.fluids.block;
 
 import javax.annotation.Nullable;
 
@@ -33,8 +33,8 @@ import net.minecraft.world.World;
 import appeng.block.AEBaseTileBlock;
 import appeng.container.ContainerLocator;
 import appeng.container.ContainerOpener;
-import appeng.container.implementations.FluidInterfaceContainer;
-import appeng.tile.misc.FluidInterfaceTileEntity;
+import appeng.fluids.container.FluidInterfaceContainer;
+import appeng.fluids.tile.FluidInterfaceTileEntity;
 import appeng.util.Platform;
 
 public class FluidInterfaceBlock extends AEBaseTileBlock<FluidInterfaceTileEntity> {

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

@@ -1,19 +1,19 @@
 
-package appeng.client.gui.implementations;
+package appeng.fluids.client.gui;
 
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.util.text.ITextComponent;
 
 import appeng.client.gui.implementations.UpgradeableScreen;
-import appeng.client.gui.widgets.FluidSlotWidget;
-import appeng.client.gui.widgets.OptionalFluidSlotWidget;
 import appeng.client.gui.widgets.TabButton;
-import appeng.container.implementations.FluidFormationPlaneContainer;
 import appeng.container.implementations.PriorityContainer;
 import appeng.core.localization.GuiText;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.SwitchGuisPacket;
-import appeng.util.fluid.IAEFluidTank;
+import appeng.fluids.client.gui.widgets.FluidSlotWidget;
+import appeng.fluids.client.gui.widgets.OptionalFluidSlotWidget;
+import appeng.fluids.container.FluidFormationPlaneContainer;
+import appeng.fluids.util.IAEFluidTank;
 
 public class FluidFormationPlaneScreen extends UpgradeableScreen<FluidFormationPlaneContainer> {
     public FluidFormationPlaneScreen(FluidFormationPlaneContainer container, PlayerInventory playerInventory,

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

@@ -16,18 +16,18 @@
  * 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.PlayerInventory;
 import net.minecraft.util.text.ITextComponent;
 
 import appeng.client.gui.implementations.UpgradeableScreen;
-import appeng.client.gui.widgets.FluidSlotWidget;
-import appeng.client.gui.widgets.OptionalFluidSlotWidget;
-import appeng.container.implementations.FluidIOContainer;
 import appeng.core.localization.GuiText;
-import appeng.parts.automation.FluidImportBusPart;
-import appeng.util.fluid.IAEFluidTank;
+import appeng.fluids.client.gui.widgets.FluidSlotWidget;
+import appeng.fluids.client.gui.widgets.OptionalFluidSlotWidget;
+import appeng.fluids.container.FluidIOContainer;
+import appeng.fluids.parts.FluidImportBusPart;
+import appeng.fluids.util.IAEFluidTank;
 
 /**
  * @author BrockWS

src/main/java/appeng/fluids/client/gui/FluidInterfaceScreen.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 com.mojang.blaze3d.matrix.MatrixStack;
 
@@ -25,16 +25,16 @@ import net.minecraft.util.text.ITextComponent;
 import net.minecraftforge.fml.client.gui.GuiUtils;
 
 import appeng.client.gui.implementations.UpgradeableScreen;
-import appeng.client.gui.widgets.FluidSlotWidget;
-import appeng.client.gui.widgets.FluidTankWidget;
 import appeng.client.gui.widgets.TabButton;
-import appeng.container.implementations.FluidInterfaceContainer;
 import appeng.container.implementations.PriorityContainer;
 import appeng.core.localization.GuiText;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.SwitchGuisPacket;
-import appeng.helpers.DualityFluidInterface;
-import appeng.util.fluid.IAEFluidTank;
+import appeng.fluids.client.gui.widgets.FluidSlotWidget;
+import appeng.fluids.client.gui.widgets.FluidTankWidget;
+import appeng.fluids.container.FluidInterfaceContainer;
+import appeng.fluids.helper.DualityFluidInterface;
+import appeng.fluids.util.IAEFluidTank;
 
 public class FluidInterfaceScreen extends UpgradeableScreen<FluidInterfaceContainer> {
     public FluidInterfaceScreen(FluidInterfaceContainer container, PlayerInventory playerInventory,

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

@@ -1,5 +1,5 @@
 
-package appeng.client.gui.implementations;
+package appeng.fluids.client.gui;
 
 import com.mojang.blaze3d.matrix.MatrixStack;
 
@@ -11,12 +11,12 @@ import appeng.api.config.Settings;
 import appeng.client.gui.NumberEntryType;
 import appeng.client.gui.implementations.NumberEntryWidget;
 import appeng.client.gui.implementations.UpgradeableScreen;
-import appeng.client.gui.widgets.FluidSlotWidget;
 import appeng.client.gui.widgets.ServerSettingToggleButton;
-import appeng.container.implementations.FluidLevelEmitterContainer;
 import appeng.core.localization.GuiText;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.ConfigValuePacket;
+import appeng.fluids.client.gui.widgets.FluidSlotWidget;
+import appeng.fluids.container.FluidLevelEmitterContainer;
 
 public class FluidLevelEmitterScreen extends UpgradeableScreen<FluidLevelEmitterContainer> {
 

src/main/java/appeng/fluids/client/gui/FluidStorageBusScreen.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 com.mojang.blaze3d.matrix.MatrixStack;
 
@@ -30,18 +30,18 @@ import appeng.api.config.Settings;
 import appeng.api.config.StorageFilter;
 import appeng.client.gui.implementations.UpgradeableScreen;
 import appeng.client.gui.widgets.ActionButton;
-import appeng.client.gui.widgets.FluidSlotWidget;
-import appeng.client.gui.widgets.OptionalFluidSlotWidget;
 import appeng.client.gui.widgets.ServerSettingToggleButton;
 import appeng.client.gui.widgets.SettingToggleButton;
 import appeng.client.gui.widgets.TabButton;
-import appeng.container.implementations.FluidStorageBusContainer;
 import appeng.container.implementations.PriorityContainer;
 import appeng.core.localization.GuiText;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.ConfigValuePacket;
 import appeng.core.sync.packets.SwitchGuisPacket;
-import appeng.util.fluid.IAEFluidTank;
+import appeng.fluids.client.gui.widgets.FluidSlotWidget;
+import appeng.fluids.client.gui.widgets.OptionalFluidSlotWidget;
+import appeng.fluids.container.FluidStorageBusContainer;
+import appeng.fluids.util.IAEFluidTank;
 
 /**
  * @author BrockWS

src/main/java/appeng/fluids/client/gui/FluidTerminalScreen.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.text.NumberFormat;
 import java.util.ArrayList;
@@ -51,14 +51,14 @@ import appeng.client.gui.widgets.SettingToggleButton;
 import appeng.client.me.FluidRepo;
 import appeng.client.me.InternalFluidSlotME;
 import appeng.client.me.SlotFluidME;
-import appeng.container.implementations.FluidTerminalContainer;
-import appeng.container.slot.IMEFluidSlot;
 import appeng.core.AELog;
 import appeng.core.AppEng;
 import appeng.core.localization.GuiText;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.ConfigValuePacket;
 import appeng.core.sync.packets.InventoryActionPacket;
+import appeng.fluids.container.FluidTerminalContainer;
+import appeng.fluids.container.slots.IMEFluidSlot;
 import appeng.helpers.InventoryAction;
 import appeng.util.IConfigManagerHost;
 import appeng.util.Platform;

src/main/java/appeng/fluids/client/gui/widgets/FluidSlotWidget.java

@@ -1,4 +1,4 @@
-package appeng.client.gui.widgets;
+package appeng.fluids.client.gui.widgets;
 
 import java.util.Collections;
 
@@ -24,8 +24,8 @@ import appeng.api.storage.data.IAEFluidStack;
 import appeng.client.gui.widgets.CustomSlotWidget;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.FluidSlotPacket;
-import appeng.util.fluid.AEFluidStack;
-import appeng.util.fluid.IAEFluidTank;
+import appeng.fluids.util.AEFluidStack;
+import appeng.fluids.util.IAEFluidTank;
 
 public class FluidSlotWidget extends CustomSlotWidget {
     private final IAEFluidTank fluids;

src/main/java/appeng/fluids/client/gui/widgets/FluidTankWidget.java

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.client.gui.widgets;
+package appeng.fluids.client.gui.widgets;
 
 import com.mojang.blaze3d.matrix.MatrixStack;
 import com.mojang.blaze3d.systems.RenderSystem;
@@ -35,7 +35,7 @@ import net.minecraftforge.fluids.FluidAttributes;
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.api.util.AEColor;
 import appeng.client.gui.widgets.ITooltip;
-import appeng.util.fluid.IAEFluidTank;
+import appeng.fluids.util.IAEFluidTank;
 
 @OnlyIn(Dist.CLIENT)
 public class FluidTankWidget extends Widget implements ITooltip {

src/main/java/appeng/fluids/client/gui/widgets/OptionalFluidSlotWidget.java

@@ -1,5 +1,5 @@
 
-package appeng.client.gui.widgets;
+package appeng.fluids.client.gui.widgets;
 
 import com.mojang.blaze3d.systems.RenderSystem;
 
@@ -7,7 +7,7 @@ import net.minecraftforge.fml.client.gui.GuiUtils;
 
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.container.slot.IOptionalSlotHost;
-import appeng.util.fluid.IAEFluidTank;
+import appeng.fluids.util.IAEFluidTank;
 
 public class OptionalFluidSlotWidget extends FluidSlotWidget {
     private final IOptionalSlotHost containerBus;

src/main/java/appeng/fluids/client/render/FluidStackSizeRenderer.java

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.client.render;
+package appeng.fluids.client.render;
 
 import java.math.RoundingMode;
 import java.text.DecimalFormat;

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

@@ -1,5 +1,5 @@
 
-package appeng.container.implementations;
+package appeng.fluids.container;
 
 import java.util.Collections;
 import java.util.Map;
@@ -15,12 +15,11 @@ import net.minecraftforge.fluids.FluidUtil;
 import appeng.api.config.Upgrades;
 import appeng.api.implementations.IUpgradeableHost;
 import appeng.api.storage.data.IAEFluidStack;
-import appeng.container.guisync.FluidSyncHelper;
 import appeng.container.implementations.UpgradeableContainer;
-import appeng.container.interfaces.IFluidSyncContainer;
+import appeng.fluids.helper.FluidSyncHelper;
+import appeng.fluids.util.AEFluidStack;
+import appeng.fluids.util.IAEFluidTank;
 import appeng.util.Platform;
-import appeng.util.fluid.AEFluidStack;
-import appeng.util.fluid.IAEFluidTank;
 
 public abstract class FluidConfigurableContainer extends UpgradeableContainer implements IFluidSyncContainer {
     private FluidSyncHelper sync = null;

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

@@ -1,5 +1,5 @@
 
-package appeng.container.implementations;
+package appeng.fluids.container;
 
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
@@ -11,9 +11,10 @@ import appeng.api.config.SecurityPermissions;
 import appeng.api.config.Upgrades;
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.container.ContainerLocator;
+import appeng.container.implementations.ContainerHelper;
 import appeng.container.slot.RestrictedInputSlot;
-import appeng.parts.automation.FluidFormationPlanePart;
-import appeng.util.fluid.IAEFluidTank;
+import appeng.fluids.parts.FluidFormationPlanePart;
+import appeng.fluids.util.IAEFluidTank;
 
 public class FluidFormationPlaneContainer extends FluidConfigurableContainer {
 

src/main/java/appeng/fluids/container/FluidIOContainer.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.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
@@ -25,8 +25,9 @@ import net.minecraft.network.PacketBuffer;
 
 import appeng.api.config.SecurityPermissions;
 import appeng.container.ContainerLocator;
-import appeng.parts.automation.SharedFluidBusPart;
-import appeng.util.fluid.IAEFluidTank;
+import appeng.container.implementations.ContainerHelper;
+import appeng.fluids.parts.SharedFluidBusPart;
+import appeng.fluids.util.IAEFluidTank;
 
 /**
  * @author BrockWS

src/main/java/appeng/fluids/container/FluidInterfaceContainer.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.Collections;
 import java.util.Map;
@@ -31,11 +31,12 @@ import appeng.api.config.SecurityPermissions;
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.api.util.IConfigManager;
 import appeng.container.ContainerLocator;
-import appeng.container.guisync.FluidSyncHelper;
-import appeng.helpers.DualityFluidInterface;
-import appeng.helpers.IFluidInterfaceHost;
+import appeng.container.implementations.ContainerHelper;
+import appeng.fluids.helper.DualityFluidInterface;
+import appeng.fluids.helper.FluidSyncHelper;
+import appeng.fluids.helper.IFluidInterfaceHost;
+import appeng.fluids.util.IAEFluidTank;
 import appeng.util.Platform;
-import appeng.util.fluid.IAEFluidTank;
 
 public class FluidInterfaceContainer extends FluidConfigurableContainer {
 

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

@@ -1,4 +1,4 @@
-package appeng.container.implementations;
+package appeng.fluids.container;
 
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
@@ -13,9 +13,10 @@ import appeng.api.config.Settings;
 import appeng.client.gui.implementations.NumberEntryWidget;
 import appeng.container.ContainerLocator;
 import appeng.container.guisync.GuiSync;
-import appeng.parts.automation.FluidLevelEmitterPart;
+import appeng.container.implementations.ContainerHelper;
+import appeng.fluids.parts.FluidLevelEmitterPart;
+import appeng.fluids.util.IAEFluidTank;
 import appeng.util.Platform;
-import appeng.util.fluid.IAEFluidTank;
 
 public class FluidLevelEmitterContainer extends FluidConfigurableContainer {
     public static ContainerType<FluidLevelEmitterContainer> TYPE;

src/main/java/appeng/fluids/container/FluidStorageBusContainer.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;
 
@@ -38,11 +38,12 @@ import appeng.api.storage.data.IAEFluidStack;
 import appeng.api.storage.data.IItemList;
 import appeng.container.ContainerLocator;
 import appeng.container.guisync.GuiSync;
+import appeng.container.implementations.ContainerHelper;
 import appeng.container.slot.RestrictedInputSlot;
 import appeng.core.Api;
-import appeng.parts.misc.FluidStorageBusPart;
+import appeng.fluids.parts.FluidStorageBusPart;
+import appeng.fluids.util.IAEFluidTank;
 import appeng.util.Platform;
-import appeng.util.fluid.IAEFluidTank;
 import appeng.util.iterators.NullIterator;
 
 /**

src/main/java/appeng/fluids/container/FluidTerminalContainer.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;
 import java.nio.BufferOverflowException;
@@ -63,18 +63,19 @@ import appeng.api.util.IConfigurableObject;
 import appeng.container.AEBaseContainer;
 import appeng.container.ContainerLocator;
 import appeng.container.guisync.GuiSync;
+import appeng.container.implementations.ContainerHelper;
 import appeng.core.AELog;
 import appeng.core.Api;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.ConfigValuePacket;
 import appeng.core.sync.packets.MEFluidInventoryUpdatePacket;
 import appeng.core.sync.packets.TargetFluidStackPacket;
+import appeng.fluids.util.AEFluidStack;
 import appeng.helpers.InventoryAction;
 import appeng.me.helpers.ChannelPowerSrc;
 import appeng.util.ConfigManager;
 import appeng.util.IConfigManagerHost;
 import appeng.util.Platform;
-import appeng.util.fluid.AEFluidStack;
 
 /**
  * @author BrockWS

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

@@ -1,5 +1,5 @@
 
-package appeng.container.interfaces;
+package appeng.fluids.container;
 
 import java.util.Map;
 

src/main/java/appeng/fluids/container/slots/IMEFluidSlot.java

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.container.slot;
+package appeng.fluids.container.slots;
 
 import appeng.api.storage.data.IAEFluidStack;
 

src/main/java/appeng/fluids/helper/DualityFluidInterface.java

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.helpers;
+package appeng.fluids.helper;
 
 import java.util.Optional;
 
@@ -59,6 +59,9 @@ import appeng.api.util.IConfigManager;
 import appeng.capabilities.Capabilities;
 import appeng.core.Api;
 import appeng.core.settings.TickRates;
+import appeng.fluids.util.AEFluidInventory;
+import appeng.fluids.util.IAEFluidInventory;
+import appeng.fluids.util.IAEFluidTank;
 import appeng.me.GridAccessException;
 import appeng.me.helpers.AENetworkProxy;
 import appeng.me.helpers.MachineSource;
@@ -68,9 +71,6 @@ import appeng.me.storage.NullInventory;
 import appeng.util.ConfigManager;
 import appeng.util.IConfigManagerHost;
 import appeng.util.Platform;
-import appeng.util.fluid.AEFluidInventory;
-import appeng.util.fluid.IAEFluidInventory;
-import appeng.util.fluid.IAEFluidTank;
 
 public class DualityFluidInterface
         implements IGridTickable, IStorageMonitorable, IAEFluidInventory, IUpgradeableHost, IConfigManagerHost {

src/main/java/appeng/fluids/helper/FluidCellConfig.java

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.items.contents;
+package appeng.fluids.helper;
 
 import javax.annotation.Nonnull;
 
@@ -27,8 +27,8 @@ import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidUtil;
 
 import appeng.core.Api;
+import appeng.fluids.items.FluidDummyItem;
 import appeng.items.contents.CellConfig;
-import appeng.items.misc.FluidDummyItem;
 
 /**
  * @author DrummerMC

src/main/java/appeng/fluids/helper/FluidSyncHelper.java

@@ -1,5 +1,5 @@
 
-package appeng.container.guisync;
+package appeng.fluids.helper;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -11,8 +11,8 @@ import net.minecraft.inventory.container.IContainerListener;
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.FluidSlotPacket;
-import appeng.util.fluid.AEFluidInventory;
-import appeng.util.fluid.IAEFluidTank;
+import appeng.fluids.util.AEFluidInventory;
+import appeng.fluids.util.IAEFluidTank;
 
 public class FluidSyncHelper {
     private final IAEFluidTank inv;

src/main/java/appeng/fluids/helper/IFluidInterfaceHost.java

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.helpers;
+package appeng.fluids.helper;
 
 import java.util.EnumSet;
 
@@ -25,7 +25,6 @@ import net.minecraft.util.Direction;
 
 import appeng.api.implementations.IUpgradeableHost;
 import appeng.api.networking.security.IActionHost;
-import appeng.helpers.DualityFluidInterface;
 import appeng.me.helpers.IGridProxyable;
 
 public interface IFluidInterfaceHost extends IActionHost, IGridProxyable, IUpgradeableHost {

src/main/java/appeng/fluids/items/BasicFluidStorageCell.java

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.items.storage;
+package appeng.fluids.items;
 
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
@@ -26,8 +26,9 @@ import appeng.api.storage.IStorageChannel;
 import appeng.api.storage.channels.IFluidStorageChannel;
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.core.Api;
-import appeng.items.contents.FluidCellConfig;
+import appeng.fluids.helper.FluidCellConfig;
 import appeng.items.materials.MaterialType;
+import appeng.items.storage.AbstractStorageCell;
 import appeng.util.InventoryAdaptor;
 
 /**

src/main/java/appeng/fluids/items/FluidDummyItem.java

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.items.misc;
+package appeng.fluids.items;
 
 import net.minecraft.fluid.Fluids;
 import net.minecraft.item.ItemGroup;

src/main/java/appeng/fluids/items/FluidDummyItemColor.java

@@ -1,4 +1,4 @@
-package appeng.client.render;
+package appeng.fluids.items;
 
 import net.minecraft.client.renderer.color.IItemColor;
 import net.minecraft.item.Item;
@@ -7,8 +7,6 @@ import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.fluids.FluidStack;
 
-import appeng.items.misc.FluidDummyItem;
-
 @OnlyIn(Dist.CLIENT)
 public class FluidDummyItemColor implements IItemColor {
 

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

@@ -1,5 +1,5 @@
 
-package appeng.parts.automation;
+package appeng.fluids.parts;
 
 import java.util.List;
 
@@ -44,12 +44,16 @@ import appeng.core.Api;
 import appeng.core.AppEng;
 import appeng.core.settings.TickRates;
 import appeng.core.sync.packets.BlockTransitionEffectPacket;
+import appeng.fluids.util.AEFluidStack;
 import appeng.items.parts.PartModels;
 import appeng.me.GridAccessException;
 import appeng.me.helpers.MachineSource;
 import appeng.parts.BasicStatePart;
+import appeng.parts.automation.PlaneConnectionHelper;
+import appeng.parts.automation.PlaneConnections;
+import appeng.parts.automation.PlaneModelData;
+import appeng.parts.automation.PlaneModels;
 import appeng.util.Platform;
-import appeng.util.fluid.AEFluidStack;
 
 public class FluidAnnihilationPlanePart extends BasicStatePart implements IGridTickable {
 

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

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.parts.automation;
+package appeng.fluids.parts;
 
 import javax.annotation.Nonnull;
 

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

@@ -1,5 +1,5 @@
 
-package appeng.parts.automation;
+package appeng.fluids.parts;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -45,15 +45,18 @@ import appeng.api.storage.data.IItemList;
 import appeng.api.util.AEPartLocation;
 import appeng.container.ContainerLocator;
 import appeng.container.ContainerOpener;
-import appeng.container.implementations.FluidFormationPlaneContainer;
 import appeng.core.Api;
+import appeng.fluids.container.FluidFormationPlaneContainer;
+import appeng.fluids.util.AEFluidInventory;
+import appeng.fluids.util.IAEFluidInventory;
+import appeng.fluids.util.IAEFluidTank;
 import appeng.items.parts.PartModels;
 import appeng.me.GridAccessException;
 import appeng.me.storage.MEInventoryHandler;
+import appeng.parts.automation.AbstractFormationPlanePart;
+import appeng.parts.automation.PlaneModelData;
+import appeng.parts.automation.PlaneModels;
 import appeng.util.Platform;
-import appeng.util.fluid.AEFluidInventory;
-import appeng.util.fluid.IAEFluidInventory;
-import appeng.util.fluid.IAEFluidTank;
 import appeng.util.prioritylist.PrecisePriorityList;
 
 public class FluidFormationPlanePart extends AbstractFormationPlanePart<IAEFluidStack> implements IAEFluidInventory {

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

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.parts.misc;
+package appeng.fluids.parts;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -39,10 +39,10 @@ import appeng.api.storage.channels.IFluidStorageChannel;
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.api.storage.data.IItemList;
 import appeng.core.Api;
+import appeng.fluids.util.AEFluidStack;
 import appeng.me.GridAccessException;
 import appeng.me.helpers.IGridProxyable;
 import appeng.me.storage.ITickingMonitor;
-import appeng.util.fluid.AEFluidStack;
 
 /**
  * Wraps an Fluid Handler in such a way that it can be used as an IMEInventory

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

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.parts.automation;
+package appeng.fluids.parts;
 
 import javax.annotation.Nonnull;
 
@@ -44,11 +44,11 @@ import appeng.api.storage.IMEMonitor;
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.core.AppEng;
 import appeng.core.settings.TickRates;
+import appeng.fluids.util.AEFluidStack;
 import appeng.items.parts.PartModels;
 import appeng.me.GridAccessException;
 import appeng.me.helpers.MachineSource;
 import appeng.parts.PartModel;
-import appeng.util.fluid.AEFluidStack;
 
 /**
  * @author BrockWS

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

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.parts.misc;
+package appeng.fluids.parts;
 
 import java.util.EnumSet;
 
@@ -51,11 +51,11 @@ import appeng.api.util.AECableType;
 import appeng.api.util.IConfigManager;
 import appeng.container.ContainerLocator;
 import appeng.container.ContainerOpener;
-import appeng.container.implementations.FluidInterfaceContainer;
 import appeng.core.Api;
 import appeng.core.AppEng;
-import appeng.helpers.DualityFluidInterface;
-import appeng.helpers.IFluidInterfaceHost;
+import appeng.fluids.container.FluidInterfaceContainer;
+import appeng.fluids.helper.DualityFluidInterface;
+import appeng.fluids.helper.IFluidInterfaceHost;
 import appeng.helpers.IPriorityHost;
 import appeng.helpers.Reflected;
 import appeng.items.parts.PartModels;

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

@@ -1,5 +1,5 @@
 
-package appeng.parts.automation;
+package appeng.fluids.parts;
 
 import java.util.Random;
 
@@ -37,17 +37,18 @@ import appeng.api.util.AEPartLocation;
 import appeng.api.util.IConfigManager;
 import appeng.container.ContainerLocator;
 import appeng.container.ContainerOpener;
-import appeng.container.implementations.FluidLevelEmitterContainer;
 import appeng.core.Api;
 import appeng.core.AppEng;
+import appeng.fluids.container.FluidLevelEmitterContainer;
+import appeng.fluids.util.AEFluidInventory;
+import appeng.fluids.util.IAEFluidInventory;
+import appeng.fluids.util.IAEFluidTank;
 import appeng.items.parts.PartModels;
 import appeng.me.GridAccessException;
 import appeng.parts.PartModel;
+import appeng.parts.automation.UpgradeablePart;
 import appeng.util.IConfigManagerHost;
 import appeng.util.Platform;
-import appeng.util.fluid.AEFluidInventory;
-import appeng.util.fluid.IAEFluidInventory;
-import appeng.util.fluid.IAEFluidTank;
 
 public class FluidLevelEmitterPart extends UpgradeablePart
         implements IStackWatcherHost, IConfigManagerHost, IAEFluidInventory, IMEMonitorHandlerReceiver<IAEFluidStack> {

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

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.parts.misc;
+package appeng.fluids.parts;
 
 import java.util.Collections;
 import java.util.List;
@@ -65,10 +65,13 @@ import appeng.api.util.AEPartLocation;
 import appeng.capabilities.Capabilities;
 import appeng.container.ContainerLocator;
 import appeng.container.ContainerOpener;
-import appeng.container.implementations.FluidStorageBusContainer;
 import appeng.core.Api;
 import appeng.core.AppEng;
 import appeng.core.settings.TickRates;
+import appeng.fluids.container.FluidStorageBusContainer;
+import appeng.fluids.util.AEFluidInventory;
+import appeng.fluids.util.IAEFluidInventory;
+import appeng.fluids.util.IAEFluidTank;
 import appeng.helpers.IInterfaceHost;
 import appeng.items.parts.PartModels;
 import appeng.me.GridAccessException;
@@ -76,10 +79,8 @@ import appeng.me.helpers.MachineSource;
 import appeng.me.storage.ITickingMonitor;
 import appeng.me.storage.MEInventoryHandler;
 import appeng.parts.PartModel;
+import appeng.parts.misc.SharedStorageBusPart;
 import appeng.util.Platform;
-import appeng.util.fluid.AEFluidInventory;
-import appeng.util.fluid.IAEFluidInventory;
-import appeng.util.fluid.IAEFluidTank;
 import appeng.util.prioritylist.FuzzyPriorityList;
 import appeng.util.prioritylist.PrecisePriorityList;
 

src/main/java/appeng/fluids/parts/FluidTerminalPart.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.PlayerEntity;
 import net.minecraft.inventory.container.ContainerType;
@@ -24,10 +24,11 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 
 import appeng.api.parts.IPartModel;
-import appeng.container.implementations.FluidTerminalContainer;
 import appeng.core.AppEng;
+import appeng.fluids.container.FluidTerminalContainer;
 import appeng.items.parts.PartModels;
 import appeng.parts.PartModel;
+import appeng.parts.reporting.AbstractTerminalPart;
 
 /**
  * @author BrockWS

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

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.parts.automation;
+package appeng.fluids.parts;
 
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
@@ -39,12 +39,13 @@ import appeng.api.storage.channels.IFluidStorageChannel;
 import appeng.api.util.AECableType;
 import appeng.container.ContainerLocator;
 import appeng.container.ContainerOpener;
-import appeng.container.implementations.FluidIOContainer;
 import appeng.core.Api;
+import appeng.fluids.container.FluidIOContainer;
+import appeng.fluids.util.AEFluidInventory;
+import appeng.fluids.util.IAEFluidTank;
 import appeng.me.GridAccessException;
+import appeng.parts.automation.UpgradeablePart;
 import appeng.util.Platform;
-import appeng.util.fluid.AEFluidInventory;
-import appeng.util.fluid.IAEFluidTank;
 
 /**
  * @author BrockWS

src/main/java/appeng/fluids/registries/BasicFluidCellGuiHandler.java

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.core.features.registries.cell;
+package appeng.fluids.registries;
 
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
@@ -31,8 +31,8 @@ import appeng.api.storage.channels.IFluidStorageChannel;
 import appeng.api.storage.data.IAEStack;
 import appeng.container.ContainerLocator;
 import appeng.container.ContainerOpener;
-import appeng.container.implementations.FluidTerminalContainer;
 import appeng.core.Api;
+import appeng.fluids.container.FluidTerminalContainer;
 
 public class BasicFluidCellGuiHandler implements ICellGuiHandler {
 

src/main/java/appeng/fluids/tile/FluidInterfaceTileEntity.java

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.tile.misc;
+package appeng.fluids.tile;
 
 import java.util.EnumSet;
 
@@ -45,10 +45,10 @@ import appeng.api.util.AECableType;
 import appeng.api.util.AEPartLocation;
 import appeng.api.util.DimensionalCoord;
 import appeng.api.util.IConfigManager;
-import appeng.container.implementations.FluidInterfaceContainer;
 import appeng.core.Api;
-import appeng.helpers.DualityFluidInterface;
-import appeng.helpers.IFluidInterfaceHost;
+import appeng.fluids.container.FluidInterfaceContainer;
+import appeng.fluids.helper.DualityFluidInterface;
+import appeng.fluids.helper.IFluidInterfaceHost;
 import appeng.helpers.IPriorityHost;
 import appeng.tile.grid.AENetworkTileEntity;
 

src/main/java/appeng/fluids/util/AEFluidInventory.java

@@ -1,5 +1,5 @@
 
-package appeng.util.fluid;
+package appeng.fluids.util;
 
 import java.util.Objects;
 

src/main/java/appeng/fluids/util/AEFluidStack.java

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.util.fluid;
+package appeng.fluids.util;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -38,7 +38,7 @@ import appeng.api.storage.IStorageChannel;
 import appeng.api.storage.channels.IFluidStorageChannel;
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.core.Api;
-import appeng.items.misc.FluidDummyItem;
+import appeng.fluids.items.FluidDummyItem;
 import appeng.util.Platform;
 import appeng.util.item.AEStack;
 

src/main/java/appeng/fluids/util/AEFluidTank.java

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.util.fluid;
+package appeng.fluids.util;
 
 import net.minecraftforge.fluids.capability.templates.FluidTank;
 

src/main/java/appeng/fluids/util/FluidList.java

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.util.fluid;
+package appeng.fluids.util;
 
 import java.util.Collection;
 import java.util.Collections;

src/main/java/appeng/fluids/util/FluidSorters.java

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.util.fluid;
+package appeng.fluids.util;
 
 import java.util.Comparator;
 

src/main/java/appeng/fluids/util/IAEFluidInventory.java

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.util.fluid;
+package appeng.fluids.util;
 
 @FunctionalInterface
 public interface IAEFluidInventory {

src/main/java/appeng/fluids/util/IAEFluidTank.java

@@ -1,5 +1,5 @@
 
-package appeng.util.fluid;
+package appeng.fluids.util;
 
 import net.minecraftforge.fluids.capability.IFluidHandler;
 

src/main/java/appeng/fluids/util/MeaningfulFluidIterator.java

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.util.fluid;
+package appeng.fluids.util;
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;

src/main/java/appeng/me/GridNode.java

@@ -327,8 +327,9 @@ public class GridNode implements IGridNode, IPathItem {
 
     @Override
     public void setPlayerID(final int playerID) {
-        if (playerID >= 0) {
+        if (playerID >= 0 && this.playerID != playerID) {
             this.playerID = playerID;
+            gridProxy.onGridNotification(GridNotification.OWNER_CHANGED);
         }
     }
 

src/main/java/appeng/me/cache/SecurityCache.java

@@ -81,8 +81,16 @@ public class SecurityCache implements ISecurityGrid {
     private void updateSecurityKey() {
         final long lastCode = this.securityKey;
 
+        /**
+         * Placing a security station will propagate the security station's owner to all
+         * connected grid nodes to prevent the network from not reforming due to
+         * different owners later.
+         */
+        int newOwner = -1;
         if (this.securityProvider.size() == 1) {
-            this.securityKey = this.securityProvider.get(0).getSecurityKey();
+            ISecurityProvider securityProvider = this.securityProvider.get(0);
+            this.securityKey = securityProvider.getSecurityKey();
+            newOwner = securityProvider.getOwner();
         } else {
             this.securityKey = -1;
         }
@@ -90,7 +98,11 @@ public class SecurityCache implements ISecurityGrid {
         if (lastCode != this.securityKey) {
             this.getGrid().postEvent(new MENetworkSecurityChange());
             for (final IGridNode n : this.getGrid().getNodes()) {
-                ((GridNode) n).setLastSecurityKey(this.securityKey);
+                GridNode gridNode = (GridNode) n;
+                gridNode.setLastSecurityKey(this.securityKey);
+                if (gridNode.getPlayerID() != newOwner) {
+                    gridNode.setPlayerID(newOwner);
+                }
             }
         }
     }

src/main/java/appeng/me/helpers/AENetworkProxy.java

@@ -167,7 +167,6 @@ public class AENetworkProxy implements IGridBlock {
      * short cut!
      *
      * @return grid of node
-     *
      * @throws GridAccessException of node or grid is null
      */
     public IGrid getGrid() throws GridAccessException {
@@ -280,6 +279,11 @@ public class AENetworkProxy implements IGridBlock {
 
     @Override
     public void onGridNotification(final GridNotification notification) {
+        if (notification == GridNotification.OWNER_CHANGED) {
+            gp.saveChanges();
+            return;
+        }
+
         if (this.gp instanceof CablePart) {
             ((CablePart) this.gp).markForUpdate();
         }

src/main/java/appeng/me/helpers/IGridProxyable.java

@@ -28,4 +28,7 @@ public interface IGridProxyable extends IGridHost {
     DimensionalCoord getLocation();
 
     void gridChanged();
+
+    void saveChanges();
+
 }

src/main/java/appeng/tile/AEBaseTileEntity.java

@@ -39,10 +39,13 @@ import net.minecraft.network.play.server.SUpdateTileEntityPacket;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.tileentity.TileEntityType;
 import net.minecraft.util.Direction;
+import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.StringTextComponent;
 import net.minecraft.world.World;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.client.model.data.IModelData;
 import net.minecraftforge.items.IItemHandler;
 
@@ -458,4 +461,15 @@ public class AEBaseTileEntity extends TileEntity implements IOrientable, ICommon
         return new AEModelData(up, forward);
     }
 
+    /**
+     * AE Tile Entities will generally confine themselves to rendering within the
+     * bounding block. Forge however would retrieve the collision box here, which is
+     * very expensive.
+     */
+    @OnlyIn(Dist.CLIENT)
+    @Override
+    public AxisAlignedBB getRenderBoundingBox() {
+        return new AxisAlignedBB(pos, pos.add(1, 1, 1));
+    }
+
 }

src/main/java/appeng/tile/storage/ChestTileEntity.java

@@ -91,9 +91,10 @@ import appeng.api.storage.data.IAEStack;
 import appeng.api.util.AEColor;
 import appeng.api.util.IConfigManager;
 import appeng.capabilities.Capabilities;
-import appeng.container.implementations.FluidTerminalContainer;
 import appeng.container.implementations.MEMonitorableContainer;
 import appeng.core.Api;
+import appeng.fluids.container.FluidTerminalContainer;
+import appeng.fluids.util.AEFluidStack;
 import appeng.helpers.IPriorityHost;
 import appeng.me.GridAccessException;
 import appeng.me.helpers.MEMonitorHandler;
@@ -104,7 +105,6 @@ import appeng.tile.inventory.AppEngInternalInventory;
 import appeng.util.ConfigManager;
 import appeng.util.IConfigManagerHost;
 import appeng.util.Platform;
-import appeng.util.fluid.AEFluidStack;
 import appeng.util.helpers.ItemHandlerUtil;
 import appeng.util.inv.InvOperation;
 import appeng.util.inv.WrapperChainedItemHandler;

src/main/java/appeng/util/Platform.java

@@ -105,12 +105,12 @@ import appeng.core.AEConfig;
 import appeng.core.AELog;
 import appeng.core.Api;
 import appeng.core.stats.AeStats;
+import appeng.fluids.util.AEFluidStack;
 import appeng.hooks.TickHandler;
 import appeng.integration.abstraction.JEIFacade;
 import appeng.me.GridAccessException;
 import appeng.me.GridNode;
 import appeng.me.helpers.AENetworkProxy;
-import appeng.util.fluid.AEFluidStack;
 import appeng.util.helpers.ItemComparisonHelper;
 import appeng.util.helpers.P2PHelper;
 import appeng.util.item.AEItemStack;