Bump to Forge 33.0.5

Initial port to 1.16.2
2020-08-15 14:32:53 +02:00 · 2020-08-13 23:29:55 +02:00 · 2020-08-13 23:15:09 +02:00 · 2020-08-13 23:14:49 +02:00
146 changed files with 2205 additions and 947 deletions
@@ -55,15 +55,7 @@ jobs:
          KEY_STORE_ALIAS: ${{ secrets.KEY_STORE_ALIAS }}
          KEY_STORE_KEY_PASS: ${{ secrets.KEY_STORE_KEY_PASS }}
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: ./gradlew publishMavenPublicationToGitHubPackagesRepository --no-daemon --max-workers 1
-      - name: Publish to modmaven
-        env:
-          KEY_STORE_PASS: ${{ secrets.KEY_STORE_PASS }}
-          KEY_STORE_ALIAS: ${{ secrets.KEY_STORE_ALIAS }}
-          KEY_STORE_KEY_PASS: ${{ secrets.KEY_STORE_KEY_PASS }}
-          MODMAVEN_USER: ${{ secrets.MODMAVEN_USER }}
-          MODMAVEN_PASSWORD: ${{ secrets.MODMAVEN_PASSWORD }}
-        run: ./gradlew publishMavenPublicationToModmavenRepository --no-daemon --max-workers 1
+        run: ./gradlew publish --no-daemon --max-workers 1
      - name: Prepare artifact metadata
        id: prepare_artifact_metadata
        run: |
@@ -190,13 +190,6 @@ publishing {
            groupId = project.group
            artifactId = project.archivesBaseName
            version = project.version
-
-            // ForgeGradle will generate wild dependency definitions, see https://github.com/MinecraftForge/ForgeGradle/issues/584
-            // Since we don't actually depend on anything, just remove the entire node.
-            pom.withXml {
-                asNode().remove(asNode().dependencies)
-            }
-
            from components.java
            artifact sourcesJar
            artifact javadocJar
@@ -212,13 +205,5 @@ publishing {
            name = "GitHubPackages"
            url = "https://maven.pkg.github.com/AppliedEnergistics/Applied-Energistics-2"
        }
-        maven {
-            credentials {
-                username System.getenv("MODMAVEN_USER")
-                password System.getenv("MODMAVEN_PASSWORD")
-            }
-            name = "modmaven"
-            url = "https://modmaven.k-4u.nl/artifactory/local-releases/"
-        }
    }
 }
@@ -9,13 +9,14 @@ artifact_basename=appliedenergistics2
 # Minecraft Versions                                    #
 #########################################################
 minecraft_release=1.16
-minecraft_version=1.16.1
+minecraft_version=1.16.2
 mcp_mappings=20200723-1.16.1
-forge_version=32.0.108
+forge_version=33.0.5

 #########################################################
 # Provided APIs                                         #
 #########################################################
+jei_minecraft_version=1.16.1
 jei_version=7.0.0.6
 top_version=3.0.1-beta-4
 hwyla_version=1.10.8-B72_1.15.2
@@ -24,8 +25,8 @@ ctm_version=MC1.15.2-1.1.0.9
 #########################################################
 # Deployment                                            #
 #########################################################
-website_version=1.16.1
-curse_versions=1.16.1
+website_version=1.16.2
+curse_versions=1.16.2
 curseforge_project=223794

 #########################################################
