Dissolved the top-level fluid package (for now) and grouped Fluid classes with their item counterparts to facilitate easier refactoring later.

Also disables spawn on AE's glass same as Vanilla glass.

src/api/java/appeng/api/implementations/items/IGrowableCrystal.java

@@ -23,13 +23,23 @@
 
 package appeng.api.implementations.items;
 
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
+import javax.annotation.Nullable;
+
+import net.minecraft.block.BlockState;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
 
 public interface IGrowableCrystal {
 
     ItemStack triggerGrowth(ItemStack is);
 
-    float getMultiplier(Block blk, Material mat);
+    /**
+     * Gets the crystal growth multiplier based on the material it is submerged in.
+     *
+     * @param state The blockstate of the block the crystal is currently in.
+     * @return The multiplier for the growth tick progress. Zero if the crystal
+     *         cannot grow in the current material.
+     */
+    float getMultiplier(BlockState state, @Nullable World world, @Nullable BlockPos pos);
 }

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

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.block;
+package appeng.block.misc;
 
 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.fluids.container.FluidInterfaceContainer;
-import appeng.fluids.tile.FluidInterfaceTileEntity;
+import appeng.container.implementations.FluidInterfaceContainer;
+import appeng.tile.misc.FluidInterfaceTileEntity;
 import appeng.util.Platform;
 
 public class FluidInterfaceBlock extends AEBaseTileBlock<FluidInterfaceTileEntity> {

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

@@ -70,6 +70,7 @@ 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;
@@ -78,6 +79,7 @@ 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;
@@ -88,8 +90,6 @@ 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/gui/implementations/FluidFormationPlaneScreen.java

@@ -1,19 +1,19 @@
 
-package appeng.fluids.client.gui;
+package appeng.client.gui.implementations;
 
 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.fluids.client.gui.widgets.FluidSlotWidget;
-import appeng.fluids.client.gui.widgets.OptionalFluidSlotWidget;
-import appeng.fluids.container.FluidFormationPlaneContainer;
-import appeng.fluids.util.IAEFluidTank;
+import appeng.util.fluid.IAEFluidTank;
 
 public class FluidFormationPlaneScreen extends UpgradeableScreen<FluidFormationPlaneContainer> {
     public FluidFormationPlaneScreen(FluidFormationPlaneContainer container, PlayerInventory playerInventory,

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

@@ -16,18 +16,18 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.client.gui;
+package appeng.client.gui.implementations;
 
 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.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;
+import appeng.parts.automation.FluidImportBusPart;
+import appeng.util.fluid.IAEFluidTank;
 
 /**
  * @author BrockWS

src/main/java/appeng/client/gui/implementations/FluidInterfaceScreen.java

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.client.gui;
+package appeng.client.gui.implementations;
 
 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.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;
+import appeng.helpers.DualityFluidInterface;
+import appeng.util.fluid.IAEFluidTank;
 
 public class FluidInterfaceScreen extends UpgradeableScreen<FluidInterfaceContainer> {
     public FluidInterfaceScreen(FluidInterfaceContainer container, PlayerInventory playerInventory,

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

@@ -1,5 +1,5 @@
 
-package appeng.fluids.client.gui;
+package appeng.client.gui.implementations;
 
 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/client/gui/implementations/FluidStorageBusScreen.java

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.client.gui;
+package appeng.client.gui.implementations;
 
 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.fluids.client.gui.widgets.FluidSlotWidget;
-import appeng.fluids.client.gui.widgets.OptionalFluidSlotWidget;
-import appeng.fluids.container.FluidStorageBusContainer;
-import appeng.fluids.util.IAEFluidTank;
+import appeng.util.fluid.IAEFluidTank;
 
 /**
  * @author BrockWS

src/main/java/appeng/client/gui/implementations/FluidTerminalScreen.java

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.client.gui;
+package appeng.client.gui.implementations;
 
 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/client/gui/widgets/FluidSlotWidget.java

@@ -1,4 +1,4 @@
-package appeng.fluids.client.gui.widgets;
+package appeng.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.fluids.util.AEFluidStack;
-import appeng.fluids.util.IAEFluidTank;
+import appeng.util.fluid.AEFluidStack;
+import appeng.util.fluid.IAEFluidTank;
 
 public class FluidSlotWidget extends CustomSlotWidget {
     private final IAEFluidTank fluids;

src/main/java/appeng/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.fluids.client.gui.widgets;
+package appeng.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.fluids.util.IAEFluidTank;
+import appeng.util.fluid.IAEFluidTank;
 
 @OnlyIn(Dist.CLIENT)
 public class FluidTankWidget extends Widget implements ITooltip {

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

@@ -1,5 +1,5 @@
 
-package appeng.fluids.client.gui.widgets;
+package appeng.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.fluids.util.IAEFluidTank;
+import appeng.util.fluid.IAEFluidTank;
 
 public class OptionalFluidSlotWidget extends FluidSlotWidget {
     private final IOptionalSlotHost containerBus;

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.fluids.container.slots.IMEFluidSlot;
+import appeng.container.slot.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.fluids.items.FluidDummyItem;
+import appeng.items.misc.FluidDummyItem;
 
 /**
  * This baked model class is used as a dispatcher to redirect the renderer to

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

@@ -1,4 +1,4 @@
-package appeng.fluids.items;
+package appeng.client.render;
 
 import net.minecraft.client.renderer.color.IItemColor;
 import net.minecraft.item.Item;
@@ -7,6 +7,8 @@ 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/client/render/FluidStackSizeRenderer.java

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

src/main/java/appeng/client/render/cablebus/CableBusBakedModel.java

@@ -21,7 +21,6 @@ package appeng.client.render.cablebus;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.EnumMap;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -30,6 +29,11 @@ import java.util.Random;
 
 import javax.annotation.Nullable;
 
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
+import com.google.common.cache.Weigher;
+
 import net.minecraft.block.BlockState;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.model.BakedQuad;
@@ -50,7 +54,10 @@ import appeng.api.util.AEColor;
 
 public class CableBusBakedModel implements IBakedModel {
 
-    private static final Map<CableBusRenderState, List<BakedQuad>> CABLE_MODEL_CACHE = new HashMap<>();
+    // The number of quads overall that will be cached
+    private static final int CACHE_QUAD_COUNT = 5000;
+
+    private final LoadingCache<CableBusRenderState, List<BakedQuad>> cableModelCache;
 
     private final CableBuilder cableBuilder;
 
@@ -66,6 +73,17 @@ public class CableBusBakedModel implements IBakedModel {
         this.facadeBuilder = facadeBuilder;
         this.partModels = partModels;
         this.particleTexture = particleTexture;
+        this.cableModelCache = CacheBuilder.newBuilder()//
+                .maximumWeight(CACHE_QUAD_COUNT)//
+                .weigher((Weigher<CableBusRenderState, List<BakedQuad>>) (key, value) -> value.size())//
+                .build(new CacheLoader<CableBusRenderState, List<BakedQuad>>() {
+                    @Override
+                    public List<BakedQuad> load(CableBusRenderState renderState) {
+                        final List<BakedQuad> model = new ArrayList<>();
+                        addCableQuads(renderState, model);
+                        return model;
+                    }
+                });
     }
 
     @Override
@@ -92,11 +110,7 @@ public class CableBusBakedModel implements IBakedModel {
         if (layer == RenderType.getCutout()) {
 
             // First, handle the cable at the center of the cable bus
-            final List<BakedQuad> cableModel = CABLE_MODEL_CACHE.computeIfAbsent(renderState, k -> {
-                final List<BakedQuad> model = new ArrayList<>();
-                this.addCableQuads(renderState, model);
-                return model;
-            });
+            final List<BakedQuad> cableModel = cableModelCache.getUnchecked(renderState);
             quads.addAll(cableModel);
 
             // Then handle attachments
@@ -341,8 +355,4 @@ public class CableBusBakedModel implements IBakedModel {
         return ItemOverrideList.EMPTY;
     }
 
-    public static void clearCache() {
-        CABLE_MODEL_CACHE.clear();
-    }
-
 }

src/main/java/appeng/client/render/cablebus/CableBusModelLoader.java

@@ -18,7 +18,6 @@ public class CableBusModelLoader implements IModelLoader<CableBusModel> {
 
     @Override
     public void onResourceManagerReload(IResourceManager resourceManager) {
-        CableBusBakedModel.clearCache();
     }
 
     @Override

src/main/java/appeng/container/guisync/FluidSyncHelper.java

@@ -1,5 +1,5 @@
 
-package appeng.fluids.helper;
+package appeng.container.guisync;
 
 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.fluids.util.AEFluidInventory;
-import appeng.fluids.util.IAEFluidTank;
+import appeng.util.fluid.AEFluidInventory;
+import appeng.util.fluid.IAEFluidTank;
 
 public class FluidSyncHelper {
     private final IAEFluidTank inv;

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

@@ -1,5 +1,5 @@
 
-package appeng.fluids.container;
+package appeng.container.implementations;
 
 import java.util.Collections;
 import java.util.Map;
@@ -15,11 +15,12 @@ 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.fluids.helper.FluidSyncHelper;
-import appeng.fluids.util.AEFluidStack;
-import appeng.fluids.util.IAEFluidTank;
+import appeng.container.interfaces.IFluidSyncContainer;
 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/container/implementations/FluidFormationPlaneContainer.java

@@ -1,5 +1,5 @@
 
-package appeng.fluids.container;
+package appeng.container.implementations;
 
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
@@ -11,10 +11,9 @@ 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.fluids.parts.FluidFormationPlanePart;
-import appeng.fluids.util.IAEFluidTank;
+import appeng.parts.automation.FluidFormationPlanePart;
+import appeng.util.fluid.IAEFluidTank;
 
 public class FluidFormationPlaneContainer extends FluidConfigurableContainer {
 

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

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.container;
+package appeng.container.implementations;
 
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
@@ -25,9 +25,8 @@ import net.minecraft.network.PacketBuffer;
 
 import appeng.api.config.SecurityPermissions;
 import appeng.container.ContainerLocator;
-import appeng.container.implementations.ContainerHelper;
-import appeng.fluids.parts.SharedFluidBusPart;
-import appeng.fluids.util.IAEFluidTank;
+import appeng.parts.automation.SharedFluidBusPart;
+import appeng.util.fluid.IAEFluidTank;
 
 /**
  * @author BrockWS

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

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.container;
+package appeng.container.implementations;
 
 import java.util.Collections;
 import java.util.Map;
@@ -31,12 +31,11 @@ import appeng.api.config.SecurityPermissions;
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.api.util.IConfigManager;
 import appeng.container.ContainerLocator;
-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.container.guisync.FluidSyncHelper;
+import appeng.helpers.DualityFluidInterface;
+import appeng.helpers.IFluidInterfaceHost;
 import appeng.util.Platform;
+import appeng.util.fluid.IAEFluidTank;
 
 public class FluidInterfaceContainer extends FluidConfigurableContainer {
 

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

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

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

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.container;
+package appeng.container.implementations;
 
 import java.util.Iterator;
 
@@ -38,12 +38,11 @@ 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.fluids.parts.FluidStorageBusPart;
-import appeng.fluids.util.IAEFluidTank;
+import appeng.parts.misc.FluidStorageBusPart;
 import appeng.util.Platform;
+import appeng.util.fluid.IAEFluidTank;
 import appeng.util.iterators.NullIterator;
 
 /**

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

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.container;
+package appeng.container.implementations;
 
 import java.io.IOException;
 import java.nio.BufferOverflowException;
@@ -63,19 +63,18 @@ 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/container/interfaces/IFluidSyncContainer.java

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

src/main/java/appeng/container/slot/IMEFluidSlot.java

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

src/main/java/appeng/core/AEConfig.java

@@ -31,6 +31,8 @@ import java.util.Set;
 import java.util.function.DoubleSupplier;
 import java.util.stream.Collectors;
 
+import javax.annotation.Nullable;
+
 import com.google.common.base.Strings;
 
 import org.apache.commons.lang3.tuple.Pair;
@@ -393,6 +395,15 @@ public final class AEConfig {
         return this.meteoriteDimensionWhitelist;
     }
 
+    @Nullable
+    public String getImprovedFluidTag() {
+        return Strings.emptyToNull(COMMON.improvedFluidTag.get());
+    }
+
+    public float getImprovedFluidMultiplier() {
+        return COMMON.improvedFluidMultiplier.get().floatValue();
+    }
+
     // Setters keep visibility as low as possible.
 
     private static class ClientConfig {
@@ -507,6 +518,11 @@ public final class AEConfig {
         public final ConfigValue<Integer> condenserMatterBallsPower;
         public final ConfigValue<Integer> condenserSingularityPower;
 
+        // In-World Purification
+        // Settings for improved speed depending on fluid the crystal is in
+        public final ConfigValue<String> improvedFluidTag;
+        public final ConfigValue<Double> improvedFluidMultiplier;
+
         public final Map<TickRates, ConfigValue<Integer>> tickRateMin = new HashMap<>();
         public final Map<TickRates, ConfigValue<Integer>> tickRateMax = new HashMap<>();
 
@@ -617,6 +633,17 @@ public final class AEConfig {
                 tickRateMax.put(tickRate, builder.define(tickRate.name() + "Max", tickRate.getDefaultMax()));
             }
             builder.pop();
+
+            builder.comment("Settings for in-world purification of crystals.").push("inWorldPurification");
+
+            improvedFluidTag = builder.comment(
+                    "A fluid tag that identifies fluids that improve crystal purification speed. Does not affect purification with water/lava.")
+                    .define("improvedFluidTag", "");
+            improvedFluidMultiplier = builder
+                    .comment("The speed multiplier to use when the crystals are submerged in the improved fluid.")
+                    .defineInRange("improvedFluidMultiplier", 2.0, 1.0, 10.0);
+
+            builder.pop();
         }
 
     }

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

@@ -100,6 +100,12 @@ 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;
@@ -159,6 +165,12 @@ 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;
@@ -186,24 +198,12 @@ 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.fluids.items.FluidDummyItem;
-import appeng.fluids.util.AEFluidStack;
-import appeng.fluids.util.FluidList;
+import appeng.items.misc.FluidDummyItem;
 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

@@ -20,6 +20,7 @@ package appeng.core.api.definitions;
 
 import static appeng.block.AEBaseBlock.defaultProps;
 
+import net.minecraft.block.AbstractBlock;
 import net.minecraft.block.Block;
 import net.minecraft.block.DispenserBlock;
 import net.minecraft.block.SlabBlock;
@@ -28,6 +29,7 @@ import net.minecraft.block.StairsBlock;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.entity.EntityClassification;
+import net.minecraft.entity.EntityType;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.common.ToolType;
@@ -49,6 +51,7 @@ 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;
@@ -120,8 +123,6 @@ 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;
@@ -133,6 +134,7 @@ 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;
@@ -262,18 +264,20 @@ public final class ApiBlocks implements IBlocks {
         this.chiseledQuartzBlock = deco.block("chiseled_quartz_block", () -> new AEDecorativeBlock(QUARTZ_PROPERTIES))
                 .build();
 
-        this.quartzGlass = registry.features(AEFeature.QUARTZ_GLASS)
-                .block("quartz_glass", () -> new QuartzGlassBlock(defaultProps(Material.GLASS).notSolid()))
-                .rendering(new BlockRenderingCustomizer() {
-                    @Override
-                    @OnlyIn(Dist.CLIENT)
-                    public void customize(IBlockRendering rendering, IItemRendering itemRendering) {
-                        rendering.renderType(RenderType.getCutout());
-                    }
-                }).build();
+        AbstractBlock.IExtendedPositionPredicate<EntityType<?>> neverAllowSpawn = (p1, p2, p3, p4) -> false;
+        this.quartzGlass = registry.features(AEFeature.QUARTZ_GLASS).block("quartz_glass", () -> {
+            return new QuartzGlassBlock(defaultProps(Material.GLASS).notSolid().setAllowsSpawn(neverAllowSpawn));
+        }).rendering(new BlockRenderingCustomizer() {
+            @Override
+            @OnlyIn(Dist.CLIENT)
+            public void customize(IBlockRendering rendering, IItemRendering itemRendering) {
+                rendering.renderType(RenderType.getCutout());
+            }
+        }).build();
         this.quartzVibrantGlass = deco
                 .block("quartz_vibrant_glass",
-                        () -> new QuartzLampBlock(defaultProps(Material.GLASS).setLightLevel(b -> 15).notSolid()))
+                        () -> new QuartzLampBlock(defaultProps(Material.GLASS).setLightLevel(b -> 15).notSolid()
+                                .setAllowsSpawn(neverAllowSpawn)))
                 .addFeatures(AEFeature.DECORATIVE_LIGHTS, AEFeature.QUARTZ_GLASS)
                 .rendering(new BlockRenderingCustomizer() {
                     @Override

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

@@ -39,6 +39,7 @@ 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;
@@ -49,18 +50,17 @@ 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,25 +33,24 @@ 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;
@@ -71,6 +70,7 @@ 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/features/registries/LocatableRegistry.java

@@ -22,12 +22,12 @@ import java.util.HashMap;
 import java.util.Map;
 
 import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
 
 import appeng.api.events.LocatableEventAnnounce;
 import appeng.api.events.LocatableEventAnnounce.LocatableEvent;
 import appeng.api.features.ILocatable;
 import appeng.api.features.ILocatableRegistry;
+import appeng.core.AELog;
 import appeng.util.Platform;
 
 public final class LocatableRegistry implements ILocatableRegistry {
@@ -35,18 +35,19 @@ public final class LocatableRegistry implements ILocatableRegistry {
 
     public LocatableRegistry() {
         this.set = new HashMap<>();
-        MinecraftForge.EVENT_BUS.register(this);
+        MinecraftForge.EVENT_BUS.addListener(this::updateLocatable);
     }
 
-    @SubscribeEvent
-    public void updateLocatable(final LocatableEventAnnounce e) {
+    private void updateLocatable(final LocatableEventAnnounce e) {
         if (Platform.isClient()) {
             return; // IGNORE!
         }
 
         if (e.change == LocatableEvent.REGISTER) {
+            AELog.debug("Registering locatable %s: %s", e.target.getLocatableSerial(), e.target);
             this.set.put(e.target.getLocatableSerial(), e.target);
         } else if (e.change == LocatableEvent.UNREGISTER) {
+            AELog.debug("Unregistering locatable %s: %s", e.target.getLocatableSerial(), e.target);
             this.set.remove(e.target.getLocatableSerial());
         }
     }

src/main/java/appeng/core/features/registries/cell/BasicFluidCellGuiHandler.java

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.registries;
+package appeng.core.features.registries.cell;
 
 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/core/sync/packets/ConfigValuePacket.java

@@ -38,6 +38,8 @@ 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;
@@ -47,8 +49,6 @@ 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.fluids.container.IFluidSyncContainer;
-import appeng.fluids.util.AEFluidStack;
+import appeng.util.fluid.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.fluids.client.gui.FluidTerminalScreen;
-import appeng.fluids.util.AEFluidStack;
+import appeng.util.fluid.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.fluids.container.FluidTerminalContainer;
-import appeng.fluids.util.AEFluidStack;
+import appeng.util.fluid.AEFluidStack;
 
 /**
  * @author BrockWS

src/main/java/appeng/decorative/solid/QuartzGlassBlock.java

@@ -20,11 +20,8 @@ package appeng.decorative.solid;
 
 import net.minecraft.block.AbstractGlassBlock;
 import net.minecraft.block.BlockState;
-import net.minecraft.block.material.Material;
 import net.minecraft.util.Direction;
 
-import appeng.helpers.AEMaterials;
-
 public class QuartzGlassBlock extends AbstractGlassBlock {
 
     public QuartzGlassBlock(Properties props) {
@@ -33,8 +30,7 @@ public class QuartzGlassBlock extends AbstractGlassBlock {
 
     @Override
     public boolean isSideInvisible(BlockState state, BlockState adjacentBlockState, Direction side) {
-        final Material mat = adjacentBlockState.getMaterial();
-        if (mat == Material.GLASS || mat == AEMaterials.GLASS) {
+        if (adjacentBlockState.getBlock() instanceof QuartzGlassBlock) {
             if (adjacentBlockState.getRenderType() == state.getRenderType()) {
                 return true;
             }

src/main/java/appeng/decorative/solid/SkyStoneBlock.java

@@ -29,7 +29,6 @@ import net.minecraft.world.server.ServerWorld;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.ToolType;
 import net.minecraftforge.event.entity.player.PlayerEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
 
 import appeng.block.AEBaseBlock;
 import appeng.core.worlddata.WorldData;
@@ -43,11 +42,10 @@ public class SkyStoneBlock extends AEBaseBlock {
         super(props);
         this.type = type;
 
-        MinecraftForge.EVENT_BUS.register(this);
+        MinecraftForge.EVENT_BUS.addListener(this::breakFaster);
     }
 
-    @SubscribeEvent
-    public void breakFaster(final PlayerEvent.BreakSpeed event) {
+    private void breakFaster(final PlayerEvent.BreakSpeed event) {
         if (event.getState().getBlock() == this && event.getPlayer() != null) {
             final ItemStack is = event.getPlayer().getItemStackFromSlot(EquipmentSlotType.MAINHAND);
             int level = -1;

src/main/java/appeng/entity/GrowingCrystalEntity.java

@@ -19,13 +19,14 @@
 package appeng.entity;
 
 import net.minecraft.block.BlockState;
-import net.minecraft.block.material.Material;
 import net.minecraft.entity.EntityType;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;
+import net.minecraft.util.math.vector.Vector3d;
 import net.minecraft.world.World;
 
 import appeng.api.features.AEFeature;
@@ -35,12 +36,27 @@ import appeng.client.EffectType;
 import appeng.core.AEConfig;
 import appeng.core.AppEng;
 import appeng.items.misc.CrystalSeedItem;
-import appeng.util.Platform;
 
 public final class GrowingCrystalEntity extends AEBaseItemEntity {
 
     public static EntityType<GrowingCrystalEntity> TYPE;
 
+    // Growth tick progress per tick by number of adjacent accelerators
+    // Expressed as 1/1000th of a growth tick, applied to progress_1000
+    // each time this entity ticks.
+    private static final int[] GROWTH_TICK_PROGRESS = { 1, // no accelerators
+            40, // 1 accelerator
+            92, // 2 accelerators
+            159, // 3 accelerators
+            247, // 4 accelerators
+            361, // 5 accelerators
+            509 // 6 accelerators
+    };
+
+    /**
+     * The accumulated progress towards a single growth tick of the crystal in
+     * 1/1000th of a growth tick.
+     */
     private int progress_1000 = 0;
 
     public GrowingCrystalEntity(EntityType<? extends GrowingCrystalEntity> type, World world) {
@@ -56,126 +72,140 @@ public final class GrowingCrystalEntity extends AEBaseItemEntity {
     public void tick() {
         super.tick();
 
+        final ItemStack is = this.getItem();
+        final Item gc = is.getItem();
+
+        if (!(gc instanceof IGrowableCrystal)) {
+            return;
+        }
+
+        applyGrowthTick((IGrowableCrystal) gc, is);
+    }
+
+    private void applyGrowthTick(IGrowableCrystal cry, ItemStack is) {
         if (!AEConfig.instance().isFeatureEnabled(AEFeature.IN_WORLD_PURIFICATION)) {
             return;
         }
 
-        final ItemStack is = this.getItem();
-        final Item gc = is.getItem();
+        final int x = MathHelper.floor(this.getPosX());
+        final int y = MathHelper.floor((this.getBoundingBox().minY + this.getBoundingBox().maxY) / 2.0D);
+        final int z = MathHelper.floor(this.getPosZ());
 
-        if (gc instanceof IGrowableCrystal) // if it changes this just stops being an issue...
-        {
-            final int j = MathHelper.floor(this.getPosX());
-            final int i = MathHelper.floor((this.getBoundingBox().minY + this.getBoundingBox().maxY) / 2.0D);
-            final int k = MathHelper.floor(this.getPosZ());
+        BlockPos pos = new BlockPos(x, y, z);
+        final BlockState state = this.world.getBlockState(pos);
 
-            final BlockState state = this.world.getBlockState(new BlockPos(j, i, k));
-            final Material mat = state.getMaterial();
-            final IGrowableCrystal cry = (IGrowableCrystal) is.getItem();
+        final float multiplier = cry.getMultiplier(state, world, pos);
 
-            final float multiplier = cry.getMultiplier(state.getBlock(), mat);
-            final int speed = (int) Math.max(1, this.getSpeed(j, i, k) * multiplier);
+        if (multiplier <= 0) {
+            // Crystal is in unsuitable material, reset progress and quit
+            this.progress_1000 = 0;
+            return;
+        }
 
-            final boolean isClient = Platform.isClient();
+        final int progressPerTick = (int) Math.max(1, this.getSpeed(pos) * multiplier);
 
-            if (mat.isLiquid()) {
-                if (isClient) {
-                    this.progress_1000++;
-                } else {
-                    this.progress_1000 += speed;
-                }
-            } else {
+        if (world.isRemote()) {
+            // On the client, we reuse the growth-tick-progress
+            // as a tick-counter for particle effects
+            int len = getTicksBetweenParticleEffects(progressPerTick);
+            if (++this.progress_1000 >= len) {
                 this.progress_1000 = 0;
+                AppEng.proxy.spawnEffect(EffectType.Vibrant, this.world, this.getPosX(), this.getPosY() + 0.2,
+                        this.getPosZ(), null);
             }
+        } else {
+            this.progress_1000 += progressPerTick;
 
-            if (isClient) {
-                int len = 40;
+            if (this.progress_1000 >= 1000) {
+                // We need to copy the stack or the change detection will not work and not sync
+                // this new stack to the client
+                ItemStack newItem = is.copy();
 
-                if (speed > 2) {
-                    len = 20;
-                }
-
-                if (speed > 90) {
-                    len = 15;
-                }
-
-                if (speed > 150) {
-                    len = 10;
-                }
-
-                if (speed > 240) {
-                    len = 7;
-                }
-
-                if (speed > 360) {
-                    len = 3;
-                }
-
-                if (speed > 500) {
-                    len = 1;
-                }
-
-                if (this.progress_1000 >= len) {
-                    this.progress_1000 = 0;
-                    AppEng.proxy.spawnEffect(EffectType.Vibrant, this.world, this.getPosX(), this.getPosY() + 0.2,
-                            this.getPosZ(), null);
-                }
-            } else {
-                if (this.progress_1000 > 1000) {
+                // If we did not use a while loop here, the fastest growth for a crystal
+                // would be limited to a minimum of 30 seconds (based on 600 required growth
+                // ticks).
+                // Should a crystal decide to use a high multiplier for a certain material,
+                // it should be possible to go faster.
+                do {
+                    newItem = cry.triggerGrowth(newItem);
                     this.progress_1000 -= 1000;
-                    // We need to copy the stack or the change detection will not work and not sync
-                    // this new stack to the client
-                    ItemStack newItem = cry.triggerGrowth(is.copy());
-                    this.setItem(newItem);
-                }
+                    // We assume that if the item changes, the process is complete and we can break
+                } while (this.progress_1000 >= 1000 && newItem.getItem() == is.getItem());
+
+                this.setItem(newItem);
             }
         }
     }
 
-    private int getSpeed(final int x, final int y, final int z) {
-        final int per = 80;
-        final float mul = 0.3f;
-
-        int qty = 0;
-
-        if (this.isAccelerated(x + 1, y, z)) {
-            qty += per + qty * mul;
+    private static int getTicksBetweenParticleEffects(int progressPerTick) {
+        if (progressPerTick > 500) {
+            return 1; // 20 times per second
+        } else if (progressPerTick > 360) {
+            return 3;
+        } else if (progressPerTick > 240) {
+            return 7;
+        } else if (progressPerTick > 150) {
+            return 10;
+        } else if (progressPerTick > 90) {
+            return 15;
+        } else if (progressPerTick > 2) {
+            return 20;
+        } else {
+            return 40; // Every 2 seconds
         }
-
-        if (this.isAccelerated(x, y + 1, z)) {
-            qty += per + qty * mul;
-        }
-
-        if (this.isAccelerated(x, y, z + 1)) {
-            qty += per + qty * mul;
-        }
-
-        if (this.isAccelerated(x - 1, y, z)) {
-            qty += per + qty * mul;
-        }
-
-        if (this.isAccelerated(x, y - 1, z)) {
-            qty += per + qty * mul;
-        }
-
-        if (this.isAccelerated(x, y, z - 1)) {
-            qty += per + qty * mul;
-        }
-
-        return qty;
     }
 
-    private boolean isAccelerated(final int x, final int y, final int z) {
-        final TileEntity te = this.world.getTileEntity(new BlockPos(x, y, z));
+    /**
+     * Gets the extra progress per tick in 1/1000th of a growth tick based on the
+     * surrounding accelerators.
+     */
+    private int getSpeed(BlockPos pos) {
+        int acceleratorCount = getAcceleratorCount(pos);
+
+        if (acceleratorCount < 0) {
+            return GROWTH_TICK_PROGRESS[0];
+        } else if (acceleratorCount >= GROWTH_TICK_PROGRESS.length) {
+            return GROWTH_TICK_PROGRESS[GROWTH_TICK_PROGRESS.length - 1];
+        } else {
+            return GROWTH_TICK_PROGRESS[acceleratorCount];
+        }
+    }
+
+    private int getAcceleratorCount(BlockPos pos) {
+        int count = 0;
+
+        BlockPos.Mutable testPos = new BlockPos.Mutable();
+        for (Direction direction : Direction.values()) {
+            if (this.isPoweredAccelerator(testPos.func_239622_a_(pos, direction))) {
+                count++;
+            }
+        }
+
+        return count;
+    }
+
+    private boolean isPoweredAccelerator(BlockPos pos) {
+        final TileEntity te = this.world.getTileEntity(pos);
 
         return te instanceof ICrystalGrowthAccelerator && ((ICrystalGrowthAccelerator) te).isPowered();
     }
 
-    // Don't let seeds "float" on water surface
     @Override
     protected void applyFloatMotion() {
         ItemStack item = getItem();
+
+        // Make ungrown seeds sink, and fully grown seeds bouyant allowing for
+        // automation based around dropping seeds between 5 CGAs, then catchiung
+        // them on their way up.
         if (item.getItem() instanceof CrystalSeedItem) {
+            Vector3d v = this.getMotion();
+
+            // Apply a much smaller acceleration to make them slowly sink
+            double yAccel = this.hasNoGravity() ? 0 : -0.002;
+
+            // Apply the x/z slow-down, and the y acceleration
+            this.setMotion(v.x * 0.99, v.y + yAccel, v.z * 0.99);
+
             return;
         }
         super.applyFloatMotion();

src/main/java/appeng/helpers/DualityFluidInterface.java

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.helper;
+package appeng.helpers;
 
 import java.util.Optional;
 
@@ -59,9 +59,6 @@ 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;
@@ -71,6 +68,9 @@ 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/helpers/IFluidInterfaceHost.java

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.helper;
+package appeng.helpers;
 
 import java.util.EnumSet;
 
@@ -25,6 +25,7 @@ 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/items/contents/FluidCellConfig.java

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.helper;
+package appeng.items.contents;
 
 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/items/misc/CrystalSeedItem.java

@@ -24,15 +24,19 @@ import javax.annotation.Nullable;
 
 import com.google.common.base.Preconditions;
 
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
+import net.minecraft.block.BlockState;
 import net.minecraft.client.util.ITooltipFlag;
 import net.minecraft.entity.Entity;
+import net.minecraft.fluid.Fluid;
 import net.minecraft.item.ItemGroup;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundNBT;
+import net.minecraft.tags.FluidTags;
+import net.minecraft.tags.ITag;
 import net.minecraft.util.IItemProvider;
 import net.minecraft.util.NonNullList;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.StringTextComponent;
@@ -41,6 +45,7 @@ import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 
 import appeng.api.implementations.items.IGrowableCrystal;
+import appeng.core.AEConfig;
 import appeng.core.localization.ButtonToolTips;
 import appeng.entity.GrowingCrystalEntity;
 import appeng.items.AEBaseItem;
@@ -94,8 +99,24 @@ public class CrystalSeedItem extends AEBaseItem implements IGrowableCrystal {
     }
 
     @Override
-    public float getMultiplier(final Block blk, final Material mat) {
-        return 0.5f;
+    public float getMultiplier(BlockState state, @Nullable World world, @Nullable BlockPos pos) {
+
+        // Check for the improved fluid tag and return the improved multiplier
+        String improvedFluidTagName = AEConfig.instance().getImprovedFluidTag();
+        if (improvedFluidTagName != null) {
+            ITag<Fluid> tag = FluidTags.getCollection().get(new ResourceLocation(improvedFluidTagName));
+            if (tag != null && state.getFluidState().isTagged(tag)) {
+                return AEConfig.instance().getImprovedFluidMultiplier();
+            }
+        }
+
+        // Check for the normal supported fluid
+        if (world != null && world.func_234923_W_() == World.field_234919_h_) {
+            // In the nether, use Lava as the "normal" fluid
+            return state.getFluidState().isTagged(FluidTags.LAVA) ? 1 : 0;
+        } else {
+            return state.getFluidState().isTagged(FluidTags.WATER) ? 1 : 0;
+        }
     }
 
     @Override

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

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

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

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

src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java

@@ -324,21 +324,21 @@ public class ColorApplicatorItem extends AEBasePoweredItem
             return w.setBlockState(pos, newState);
         }
 
+        if (blk instanceof CableBusBlock && p != null) {
+            return ((CableBusBlock) blk).recolorBlock(w, pos, side, newColor.dye, p);
+        }
+
         TileEntity be = w.getTileEntity(pos);
         if (be instanceof IColorableTile) {
             IColorableTile ct = (IColorableTile) be;
             AEColor c = ct.getColor();
             if (c != newColor) {
-                ct.recolourBlock(side, newColor, null);
+                ct.recolourBlock(side, newColor, p);
                 return true;
             }
             return false;
         }
 
-        if (blk instanceof CableBusBlock && p != null) {
-            return ((CableBusBlock) blk).recolorBlock(w, pos, side, newColor.dye, p);
-        }
-
         return false;
     }
 

src/main/java/appeng/me/cluster/implementations/QuantumCluster.java

@@ -22,7 +22,6 @@ import java.util.Iterator;
 
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.ChunkPos;
 import net.minecraft.world.World;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.world.WorldEvent;
@@ -159,12 +158,16 @@ public class QuantumCluster implements ILocatable, IAECluster {
         if (qc != null) {
             final World theWorld = qc.center.getWorld();
             if (!qc.isDestroyed) {
-                ChunkPos cPos = new ChunkPos(qc.center.getPos());
-                if (theWorld.getChunkProvider().isChunkLoaded(cPos)) {
+                // In future versions, we might actually want to delay the entire registration
+                // until the center
+                // tile begins ticking normally.
+                if (theWorld.isBlockLoaded(qc.center.getPos())) {
                     final World cur = theWorld.getServer().getWorld(theWorld.func_234923_W_());
 
                     final TileEntity te = theWorld.getTileEntity(qc.center.getPos());
                     return te != qc.center || theWorld != cur;
+                } else {
+                    AELog.warn("Found a registered QNB with serial %s whose chunk seems to be unloaded: %s", qe, qc);
                 }
             }
         }
@@ -275,4 +278,17 @@ public class QuantumCluster implements ILocatable, IAECluster {
     private void setRing(final QuantumBridgeTileEntity[] ring) {
         this.Ring = ring;
     }
+
+    @Override
+    public String toString() {
+        if (center == null) {
+            return "QuantumCluster{no-center}";
+        }
+
+        World world = center.getWorld();
+        BlockPos pos = center.getPos();
+
+        return "QuantumCluster{" + world + "," + pos + "}";
+    }
+
 }

src/main/java/appeng/parts/CableBusContainer.java

@@ -41,7 +41,6 @@ import net.minecraft.util.Hand;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.shapes.VoxelShape;
-import net.minecraft.util.math.shapes.VoxelShapes;
 import net.minecraft.util.math.vector.Vector3d;
 import net.minecraft.world.IBlockReader;
 import net.minecraft.world.World;
@@ -82,7 +81,6 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I
     private final EnumSet<LayerFlags> myLayerFlags = EnumSet.noneOf(LayerFlags.class);
     private YesNo hasRedstone = YesNo.UNDECIDED;
     private IPartHost tcb;
-    // TODO 1.10.2-R - does somebody seriously want to make parts TESR??? Hope not.
     private boolean requiresDynamicRender = false;
     private boolean inWorld = false;
     // Cached collision shape for living entities
@@ -1096,11 +1094,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I
             }
         }
 
-        VoxelShape shape = VoxelShapes.empty();
-        for (final AxisAlignedBB bx : boxes) {
-            shape = VoxelShapes.or(shape, VoxelShapes.create(bx));
-        }
-        return shape;
+        return VoxelShapeCache.get(boxes);
     }
 
     private void invalidateShapes() {

src/main/java/appeng/parts/VoxelShapeCache.java

@@ -0,0 +1,81 @@
+/*
+ * This file is part of Applied Energistics 2.
+ * Copyright (c) 2013 - 2015, AlgorithmX2, All rights reserved.
+ *
+ * Applied Energistics 2 is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Applied Energistics 2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
+ */
+
+package appeng.parts;
+
+import java.util.List;
+
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
+
+import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.util.math.shapes.IBooleanFunction;
+import net.minecraft.util.math.shapes.VoxelShape;
+import net.minecraft.util.math.shapes.VoxelShapes;
+
+/**
+ * While creation of a {@link VoxelShape} with
+ * {@link VoxelShapes#create(AxisAlignedBB)} is fast enough, combining voxel
+ * shapes with {@link VoxelShapes#or(VoxelShape, VoxelShape)} or any other
+ * combination method, as well as {@link VoxelShape#simplify()} are <b>extremely
+ * slow</b>. For example: Creating a VoxelShape for a list of 5 bounding boxes
+ * 10,000 times takes about 1.7 seconds.
+ *
+ * <p>
+ * To reduce the impact of this on cables, we introduce a global voxel shape
+ * cache so that cables can share their combined voxel shapes better.
+ */
+final class VoxelShapeCache {
+
+    // Why using a List here should not make much of a difference vs. using a Set:
+    // The part's bounding box depends on the side it is attached to, and the sides
+    // are iterated over in a fixed order, meaning the order of bounding boxes
+    // should
+    // be the same for a same set of parts.
+    private static final LoadingCache<List<AxisAlignedBB>, VoxelShape> CACHE = CacheBuilder.newBuilder()//
+            .maximumSize(10000L)//
+            .build(new CacheLoader<List<AxisAlignedBB>, VoxelShape>() {
+                @Override
+                public VoxelShape load(List<AxisAlignedBB> key) {
+                    return create(key);
+                }
+            });
+
+    private VoxelShapeCache() {
+    }
+
+    public static VoxelShape get(List<AxisAlignedBB> boxes) {
+        return CACHE.getUnchecked(boxes);
+    }
+
+    private static VoxelShape create(List<AxisAlignedBB> boxes) {
+        if (boxes.isEmpty()) {
+            return VoxelShapes.empty();
+        }
+
+        int i = 0;
+        VoxelShape shape = VoxelShapes.create(boxes.get(i));
+        for (; i < boxes.size(); i++) {
+            AxisAlignedBB box = boxes.get(i);
+            shape = VoxelShapes.combine(shape, VoxelShapes.create(box), IBooleanFunction.OR);
+        }
+        return shape.simplify();
+    }
+
+}

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

@@ -1,5 +1,5 @@
 
-package appeng.fluids.parts;
+package appeng.parts.automation;
 
 import java.util.List;
 
@@ -44,16 +44,12 @@ 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/parts/automation/FluidExportBusPart.java

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

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

@@ -1,5 +1,5 @@
 
-package appeng.fluids.parts;
+package appeng.parts.automation;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -45,18 +45,15 @@ 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/parts/automation/FluidImportBusPart.java

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.parts;
+package appeng.parts.automation;
 
 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
@@ -96,16 +96,15 @@ public class FluidImportBusPart extends SharedFluidBusPart {
         }
 
         final TileEntity te = this.getConnectedTE();
-        LazyOptional<IFluidHandler> fhOpt = LazyOptional.empty();
         if (te != null) {
-            te.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, this.getSide().getFacing().getOpposite());
-        }
-        if (fhOpt.isPresent()) {
-            try {
-                final IFluidHandler fh = fhOpt.orElse(null);
-                final IMEMonitor<IAEFluidStack> inv = this.getProxy().getStorage().getInventory(this.getChannel());
+            LazyOptional<IFluidHandler> fhOpt = te.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY,
+                    this.getSide().getFacing().getOpposite());
+
+            if (fhOpt.isPresent()) {
+                try {
+                    final IFluidHandler fh = fhOpt.orElseThrow(() -> new IllegalStateException());
+                    final IMEMonitor<IAEFluidStack> inv = this.getProxy().getStorage().getInventory(this.getChannel());
 
-                if (fh != null) {
                     final FluidStack fluidStack = fh.drain(this.calculateAmountToSend(), FluidAction.SIMULATE);
 
                     if (this.filterEnabled() && !this.isInFilter(fluidStack)) {
@@ -128,12 +127,11 @@ public class FluidImportBusPart extends SharedFluidBusPart {
                     }
 
                     return TickRateModulation.IDLE;
+                } catch (GridAccessException e) {
+                    // skip
                 }
-            } catch (GridAccessException e) {
-                e.printStackTrace();
             }
         }
-
         return TickRateModulation.SLEEP;
     }
 

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

@@ -1,5 +1,5 @@
 
-package appeng.fluids.parts;
+package appeng.parts.automation;
 
 import java.util.Random;
 
@@ -37,18 +37,17 @@ 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/parts/automation/SharedFluidBusPart.java

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.parts;
+package appeng.parts.automation;
 
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
@@ -39,13 +39,12 @@ 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/parts/misc/FluidHandlerAdapter.java

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.parts;
+package appeng.parts.misc;
 
 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/parts/misc/FluidInterfacePart.java

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.parts;
+package appeng.parts.misc;
 
 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.fluids.container.FluidInterfaceContainer;
-import appeng.fluids.helper.DualityFluidInterface;
-import appeng.fluids.helper.IFluidInterfaceHost;
+import appeng.helpers.DualityFluidInterface;
+import appeng.helpers.IFluidInterfaceHost;
 import appeng.helpers.IPriorityHost;
 import appeng.helpers.Reflected;
 import appeng.items.parts.PartModels;

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

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.parts;
+package appeng.parts.misc;
 
 import java.util.Collections;
 import java.util.List;
@@ -65,13 +65,10 @@ 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;
@@ -79,8 +76,10 @@ 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/parts/reporting/FluidTerminalPart.java

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.parts;
+package appeng.parts.reporting;
 
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.inventory.container.ContainerType;
@@ -24,11 +24,10 @@ 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/tile/AEBaseTileEntity.java

@@ -253,9 +253,11 @@ public class AEBaseTileEntity extends TileEntity implements IOrientable, ICommon
         if (this.renderFragment > 0) {
             this.renderFragment |= 1;
         } else {
+            // Clearing the cached model-data is always harmless regardless of status
+            this.requestModelDataUpdate();
+
             // TODO: Optimize Network Load
-            if (this.world != null) {
-                this.requestModelDataUpdate();
+            if (this.world != null && !this.isRemoved() && !notLoaded()) {
 
                 boolean alreadyUpdated = false;
                 // Let the block update it's own state with our internal state changes
@@ -368,7 +370,6 @@ public class AEBaseTileEntity extends TileEntity implements IOrientable, ICommon
      * null means nothing to store...
      *
      * @param from source of settings
-     *
      * @return compound of source
      */
     public CompoundNBT downloadSettings(final SettingsFrom from) {

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

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.tile;
+package appeng.tile.misc;
 
 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.fluids.container.FluidInterfaceContainer;
-import appeng.fluids.helper.DualityFluidInterface;
-import appeng.fluids.helper.IFluidInterfaceHost;
+import appeng.helpers.DualityFluidInterface;
+import appeng.helpers.IFluidInterfaceHost;
 import appeng.helpers.IPriorityHost;
 import appeng.tile.grid.AENetworkTileEntity;
 

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

@@ -91,10 +91,9 @@ 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;
@@ -105,6 +104,7 @@ 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;

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

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

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

@@ -16,7 +16,7 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
-package appeng.fluids.util;
+package appeng.util.fluid;
 
 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.fluids.items.FluidDummyItem;
+import appeng.items.misc.FluidDummyItem;
 import appeng.util.Platform;
 import appeng.util.item.AEStack;
 

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

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

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

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

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

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

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

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

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

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

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

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

src/main/resources/assets/appliedenergistics2/models/item/cable_bus.json

@@ -1,3 +1 @@
-{
-  "parent": "appliedenergistics2:block/cable_bus"
-}
+{}

src/main/resources/data/appliedenergistics2/advancements/main/facade.json

@@ -1,7 +1,8 @@
 {
   "display": {
     "icon": {
-      "item": "appliedenergistics2:facade"
+      "item": "appliedenergistics2:facade",
+      "nbt": "{item:\"minecraft:stone\"}"
     },
     "title": {
       "translate": "achievement.ae2.Facade"