@@ -29,12 +29,12 @@ dependencies {
    minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"

    // compile against provided APIs
-    compileOnly "mezz.jei:jei-${minecraft_version}:${jei_version}:api"
+    compileOnly "mezz.jei:jei-${jei_minecraft_version}:${jei_version}:api"
    compileOnly "mcjty.theoneprobe:TheOneProbe-${minecraft_release}:${minecraft_release}-${top_version}:api"

    // Runtime, Mods
-    runtimeOnly fg.deobf("mezz.jei:jei-${minecraft_version}:${jei_version}")
-    runtimeOnly fg.deobf("mcjty.theoneprobe:TheOneProbe-${minecraft_release}:${minecraft_release}-${top_version}")
+// FIXME 1.16.2    runtimeOnly fg.deobf("mezz.jei:jei-${jei_minecraft_version}:${jei_version}")
+// FIXME 1.16.2    runtimeOnly fg.deobf("mcjty.theoneprobe:TheOneProbe-${minecraft_release}:${minecraft_release}-${top_version}")
    //runtimeOnly fg.deobf("team.chisel.ctm:CTM:${ctm_version}")

    // unit test dependencies
@@ -53,8 +53,6 @@ public interface ICraftingHelper {
     * @param stack If null, a new item will be created to hold the encoded pattern.
     *              Otherwise the given item must already contains an encoded
     *              pattern that will be overwritten.
-     * @throws IllegalArgumentException If either in or out contain only empty
-     *                                  ItemStacks.
     * @return A new encoded pattern, or the given stack with the pattern encoded in
     *         it.
     */
@@ -75,8 +73,6 @@ public interface ICraftingHelper {
     *                         operation by the ME system.
     * @param allowSubstitutes Controls whether the ME system will allow the use of
     *                         equivalent items to craft this recipe.
-     * @throws IllegalArgumentException If either in or out contain only empty
-     *                                  ItemStacks.
     */
    ItemStack encodeCraftingPattern(@Nullable ItemStack stack, ICraftingRecipe recipe, ItemStack[] in, ItemStack out,
            boolean allowSubstitutes);
@@ -23,23 +23,13 @@

 package appeng.api.implementations.items;

-import javax.annotation.Nullable;
-
-import net.minecraft.block.BlockState;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;

 public interface IGrowableCrystal {

    ItemStack triggerGrowth(ItemStack is);

-    /**
-     * 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);
+    float getMultiplier(Block blk, Material mat);
 }
@@ -27,13 +27,14 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.DimensionType;
 import net.minecraft.world.IWorld;
+import net.minecraft.world.World;

 /**
 * Represents a location in the Minecraft Universe
 */
 public class DimensionalCoord extends WorldCoord {

-    private final IWorld world;
+    private final World world;
    private final DimensionType dimension;

    public DimensionalCoord(final DimensionalCoord coordinate) {
@@ -48,13 +49,13 @@ public class DimensionalCoord extends WorldCoord {
        this.dimension = this.world.func_230315_m_();
    }

-    public DimensionalCoord(final IWorld world, final int x, final int y, final int z) {
+    public DimensionalCoord(final World world, final int x, final int y, final int z) {
        super(x, y, z);
        this.world = world;
        this.dimension = world.func_230315_m_();
    }

-    public DimensionalCoord(final IWorld world, final BlockPos pos) {
+    public DimensionalCoord(final World world, final BlockPos pos) {
        super(pos);
        this.world = world;
        this.dimension = world.func_230315_m_();
@@ -84,7 +85,7 @@ public class DimensionalCoord extends WorldCoord {
        return this.world == world;
    }

-    public IWorld getWorld() {
+    public World getWorld() {
        return this.world;
    }

@@ -111,11 +111,6 @@ public abstract class AEBaseTileBlock<T extends AEBaseTileEntity> extends AEBase
        return this.tileEntityFactory.get();
    }

-    @Override
-    public void dropXpOnBlockBreak(World worldIn, BlockPos pos, int amount) {
-        super.dropXpOnBlockBreak(worldIn, pos, amount);
-    }
-
    @Override
    public void onReplaced(BlockState state, World w, BlockPos pos, BlockState newState, boolean isMoving) {
        if (newState.getBlock() == state.getBlock()) {
@@ -22,6 +22,7 @@ import java.text.NumberFormat;
 import java.util.List;
 import java.util.Locale;

+import com.google.common.collect.Lists;
 import com.mojang.blaze3d.matrix.MatrixStack;

 import net.minecraft.entity.player.PlayerInventory;
@@ -72,14 +73,16 @@ public abstract class AEBaseMEScreen<T extends AEBaseContainer> extends AEBaseSc
                    currentToolTip.add(ButtonToolTips.ItemsRequestable.text(formattedAmount));
                }

-                this.renderToolTip(matrixStack, currentToolTip, x, y, this.font);
+                this.renderToolTip(matrixStack, Lists.transform(currentToolTip, ITextComponent::func_241878_f), x, y,
+                        this.font);

                return;
            } else if (stack.getCount() > bigNumber) {
                final String formattedAmount = NumberFormat.getNumberInstance(Locale.US).format(stack.getCount());
                currentToolTip.add(ButtonToolTips.ItemsStored.text(formattedAmount).mergeStyle(TextFormatting.GRAY));

-                this.renderToolTip(matrixStack, currentToolTip, x, y, this.font);
+                this.renderToolTip(matrixStack, Lists.transform(currentToolTip, ITextComponent::func_241878_f), x, y,
+                        this.font);

                return;
            }
@@ -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> {
@@ -218,7 +218,7 @@ public abstract class AEBaseScreen<T extends AEBaseContainer> extends ContainerS
            styledLines.add(lines.get(i).deepCopy().modifyStyle(s -> style));
        }

-        this.renderTooltip(matrices, styledLines, x, y);
+        this.func_243308_b(matrices, styledLines, x, y);

    }

@@ -8,18 +8,19 @@ import net.minecraft.inventory.container.Slot;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
+import net.minecraftforge.items.SlotItemHandler;

 /**
 * A proxy for a slot that will always return an itemstack with size 1, if there
 * is an item in the slot. Used to prevent the default item count from
 * rendering.
 */
-class Size1Slot extends Slot {
+class Size1Slot extends SlotItemHandler {

-    private final Slot delegate;
+    private final SlotItemHandler delegate;

-    public Size1Slot(Slot delegate) {
-        super(delegate.inventory, delegate.getSlotIndex(), delegate.xPos, delegate.yPos);
+    public Size1Slot(SlotItemHandler delegate) {
+        super(delegate.getItemHandler(), delegate.getSlotIndex(), delegate.xPos, delegate.yPos);
        this.delegate = delegate;
    }

@@ -90,9 +90,7 @@ public class InterfaceTerminalScreen extends AEBaseScreen<InterfaceTerminalConta
        this.searchField.setMaxStringLength(25);
        this.searchField.setTextColor(0xFFFFFF);
        this.searchField.setVisible(true);
-        this.searchField.setResponder(str -> this.refreshList());
-        this.addListener(this.searchField);
-        this.changeFocus(true);
+        this.searchField.setFocused2(true);
    }

    @Override
@@ -133,8 +131,11 @@ public class InterfaceTerminalScreen extends AEBaseScreen<InterfaceTerminalConta

    @Override
    public boolean mouseClicked(final double xCoord, final double yCoord, final int btn) {
-        if (btn == 1 && this.searchField.isMouseOver(xCoord, yCoord)) {
-            this.searchField.setText("");
+        if (this.searchField.mouseClicked(xCoord, yCoord, btn)) {
+            if (btn == 1 && this.searchField.isMouseOver(xCoord, yCoord)) {
+                this.searchField.setText("");
+                this.refreshList();
+            }
            return true;
        }

@@ -172,7 +173,11 @@ public class InterfaceTerminalScreen extends AEBaseScreen<InterfaceTerminalConta
        if (character == ' ' && this.searchField.getText().isEmpty()) {
            return true;
        }
-        return super.charTyped(character, key);
+        if (this.searchField.charTyped(character, key)) {
+            this.refreshList();
+            return true;
+        }
+        return false;
    }

    @Override
@@ -240,7 +245,7 @@ public class InterfaceTerminalScreen extends AEBaseScreen<InterfaceTerminalConta

    /**
     * Rebuilds the list of interfaces.
-     * <p>
+     *
     * Respects a search term if present (ignores case) and adding only matching
     * patterns.
     */
@@ -333,11 +338,12 @@ public class InterfaceTerminalScreen extends AEBaseScreen<InterfaceTerminalConta

    /**
     * Tries to retrieve a cache for a with search term as keyword.
-     * <p>
+     *
     * If this cache should be empty, it will populate it with an earlier cache if
     * available or at least the cache for the empty string.
     *
     * @param searchTerm the corresponding search
+     *
     * @return a Set matching a superset of the search term
     */
    private Set<Object> getCacheForSearchTerm(final String searchTerm) {
@@ -37,10 +37,15 @@ 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;

+/**
+ * @author BrockWS
+ * @version rv6 - 22/05/2018
+ * @since rv6 22/05/2018
+ */
 public class FluidRepo {
    private final IItemList<IAEFluidStack> list = Api.instance().storage().getStorageChannel(IFluidStorageChannel.class)
            .createList();
@@ -21,22 +21,23 @@ package appeng.client.me;
 import javax.annotation.Nonnull;

 import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.Inventory;
-import net.minecraft.inventory.container.Slot;
 import net.minecraft.item.ItemStack;
+import net.minecraftforge.items.SlotItemHandler;

 import appeng.api.storage.data.IAEFluidStack;
-import appeng.container.slot.IMEFluidSlot;
+import appeng.fluids.container.slots.IMEFluidSlot;

-public class SlotFluidME extends Slot implements IMEFluidSlot {
+/**
+ * @author BrockWS
+ * @version rv6 - 22/05/2018
+ * @since rv6 22/05/2018
+ */
+public class SlotFluidME extends SlotItemHandler implements IMEFluidSlot {

-    private static final IInventory EMPTY_INVENTORY = new Inventory(0);
-
-    private final InternalFluidSlotME slot;
+    private InternalFluidSlotME slot;

    public SlotFluidME(InternalFluidSlotME slot) {
-        super(EMPTY_INVENTORY, 0, slot.getxPosition(), slot.getyPosition());
+        super(null, 0, slot.getxPosition(), slot.getyPosition());
        this.slot = slot;
    }

@@ -49,7 +50,7 @@ public class SlotFluidME extends Slot implements IMEFluidSlot {
    }

    @Override
-    public boolean isItemValid(final ItemStack stack) {
+    public boolean isItemValid(final ItemStack par1ItemStack) {
        return false;
    }

@@ -68,7 +69,7 @@ public class SlotFluidME extends Slot implements IMEFluidSlot {
    }

    @Override
-    public void putStack(final ItemStack stack) {
+    public void putStack(final ItemStack par1ItemStack) {

    }

@@ -84,7 +85,7 @@ public class SlotFluidME extends Slot implements IMEFluidSlot {
    }

    @Override
-    public boolean canTakeStack(final PlayerEntity player) {
+    public boolean canTakeStack(final PlayerEntity par1PlayerEntity) {
        return false;
    }
 }
@@ -19,27 +19,23 @@
 package appeng.client.me;

 import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.Inventory;
-import net.minecraft.inventory.container.Slot;
 import net.minecraft.item.ItemStack;
+import net.minecraftforge.items.SlotItemHandler;

 import appeng.api.storage.data.IAEItemStack;

-public class SlotME extends Slot {
+public class SlotME extends SlotItemHandler {

-    private static final IInventory EMPTY_INVENTORY = new Inventory(0);
+    private final InternalSlotME mySlot;

-    private final InternalSlotME slot;
-
-    public SlotME(final InternalSlotME slot) {
-        super(EMPTY_INVENTORY, 0, slot.getxPosition(), slot.getyPosition());
-        this.slot = slot;
+    public SlotME(final InternalSlotME me) {
+        super(null, 0, me.getxPosition(), me.getyPosition());
+        this.mySlot = me;
    }

    public IAEItemStack getAEStack() {
-        if (this.slot.hasPower()) {
-            return this.slot.getAEStack();
+        if (this.mySlot.hasPower()) {
+            return this.mySlot.getAEStack();
        }
        return null;
    }
@@ -51,15 +47,15 @@ public class SlotME extends Slot {

    @Override
    public ItemStack getStack() {
-        if (this.slot.hasPower()) {
-            return this.slot.getStack();
+        if (this.mySlot.hasPower()) {
+            return this.mySlot.getStack();
        }
        return ItemStack.EMPTY;
    }

    @Override
    public boolean getHasStack() {
-        if (this.slot.hasPower()) {
+        if (this.mySlot.hasPower()) {
            return !this.getStack().isEmpty();
        }
        return false;
@@ -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
@@ -21,6 +21,7 @@ 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;
@@ -29,11 +30,6 @@ 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;
@@ -54,10 +50,7 @@ import appeng.api.util.AEColor;

 public class CableBusBakedModel implements IBakedModel {

-    // 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 static final Map<CableBusRenderState, List<BakedQuad>> CABLE_MODEL_CACHE = new HashMap<>();

    private final CableBuilder cableBuilder;

@@ -73,17 +66,6 @@ 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
@@ -110,7 +92,11 @@ public class CableBusBakedModel implements IBakedModel {
        if (layer == RenderType.getCutout()) {

            // First, handle the cable at the center of the cable bus
-            final List<BakedQuad> cableModel = cableModelCache.getUnchecked(renderState);
+            final List<BakedQuad> cableModel = CABLE_MODEL_CACHE.computeIfAbsent(renderState, k -> {
+                final List<BakedQuad> model = new ArrayList<>();
+                this.addCableQuads(renderState, model);
+                return model;
+            });
            quads.addAll(cableModel);

            // Then handle attachments
@@ -355,4 +341,8 @@ public class CableBusBakedModel implements IBakedModel {
        return ItemOverrideList.EMPTY;
    }

+    public static void clearCache() {
+        CABLE_MODEL_CACHE.clear();
+    }
+
 }
@@ -18,6 +18,7 @@ public class CableBusModelLoader implements IModelLoader<CableBusModel> {

    @Override
    public void onResourceManagerReload(IResourceManager resourceManager) {
+        CableBusBakedModel.clearCache();
    }

    @Override
@@ -142,7 +142,7 @@ public class ChestTileEntityRenderer extends TileEntityRenderer<ChestTileEntity>
        public List<BakedQuad> getQuads(@Nullable BlockState state, @Nullable Direction side, @Nonnull Random rand,
                @Nonnull IModelData extraData) {
            if (side != null) {
-                side = r.resultingRotate(side); // This fixes the incorrect lightmap position
+                side = r.rotate(side); // This fixes the incorrect lightmap position
            }
            List<BakedQuad> quads = new ArrayList<>(super.getQuads(state, side, rand, extraData));

@@ -133,7 +133,7 @@ public final class ContainerLocator {
    public static ContainerLocator forPart(AEBasePart part) {
        IPartHost host = part.getHost();
        DimensionalCoord pos = host.getLocation();
-        return new ContainerLocator(Type.PART, -1, pos.getWorld().getWorld(), pos.getBlockPos(), part.getSide());
+        return new ContainerLocator(Type.PART, -1, pos.getWorld(), pos.getBlockPos(), part.getSide());
    }

    public boolean hasItemIndex() {
@@ -42,7 +42,7 @@ import appeng.api.networking.security.IActionHost;
 import appeng.container.AEBaseContainer;
 import appeng.container.ContainerLocator;
 import appeng.core.sync.network.NetworkHandler;
-import appeng.core.sync.packets.MEInterfaceUpdatePacket;
+import appeng.core.sync.packets.CompressedNBTPacket;
 import appeng.helpers.DualityInterface;
 import appeng.helpers.IInterfaceHost;
 import appeng.helpers.InventoryAction;
@@ -177,7 +177,7 @@ public final class InterfaceTerminalContainer extends AEBaseContainer {

        if (!this.data.isEmpty()) {
            try {
-                NetworkHandler.instance().sendTo(new MEInterfaceUpdatePacket(this.data),
+                NetworkHandler.instance().sendTo(new CompressedNBTPacket(this.data),
                        (ServerPlayerEntity) this.getPlayerInv().player);
            } catch (final IOException e) {
                // :P
@@ -261,19 +261,13 @@ public class PatternTermContainer extends MEMonitorableContainer
                return new ItemStack[] { out };
            }
        } else {
-            boolean hasValue = false;
            final ItemStack[] list = new ItemStack[3];

            for (int i = 0; i < this.outputSlots.length; i++) {
                final ItemStack out = this.outputSlots[i].getStack();
                list[i] = out;
-                if (!out.isEmpty()) {
-                    hasValue = true;
-                }
-            }
-            if (hasValue) {
-                return list;
            }
+            return list;
        }

        return null;
@@ -31,8 +31,6 @@ 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;
@@ -395,15 +393,6 @@ 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 {
@@ -518,11 +507,6 @@ 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<>();

@@ -633,17 +617,6 @@ 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();
        }

    }
@@ -34,13 +34,12 @@ import net.minecraft.item.crafting.IRecipeSerializer;
 import net.minecraft.particles.ParticleType;
 import net.minecraft.tileentity.TileEntityType;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.world.biome.Biome;
-import net.minecraft.world.gen.feature.Feature;
-import net.minecraft.world.gen.feature.structure.Structure;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.RegistryEvent;
 import net.minecraftforge.eventbus.api.IEventBus;
+import net.minecraftforge.fml.DeferredWorkQueue;
 import net.minecraftforge.fml.DistExecutor;
 import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.client.registry.RenderingRegistry;
@@ -101,6 +100,7 @@ public final class AppEng {

        IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
        registration = new Registration();
+        modEventBus.addListener(this::bootstrap);
        modEventBus.addGenericListener(Block.class, registration::registerBlocks);
        modEventBus.addGenericListener(Item.class, registration::registerItems);
        modEventBus.addGenericListener(EntityType.class, registration::registerEntities);
@@ -108,9 +108,6 @@ public final class AppEng {
        modEventBus.addGenericListener(TileEntityType.class, registration::registerTileEntities);
        modEventBus.addGenericListener(ContainerType.class, registration::registerContainerTypes);
        modEventBus.addGenericListener(IRecipeSerializer.class, registration::registerRecipeSerializers);
-        modEventBus.addGenericListener(Feature.class, registration::registerFeatures);
-        modEventBus.addGenericListener(Structure.class, registration::registerStructures);
-        modEventBus.addGenericListener(Biome.class, registration::registerBiomes);

        modEventBus.addListener(Integrations::enqueueIMC);
        modEventBus.addListener(this::commonSetup);
@@ -129,7 +126,15 @@ public final class AppEng {
        MinecraftForge.EVENT_BUS.register(new PartPlacement());
    }

+    private void bootstrap(RegistryEvent.NewRegistry e) {
+        // This has to be here so it's not run in parallel with other registrations
+        AppEngBootstrap.initialize();
+    }
+
    private void commonSetup(FMLCommonSetupEvent event) {
+        // This must run here because the config is not available earlier
+        DeferredWorkQueue.runLater(AppEngBootstrap::enhanceBiomes);
+
        ApiDefinitions definitions = Api.INSTANCE.definitions();
        definitions.getRegistry().getBootstrapComponents(IInitComponent.class)
                .forEachRemaining(IInitComponent::initialize);
@@ -0,0 +1,135 @@
+package appeng.core;
+
+import net.minecraft.block.BlockState;
+import net.minecraft.util.registry.Registry;
+import net.minecraft.util.registry.WorldGenRegistries;
+import net.minecraft.world.biome.Biome;
+import net.minecraft.world.gen.GenerationStage;
+import net.minecraft.world.gen.feature.ConfiguredFeature;
+import net.minecraft.world.gen.feature.Feature;
+import net.minecraft.world.gen.feature.OreFeatureConfig;
+import net.minecraft.world.gen.placement.NoPlacementConfig;
+import net.minecraft.world.gen.placement.Placement;
+import net.minecraft.world.gen.placement.TopSolidRangeConfig;
+
+import appeng.api.features.AEFeature;
+import appeng.mixins.feature.ConfiguredFeaturesAccessor;
+import appeng.mixins.structure.ConfiguredStructureFeaturesAccessor;
+import appeng.mixins.structure.StructureFeatureAccessor;
+import appeng.spatial.SpatialStorageChunkGenerator;
+import appeng.spatial.SpatialStorageDimensionIds;
+import appeng.worldgen.BiomeModifier;
+import appeng.worldgen.ChargedQuartzOreConfig;
+import appeng.worldgen.ChargedQuartzOreFeature;
+import appeng.worldgen.meteorite.MeteoriteStructure;
+import appeng.worldgen.meteorite.MeteoriteStructurePiece;
+
+/**
+ * Hooks into the very early bootstrapping phase to register things before the
+ * first dynamic registry manager is created.
+ */
+public final class AppEngBootstrap {
+
+    private static boolean initialized;
+    private static ConfiguredFeature<?, ?> quartzOreFeature;
+    private static ConfiguredFeature<?, ?> chargedQuartzOreFeature;
+
+    private AppEngBootstrap() {
+    }
+
+    public synchronized static void initialize() {
+        if (initialized) {
+            return;
+        }
+        initialized = true;
+
+        registerStructures();
+
+        quartzOreFeature = registerQuartzOreFeature();
+        chargedQuartzOreFeature = registerChargedQuartzOreFeature();
+
+        registerDimension();
+    }
+
+    public synchronized static void enhanceBiomes() {
+        // add to all standard biomes
+        // TODO: This means we'll not add these things to newly created biomes
+        WorldGenRegistries.field_243657_i.forEach(b -> {
+            addMeteoriteWorldGen(b);
+            addQuartzWorldGen(b, quartzOreFeature, chargedQuartzOreFeature);
+        });
+    }
+
+    private static void registerStructures() {
+
+        MeteoriteStructurePiece.register();
+
+        // Registering into the registry alone is INSUFFICIENT!
+        // There's a bidirectional map in the Structure class itself primarily for the
+        // purposes of NBT serialization
+        StructureFeatureAccessor.register(MeteoriteStructure.ID.toString(), MeteoriteStructure.INSTANCE,
+                GenerationStage.Decoration.TOP_LAYER_MODIFICATION);
+
+        ConfiguredStructureFeaturesAccessor.register(MeteoriteStructure.ID.toString(),
+                MeteoriteStructure.CONFIGURED_INSTANCE);
+    }
+
+    private static void addMeteoriteWorldGen(Biome b) {
+        if (!AEConfig.instance().isFeatureEnabled(AEFeature.METEORITE_WORLD_GEN)) {
+            return;
+        }
+
+        if (b.getCategory() == Biome.Category.THEEND || b.getCategory() == Biome.Category.NETHER) {
+            return;
+        }
+
+        BiomeModifier modifier = new BiomeModifier(b);
+        modifier.addStructureFeature(MeteoriteStructure.CONFIGURED_INSTANCE);
+    }
+
+    private static void addQuartzWorldGen(Biome b, ConfiguredFeature<?, ?> quartzOre,
+            ConfiguredFeature<?, ?> chargedQuartz) {
+        if (!AEConfig.instance().isFeatureEnabled(AEFeature.CERTUS_QUARTZ_WORLD_GEN)) {
+            return;
+        }
+
+        BiomeModifier modifier = new BiomeModifier(b);
+
+        modifier.addFeature(GenerationStage.Decoration.UNDERGROUND_ORES, quartzOre);
+
+        if (AEConfig.instance().isFeatureEnabled(AEFeature.CHARGED_CERTUS_ORE)) {
+            modifier.addFeature(GenerationStage.Decoration.UNDERGROUND_DECORATION, chargedQuartz);
+        }
+    }
+
+    private static ConfiguredFeature<?, ?> registerQuartzOreFeature() {
+        // Tell Minecraft about our configured quartz ore feature
+        BlockState quartzOreState = Api.instance().definitions().blocks().quartzOre().block().getDefaultState();
+        return ConfiguredFeaturesAccessor.register(AppEng.makeId("quartz_ore").toString(), Feature.ORE
+                .withConfiguration(new OreFeatureConfig(OreFeatureConfig.FillerBlockType.field_241882_a, quartzOreState,
+                        AEConfig.instance().getQuartzOresPerCluster()))
+                .withPlacement(Placement.field_242907_l/* RANGE */.configure(new TopSolidRangeConfig(12, 12, 72)))
+                .func_242728_a/* spreadHorizontally */()
+                .func_242731_b/* repeat */(AEConfig.instance().getQuartzOresClusterAmount()));
+    }
+
+    private static ConfiguredFeature<?, ?> registerChargedQuartzOreFeature() {
+        // Tell Minecraft about our configured charged quartz ore feature
+        Registry.register(Registry.FEATURE, AppEng.makeId("charged_quartz_ore"), ChargedQuartzOreFeature.INSTANCE);
+
+        BlockState quartzOreState = Api.instance().definitions().blocks().quartzOre().block().getDefaultState();
+        BlockState chargedQuartzOreState = Api.instance().definitions().blocks().quartzOreCharged().block()
+                .getDefaultState();
+        return ConfiguredFeaturesAccessor.register(AppEng.makeId("charged_quartz_ore").toString(),
+                ChargedQuartzOreFeature.INSTANCE
+                        .withConfiguration(new ChargedQuartzOreConfig(quartzOreState, chargedQuartzOreState,
+                                AEConfig.instance().getSpawnChargedChance()))
+                        .withPlacement(Placement.NOPE.configure(NoPlacementConfig.field_236556_b_)));
+    }
+
+    private static void registerDimension() {
+        Registry.register(Registry.CHUNK_GENERATOR_CODEC, SpatialStorageDimensionIds.CHUNK_GENERATOR_ID,
+                SpatialStorageChunkGenerator.CODEC);
+    }
+
+}
@@ -34,6 +34,7 @@ import net.minecraft.particles.ParticleType;
 import net.minecraft.tileentity.TileEntityType;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.registry.Registry;
+import net.minecraft.util.registry.WorldGenRegistries;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.gen.GenerationStage;
@@ -41,7 +42,6 @@ import net.minecraft.world.gen.feature.Feature;
 import net.minecraft.world.gen.feature.IFeatureConfig;
 import net.minecraft.world.gen.feature.OreFeatureConfig;
 import net.minecraft.world.gen.feature.structure.Structure;
-import net.minecraft.world.gen.placement.CountRangeConfig;
 import net.minecraft.world.gen.placement.IPlacementConfig;
 import net.minecraft.world.gen.placement.Placement;
 import net.minecraftforge.api.distmarker.Dist;
@@ -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;
@@ -213,7 +213,6 @@ import appeng.me.cache.PathGridCache;
 import appeng.me.cache.SecurityCache;
 import appeng.me.cache.SpatialPylonCache;
 import appeng.me.cache.TickManagerCache;
-import appeng.mixins.StructureAccessor;
 import appeng.parts.automation.PlaneModelLoader;
 import appeng.recipes.game.DisassembleRecipe;
 import appeng.recipes.game.FacadeRecipe;
@@ -682,73 +681,6 @@ final class Registration {
                    new ResourceLocation(dimension));
        }

-        MeteoriteStructurePiece.register();
-
-        ForgeRegistries.BIOMES.forEach(b -> {
-            addMeteoriteWorldGen(b);
-            addQuartzWorldGen(b);
-        });
-
-    }
-
-    private static void addMeteoriteWorldGen(Biome b) {
-        if (!AEConfig.instance().isFeatureEnabled(AEFeature.METEORITE_WORLD_GEN)) {
-            return;
-        }
-
-        if (b.getCategory() == Biome.Category.THEEND || b.getCategory() == Biome.Category.NETHER) {
-            return;
-        }
-
-        b.func_235063_a_(MeteoriteStructure.INSTANCE.func_236391_a_(IFeatureConfig.NO_FEATURE_CONFIG));
-    }
-
-    private static void addQuartzWorldGen(Biome b) {
-        if (!AEConfig.instance().isFeatureEnabled(AEFeature.CERTUS_QUARTZ_WORLD_GEN)) {
-            return;
-        }
-
-        BlockState quartzOre = Api.instance().definitions().blocks().quartzOre().block().getDefaultState();
-        b.addFeature(GenerationStage.Decoration.UNDERGROUND_ORES,
-                Feature.ORE
-                        .withConfiguration(new OreFeatureConfig(OreFeatureConfig.FillerBlockType.NATURAL_STONE,
-                                quartzOre, AEConfig.instance().getQuartzOresPerCluster()))
-                        .withPlacement(Placement.COUNT_RANGE.configure(
-                                new CountRangeConfig(AEConfig.instance().getQuartzOresClusterAmount(), 12, 12, 72))));
-
-        if (AEConfig.instance().isFeatureEnabled(AEFeature.CHARGED_CERTUS_ORE)) {
-
-            BlockState chargedQuartzOre = Api.instance().definitions().blocks().quartzOreCharged().block()
-                    .getDefaultState();
-            b.addFeature(GenerationStage.Decoration.UNDERGROUND_DECORATION,
-                    ChargedQuartzOreFeature.INSTANCE
-                            .withConfiguration(new ChargedQuartzOreConfig(quartzOre, chargedQuartzOre,
-                                    AEConfig.instance().getSpawnChargedChance()))
-                            .withPlacement(Placement.NOPE.configure(IPlacementConfig.NO_PLACEMENT_CONFIG)));
-
-        }
-    }
-
-    public void registerFeatures(RegistryEvent.Register<Feature<?>> evt) {
-        IForgeRegistry<Feature<?>> r = evt.getRegistry();
-
-        r.register(ChargedQuartzOreFeature.INSTANCE.setRegistryName(AppEng.makeId("charged_quartz_ore")));
-    }
-
-    public void registerStructures(RegistryEvent.Register<Structure<?>> evt) {
-        // Registering into the Forge registry is INSUFFICIENT!
-        // There's a bidirectional map in the Structure class itself primarily for the
-        // purposes of NBT serialization
-        StructureAccessor.register(MeteoriteStructure.ID.toString(),
-                MeteoriteStructure.INSTANCE.setRegistryName(MeteoriteStructure.ID),
-                GenerationStage.Decoration.TOP_LAYER_MODIFICATION);
-
-        Registry.register(Registry.CHUNK_GENERATOR_CODEC, SpatialStorageDimensionIds.CHUNK_GENERATOR_ID,
-                SpatialStorageChunkGenerator.CODEC);
-    }
-
-    public void registerBiomes(RegistryEvent.Register<Biome> evt) {
-        evt.getRegistry().register(SpatialStorageBiome.INSTANCE.setRegistryName(SpatialStorageDimensionIds.BIOME_ID));
    }

    @OnlyIn(Dist.CLIENT)
@@ -115,12 +115,7 @@ public class ApiCrafting implements ICraftingHelper {
        // We use the shared itemstack for an identity lookup.
        IAEItemStack ais = Api.instance().storage().getStorageChannel(IItemStorageChannel.class).createStack(is);

-        try {
-            return new CraftingPatternDetails(ais, world);
-        } catch (IllegalStateException e) {
-            AELog.warn("Could not decode an invalid pattern %s: %s", is, e);
-            return null;
-        }
+        return new CraftingPatternDetails(ais, world);
    }

    private boolean attemptRecovery(EncodedPatternItem patternItem, ItemStack itemStack, World world) {
@@ -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;

@@ -20,7 +20,6 @@ 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;
@@ -29,7 +28,6 @@ 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;
@@ -51,7 +49,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 +120,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 +133,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;
@@ -264,20 +262,18 @@ public final class ApiBlocks implements IBlocks {
        this.chiseledQuartzBlock = deco.block("chiseled_quartz_block", () -> new AEDecorativeBlock(QUARTZ_PROPERTIES))
                .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.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();
        this.quartzVibrantGlass = deco
                .block("quartz_vibrant_glass",
-                        () -> new QuartzLampBlock(defaultProps(Material.GLASS).setLightLevel(b -> 15).notSolid()
-                                .setAllowsSpawn(neverAllowSpawn)))
+                        () -> new QuartzLampBlock(defaultProps(Material.GLASS).setLightLevel(b -> 15).notSolid()))
                .addFeatures(AEFeature.DECORATIVE_LIGHTS, AEFeature.QUARTZ_GLASS)
                .rendering(new BlockRenderingCustomizer() {
                    @Override
@@ -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,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;
@@ -300,15 +299,24 @@ public final class ApiItems implements IItems {
        this.certusCrystalSeed = registry
                .item("certus_crystal_seed",
                        props -> new CrystalSeedItem(props, materials.purifiedCertusQuartzCrystal().item()))
-                .bootstrap(CrystalSeedRendering::new).features(AEFeature.CRYSTAL_SEEDS).build();
+                .bootstrap(item -> new IClientSetupComponent() {
+                    @Override
+                    @OnlyIn(Dist.CLIENT)
+                    public void setup() {
+                        // Expose the growth of the seed to the model system
+                        ItemModelsProperties.func_239418_a_(item, new ResourceLocation("appliedenergistics2:growth"),
+                                (is, w, p) -> CrystalSeedItem.getGrowthTicks(is)
+                                        / (float) CrystalSeedItem.GROWTH_TICKS_REQUIRED);
+                    }
+                }).features(AEFeature.CRYSTAL_SEEDS).build();
        this.fluixCrystalSeed = registry
                .item("fluix_crystal_seed",
                        props -> new CrystalSeedItem(props, materials.purifiedFluixCrystal().item()))
-                .bootstrap(CrystalSeedRendering::new).features(AEFeature.CRYSTAL_SEEDS).build();
+                .features(AEFeature.CRYSTAL_SEEDS).build();
        this.netherQuartzSeed = registry
                .item("nether_quartz_seed",
                        props -> new CrystalSeedItem(props, materials.purifiedNetherQuartzCrystal().item()))
-                .bootstrap(CrystalSeedRendering::new).features(AEFeature.CRYSTAL_SEEDS).build();
+                .features(AEFeature.CRYSTAL_SEEDS).build();

        GrowingCrystalEntity.TYPE = registry
                .<GrowingCrystalEntity>entity("growing_crystal", GrowingCrystalEntity::new, EntityClassification.MISC)
@@ -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;
@@ -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,19 +35,18 @@ public final class LocatableRegistry implements ILocatableRegistry {

    public LocatableRegistry() {
        this.set = new HashMap<>();
-        MinecraftForge.EVENT_BUS.addListener(this::updateLocatable);
+        MinecraftForge.EVENT_BUS.register(this);
    }

-    private void updateLocatable(final LocatableEventAnnounce e) {
+    @SubscribeEvent
+    public 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());
        }
    }
@@ -51,12 +51,12 @@ public class MovableTileRegistry implements IMovableRegistry {
    private final List<IMovableHandler> handlers = new ArrayList<>();
    private final DefaultSpatialHandler dsh = new DefaultSpatialHandler();
    private final IMovableHandler nullHandler = new DefaultSpatialHandler();
-    private final ITag<Block> blockTagWhiteList;
-    private final ITag<Block> blockTagBlackList;
+    private final ITag.INamedTag<Block> blockTagWhiteList;
+    private final ITag.INamedTag<Block> blockTagBlackList;

    public MovableTileRegistry() {
-        this.blockTagWhiteList = BlockTags.getCollection().getOrCreate(TAG_WHITELIST);
-        this.blockTagBlackList = BlockTags.getCollection().getOrCreate(TAG_BLACKLIST);
+        this.blockTagWhiteList = BlockTags.makeWrapperTag(TAG_WHITELIST.toString());
+        this.blockTagBlackList = BlockTags.makeWrapperTag(TAG_BLACKLIST.toString());
    }

    @Override
@@ -29,6 +29,7 @@ import appeng.core.sync.packets.BlockTransitionEffectPacket;
 import appeng.core.sync.packets.ClickPacket;
 import appeng.core.sync.packets.CompassRequestPacket;
 import appeng.core.sync.packets.CompassResponsePacket;
+import appeng.core.sync.packets.CompressedNBTPacket;
 import appeng.core.sync.packets.ConfigButtonPacket;
 import appeng.core.sync.packets.ConfigValuePacket;
 import appeng.core.sync.packets.CraftRequestPacket;
@@ -38,7 +39,6 @@ import appeng.core.sync.packets.ItemTransitionEffectPacket;
 import appeng.core.sync.packets.JEIRecipePacket;
 import appeng.core.sync.packets.LightningPacket;
 import appeng.core.sync.packets.MEFluidInventoryUpdatePacket;
-import appeng.core.sync.packets.MEInterfaceUpdatePacket;
 import appeng.core.sync.packets.MEInventoryUpdatePacket;
 import appeng.core.sync.packets.MatterCannonPacket;
 import appeng.core.sync.packets.MockExplosionPacket;
@@ -101,7 +101,7 @@ public class BasePacketHandler {

        PACKET_ASSEMBLER_ANIMATION(AssemblerAnimationPacket.class, AssemblerAnimationPacket::new),

-        PACKET_ME_INTERFACE_UPDATE(MEInterfaceUpdatePacket.class, MEInterfaceUpdatePacket::new),
+        PACKET_COMPRESSED_NBT(CompressedNBTPacket.class, CompressedNBTPacket::new),

        PACKET_PAINTED_ENTITY(PaintedEntityPacket.class, PaintedEntityPacket::new),

@@ -71,7 +71,7 @@ public class BlockTransitionEffectPacket extends BasePacket {

        data.writeInt(this.getPacketID());
        data.writeBlockPos(pos);
-        int blockStateId = GameData.getBlockStateIDMap().get(blockState);
+        int blockStateId = GameData.getBlockStateIDMap().getId(blockState);
        if (blockStateId == -1) {
            AELog.warn("Failed to find numeric id for block state %s", blockState);
        }
@@ -18,7 +18,13 @@

 package appeng.core.sync.packets;

+import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.zip.GZIPInputStream;
+import java.util.zip.GZIPOutputStream;

 import io.netty.buffer.Unpooled;

@@ -26,6 +32,7 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.nbt.CompoundNBT;
+import net.minecraft.nbt.CompressedStreamTools;
 import net.minecraft.network.PacketBuffer;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
@@ -34,24 +41,55 @@ import appeng.client.gui.implementations.InterfaceTerminalScreen;
 import appeng.core.sync.BasePacket;
 import appeng.core.sync.network.INetworkInfo;

-public class MEInterfaceUpdatePacket extends BasePacket {
+//TODO, this is pointless, NBT is already compressed when written to a PacketBuffer.
+public class CompressedNBTPacket extends BasePacket {

    // input.
    private final CompoundNBT in;
    // output...
    private final PacketBuffer data;
+    private final GZIPOutputStream compressFrame;

-    public MEInterfaceUpdatePacket(final PacketBuffer stream) {
+    public CompressedNBTPacket(final PacketBuffer stream) {
        this.data = null;
-        this.in = stream.readCompoundTag();
+        this.compressFrame = null;
+
+        try (DataInputStream inStream = new DataInputStream(new GZIPInputStream(new InputStream() {
+
+            @Override
+            public int read() {
+                if (stream.readableBytes() <= 0) {
+                    return -1;
+                }
+
+                return stream.readByte() & 0xff;
+            }
+        }))) {
+            this.in = CompressedStreamTools.read(inStream);
+        } catch (IOException e) {
+            throw new RuntimeException("Failed to decompress packet.", e);
+        }
    }

    // api
-    public MEInterfaceUpdatePacket(final CompoundNBT din) throws IOException {
-        this.in = null;
+    public CompressedNBTPacket(final CompoundNBT din) throws IOException {
+
        this.data = new PacketBuffer(Unpooled.buffer(2048));
        this.data.writeInt(this.getPacketID());
-        this.data.writeCompoundTag(din);
+
+        this.in = din;
+
+        this.compressFrame = new GZIPOutputStream(new OutputStream() {
+
+            @Override
+            public void write(final int value) {
+                CompressedNBTPacket.this.data.writeByte(value);
+            }
+        });
+
+        CompressedStreamTools.write(din, new DataOutputStream(this.compressFrame));
+        this.compressFrame.close();
+
        this.configureWrite(this.data);
    }

@@ -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 {
@@ -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;
@@ -19,9 +19,13 @@
 package appeng.core.sync.packets;

 import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.nio.BufferOverflowException;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.zip.GZIPInputStream;
+import java.util.zip.GZIPOutputStream;

 import javax.annotation.Nullable;

@@ -37,10 +41,11 @@ 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.AELog;
 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
@@ -50,6 +55,8 @@ import appeng.util.fluid.AEFluidStack;
 public class MEFluidInventoryUpdatePacket extends BasePacket {
    private static final int UNCOMPRESSED_PACKET_BYTE_LIMIT = 16 * 1024 * 1024;
    private static final int OPERATION_BYTE_LIMIT = 2 * 1024;
+    private static final int TEMP_BUFFER_SIZE = 1024;
+    private static final int STREAM_MASK = 0xff;

    // input.
    @Nullable
@@ -59,18 +66,47 @@ public class MEFluidInventoryUpdatePacket extends BasePacket {

    @Nullable
    private final PacketBuffer data;
+    @Nullable
+    private final GZIPOutputStream compressFrame;

    private int writtenBytes = 0;
    private boolean empty = true;

    public MEFluidInventoryUpdatePacket(final PacketBuffer stream) {
        this.data = null;
+        this.compressFrame = null;
        this.list = new LinkedList<>();
        this.ref = stream.readByte();

-        while (stream.readableBytes() > 0) {
-            this.list.add(AEFluidStack.fromPacket(stream));
+        try (final GZIPInputStream gzReader = new GZIPInputStream(new InputStream() {
+            @Override
+            public int read() {
+                if (stream.readableBytes() <= 0) {
+                    return -1;
+                }
+
+                return stream.readByte() & STREAM_MASK;
+            }
+        })) {
+
+            final PacketBuffer uncompressed = new PacketBuffer(Unpooled.buffer(stream.readableBytes()));
+            final byte[] tmp = new byte[TEMP_BUFFER_SIZE];
+
+            while (gzReader.available() != 0) {
+                final int bytes = gzReader.read(tmp);
+
+                if (bytes > 0) {
+                    uncompressed.writeBytes(tmp, 0, bytes);
+                }
+            }
+
+            while (uncompressed.readableBytes() > 0) {
+                this.list.add(AEFluidStack.fromPacket(uncompressed));
+            }
+        } catch (IOException e) {
+            throw new RuntimeException("Failed to decompress packet.", e);
        }
+
        this.empty = this.list.isEmpty();
    }

@@ -85,6 +121,14 @@ public class MEFluidInventoryUpdatePacket extends BasePacket {
        this.data = new PacketBuffer(Unpooled.buffer(OPERATION_BYTE_LIMIT));
        this.data.writeInt(this.getPacketID());
        this.data.writeByte(this.ref);
+
+        this.compressFrame = new GZIPOutputStream(new OutputStream() {
+            @Override
+            public void write(final int value) {
+                MEFluidInventoryUpdatePacket.this.data.writeByte(value);
+            }
+        });
+
        this.list = null;
    }

@@ -101,19 +145,28 @@ public class MEFluidInventoryUpdatePacket extends BasePacket {
    @Nullable
    @Override
    public IPacket<?> toPacket(NetworkDirection direction) {
-        this.configureWrite(this.data);
-        return super.toPacket(direction);
+        try {
+            this.compressFrame.close();
+
+            this.configureWrite(this.data);
+            return super.toPacket(direction);
+        } catch (final IOException e) {
+            AELog.debug(e);
+        }
+
+        return null;
    }

    public void appendFluid(final IAEFluidStack fs) throws IOException, BufferOverflowException {
        final PacketBuffer tmp = new PacketBuffer(Unpooled.buffer(OPERATION_BYTE_LIMIT));
        fs.writeToPacket(tmp);

+        this.compressFrame.flush();
        if (this.writtenBytes + tmp.readableBytes() > UNCOMPRESSED_PACKET_BYTE_LIMIT) {
            throw new BufferOverflowException();
        } else {
            this.writtenBytes += tmp.readableBytes();
-            this.data.writeBytes(tmp.array(), 0, tmp.readableBytes());
+            this.compressFrame.write(tmp.array(), 0, tmp.readableBytes());
            this.empty = false;
        }
    }
@@ -19,10 +19,12 @@
 package appeng.core.sync.packets;

 import java.io.IOException;
+import java.io.InputStream;
 import java.io.OutputStream;
 import java.nio.BufferOverflowException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;

 import javax.annotation.Nullable;
@@ -43,6 +45,7 @@ import appeng.client.gui.implementations.CraftConfirmScreen;
 import appeng.client.gui.implementations.CraftingCPUScreen;
 import appeng.client.gui.implementations.MEMonitorableScreen;
 import appeng.client.gui.implementations.NetworkStatusScreen;
+import appeng.core.AELog;
 import appeng.core.sync.BasePacket;
 import appeng.core.sync.network.INetworkInfo;
 import appeng.util.item.AEItemStack;
@@ -50,6 +53,8 @@ import appeng.util.item.AEItemStack;
 public class MEInventoryUpdatePacket extends BasePacket {
    private static final int UNCOMPRESSED_PACKET_BYTE_LIMIT = 16 * 1024 * 1024;
    private static final int OPERATION_BYTE_LIMIT = 2 * 1024;
+    private static final int TEMP_BUFFER_SIZE = 1024;
+    private static final int STREAM_MASK = 0xff;

    // input.
    @Nullable
@@ -59,18 +64,48 @@ public class MEInventoryUpdatePacket extends BasePacket {

    @Nullable
    private final PacketBuffer data;
+    @Nullable
+    private final GZIPOutputStream compressFrame;

    private int writtenBytes = 0;
    private boolean empty = true;

    public MEInventoryUpdatePacket(final PacketBuffer stream) {
        this.data = null;
+        this.compressFrame = null;
        this.list = new ArrayList<>();
        this.ref = stream.readByte();

-        while (stream.readableBytes() > 0) {
-            this.list.add(AEItemStack.fromPacket(stream));
+        // int originalBytes = stream.readableBytes();
+
+        try (GZIPInputStream gzReader = new GZIPInputStream(new InputStream() {
+            @Override
+            public int read() {
+                if (stream.readableBytes() <= 0) {
+                    return -1;
+                }
+
+                return stream.readByte() & STREAM_MASK;
+            }
+        })) {
+            final PacketBuffer uncompressed = new PacketBuffer(Unpooled.buffer(stream.readableBytes()));
+            final byte[] tmp = new byte[TEMP_BUFFER_SIZE];
+
+            while (gzReader.available() != 0) {
+                final int bytes = gzReader.read(tmp);
+
+                if (bytes > 0) {
+                    uncompressed.writeBytes(tmp, 0, bytes);
+                }
+            }
+
+            while (uncompressed.readableBytes() > 0) {
+                this.list.add(AEItemStack.fromPacket(uncompressed));
+            }
+        } catch (IOException e) {
+            throw new RuntimeException("Failed to decompress packet.", e);
        }
+
        this.empty = this.list.isEmpty();
    }

@@ -85,6 +120,14 @@ public class MEInventoryUpdatePacket extends BasePacket {
        this.data = new PacketBuffer(Unpooled.buffer(OPERATION_BYTE_LIMIT));
        this.data.writeInt(this.getPacketID());
        this.data.writeByte(this.ref);
+
+        this.compressFrame = new GZIPOutputStream(new OutputStream() {
+            @Override
+            public void write(final int value) {
+                MEInventoryUpdatePacket.this.data.writeByte(value);
+            }
+        });
+
        this.list = null;
    }

@@ -113,19 +156,28 @@ public class MEInventoryUpdatePacket extends BasePacket {
    @Nullable
    @Override
    public IPacket<?> toPacket(NetworkDirection direction) {
-        this.configureWrite(this.data);
-        return super.toPacket(direction);
+        try {
+            this.compressFrame.close();
+
+            this.configureWrite(this.data);
+            return super.toPacket(direction);
+        } catch (final IOException e) {
+            AELog.debug(e);
+        }
+
+        return null;
    }

    public void appendItem(final IAEItemStack is) throws IOException, BufferOverflowException {
        final PacketBuffer tmp = new PacketBuffer(Unpooled.buffer(OPERATION_BYTE_LIMIT));
        is.writeToPacket(tmp);

+        this.compressFrame.flush();
        if (this.writtenBytes + tmp.readableBytes() > UNCOMPRESSED_PACKET_BYTE_LIMIT) {
            throw new BufferOverflowException();
        } else {
            this.writtenBytes += tmp.readableBytes();
-            this.data.writeBytes(tmp.array(), 0, tmp.readableBytes());
+            this.compressFrame.write(tmp.array(), 0, tmp.readableBytes());
            this.empty = false;
        }
    }
@@ -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
@@ -129,7 +129,7 @@ public class MeteoritePlacerItem extends AEBaseItem {
        // is a debug tool, we'll not care about being terribly efficient here
        ChunkPos.getAllInBox(new ChunkPos(spawned.getPos()), 1).forEach(cp -> {
            Chunk c = world.getChunk(cp.x, cp.z);
-            player.connection.sendPacket(new SChunkDataPacket(c, 65535, false)); // 65535 == full chunk
+            player.connection.sendPacket(new SChunkDataPacket(c, 65535)); // 65535 == full chunk
        });

        return ActionResultType.SUCCESS;
@@ -20,8 +20,11 @@ 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) {
@@ -30,7 +33,8 @@ public class QuartzGlassBlock extends AbstractGlassBlock {

    @Override
    public boolean isSideInvisible(BlockState state, BlockState adjacentBlockState, Direction side) {
-        if (adjacentBlockState.getBlock() instanceof QuartzGlassBlock) {
+        final Material mat = adjacentBlockState.getMaterial();
+        if (mat == Material.GLASS || mat == AEMaterials.GLASS) {
            if (adjacentBlockState.getRenderType() == state.getRenderType()) {
                return true;
            }
@@ -29,6 +29,7 @@ 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;
@@ -42,10 +43,11 @@ public class SkyStoneBlock extends AEBaseBlock {
        super(props);
        this.type = type;

-        MinecraftForge.EVENT_BUS.addListener(this::breakFaster);
+        MinecraftForge.EVENT_BUS.register(this);
    }

-    private void breakFaster(final PlayerEvent.BreakSpeed event) {
+    @SubscribeEvent
+    public 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;
@@ -19,14 +19,13 @@
 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;
@@ -36,27 +35,12 @@ 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) {
@@ -72,140 +56,126 @@ 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 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());
+        final ItemStack is = this.getItem();
+        final Item gc = is.getItem();

-        BlockPos pos = new BlockPos(x, y, z);
-        final BlockState state = this.world.getBlockState(pos);
+        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());

-        final float multiplier = cry.getMultiplier(state, world, pos);
+            final BlockState state = this.world.getBlockState(new BlockPos(j, i, k));
+            final Material mat = state.getMaterial();
+            final IGrowableCrystal cry = (IGrowableCrystal) is.getItem();

-        if (multiplier <= 0) {
-            // Crystal is in unsuitable material, reset progress and quit
-            this.progress_1000 = 0;
-            return;
-        }
+            final float multiplier = cry.getMultiplier(state.getBlock(), mat);
+            final int speed = (int) Math.max(1, this.getSpeed(j, i, k) * multiplier);

-        final int progressPerTick = (int) Math.max(1, this.getSpeed(pos) * multiplier);
+            final boolean isClient = Platform.isClient();

-        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) {
+            if (mat.isLiquid()) {
+                if (isClient) {
+                    this.progress_1000++;
+                } else {
+                    this.progress_1000 += speed;
+                }
+            } else {
                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 (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 (isClient) {
+                int len = 40;

-                // 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);
+                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) {
                    this.progress_1000 -= 1000;
-                    // 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);
+                    // 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);
+                }
            }
        }
    }

-    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
-        }
-    }
+    private int getSpeed(final int x, final int y, final int z) {
+        final int per = 80;
+        final float mul = 0.3f;

-    /**
-     * 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);
+        int qty = 0;

-        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++;
-            }
+        if (this.isAccelerated(x + 1, y, z)) {
+            qty += per + qty * mul;
        }

-        return count;
+        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 isPoweredAccelerator(BlockPos pos) {
-        final TileEntity te = this.world.getTileEntity(pos);
+    private boolean isAccelerated(final int x, final int y, final int z) {
+        final TileEntity te = this.world.getTileEntity(new BlockPos(x, y, z));

        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();
@@ -140,8 +140,8 @@ public final class TinyTNTPrimedEntity extends TNTEntity implements IEntityAddit
            return;
        }

-        final Explosion ex = new Explosion(this.world, this, null, null, this.getPosX(), this.getPosY(), this.getPosZ(),
-                0.2f, false, Explosion.Mode.BREAK);
+        final Explosion ex = new Explosion(this.world, this, this.getPosX(), this.getPosY(), this.getPosZ(), 0.2f,
+                false, Mode.BREAK);
        final AxisAlignedBB area = new AxisAlignedBB(this.getPosX() - 1.5, this.getPosY() - 1.5f, this.getPosZ() - 1.5,
                this.getPosX() + 1.5, this.getPosY() + 1.5, this.getPosZ() + 1.5);
        final List<Entity> list = this.world.getEntitiesWithinAABBExcludingEntity(this, area);
@@ -37,18 +37,15 @@ public class FacadeContainer implements IFacadeContainer {

    private final int facades = 6;
    private final CableBusStorage storage;
-    private final Runnable changeCallback;

-    public FacadeContainer(final CableBusStorage cbs, Runnable changeCallback) {
+    public FacadeContainer(final CableBusStorage cbs) {
        this.storage = cbs;
-        this.changeCallback = changeCallback;
    }

    @Override
    public boolean addFacade(final IFacadePart a) {
        if (this.getFacade(a.getSide()) == null) {
            this.storage.setFacade(a.getSide().ordinal(), a);
-            this.notifyChange();
            return true;
        }
        return false;
@@ -59,7 +56,6 @@ public class FacadeContainer implements IFacadeContainer {
        if (side != null && side != AEPartLocation.INTERNAL) {
            if (this.storage.getFacade(side.ordinal()) != null) {
                this.storage.setFacade(side.ordinal(), null);
-                this.notifyChange();
                if (host != null) {
                    host.markForUpdate();
                }
@@ -88,7 +84,6 @@ public class FacadeContainer implements IFacadeContainer {
        for (int x = 0; x < this.facades; x++) {
            this.storage.setFacade(x, newFacades[x]);
        }
-        this.notifyChange();
    }

    @Override
@@ -180,9 +175,4 @@ public class FacadeContainer implements IFacadeContainer {
        }
        return true;
    }
-
-    private void notifyChange() {
-        this.changeCallback.run();
-    }
-
 }
@@ -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> {
@@ -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,
@@ -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
@@ -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,
@@ -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> {

@@ -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
@@ -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;
@@ -176,7 +176,7 @@ public class FluidTerminalScreen extends AEBaseMEScreen<FluidTerminalContainer>
                list.add(new StringTextComponent(formattedAmount));
                list.add(new StringTextComponent(modName));

-                this.renderTooltip(matrixStack, list, mouseX, mouseY);
+                this.func_243308_b(matrixStack, list, mouseX, mouseY);

                return;
            }
@@ -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;
@@ -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 {
@@ -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;
@@ -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;
@@ -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;
@@ -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 {

@@ -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
@@ -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 {

@@ -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;
@@ -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;

 /**
@@ -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
@@ -1,5 +1,5 @@

-package appeng.container.interfaces;
+package appeng.fluids.container;

 import java.util.Map;

@@ -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;

@@ -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 {
@@ -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
@@ -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;
@@ -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 {
@@ -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;

 /**
@@ -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;
@@ -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 {

@@ -1,5 +1,5 @@

-package appeng.parts.automation;
+package appeng.fluids.parts;

 import java.util.List;

@@ -14,7 +14,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.tags.FluidTags;
 import net.minecraft.tags.ITag;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockReader;
 import net.minecraft.world.World;
@@ -44,17 +43,21 @@ 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 {

-    public static final ResourceLocation TAG_BLACKLIST = new ResourceLocation(AppEng.MOD_ID,
-            "blacklisted/fluid_annihilation_plane");
+    public static final ITag.INamedTag<Fluid> TAG_BLACKLIST = FluidTags
+            .makeWrapperTag(AppEng.makeId("blacklisted/fluid_annihilation_plane").toString());

    private static final PlaneModels MODELS = new PlaneModels("part/fluid_annihilation_plane",
            "part/fluid_annihilation_plane_on");
@@ -210,8 +213,7 @@ public class FluidAnnihilationPlanePart extends BasicStatePart implements IGridT
    }

    private boolean isFluidBlacklisted(Fluid fluid) {
-        ITag<Fluid> tag = FluidTags.getCollection().getOrCreate(TAG_BLACKLIST);
-        return fluid.isIn(tag);
+        return TAG_BLACKLIST.contains(fluid);
    }

 }
@@ -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;

@@ -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 {
@@ -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
@@ -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
@@ -96,15 +96,16 @@ public class FluidImportBusPart extends SharedFluidBusPart {
        }

        final TileEntity te = this.getConnectedTE();
+        LazyOptional<IFluidHandler> fhOpt = LazyOptional.empty();
        if (te != null) {
-            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());
+            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());

+                if (fh != null) {
                    final FluidStack fluidStack = fh.drain(this.calculateAmountToSend(), FluidAction.SIMULATE);

                    if (this.filterEnabled() && !this.isInFilter(fluidStack)) {
@@ -127,11 +128,12 @@ public class FluidImportBusPart extends SharedFluidBusPart {
                    }

                    return TickRateModulation.IDLE;
-                } catch (GridAccessException e) {
-                    // skip
                }
+            } catch (GridAccessException e) {
+                e.printStackTrace();
            }
        }
+
        return TickRateModulation.SLEEP;
    }

@@ -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;
@@ -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> {
@@ -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;

@@ -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
@@ -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
@@ -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 {

@@ -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;

@@ -1,5 +1,5 @@

-package appeng.util.fluid;
+package appeng.fluids.util;

 import java.util.Objects;

@@ -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;

@@ -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;

@@ -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;
@@ -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;

@@ -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 {
@@ -1,5 +1,5 @@

-package appeng.util.fluid;
+package appeng.fluids.util;

 import net.minecraftforge.fluids.capability.IFluidHandler;

@@ -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;
@@ -24,19 +24,15 @@ import javax.annotation.Nullable;

 import com.google.common.base.Preconditions;

-import net.minecraft.block.BlockState;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
 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;
@@ -45,7 +41,6 @@ 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;
@@ -99,24 +94,8 @@ public class CrystalSeedItem extends AEBaseItem implements IGrowableCrystal {
    }

    @Override
-    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;
-        }
+    public float getMultiplier(final Block blk, final Material mat) {
+        return 0.5f;
    }

    @Override
@@ -1,29 +0,0 @@
-package appeng.items.misc;
-
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemModelsProperties;
-import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
-
-import appeng.bootstrap.components.IClientSetupComponent;
-
-/**
- * Exposes a predicate "growth", which is used in the item model to
- * differentiate the growth stages.
- */
-public class CrystalSeedRendering implements IClientSetupComponent {
-    private final Item item;
-
-    public CrystalSeedRendering(Item item) {
-        this.item = item;
-    }
-
-    @Override
-    @OnlyIn(Dist.CLIENT)
-    public void setup() {
-        // Expose the growth of the seed to the model system
-        ItemModelsProperties.func_239418_a_(item, new ResourceLocation("appliedenergistics2:growth"),
-                (is, w, p) -> CrystalSeedItem.getGrowthTicks(is) / (float) CrystalSeedItem.GROWTH_TICKS_REQUIRED);
-    }
-}
@@ -307,27 +307,14 @@ public class EncodedPatternItem extends AEBaseItem {
        final ListNBT tagIn = new ListNBT();
        final ListNBT tagOut = new ListNBT();

-        boolean hasInput = false;
        for (final ItemStack i : in) {
            tagIn.add(createItemTag(i));
-            if (!i.isEmpty()) {
-                hasInput = true;
-            }
        }

-        Preconditions.checkArgument(hasInput, "cannot encode a pattern that has no inputs.");
-
-        boolean hasNonEmptyOutput = false;
        for (final ItemStack i : out) {
            tagOut.add(createItemTag(i));
-            if (!i.isEmpty()) {
-                hasNonEmptyOutput = true;
-            }
        }

-        // Patterns without any outputs are corrupt! Never encode such a pattern.
-        Preconditions.checkArgument(hasNonEmptyOutput, "cannot encode a pattern that has no output.");
-
        encodedValue.put(EncodedPatternItem.NBT_INGREDIENTS, tagIn);
        encodedValue.put(EncodedPatternItem.NBT_PRODUCTS, tagOut);
        return encodedValue;
@@ -58,7 +58,8 @@ public class FacadeItem extends AEBaseItem implements IFacadeItem, IAlphaPassIte
    /**
     * Block tag used to explicitly whitelist blocks for use in facades.
     */
-    private static final ResourceLocation TAG_WHITELISTED = new ResourceLocation(AppEng.MOD_ID, "whitelisted/facades");
+    private static final ITag.INamedTag<Block> BLOCK_WHITELIST = BlockTags
+            .makeWrapperTag(AppEng.makeId("whitelisted/facades").toString());

    private static final String NBT_ITEM_ID = "item";

@@ -105,8 +106,7 @@ public class FacadeItem extends AEBaseItem implements IFacadeItem, IAlphaPassIte
        BlockState blockState = block.getDefaultState();

        final boolean areTileEntitiesEnabled = AEConfig.instance().isFeatureEnabled(AEFeature.TILE_ENTITY_FACADES);
-        ITag<Block> whitelistTag = BlockTags.getCollection().getOrCreate(TAG_WHITELISTED);
-        final boolean isWhiteListed = block.isIn(whitelistTag);
+        final boolean isWhiteListed = BLOCK_WHITELIST.contains(block);
        final boolean isModel = blockState.getRenderType() == BlockRenderType.MODEL;

        final BlockState defaultState = block.getDefaultState();
@@ -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, p);
+                ct.recolourBlock(side, newColor, null);
                return true;
            }
            return false;
        }

+        if (blk instanceof CableBusBlock && p != null) {
+            return ((CableBusBlock) blk).recolorBlock(w, pos, side, newColor.dye, p);
+        }
+
        return false;
    }

@@ -176,6 +176,7 @@ public class Grid implements IGrid {
        }

        gridNode.getGridProxy().gridChanged();
+        // postEventTo( gridNode, networkChanged );
    }

    @Override
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Sebastian Hartte	c1713f1682	Bump to Forge 33.0.5	2020-08-15 14:32:53 +02:00
Sebastian Hartte	f455fd1994	Initial port to 1.16.2	2020-08-13 23:29:55 +02:00
Sebastian Hartte	1657c88681	Initial port to 1.16.2	2020-08-13 23:15:09 +02:00
Sebastian Hartte	fd67e0e5c6	Initial port to 1.16.2	2020-08-13 23:14:49 +02:00