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

2020-09-10 14:20:57 +02:00
118 changed files with 591 additions and 981 deletions
@@ -72,20 +72,12 @@ The API for Applied Energistics 2. It is open source to discuss changes, improve

 ### Maven

-Our authoritative Maven repository is Github Packages, which you can also use in your builds. Use of Github Packages 
-[requires special setup](https://docs.github.com/en/packages/using-github-packages-with-your-projects-ecosystem/configuring-gradle-for-use-with-github-packages#authenticating-to-github-packages) 
-to authenticate with your personal access token.
-
-AE2 is also available without authentication from Modmaven. You can use the following snippet as example on how to add a repository to your gradle build file.
+We use Github Packages as maven repository now. You can use the following snippet as example on how to add a repository to your gradle build file.

    repositories {
        maven {
-            name "Modmaven"
-            url "https://modmaven.k-4u.nl/"
-            // For Gradle 5.1 and above, limit it to just AE2
-            content {
-                includeGroup 'appeng'
-            }
+            name "AE2"
+            url "https://maven.pkg.github.com/AppliedEnergistics/Applied-Energistics-2"
        }
    }

@@ -9,24 +9,23 @@ artifact_basename=appliedenergistics2
 # Minecraft Versions                                    #
 #########################################################
 minecraft_release=1.16
-minecraft_version=1.16.2
+minecraft_version=1.16.1
 mcp_mappings=20200723-1.16.1
-forge_version=33.0.42
+forge_version=32.0.108

 #########################################################
 # Provided APIs                                         #
 #########################################################
-jei_minecraft_version=1.16.2
-jei_version=7.1.1.15
-top_version=3.0.3-beta-6
+jei_version=7.0.0.6
+top_version=3.0.1-beta-4
 hwyla_version=1.10.8-B72_1.15.2
 ctm_version=MC1.15.2-1.1.0.9

 #########################################################
 # Deployment                                            #
 #########################################################
-website_version=1.16.2
-curse_versions=1.16.2
+website_version=1.16.1
+curse_versions=1.16.1
 curseforge_project=223794

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

    // compile against provided APIs
-    compileOnly "mezz.jei:jei-${jei_minecraft_version}:${jei_version}:api"
+    compileOnly "mezz.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-${jei_minecraft_version}:${jei_version}")
+    runtimeOnly fg.deobf("mezz.jei:jei-${minecraft_version}:${jei_version}")
    runtimeOnly fg.deobf("mcjty.theoneprobe:TheOneProbe-${minecraft_release}:${minecraft_release}-${top_version}")
    //runtimeOnly fg.deobf("team.chisel.ctm:CTM:${ctm_version}")

@@ -27,14 +27,13 @@ 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 World world;
+    private final IWorld world;
    private final DimensionType dimension;

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

-    public DimensionalCoord(final World world, final int x, final int y, final int z) {
+    public DimensionalCoord(final IWorld 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 World world, final BlockPos pos) {
+    public DimensionalCoord(final IWorld world, final BlockPos pos) {
        super(pos);
        this.world = world;
        this.dimension = world.func_230315_m_();
@@ -85,7 +84,7 @@ public class DimensionalCoord extends WorldCoord {
        return this.world == world;
    }

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

@@ -111,6 +111,11 @@ 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()) {
@@ -16,7 +16,7 @@
 * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
 */

-package appeng.fluids.block;
+package appeng.block.misc;

 import javax.annotation.Nullable;

@@ -33,8 +33,8 @@ import net.minecraft.world.World;
 import appeng.block.AEBaseTileBlock;
 import appeng.container.ContainerLocator;
 import appeng.container.ContainerOpener;
-import appeng.fluids.container.FluidInterfaceContainer;
-import appeng.fluids.tile.FluidInterfaceTileEntity;
+import appeng.container.implementations.FluidInterfaceContainer;
+import appeng.tile.misc.FluidInterfaceTileEntity;
 import appeng.util.Platform;

 public class FluidInterfaceBlock extends AEBaseTileBlock<FluidInterfaceTileEntity> {
@@ -79,10 +79,10 @@ class PaintSplotchesBakedModel implements IDynamicBakedModel {

            if (s.isLumen()) {
                builder.setColorRGB(s.getColor().whiteVariant);
-                builder.setEmissiveMaterial(true);
+                builder.setRenderFullBright(true);
            } else {
                builder.setColorRGB(s.getColor().mediumVariant);
-                builder.setEmissiveMaterial(false);
+                builder.setRenderFullBright(false);
            }

            float offset = offsetConstant;
@@ -117,7 +117,7 @@ class QnbFormedBakedModel implements IDynamicBakedModel {

                if (formedState.isPowered()) {
                    builder.setTexture(this.lightCornerTexture);
-                    builder.setEmissiveMaterial(true);
+                    builder.setRenderFullBright(true);
                    for (Direction facing : Direction.values()) {
                        // Offset the face by a slight amount so that it is drawn over the already drawn
                        // ring texture
@@ -131,7 +131,6 @@ class QnbFormedBakedModel implements IDynamicBakedModel {
                                DEFAULT_RENDER_MIN - zOffset, DEFAULT_RENDER_MAX + xOffset,
                                DEFAULT_RENDER_MAX + yOffset, DEFAULT_RENDER_MAX + zOffset);
                    }
-                    builder.setEmissiveMaterial(false);
                }
            } else {
                builder.setTexture(this.ringTexture);
@@ -144,7 +143,7 @@ class QnbFormedBakedModel implements IDynamicBakedModel {

                if (formedState.isPowered()) {
                    builder.setTexture(this.lightTexture);
-                    builder.setEmissiveMaterial(true);
+                    builder.setRenderFullBright(true);
                    for (Direction facing : Direction.values()) {
                        // Offset the face by a slight amount so that it is drawn over the already drawn
                        // ring texture
@@ -22,7 +22,6 @@ 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;
@@ -73,16 +72,14 @@ public abstract class AEBaseMEScreen<T extends AEBaseContainer> extends AEBaseSc
                    currentToolTip.add(ButtonToolTips.ItemsRequestable.text(formattedAmount));
                }

-                this.renderToolTip(matrixStack, Lists.transform(currentToolTip, ITextComponent::func_241878_f), x, y,
-                        this.font);
+                this.renderToolTip(matrixStack, currentToolTip, 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, Lists.transform(currentToolTip, ITextComponent::func_241878_f), x, y,
-                        this.font);
+                this.renderToolTip(matrixStack, currentToolTip, x, y, this.font);

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

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

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

    }

@@ -1,19 +1,19 @@

-package appeng.fluids.client.gui;
+package appeng.client.gui.implementations;

 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.util.text.ITextComponent;

 import appeng.client.gui.implementations.UpgradeableScreen;
+import appeng.client.gui.widgets.FluidSlotWidget;
+import appeng.client.gui.widgets.OptionalFluidSlotWidget;
 import appeng.client.gui.widgets.TabButton;
+import appeng.container.implementations.FluidFormationPlaneContainer;
 import appeng.container.implementations.PriorityContainer;
 import appeng.core.localization.GuiText;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.SwitchGuisPacket;
-import appeng.fluids.client.gui.widgets.FluidSlotWidget;
-import appeng.fluids.client.gui.widgets.OptionalFluidSlotWidget;
-import appeng.fluids.container.FluidFormationPlaneContainer;
-import appeng.fluids.util.IAEFluidTank;
+import appeng.util.fluid.IAEFluidTank;

 public class FluidFormationPlaneScreen extends UpgradeableScreen<FluidFormationPlaneContainer> {
    public FluidFormationPlaneScreen(FluidFormationPlaneContainer container, PlayerInventory playerInventory,
@@ -16,18 +16,18 @@
 * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
 */

-package appeng.fluids.client.gui;
+package appeng.client.gui.implementations;

 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.util.text.ITextComponent;

 import appeng.client.gui.implementations.UpgradeableScreen;
+import appeng.client.gui.widgets.FluidSlotWidget;
+import appeng.client.gui.widgets.OptionalFluidSlotWidget;
+import appeng.container.implementations.FluidIOContainer;
 import appeng.core.localization.GuiText;
-import appeng.fluids.client.gui.widgets.FluidSlotWidget;
-import appeng.fluids.client.gui.widgets.OptionalFluidSlotWidget;
-import appeng.fluids.container.FluidIOContainer;
-import appeng.fluids.parts.FluidImportBusPart;
-import appeng.fluids.util.IAEFluidTank;
+import appeng.parts.automation.FluidImportBusPart;
+import appeng.util.fluid.IAEFluidTank;

 /**
 * @author BrockWS
@@ -16,7 +16,7 @@
 * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
 */

-package appeng.fluids.client.gui;
+package appeng.client.gui.implementations;

 import com.mojang.blaze3d.matrix.MatrixStack;

@@ -25,16 +25,16 @@ import net.minecraft.util.text.ITextComponent;
 import net.minecraftforge.fml.client.gui.GuiUtils;

 import appeng.client.gui.implementations.UpgradeableScreen;
+import appeng.client.gui.widgets.FluidSlotWidget;
+import appeng.client.gui.widgets.FluidTankWidget;
 import appeng.client.gui.widgets.TabButton;
+import appeng.container.implementations.FluidInterfaceContainer;
 import appeng.container.implementations.PriorityContainer;
 import appeng.core.localization.GuiText;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.SwitchGuisPacket;
-import appeng.fluids.client.gui.widgets.FluidSlotWidget;
-import appeng.fluids.client.gui.widgets.FluidTankWidget;
-import appeng.fluids.container.FluidInterfaceContainer;
-import appeng.fluids.helper.DualityFluidInterface;
-import appeng.fluids.util.IAEFluidTank;
+import appeng.helpers.DualityFluidInterface;
+import appeng.util.fluid.IAEFluidTank;

 public class FluidInterfaceScreen extends UpgradeableScreen<FluidInterfaceContainer> {
    public FluidInterfaceScreen(FluidInterfaceContainer container, PlayerInventory playerInventory,
@@ -1,5 +1,5 @@

-package appeng.fluids.client.gui;
+package appeng.client.gui.implementations;

 import com.mojang.blaze3d.matrix.MatrixStack;

@@ -11,12 +11,12 @@ import appeng.api.config.Settings;
 import appeng.client.gui.NumberEntryType;
 import appeng.client.gui.implementations.NumberEntryWidget;
 import appeng.client.gui.implementations.UpgradeableScreen;
+import appeng.client.gui.widgets.FluidSlotWidget;
 import appeng.client.gui.widgets.ServerSettingToggleButton;
+import appeng.container.implementations.FluidLevelEmitterContainer;
 import appeng.core.localization.GuiText;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.ConfigValuePacket;
-import appeng.fluids.client.gui.widgets.FluidSlotWidget;
-import appeng.fluids.container.FluidLevelEmitterContainer;

 public class FluidLevelEmitterScreen extends UpgradeableScreen<FluidLevelEmitterContainer> {

@@ -16,7 +16,7 @@
 * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
 */

-package appeng.fluids.client.gui;
+package appeng.client.gui.implementations;

 import com.mojang.blaze3d.matrix.MatrixStack;

@@ -30,18 +30,18 @@ import appeng.api.config.Settings;
 import appeng.api.config.StorageFilter;
 import appeng.client.gui.implementations.UpgradeableScreen;
 import appeng.client.gui.widgets.ActionButton;
+import appeng.client.gui.widgets.FluidSlotWidget;
+import appeng.client.gui.widgets.OptionalFluidSlotWidget;
 import appeng.client.gui.widgets.ServerSettingToggleButton;
 import appeng.client.gui.widgets.SettingToggleButton;
 import appeng.client.gui.widgets.TabButton;
+import appeng.container.implementations.FluidStorageBusContainer;
 import appeng.container.implementations.PriorityContainer;
 import appeng.core.localization.GuiText;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.ConfigValuePacket;
 import appeng.core.sync.packets.SwitchGuisPacket;
-import appeng.fluids.client.gui.widgets.FluidSlotWidget;
-import appeng.fluids.client.gui.widgets.OptionalFluidSlotWidget;
-import appeng.fluids.container.FluidStorageBusContainer;
-import appeng.fluids.util.IAEFluidTank;
+import appeng.util.fluid.IAEFluidTank;

 /**
 * @author BrockWS
@@ -16,7 +16,7 @@
 * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
 */

-package appeng.fluids.client.gui;
+package appeng.client.gui.implementations;

 import java.text.NumberFormat;
 import java.util.ArrayList;
@@ -51,14 +51,14 @@ import appeng.client.gui.widgets.SettingToggleButton;
 import appeng.client.me.FluidRepo;
 import appeng.client.me.InternalFluidSlotME;
 import appeng.client.me.SlotFluidME;
+import appeng.container.implementations.FluidTerminalContainer;
+import appeng.container.slot.IMEFluidSlot;
 import appeng.core.AELog;
 import appeng.core.AppEng;
 import appeng.core.localization.GuiText;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.ConfigValuePacket;
 import appeng.core.sync.packets.InventoryActionPacket;
-import appeng.fluids.container.FluidTerminalContainer;
-import appeng.fluids.container.slots.IMEFluidSlot;
 import appeng.helpers.InventoryAction;
 import appeng.util.IConfigManagerHost;
 import appeng.util.Platform;
@@ -176,7 +176,7 @@ public class FluidTerminalScreen extends AEBaseMEScreen<FluidTerminalContainer>
                list.add(new StringTextComponent(formattedAmount));
                list.add(new StringTextComponent(modName));

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

                return;
            }
@@ -1,7 +1,6 @@
-package appeng.fluids.client.gui.widgets;
+package appeng.client.gui.widgets;

 import java.util.Collections;
-import java.util.Optional;

 import com.mojang.blaze3d.matrix.MatrixStack;
 import com.mojang.blaze3d.systems.RenderSystem;
@@ -25,8 +24,8 @@ import appeng.api.storage.data.IAEFluidStack;
 import appeng.client.gui.widgets.CustomSlotWidget;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.FluidSlotPacket;
-import appeng.fluids.util.AEFluidStack;
-import appeng.fluids.util.IAEFluidTank;
+import appeng.util.fluid.AEFluidStack;
+import appeng.util.fluid.IAEFluidTank;

 public class FluidSlotWidget extends CustomSlotWidget {
    private final IAEFluidTank fluids;
@@ -74,7 +73,7 @@ public class FluidSlotWidget extends CustomSlotWidget {
        if (clickStack.isEmpty() || mouseButton == 1) {
            this.setFluidStack(null);
        } else if (mouseButton == 0) {
-            final Optional<FluidStack> fluidOpt = FluidUtil.getFluidContained(clickStack);
+            final LazyOptional<FluidStack> fluidOpt = FluidUtil.getFluidContained(clickStack);
            fluidOpt.ifPresent(fluid -> {
                this.setFluidStack(AEFluidStack.fromFluidStack(fluid));
            });
@@ -16,7 +16,7 @@
 * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
 */

-package appeng.fluids.client.gui.widgets;
+package appeng.client.gui.widgets;

 import com.mojang.blaze3d.matrix.MatrixStack;
 import com.mojang.blaze3d.systems.RenderSystem;
@@ -35,7 +35,7 @@ import net.minecraftforge.fluids.FluidAttributes;
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.api.util.AEColor;
 import appeng.client.gui.widgets.ITooltip;
-import appeng.fluids.util.IAEFluidTank;
+import appeng.util.fluid.IAEFluidTank;

@OnlyIn(Dist.CLIENT)
 public class FluidTankWidget extends Widget implements ITooltip {
@@ -1,5 +1,5 @@

-package appeng.fluids.client.gui.widgets;
+package appeng.client.gui.widgets;

 import com.mojang.blaze3d.systems.RenderSystem;

@@ -7,7 +7,7 @@ import net.minecraftforge.fml.client.gui.GuiUtils;

 import appeng.api.storage.data.IAEFluidStack;
 import appeng.container.slot.IOptionalSlotHost;
-import appeng.fluids.util.IAEFluidTank;
+import appeng.util.fluid.IAEFluidTank;

 public class OptionalFluidSlotWidget extends FluidSlotWidget {
    private final IOptionalSlotHost containerBus;
@@ -37,8 +37,8 @@ import appeng.client.gui.widgets.IScrollSource;
 import appeng.client.gui.widgets.ISortSource;
 import appeng.core.AEConfig;
 import appeng.core.Api;
-import appeng.fluids.util.FluidSorters;
 import appeng.util.Platform;
+import appeng.util.fluid.FluidSorters;
 import appeng.util.prioritylist.IPartitionList;

 public class FluidRepo {
@@ -27,7 +27,7 @@ import net.minecraft.inventory.container.Slot;
 import net.minecraft.item.ItemStack;

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

 public class SlotFluidME extends Slot implements IMEFluidSlot {

@@ -45,7 +45,7 @@ import net.minecraftforge.client.model.ItemLayerModel;
 import net.minecraftforge.fluids.FluidAttributes;
 import net.minecraftforge.fluids.FluidStack;

-import appeng.fluids.items.FluidDummyItem;
+import appeng.items.misc.FluidDummyItem;

 /**
 * This baked model class is used as a dispatcher to redirect the renderer to
@@ -1,4 +1,4 @@
-package appeng.fluids.items;
+package appeng.client.render;

 import net.minecraft.client.renderer.color.IItemColor;
 import net.minecraft.item.Item;
@@ -7,6 +7,8 @@ import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.fluids.FluidStack;

+import appeng.items.misc.FluidDummyItem;
+
@OnlyIn(Dist.CLIENT)
 public class FluidDummyItemColor implements IItemColor {

@@ -16,7 +16,7 @@
 * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
 */

-package appeng.fluids.client.render;
+package appeng.client.render;

 import java.math.RoundingMode;
 import java.text.DecimalFormat;
@@ -342,7 +342,7 @@ class CableBuilder {
            this.addBigCoveredCableSizedCube(facing, cubeBuilder);

            // Render the channel indicators brightly lit at night
-            cubeBuilder.setEmissiveMaterial(true);
+            cubeBuilder.setRenderFullBright(true);

            cubeBuilder.setTexture(oddChannel);
            cubeBuilder.setColorRGB(cableColor.blackVariant);
@@ -353,14 +353,14 @@ class CableBuilder {
            this.addBigCoveredCableSizedCube(facing, cubeBuilder);

            // Reset back to normal rendering for the rest
-            cubeBuilder.setEmissiveMaterial(false);
+            cubeBuilder.setRenderFullBright(false);
            cubeBuilder.setTexture(texture);
        }

        addCoveredCableSizedCube(facing, cubeBuilder);

        // Render the channel indicators brightly lit at night
-        cubeBuilder.setEmissiveMaterial(true);
+        cubeBuilder.setRenderFullBright(true);

        cubeBuilder.setTexture(oddChannel);
        cubeBuilder.setColorRGB(cableColor.blackVariant);
@@ -369,9 +369,6 @@ class CableBuilder {
        cubeBuilder.setTexture(evenChannel);
        cubeBuilder.setColorRGB(cableColor.whiteVariant);
        addCoveredCableSizedCube(facing, cubeBuilder);
-
-        // Reset back to default
-        cubeBuilder.setEmissiveMaterial(false);
    }

    public void addStraightSmartConnection(Direction facing, AEColor cableColor, int channels,
@@ -389,7 +386,7 @@ class CableBuilder {
        TextureAtlasSprite evenChannel = this.smartCableTextures.getEvenTextureForChannels(channels);

        // Render the channel indicators brightly lit at night
-        cubeBuilder.setEmissiveMaterial(true);
+        cubeBuilder.setRenderFullBright(true);

        cubeBuilder.setTexture(oddChannel);
        cubeBuilder.setColorRGB(cableColor.blackVariant);
@@ -398,9 +395,6 @@ class CableBuilder {
        cubeBuilder.setTexture(evenChannel);
        cubeBuilder.setColorRGB(cableColor.whiteVariant);
        addStraightCoveredCableSizedCube(facing, cubeBuilder);
-
-        // Reset back to default
-        cubeBuilder.setEmissiveMaterial(false);
    }

    public void addConstrainedSmartConnection(Direction facing, AEColor cableColor, int distanceFromEdge, int channels,
@@ -423,7 +417,7 @@ class CableBuilder {
        TextureAtlasSprite evenChannel = this.smartCableTextures.getEvenTextureForChannels(channels);

        // Render the channel indicators brightly lit at night
-        cubeBuilder.setEmissiveMaterial(true);
+        cubeBuilder.setRenderFullBright(true);

        cubeBuilder.setTexture(oddChannel);
        cubeBuilder.setColorRGB(cableColor.blackVariant);
@@ -432,9 +426,6 @@ class CableBuilder {
        cubeBuilder.setTexture(evenChannel);
        cubeBuilder.setColorRGB(cableColor.whiteVariant);
        addCoveredCableSizedCube(facing, distanceFromEdge, cubeBuilder);
-
-        // Reset back to default
-        cubeBuilder.setEmissiveMaterial(false);
    }

    public void addDenseCoveredConnection(Direction facing, AEColor cableColor, AECableType connectionType,
@@ -458,7 +449,7 @@ class CableBuilder {
        addDenseCableSizedCube(facing, cubeBuilder);

        // Reset back to normal rendering for the rest
-        cubeBuilder.setEmissiveMaterial(false);
+        cubeBuilder.setRenderFullBright(false);
        cubeBuilder.setTexture(texture);
    }

@@ -494,7 +485,7 @@ class CableBuilder {
        TextureAtlasSprite evenChannel = this.smartCableTextures.getEvenTextureForChannels(channels);

        // Render the channel indicators brightly lit at night
-        cubeBuilder.setEmissiveMaterial(true);
+        cubeBuilder.setRenderFullBright(true);

        cubeBuilder.setTexture(oddChannel);
        cubeBuilder.setColorRGB(cableColor.blackVariant);
@@ -505,7 +496,7 @@ class CableBuilder {
        addDenseCableSizedCube(facing, cubeBuilder);

        // Reset back to normal rendering for the rest
-        cubeBuilder.setEmissiveMaterial(false);
+        cubeBuilder.setRenderFullBright(false);
        cubeBuilder.setTexture(texture);
    }

@@ -538,7 +529,7 @@ class CableBuilder {
        TextureAtlasSprite evenChannel = this.smartCableTextures.getEvenTextureForChannels(channels);

        // Render the channel indicators brightly lit at night
-        cubeBuilder.setEmissiveMaterial(true);
+        cubeBuilder.setRenderFullBright(true);

        cubeBuilder.setTexture(oddChannel);
        cubeBuilder.setColorRGB(cableColor.blackVariant);
@@ -547,9 +538,6 @@ class CableBuilder {
        cubeBuilder.setTexture(evenChannel);
        cubeBuilder.setColorRGB(cableColor.whiteVariant);
        addStraightDenseCableSizedCube(facing, cubeBuilder);
-
-        // Reset back to default
-        cubeBuilder.setEmissiveMaterial(false);
    }

    private static void addDenseCableSizedCube(Direction facing, CubeBuilder cubeBuilder) {
@@ -52,7 +52,7 @@ public class CubeBuilder {

    private boolean useStandardUV = false;

-    private boolean emissiveMaterial;
+    private boolean renderFullBright;

    public CubeBuilder(List<BakedQuad> output) {
        this.output = output;
@@ -379,7 +379,7 @@ public class CubeBuilder {
                    if (e.getIndex() == 0) {
                        builder.put(i, u, v);
                        break;
-                    } else if (e.getIndex() == 2 && emissiveMaterial) {
+                    } else if (e.getIndex() == 2 && renderFullBright) {
                        // Force Brightness to 15, this is for full bright mode
                        // this vertex element will only be present in that case
                        final float lightMapU = (float) (15 * 0x20) / 0xFFFF;
@@ -434,8 +434,8 @@ public class CubeBuilder {
        this.setColorRGB((int) (r * 255) << 16 | (int) (g * 255) << 8 | (int) (b * 255));
    }

-    public void setEmissiveMaterial(boolean renderFullBright) {
-        this.emissiveMaterial = renderFullBright;
+    public void setRenderFullBright(boolean renderFullBright) {
+        this.renderFullBright = renderFullBright;
    }

    public void setCustomUv(Direction facing, float u1, float v1, float u2, float v2) {
@@ -49,7 +49,7 @@ public class P2PTunnelFrequencyBakedModel implements IDynamicBakedModel {

        cb.setTexture(this.texture);
        cb.useStandardUV();
-        cb.setEmissiveMaterial(active);
+        cb.setRenderFullBright(active);

        for (int i = 0; i < 4; ++i) {
            final int[] offs = QUAD_OFFSETS[i];
@@ -70,10 +70,6 @@ public class P2PTunnelFrequencyBakedModel implements IDynamicBakedModel {
            }

        }
-
-        // Reset back to default
-        cb.setEmissiveMaterial(false);
-
        return cb.getOutput();
    }

@@ -51,10 +51,8 @@ class LightBakedModel extends CraftingCubeBakedModel {
        builder.addCube(x1, y1, z1, x2, y2, z2);

        boolean powered = state.get(AbstractCraftingUnitBlock.POWERED);
-        builder.setEmissiveMaterial(powered);
+        builder.setRenderFullBright(powered);
        builder.setTexture(this.lightTexture);
        builder.addCube(x1, y1, z1, x2, y2, z2);
-        // Reset back to default
-        builder.setEmissiveMaterial(false);
    }
 }
@@ -78,7 +78,7 @@ public class MonitorBakedModel extends CraftingCubeBakedModel {
        AEColor color = getColor(modelData);
        boolean powered = state.get(CraftingMonitorBlock.POWERED);

-        builder.setEmissiveMaterial(powered);
+        builder.setRenderFullBright(powered);

        builder.setColorRGB(color.whiteVariant);
        builder.setTexture(this.lightBrightTexture);
@@ -92,8 +92,6 @@ public class MonitorBakedModel extends CraftingCubeBakedModel {
        builder.setTexture(this.lightDarkTexture);
        builder.addCube(x1, y1, z1, x2, y2, z2);

-        // Reset back to default
-        builder.setEmissiveMaterial(false);
    }

    private static AEColor getColor(IModelData modelData) {
@@ -117,7 +117,7 @@ class SpatialPylonBakedModel implements IDynamicBakedModel {

            if ((flags
                    & SpatialPylonTileEntity.DISPLAY_POWERED_ENABLED) == SpatialPylonTileEntity.DISPLAY_POWERED_ENABLED) {
-                builder.setEmissiveMaterial(true);
+                builder.setRenderFullBright(true);
            }

            builder.setTextures(this.textures.get(getTextureTypeFromSideInside(flags, ori, Direction.UP)),
@@ -135,9 +135,6 @@ class SpatialPylonBakedModel implements IDynamicBakedModel {
            builder.addCube(0, 0, 0, 16, 16, 16);
        }

-        // Reset back to default
-        builder.setEmissiveMaterial(false);
-
        return builder.getOutput();
    }

@@ -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(), pos.getBlockPos(), part.getSide());
+        return new ContainerLocator(Type.PART, -1, pos.getWorld().getWorld(), pos.getBlockPos(), part.getSide());
    }

    public boolean hasItemIndex() {
@@ -1,5 +1,5 @@

-package appeng.fluids.helper;
+package appeng.container.guisync;

 import java.util.HashMap;
 import java.util.Map;
@@ -11,8 +11,8 @@ import net.minecraft.inventory.container.IContainerListener;
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.FluidSlotPacket;
-import appeng.fluids.util.AEFluidInventory;
-import appeng.fluids.util.IAEFluidTank;
+import appeng.util.fluid.AEFluidInventory;
+import appeng.util.fluid.IAEFluidTank;

 public class FluidSyncHelper {
    private final IAEFluidTank inv;
@@ -1,9 +1,8 @@

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

 import java.util.Collections;
 import java.util.Map;
-import java.util.Optional;

 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.inventory.container.ContainerType;
@@ -16,11 +15,12 @@ import net.minecraftforge.fluids.FluidUtil;
 import appeng.api.config.Upgrades;
 import appeng.api.implementations.IUpgradeableHost;
 import appeng.api.storage.data.IAEFluidStack;
+import appeng.container.guisync.FluidSyncHelper;
 import appeng.container.implementations.UpgradeableContainer;
-import appeng.fluids.helper.FluidSyncHelper;
-import appeng.fluids.util.AEFluidStack;
-import appeng.fluids.util.IAEFluidTank;
+import appeng.container.interfaces.IFluidSyncContainer;
 import appeng.util.Platform;
+import appeng.util.fluid.AEFluidStack;
+import appeng.util.fluid.IAEFluidTank;

 public abstract class FluidConfigurableContainer extends UpgradeableContainer implements IFluidSyncContainer {
    private FluidSyncHelper sync = null;
@@ -40,7 +40,7 @@ public abstract class FluidConfigurableContainer extends UpgradeableContainer im

    @Override
    protected ItemStack transferStackToContainer(ItemStack input) {
-        Optional<FluidStack> fsOpt = FluidUtil.getFluidContained(input);
+        LazyOptional<FluidStack> fsOpt = FluidUtil.getFluidContained(input);
        if (fsOpt.isPresent()) {
            final IAEFluidTank t = this.getFluidConfigInventory();
            final IAEFluidStack stack = AEFluidStack.fromFluidStack(fsOpt.orElse(null));
@@ -1,5 +1,5 @@

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

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

 public class FluidFormationPlaneContainer extends FluidConfigurableContainer {

@@ -16,7 +16,7 @@
 * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
 */

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

 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
@@ -25,9 +25,8 @@ import net.minecraft.network.PacketBuffer;

 import appeng.api.config.SecurityPermissions;
 import appeng.container.ContainerLocator;
-import appeng.container.implementations.ContainerHelper;
-import appeng.fluids.parts.SharedFluidBusPart;
-import appeng.fluids.util.IAEFluidTank;
+import appeng.parts.automation.SharedFluidBusPart;
+import appeng.util.fluid.IAEFluidTank;

 /**
 * @author BrockWS
@@ -16,7 +16,7 @@
 * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
 */

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

 import java.util.Collections;
 import java.util.Map;
@@ -31,12 +31,11 @@ import appeng.api.config.SecurityPermissions;
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.api.util.IConfigManager;
 import appeng.container.ContainerLocator;
-import appeng.container.implementations.ContainerHelper;
-import appeng.fluids.helper.DualityFluidInterface;
-import appeng.fluids.helper.FluidSyncHelper;
-import appeng.fluids.helper.IFluidInterfaceHost;
-import appeng.fluids.util.IAEFluidTank;
+import appeng.container.guisync.FluidSyncHelper;
+import appeng.helpers.DualityFluidInterface;
+import appeng.helpers.IFluidInterfaceHost;
 import appeng.util.Platform;
+import appeng.util.fluid.IAEFluidTank;

 public class FluidInterfaceContainer extends FluidConfigurableContainer {

@@ -1,4 +1,4 @@
-package appeng.fluids.container;
+package appeng.container.implementations;

 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
@@ -13,10 +13,9 @@ import appeng.api.config.Settings;
 import appeng.client.gui.implementations.NumberEntryWidget;
 import appeng.container.ContainerLocator;
 import appeng.container.guisync.GuiSync;
-import appeng.container.implementations.ContainerHelper;
-import appeng.fluids.parts.FluidLevelEmitterPart;
-import appeng.fluids.util.IAEFluidTank;
+import appeng.parts.automation.FluidLevelEmitterPart;
 import appeng.util.Platform;
+import appeng.util.fluid.IAEFluidTank;

 public class FluidLevelEmitterContainer extends FluidConfigurableContainer {
    public static ContainerType<FluidLevelEmitterContainer> TYPE;
@@ -16,7 +16,7 @@
 * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
 */

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

 import java.util.Iterator;

@@ -38,12 +38,11 @@ import appeng.api.storage.data.IAEFluidStack;
 import appeng.api.storage.data.IItemList;
 import appeng.container.ContainerLocator;
 import appeng.container.guisync.GuiSync;
-import appeng.container.implementations.ContainerHelper;
 import appeng.container.slot.RestrictedInputSlot;
 import appeng.core.Api;
-import appeng.fluids.parts.FluidStorageBusPart;
-import appeng.fluids.util.IAEFluidTank;
+import appeng.parts.misc.FluidStorageBusPart;
 import appeng.util.Platform;
+import appeng.util.fluid.IAEFluidTank;
 import appeng.util.iterators.NullIterator;

 /**
@@ -16,7 +16,7 @@
 * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
 */

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

 import java.io.IOException;
 import java.nio.BufferOverflowException;
@@ -63,19 +63,18 @@ import appeng.api.util.IConfigurableObject;
 import appeng.container.AEBaseContainer;
 import appeng.container.ContainerLocator;
 import appeng.container.guisync.GuiSync;
-import appeng.container.implementations.ContainerHelper;
 import appeng.core.AELog;
 import appeng.core.Api;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.ConfigValuePacket;
 import appeng.core.sync.packets.MEFluidInventoryUpdatePacket;
 import appeng.core.sync.packets.TargetFluidStackPacket;
-import appeng.fluids.util.AEFluidStack;
 import appeng.helpers.InventoryAction;
 import appeng.me.helpers.ChannelPowerSrc;
 import appeng.util.ConfigManager;
 import appeng.util.IConfigManagerHost;
 import appeng.util.Platform;
+import appeng.util.fluid.AEFluidStack;

 /**
 * @author BrockWS
@@ -1,5 +1,5 @@

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

 import java.util.Map;

@@ -16,7 +16,7 @@
 * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
 */

-package appeng.fluids.container.slots;
+package appeng.container.slot;

 import appeng.api.storage.data.IAEFluidStack;

@@ -34,12 +34,13 @@ 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;
@@ -100,7 +101,6 @@ 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,6 +108,9 @@ 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);
@@ -126,15 +129,7 @@ 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);
@@ -1,135 +0,0 @@
-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,7 +34,6 @@ 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;
@@ -42,6 +41,7 @@ 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,6 +100,12 @@ import appeng.client.gui.implementations.CraftingCPUScreen;
 import appeng.client.gui.implementations.CraftingStatusScreen;
 import appeng.client.gui.implementations.CraftingTermScreen;
 import appeng.client.gui.implementations.DriveScreen;
+import appeng.client.gui.implementations.FluidFormationPlaneScreen;
+import appeng.client.gui.implementations.FluidIOScreen;
+import appeng.client.gui.implementations.FluidInterfaceScreen;
+import appeng.client.gui.implementations.FluidLevelEmitterScreen;
+import appeng.client.gui.implementations.FluidStorageBusScreen;
+import appeng.client.gui.implementations.FluidTerminalScreen;
 import appeng.client.gui.implementations.FormationPlaneScreen;
 import appeng.client.gui.implementations.GrinderScreen;
 import appeng.client.gui.implementations.IOPortScreen;
@@ -159,6 +165,12 @@ import appeng.container.implementations.CraftingCPUContainer;
 import appeng.container.implementations.CraftingStatusContainer;
 import appeng.container.implementations.CraftingTermContainer;
 import appeng.container.implementations.DriveContainer;
+import appeng.container.implementations.FluidFormationPlaneContainer;
+import appeng.container.implementations.FluidIOContainer;
+import appeng.container.implementations.FluidInterfaceContainer;
+import appeng.container.implementations.FluidLevelEmitterContainer;
+import appeng.container.implementations.FluidStorageBusContainer;
+import appeng.container.implementations.FluidTerminalContainer;
 import appeng.container.implementations.FormationPlaneContainer;
 import appeng.container.implementations.GrinderContainer;
 import appeng.container.implementations.IOPortContainer;
@@ -186,24 +198,12 @@ import appeng.container.implementations.WirelessTermContainer;
 import appeng.core.features.registries.P2PTunnelRegistry;
 import appeng.core.features.registries.PartModels;
 import appeng.core.features.registries.cell.BasicCellHandler;
+import appeng.core.features.registries.cell.BasicFluidCellGuiHandler;
 import appeng.core.features.registries.cell.BasicItemCellGuiHandler;
 import appeng.core.features.registries.cell.CreativeCellHandler;
 import appeng.core.localization.GuiText;
 import appeng.core.stats.AdvancementTriggers;
 import appeng.core.stats.AeStats;
-import appeng.fluids.client.gui.FluidFormationPlaneScreen;
-import appeng.fluids.client.gui.FluidIOScreen;
-import appeng.fluids.client.gui.FluidInterfaceScreen;
-import appeng.fluids.client.gui.FluidLevelEmitterScreen;
-import appeng.fluids.client.gui.FluidStorageBusScreen;
-import appeng.fluids.client.gui.FluidTerminalScreen;
-import appeng.fluids.container.FluidFormationPlaneContainer;
-import appeng.fluids.container.FluidIOContainer;
-import appeng.fluids.container.FluidInterfaceContainer;
-import appeng.fluids.container.FluidLevelEmitterContainer;
-import appeng.fluids.container.FluidStorageBusContainer;
-import appeng.fluids.container.FluidTerminalContainer;
-import appeng.fluids.registries.BasicFluidCellGuiHandler;
 import appeng.items.parts.FacadeItem;
 import appeng.me.cache.CraftingGridCache;
 import appeng.me.cache.EnergyGridCache;
@@ -213,6 +213,7 @@ 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;
@@ -681,6 +682,73 @@ 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)
@@ -47,10 +47,10 @@ import appeng.api.storage.data.IAEItemStack;
 import appeng.api.storage.data.IAEStack;
 import appeng.api.storage.data.IItemList;
 import appeng.crafting.CraftingLink;
-import appeng.fluids.items.FluidDummyItem;
-import appeng.fluids.util.AEFluidStack;
-import appeng.fluids.util.FluidList;
+import appeng.items.misc.FluidDummyItem;
 import appeng.util.Platform;
+import appeng.util.fluid.AEFluidStack;
+import appeng.util.fluid.FluidList;
 import appeng.util.item.AEItemStack;
 import appeng.util.item.ItemList;

@@ -22,7 +22,6 @@ import static appeng.block.AEBaseBlock.defaultProps;

 import net.minecraft.block.AbstractBlock;
 import net.minecraft.block.Block;
-import net.minecraft.block.Blocks;
 import net.minecraft.block.DispenserBlock;
 import net.minecraft.block.SlabBlock;
 import net.minecraft.block.SoundType;
@@ -52,6 +51,7 @@ import appeng.block.grindstone.GrinderBlock;
 import appeng.block.misc.CellWorkbenchBlock;
 import appeng.block.misc.ChargerBlock;
 import appeng.block.misc.CondenserBlock;
+import appeng.block.misc.FluidInterfaceBlock;
 import appeng.block.misc.InscriberBlock;
 import appeng.block.misc.InscriberRendering;
 import appeng.block.misc.InterfaceBlock;
@@ -123,8 +123,6 @@ import appeng.decorative.solid.QuartzPillarBlock;
 import appeng.decorative.solid.SkyStoneBlock;
 import appeng.decorative.solid.SkyStoneBlock.SkystoneType;
 import appeng.entity.TinyTNTPrimedEntity;
-import appeng.fluids.block.FluidInterfaceBlock;
-import appeng.fluids.tile.FluidInterfaceTileEntity;
 import appeng.hooks.TinyTNTDispenseItemBehavior;
 import appeng.tile.crafting.CraftingMonitorTileEntity;
 import appeng.tile.crafting.CraftingStorageTileEntity;
@@ -136,6 +134,7 @@ import appeng.tile.grindstone.GrinderTileEntity;
 import appeng.tile.misc.CellWorkbenchTileEntity;
 import appeng.tile.misc.ChargerTileEntity;
 import appeng.tile.misc.CondenserTileEntity;
+import appeng.tile.misc.FluidInterfaceTileEntity;
 import appeng.tile.misc.InscriberTileEntity;
 import appeng.tile.misc.InterfaceTileEntity;
 import appeng.tile.misc.LightDetectorTileEntity;
@@ -39,6 +39,7 @@ import appeng.bootstrap.FeatureFactory;
 import appeng.bootstrap.IItemRendering;
 import appeng.bootstrap.ItemRenderingCustomizer;
 import appeng.bootstrap.components.IClientSetupComponent;
+import appeng.client.render.FluidDummyItemColor;
 import appeng.core.AppEng;
 import appeng.core.features.ActivityState;
 import appeng.core.features.ColoredItemDefinition;
@@ -49,18 +50,17 @@ import appeng.debug.EraserItem;
 import appeng.debug.MeteoritePlacerItem;
 import appeng.debug.ReplicatorCardItem;
 import appeng.entity.GrowingCrystalEntity;
-import appeng.fluids.items.BasicFluidStorageCell;
-import appeng.fluids.items.FluidDummyItem;
-import appeng.fluids.items.FluidDummyItemColor;
 import appeng.hooks.BlockToolDispenseItemBehavior;
 import appeng.hooks.MatterCannonDispenseItemBehavior;
 import appeng.items.materials.MaterialType;
 import appeng.items.misc.CrystalSeedItem;
 import appeng.items.misc.CrystalSeedRendering;
 import appeng.items.misc.EncodedPatternItem;
+import appeng.items.misc.FluidDummyItem;
 import appeng.items.misc.PaintBallItem;
 import appeng.items.misc.PaintBallItemRendering;
 import appeng.items.parts.FacadeItem;
+import appeng.items.storage.BasicFluidStorageCell;
 import appeng.items.storage.BasicStorageCellItem;
 import appeng.items.storage.CreativeStorageCellItem;
 import appeng.items.storage.SpatialStorageCellItem;
@@ -33,25 +33,24 @@ import appeng.core.features.ActivityState;
 import appeng.core.features.ColoredItemDefinition;
 import appeng.core.features.ItemStackSrc;
 import appeng.core.features.registries.PartModels;
-import appeng.fluids.parts.FluidAnnihilationPlanePart;
-import appeng.fluids.parts.FluidExportBusPart;
-import appeng.fluids.parts.FluidFormationPlanePart;
-import appeng.fluids.parts.FluidImportBusPart;
-import appeng.fluids.parts.FluidInterfacePart;
-import appeng.fluids.parts.FluidLevelEmitterPart;
-import appeng.fluids.parts.FluidStorageBusPart;
-import appeng.fluids.parts.FluidTerminalPart;
 import appeng.items.parts.ColoredPartItem;
 import appeng.items.parts.PartItem;
 import appeng.items.parts.PartItemRendering;
 import appeng.items.parts.PartModelsHelper;
 import appeng.parts.automation.AnnihilationPlanePart;
 import appeng.parts.automation.ExportBusPart;
+import appeng.parts.automation.FluidAnnihilationPlanePart;
+import appeng.parts.automation.FluidExportBusPart;
+import appeng.parts.automation.FluidFormationPlanePart;
+import appeng.parts.automation.FluidImportBusPart;
+import appeng.parts.automation.FluidLevelEmitterPart;
 import appeng.parts.automation.FormationPlanePart;
 import appeng.parts.automation.IdentityAnnihilationPlanePart;
 import appeng.parts.automation.ImportBusPart;
 import appeng.parts.automation.LevelEmitterPart;
 import appeng.parts.misc.CableAnchorPart;
+import appeng.parts.misc.FluidInterfacePart;
+import appeng.parts.misc.FluidStorageBusPart;
 import appeng.parts.misc.InterfacePart;
 import appeng.parts.misc.InvertedToggleBusPart;
 import appeng.parts.misc.StorageBusPart;
@@ -71,6 +70,7 @@ import appeng.parts.p2p.RedstoneP2PTunnelPart;
 import appeng.parts.reporting.ConversionMonitorPart;
 import appeng.parts.reporting.CraftingTerminalPart;
 import appeng.parts.reporting.DarkPanelPart;
+import appeng.parts.reporting.FluidTerminalPart;
 import appeng.parts.reporting.InterfaceTerminalPart;
 import appeng.parts.reporting.PanelPart;
 import appeng.parts.reporting.PatternTerminalPart;
@@ -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.INamedTag<Block> blockTagWhiteList;
-    private final ITag.INamedTag<Block> blockTagBlackList;
+    private final ITag<Block> blockTagWhiteList;
+    private final ITag<Block> blockTagBlackList;

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

    @Override
@@ -16,7 +16,7 @@
 * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
 */

-package appeng.fluids.registries;
+package appeng.core.features.registries.cell;

 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
@@ -31,8 +31,8 @@ import appeng.api.storage.channels.IFluidStorageChannel;
 import appeng.api.storage.data.IAEStack;
 import appeng.container.ContainerLocator;
 import appeng.container.ContainerOpener;
+import appeng.container.implementations.FluidTerminalContainer;
 import appeng.core.Api;
-import appeng.fluids.container.FluidTerminalContainer;

 public class BasicFluidCellGuiHandler implements ICellGuiHandler {

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

        data.writeInt(this.getPacketID());
        data.writeBlockPos(pos);
-        int blockStateId = GameData.getBlockStateIDMap().getId(blockState);
+        int blockStateId = GameData.getBlockStateIDMap().get(blockState);
        if (blockStateId == -1) {
            AELog.warn("Failed to find numeric id for block state %s", blockState);
        }
@@ -38,6 +38,8 @@ import appeng.container.implementations.CellWorkbenchContainer;
 import appeng.container.implementations.CraftConfirmContainer;
 import appeng.container.implementations.CraftingCPUContainer;
 import appeng.container.implementations.CraftingStatusContainer;
+import appeng.container.implementations.FluidLevelEmitterContainer;
+import appeng.container.implementations.FluidStorageBusContainer;
 import appeng.container.implementations.LevelEmitterContainer;
 import appeng.container.implementations.NetworkToolContainer;
 import appeng.container.implementations.PatternTermContainer;
@@ -47,8 +49,6 @@ import appeng.container.implementations.SecurityStationContainer;
 import appeng.container.implementations.StorageBusContainer;
 import appeng.core.sync.BasePacket;
 import appeng.core.sync.network.INetworkInfo;
-import appeng.fluids.container.FluidLevelEmitterContainer;
-import appeng.fluids.container.FluidStorageBusContainer;
 import appeng.helpers.IMouseWheelItem;

 public class ConfigValuePacket extends BasePacket {
@@ -29,10 +29,10 @@ import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.network.PacketBuffer;

 import appeng.api.storage.data.IAEFluidStack;
+import appeng.container.interfaces.IFluidSyncContainer;
 import appeng.core.sync.BasePacket;
 import appeng.core.sync.network.INetworkInfo;
-import appeng.fluids.container.IFluidSyncContainer;
-import appeng.fluids.util.AEFluidStack;
+import appeng.util.fluid.AEFluidStack;

 public class FluidSlotPacket extends BasePacket {
    private final Map<Integer, IAEFluidStack> list;
@@ -37,10 +37,10 @@ import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.fml.network.NetworkDirection;

 import appeng.api.storage.data.IAEFluidStack;
+import appeng.client.gui.implementations.FluidTerminalScreen;
 import appeng.core.sync.BasePacket;
 import appeng.core.sync.network.INetworkInfo;
-import appeng.fluids.client.gui.FluidTerminalScreen;
-import appeng.fluids.util.AEFluidStack;
+import appeng.util.fluid.AEFluidStack;

 /**
 * @author BrockWS
@@ -23,11 +23,11 @@ import io.netty.buffer.Unpooled;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.network.PacketBuffer;

+import appeng.container.implementations.FluidTerminalContainer;
 import appeng.core.AELog;
 import appeng.core.sync.BasePacket;
 import appeng.core.sync.network.INetworkInfo;
-import appeng.fluids.container.FluidTerminalContainer;
-import appeng.fluids.util.AEFluidStack;
+import appeng.util.fluid.AEFluidStack;

 /**
 * @author BrockWS
@@ -28,7 +28,6 @@ import net.minecraft.loot.RandomValueRange;
 import net.minecraft.loot.conditions.SurvivesExplosion;
 import net.minecraft.loot.functions.ApplyBonus;
 import net.minecraft.loot.functions.SetCount;
-import net.minecraft.util.RegistryKey;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fml.event.lifecycle.GatherDataEvent;
 import net.minecraftforge.registries.ForgeRegistries;
@@ -63,13 +62,12 @@ public class BlockDropProvider extends BlockLootTables implements IAE2DataProvid

    @Override
    public void act(@Nonnull DirectoryCache cache) throws IOException {
-        for (Map.Entry<RegistryKey<Block>, Block> entry : ForgeRegistries.BLOCKS.getEntries()) {
+        for (Map.Entry<ResourceLocation, Block> entry : ForgeRegistries.BLOCKS.getEntries()) {
            LootTable.Builder builder;
-            if (entry.getKey().func_240901_a_().getNamespace().equals(AppEng.MOD_ID)) {
+            if (entry.getKey().getNamespace().equals(AppEng.MOD_ID)) {
                builder = overrides.getOrDefault(entry.getValue(), this::defaultBuilder).apply(entry.getValue());

-                IDataProvider.save(GSON, cache, toJson(builder),
-                        getPath(outputFolder, entry.getKey().func_240901_a_()));
+                IDataProvider.save(GSON, cache, toJson(builder), getPath(outputFolder, entry.getKey()));
            }
        }
    }
@@ -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)); // 65535 == full chunk
+            player.connection.sendPacket(new SChunkDataPacket(c, 65535, false)); // 65535 == full chunk
        });

        return ActionResultType.SUCCESS;
@@ -16,7 +16,7 @@
 * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
 */

-package appeng.fluids.helper;
+package appeng.helpers;

 import java.util.Optional;

@@ -59,9 +59,6 @@ import appeng.api.util.IConfigManager;
 import appeng.capabilities.Capabilities;
 import appeng.core.Api;
 import appeng.core.settings.TickRates;
-import appeng.fluids.util.AEFluidInventory;
-import appeng.fluids.util.IAEFluidInventory;
-import appeng.fluids.util.IAEFluidTank;
 import appeng.me.GridAccessException;
 import appeng.me.helpers.AENetworkProxy;
 import appeng.me.helpers.MachineSource;
@@ -71,6 +68,9 @@ import appeng.me.storage.NullInventory;
 import appeng.util.ConfigManager;
 import appeng.util.IConfigManagerHost;
 import appeng.util.Platform;
+import appeng.util.fluid.AEFluidInventory;
+import appeng.util.fluid.IAEFluidInventory;
+import appeng.util.fluid.IAEFluidTank;

 public class DualityFluidInterface
        implements IGridTickable, IStorageMonitorable, IAEFluidInventory, IUpgradeableHost, IConfigManagerHost {
@@ -16,7 +16,7 @@
 * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
 */

-package appeng.fluids.helper;
+package appeng.helpers;

 import java.util.EnumSet;

@@ -25,6 +25,7 @@ import net.minecraft.util.Direction;

 import appeng.api.implementations.IUpgradeableHost;
 import appeng.api.networking.security.IActionHost;
+import appeng.helpers.DualityFluidInterface;
 import appeng.me.helpers.IGridProxyable;

 public interface IFluidInterfaceHost extends IActionHost, IGridProxyable, IUpgradeableHost {
@@ -16,20 +16,19 @@
 * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
 */

-package appeng.fluids.helper;
-
-import java.util.Optional;
+package appeng.items.contents;

 import javax.annotation.Nonnull;

 import net.minecraft.item.ItemStack;
+import net.minecraftforge.common.util.LazyOptional;
 import net.minecraftforge.fluids.FluidAttributes;
 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
@@ -47,7 +46,7 @@ public class FluidCellConfig extends CellConfig {
        if (stack.isEmpty() || stack.getItem() instanceof FluidDummyItem) {
            super.insertItem(slot, stack, simulate);
        }
-        Optional<FluidStack> fluidOpt = FluidUtil.getFluidContained(stack);
+        LazyOptional<FluidStack> fluidOpt = FluidUtil.getFluidContained(stack);
        if (!fluidOpt.isPresent() || !Api.instance().definitions().items().dummyFluidItem().maybeStack(1).isPresent()) {
            return stack;
        }
@@ -65,7 +64,7 @@ public class FluidCellConfig extends CellConfig {
        if (stack.isEmpty() || stack.getItem() instanceof FluidDummyItem) {
            super.setStackInSlot(slot, stack);
        }
-        Optional<FluidStack> fluidOpt = FluidUtil.getFluidContained(stack);
+        LazyOptional<FluidStack> fluidOpt = FluidUtil.getFluidContained(stack);
        if (!fluidOpt.isPresent() || !Api.instance().definitions().items().dummyFluidItem().maybeStack(1).isPresent()) {
            return;
        }
@@ -83,7 +82,7 @@ public class FluidCellConfig extends CellConfig {
        if (stack.isEmpty() || stack.getItem() instanceof FluidDummyItem) {
            super.isItemValid(slot, stack);
        }
-        Optional<FluidStack> fluidOpt = FluidUtil.getFluidContained(stack);
+        LazyOptional<FluidStack> fluidOpt = FluidUtil.getFluidContained(stack);
        if (!fluidOpt.isPresent() || !Api.instance().definitions().items().dummyFluidItem().maybeStack(1).isPresent()) {
            return false;
        }
@@ -16,7 +16,7 @@
 * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
 */

-package appeng.fluids.items;
+package appeng.items.misc;

 import net.minecraft.fluid.Fluids;
 import net.minecraft.item.ItemGroup;
@@ -58,8 +58,7 @@ public class FacadeItem extends AEBaseItem implements IFacadeItem, IAlphaPassIte
    /**
     * Block tag used to explicitly whitelist blocks for use in facades.
     */
-    private static final ITag.INamedTag<Block> BLOCK_WHITELIST = BlockTags
-            .makeWrapperTag(AppEng.makeId("whitelisted/facades").toString());
+    private static final ResourceLocation TAG_WHITELISTED = new ResourceLocation(AppEng.MOD_ID, "whitelisted/facades");

    private static final String NBT_ITEM_ID = "item";

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

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

        final BlockState defaultState = block.getDefaultState();
@@ -16,7 +16,7 @@
 * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
 */

-package appeng.fluids.items;
+package appeng.items.storage;

 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
@@ -26,9 +26,8 @@ import appeng.api.storage.IStorageChannel;
 import appeng.api.storage.channels.IFluidStorageChannel;
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.core.Api;
-import appeng.fluids.helper.FluidCellConfig;
+import appeng.items.contents.FluidCellConfig;
 import appeng.items.materials.MaterialType;
-import appeng.items.storage.AbstractStorageCell;
 import appeng.util.InventoryAdaptor;

 /**
@@ -1,4 +1,4 @@
-package appeng.mixins.structure;
+package appeng.mixins;

 import com.google.common.collect.ImmutableMap;

@@ -1,4 +1,4 @@
-package appeng.mixins.structure;
+package appeng.mixins;

 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Invoker;
@@ -7,10 +7,10 @@ import net.minecraft.world.gen.GenerationStage;
 import net.minecraft.world.gen.feature.structure.Structure;

@Mixin(Structure.class)
-public interface StructureFeatureAccessor {
+public interface StructureAccessor {

    @Invoker("func_236394_a_")
-    static <F extends Structure<?>> F register(String id, F structureFeature, GenerationStage.Decoration step) {
+    static <F extends Structure<?>> F register(String id, F feature, GenerationStage.Decoration defaultStage) {
        throw new AssertionError();
    }

@@ -0,0 +1,15 @@
+package appeng.mixins;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+import net.minecraft.world.chunk.listener.IChunkStatusListener;
+import net.minecraft.world.server.ChunkManager;
+
+@Mixin(ChunkManager.class)
+public interface ThreadedAnvilChunkStorageAccessor {
+
+    @Accessor("field_219266_t")
+    IChunkStatusListener getWorldGenerationProgressListener();
+
+}
@@ -1,19 +0,0 @@
-package appeng.mixins.feature;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Invoker;
-
-import net.minecraft.world.gen.feature.ConfiguredFeature;
-import net.minecraft.world.gen.feature.Features;
-import net.minecraft.world.gen.feature.IFeatureConfig;
-
-@Mixin(Features.class)
-public interface ConfiguredFeaturesAccessor {
-
-    @Invoker("func_243968_a")
-    static <FC extends IFeatureConfig> ConfiguredFeature<FC, ?> register(String id,
-            ConfiguredFeature<FC, ?> configuredFeature) {
-        throw new AssertionError();
-    }
-
-}
@@ -1,27 +0,0 @@
-package appeng.mixins.spatial;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import net.minecraft.util.registry.WorldGenRegistries;
-import net.minecraft.world.biome.BiomeRegistry;
-
-import appeng.spatial.SpatialStorageBiome;
-import appeng.spatial.SpatialStorageDimensionIds;
-
-/**
- * This only needs to be here because the server-side will create a dynamic
- * registry manager long before our mod is initialized.
- */
-@Mixin(BiomeRegistry.class)
-public class BiomesMixin {
-
-    @Inject(method = "<clinit>", at = @At("TAIL"))
-    private static void registerBiomes(CallbackInfo ci) {
-        WorldGenRegistries.func_243664_a(WorldGenRegistries.field_243657_i,
-                SpatialStorageDimensionIds.BIOME_KEY.func_240901_a_(), SpatialStorageBiome.INSTANCE);
-    }
-
-}
@@ -35,4 +35,4 @@ public class DimensionOptionMixin {
        return dimensions;
    }

-}
+}
@@ -2,25 +2,15 @@ package appeng.mixins.spatial;

 import java.util.OptionalLong;

-import com.mojang.serialization.Lifecycle;
-
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Invoker;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;

+import net.minecraft.server.IDynamicRegistries;
 import net.minecraft.tags.BlockTags;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.registry.DynamicRegistries;
-import net.minecraft.util.registry.Registry;
-import net.minecraft.util.registry.SimpleRegistry;
-import net.minecraft.world.Dimension;
 import net.minecraft.world.DimensionType;
-import net.minecraft.world.biome.Biome;
-import net.minecraft.world.gen.DimensionSettings;

-import appeng.spatial.SpatialStorageChunkGenerator;
 import appeng.spatial.SpatialStorageDimensionIds;

 /**
@@ -31,37 +21,12 @@ import appeng.spatial.SpatialStorageDimensionIds;
@Mixin(value = DimensionType.class)
 public class DimensionTypeMixin {

-    @Invoker("<init>")
-    static DimensionType create(OptionalLong fixedTime, boolean hasSkylight, boolean hasCeiling, boolean ultrawarm,
-            boolean natural, double coordinateScale, boolean piglinSafe, boolean bedWorks, boolean respawnAnchorWorks,
-            boolean hasRaids, int logicalHeight, ResourceLocation infiniburn, ResourceLocation skyProperties,
-            float ambientLight) {
-        throw new AssertionError();
-    }
-
    @Inject(method = "func_236027_a_", at = @At("TAIL"))
-    private static void addRegistryDefaults(DynamicRegistries.Impl registryTracker, CallbackInfoReturnable<?> cir) {
-        DimensionType dimensionType = create(OptionalLong.of(12000), false, false, false, false, 1.0, false, false,
-                false, false, 256, BlockTags.INFINIBURN_OVERWORLD.getName(),
-                SpatialStorageDimensionIds.SKY_PROPERTIES_ID, 1.0f);
+    private static void addRegistryDefaults(IDynamicRegistries.Impl registryTracker, CallbackInfoReturnable<?> cir) {

-        Registry.register(registryTracker.func_230520_a_(),
-                SpatialStorageDimensionIds.DIMENSION_TYPE_ID.func_240901_a_(), dimensionType);
-    }
-
-    /**
-     * Insert our custom dimension into the initial registry. <em>This is what will
-     * ultimately lead to the creation of a new World.</em>
-     */
-    @Inject(method = "func_242718_a", at = @At("RETURN"))
-    private static void buildDimensionRegistry(Registry<DimensionType> dimensionTypes, Registry<Biome> biomes,
-            Registry<DimensionSettings> dimensionSettings, long seed,
-            CallbackInfoReturnable<SimpleRegistry<Dimension>> cir) {
-        SimpleRegistry<Dimension> simpleregistry = cir.getReturnValue();
-
-        simpleregistry.register(SpatialStorageDimensionIds.DIMENSION_ID, new Dimension(() -> {
-            return dimensionTypes.func_243576_d(SpatialStorageDimensionIds.DIMENSION_TYPE_ID);
-        }, new SpatialStorageChunkGenerator(biomes)), Lifecycle.stable());
+        registryTracker.func_239774_a_(SpatialStorageDimensionIds.DIMENSION_TYPE_ID,
+                new DimensionType(OptionalLong.of(12000), false, false, false, false, false, false, true, false, false,
+                        256, BlockTags.INFINIBURN_OVERWORLD.getName(), 1.0f));

    }

@@ -1,33 +0,0 @@
-package appeng.mixins.spatial;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-import net.minecraft.block.PortalInfo;
-import net.minecraft.entity.Entity;
-import net.minecraft.world.server.ServerWorld;
-
-import appeng.spatial.SpatialStorageDimensionIds;
-import appeng.spatial.SpatialStorageHelper;
-
-/**
- * This mixin sets the teleport destination, because otherwise Vanilla will not
- * move the player.
- */
-@Mixin(Entity.class)
-public class EntityMixin {
-
-    @Inject(method = "func_241829_a", at = @At("HEAD"), cancellable = true, allow = 1)
-    public void getTeleportTarget(ServerWorld destination, CallbackInfoReturnable<PortalInfo> cri) {
-        // Check if a destination has been set for the entity currently being teleported
-        if (destination.func_234923_W_() == SpatialStorageDimensionIds.WORLD_ID) {
-            PortalInfo target = SpatialStorageHelper.getInstance().getTeleportTarget();
-            if (target != null) {
-                cri.setReturnValue(target);
-            }
-        }
-    }
-
-}
@@ -1,15 +1,15 @@
 package appeng.mixins.spatial;

+import java.util.Optional;
+
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;

 import net.minecraft.client.world.DimensionRenderInfo;
-import net.minecraft.util.ResourceLocation;
-
-import it.unimi.dsi.fastutil.objects.Object2ObjectMap;
+import net.minecraft.util.RegistryKey;
+import net.minecraft.world.DimensionType;

 import appeng.spatial.SpatialStorageDimensionIds;
 import appeng.spatial.SpatialStorageSkyProperties;
@@ -17,12 +17,12 @@ import appeng.spatial.SpatialStorageSkyProperties;
@Mixin(DimensionRenderInfo.class)
 public class SkyPropertiesMixin {

-    @Shadow
-    private static Object2ObjectMap<ResourceLocation, DimensionRenderInfo> field_239208_a_/* BY_IDENTIFIER */;
-
-    @Inject(method = "<clinit>", at = @At("TAIL"))
-    private static void init(CallbackInfo ci) {
-        field_239208_a_.put(SpatialStorageDimensionIds.SKY_PROPERTIES_ID, SpatialStorageSkyProperties.INSTANCE);
+    @Inject(method = "func_239215_a_", at = @At("HEAD"), cancellable = true)
+    private static void byDimensionType(Optional<RegistryKey<DimensionType>> optional,
+            CallbackInfoReturnable<DimensionRenderInfo> ci) {
+        if (optional.orElse(null) == SpatialStorageDimensionIds.DIMENSION_TYPE_ID) {
+            ci.setReturnValue(SpatialStorageSkyProperties.INSTANCE);
+        }
    }

 }
@@ -23,7 +23,7 @@ public class SkyRenderMixin {
    @SuppressWarnings("ConstantConditions")
    @Inject(method = "renderSky(Lcom/mojang/blaze3d/matrix/MatrixStack;F)V", at = @At("HEAD"), cancellable = true)
    public void renderSky(MatrixStack matrices, float tickDelta, CallbackInfo ci) {
-        if (mc.world.func_234923_W_() == SpatialStorageDimensionIds.WORLD_ID) {
+        if (mc.world.func_234922_V_() == SpatialStorageDimensionIds.DIMENSION_TYPE_ID) {
            SpatialSkyRender.getInstance().render(matrices);
            ci.cancel();
        }
@@ -1,26 +0,0 @@
-package appeng.mixins.structure;
-
-import java.util.List;
-import java.util.Map;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-import net.minecraft.world.biome.Biome;
-import net.minecraft.world.gen.feature.StructureFeature;
-import net.minecraft.world.gen.feature.structure.Structure;
-
-/**
- * Allows access to the copy of _all_ structures that is maintained within each
- * instance of {@link Biome}, in order to add our new structure to it. Note that
- * this does not mean the structure will start _generating_ in this biome, it
- * will only continue to generate if an adjacent biome has started the structure
- * and it extends into this one.
- */
-@Mixin(Biome.class)
-public interface BiomeAccessor {
-
-    @Accessor
-    Map<Integer, List<Structure<?>>> getField_242421_g();
-
-}
@@ -1,20 +0,0 @@
-package appeng.mixins.structure;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Invoker;
-
-import net.minecraft.world.gen.feature.IFeatureConfig;
-import net.minecraft.world.gen.feature.StructureFeature;
-import net.minecraft.world.gen.feature.structure.Structure;
-import net.minecraft.world.gen.feature.structure.StructureFeatures;
-
-@Mixin(StructureFeatures.class)
-public interface ConfiguredStructureFeaturesAccessor {
-
-    @Invoker("func_244162_a")
-    static <FC extends IFeatureConfig, F extends Structure<FC>> StructureFeature<FC, F> register(String id,
-            StructureFeature<FC, F> configuredStructureFeature) {
-        throw new AssertionError();
-    }
-
-}
@@ -1,31 +0,0 @@
-package appeng.mixins.structure;
-
-import java.util.List;
-import java.util.function.Supplier;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-import net.minecraft.world.biome.BiomeGenerationSettings;
-import net.minecraft.world.gen.feature.ConfiguredFeature;
-import net.minecraft.world.gen.feature.StructureFeature;
-
-/**
- * Allows the settings in a Biome's generation settings to be modified.
- */
-@Mixin(BiomeGenerationSettings.class)
-public interface GenerationSettingsAccessor {
-
-    @Accessor("field_242484_f")
-    List<List<Supplier<ConfiguredFeature<?, ?>>>> getFeatures();
-
-    @Accessor("field_242484_f")
-    void setFeatures(List<List<Supplier<ConfiguredFeature<?, ?>>>> features);
-
-    @Accessor("field_242485_g")
-    List<Supplier<StructureFeature<?, ?>>> getStructureFeatures();
-
-    @Accessor("field_242485_g")
-    void setStructureFeatures(List<Supplier<StructureFeature<?, ?>>> structureFeatures);
-
-}
@@ -34,7 +34,6 @@ import net.minecraft.item.Items;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.tags.ITag;
 import net.minecraft.tags.ItemTags;
-import net.minecraft.tags.Tag;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.AxisAlignedBB;
@@ -83,10 +82,6 @@ public class AnnihilationPlanePart extends BasicStatePart implements IGridTickab
    public static final ResourceLocation TAG_BLACKLIST = new ResourceLocation(AppEng.MOD_ID,
            "blacklisted/annihilation_plane");

-    private static final ITag.INamedTag<Block> BLOCK_BLACKLIST = BlockTags.makeWrapperTag(TAG_BLACKLIST.toString());
-
-    private static final ITag.INamedTag<Item> ITEM_BLACKLIST = ItemTags.makeWrapperTag(TAG_BLACKLIST.toString());
-
    private static final PlaneModels MODELS = new PlaneModels("part/annihilation_plane", "part/annihilation_plane_on");

    @PartModels
@@ -532,11 +527,13 @@ public class AnnihilationPlanePart extends BasicStatePart implements IGridTickab
    }

    public static boolean isBlockBlacklisted(Block b) {
-        return BLOCK_BLACKLIST.contains(b);
+        ITag<Block> tag = BlockTags.getCollection().getOrCreate(TAG_BLACKLIST);
+        return b.isIn(tag);
    }

    public static boolean isItemBlacklisted(Item i) {
-        return ITEM_BLACKLIST.contains(i);
+        ITag<Item> tag = ItemTags.getCollection().getOrCreate(TAG_BLACKLIST);
+        return i.isIn(tag);
    }

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

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

 import java.util.List;

@@ -14,6 +14,7 @@ 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;
@@ -43,21 +44,17 @@ 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 ITag.INamedTag<Fluid> TAG_BLACKLIST = FluidTags
-            .makeWrapperTag(AppEng.makeId("blacklisted/fluid_annihilation_plane").toString());
+    public static final ResourceLocation TAG_BLACKLIST = new ResourceLocation(AppEng.MOD_ID,
+            "blacklisted/fluid_annihilation_plane");

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

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

 }
@@ -16,7 +16,7 @@
 * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
 */

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

 import javax.annotation.Nonnull;

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

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

 import java.util.ArrayList;
 import java.util.Collections;
@@ -45,18 +45,15 @@ import appeng.api.storage.data.IItemList;
 import appeng.api.util.AEPartLocation;
 import appeng.container.ContainerLocator;
 import appeng.container.ContainerOpener;
+import appeng.container.implementations.FluidFormationPlaneContainer;
 import appeng.core.Api;
-import appeng.fluids.container.FluidFormationPlaneContainer;
-import appeng.fluids.util.AEFluidInventory;
-import appeng.fluids.util.IAEFluidInventory;
-import appeng.fluids.util.IAEFluidTank;
 import appeng.items.parts.PartModels;
 import appeng.me.GridAccessException;
 import appeng.me.storage.MEInventoryHandler;
-import appeng.parts.automation.AbstractFormationPlanePart;
-import appeng.parts.automation.PlaneModelData;
-import appeng.parts.automation.PlaneModels;
 import appeng.util.Platform;
+import appeng.util.fluid.AEFluidInventory;
+import appeng.util.fluid.IAEFluidInventory;
+import appeng.util.fluid.IAEFluidTank;
 import appeng.util.prioritylist.PrecisePriorityList;

 public class FluidFormationPlanePart extends AbstractFormationPlanePart<IAEFluidStack> implements IAEFluidInventory {
@@ -16,7 +16,7 @@
 * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
 */

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

 import javax.annotation.Nonnull;

@@ -44,11 +44,11 @@ import appeng.api.storage.IMEMonitor;
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.core.AppEng;
 import appeng.core.settings.TickRates;
-import appeng.fluids.util.AEFluidStack;
 import appeng.items.parts.PartModels;
 import appeng.me.GridAccessException;
 import appeng.me.helpers.MachineSource;
 import appeng.parts.PartModel;
+import appeng.util.fluid.AEFluidStack;

 /**
 * @author BrockWS
@@ -1,5 +1,5 @@

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

 import java.util.Random;

@@ -37,18 +37,17 @@ import appeng.api.util.AEPartLocation;
 import appeng.api.util.IConfigManager;
 import appeng.container.ContainerLocator;
 import appeng.container.ContainerOpener;
+import appeng.container.implementations.FluidLevelEmitterContainer;
 import appeng.core.Api;
 import appeng.core.AppEng;
-import appeng.fluids.container.FluidLevelEmitterContainer;
-import appeng.fluids.util.AEFluidInventory;
-import appeng.fluids.util.IAEFluidInventory;
-import appeng.fluids.util.IAEFluidTank;
 import appeng.items.parts.PartModels;
 import appeng.me.GridAccessException;
 import appeng.parts.PartModel;
-import appeng.parts.automation.UpgradeablePart;
 import appeng.util.IConfigManagerHost;
 import appeng.util.Platform;
+import appeng.util.fluid.AEFluidInventory;
+import appeng.util.fluid.IAEFluidInventory;
+import appeng.util.fluid.IAEFluidTank;

 public class FluidLevelEmitterPart extends UpgradeablePart
        implements IStackWatcherHost, IConfigManagerHost, IAEFluidInventory, IMEMonitorHandlerReceiver<IAEFluidStack> {
@@ -379,12 +379,12 @@ public class FormationPlanePart extends AbstractFormationPlanePart<IAEItemStack>

        @Override
        public BlockPos getPos() {
-            return this.func_242401_i().getPos();
+            return this.rayTraceResult.getPos();
        }

        @Override
        public boolean canPlace() {
-            return getWorld().getBlockState(this.getPos()).isReplaceable(this);
+            return this.world.getBlockState(this.rayTraceResult.getPos()).isReplaceable(this);
        }

        @Override
@@ -16,7 +16,7 @@
 * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
 */

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

 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
@@ -39,13 +39,12 @@ import appeng.api.storage.channels.IFluidStorageChannel;
 import appeng.api.util.AECableType;
 import appeng.container.ContainerLocator;
 import appeng.container.ContainerOpener;
+import appeng.container.implementations.FluidIOContainer;
 import appeng.core.Api;
-import appeng.fluids.container.FluidIOContainer;
-import appeng.fluids.util.AEFluidInventory;
-import appeng.fluids.util.IAEFluidTank;
 import appeng.me.GridAccessException;
-import appeng.parts.automation.UpgradeablePart;
 import appeng.util.Platform;
+import appeng.util.fluid.AEFluidInventory;
+import appeng.util.fluid.IAEFluidTank;

 /**
 * @author BrockWS
@@ -16,7 +16,7 @@
 * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
 */

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

 import java.util.ArrayList;
 import java.util.Arrays;
@@ -39,10 +39,10 @@ import appeng.api.storage.channels.IFluidStorageChannel;
 import appeng.api.storage.data.IAEFluidStack;
 import appeng.api.storage.data.IItemList;
 import appeng.core.Api;
-import appeng.fluids.util.AEFluidStack;
 import appeng.me.GridAccessException;
 import appeng.me.helpers.IGridProxyable;
 import appeng.me.storage.ITickingMonitor;
+import appeng.util.fluid.AEFluidStack;

 /**
 * Wraps an Fluid Handler in such a way that it can be used as an IMEInventory
@@ -16,7 +16,7 @@
 * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
 */

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

 import java.util.EnumSet;

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

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

 import java.util.Collections;
 import java.util.List;
@@ -65,13 +65,10 @@ import appeng.api.util.AEPartLocation;
 import appeng.capabilities.Capabilities;
 import appeng.container.ContainerLocator;
 import appeng.container.ContainerOpener;
+import appeng.container.implementations.FluidStorageBusContainer;
 import appeng.core.Api;
 import appeng.core.AppEng;
 import appeng.core.settings.TickRates;
-import appeng.fluids.container.FluidStorageBusContainer;
-import appeng.fluids.util.AEFluidInventory;
-import appeng.fluids.util.IAEFluidInventory;
-import appeng.fluids.util.IAEFluidTank;
 import appeng.helpers.IInterfaceHost;
 import appeng.items.parts.PartModels;
 import appeng.me.GridAccessException;
@@ -79,8 +76,10 @@ import appeng.me.helpers.MachineSource;
 import appeng.me.storage.ITickingMonitor;
 import appeng.me.storage.MEInventoryHandler;
 import appeng.parts.PartModel;
-import appeng.parts.misc.SharedStorageBusPart;
 import appeng.util.Platform;
+import appeng.util.fluid.AEFluidInventory;
+import appeng.util.fluid.IAEFluidInventory;
+import appeng.util.fluid.IAEFluidTank;
 import appeng.util.prioritylist.FuzzyPriorityList;
 import appeng.util.prioritylist.PrecisePriorityList;

@@ -16,7 +16,7 @@
 * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
 */

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

 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.inventory.container.ContainerType;
@@ -24,11 +24,10 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;

 import appeng.api.parts.IPartModel;
+import appeng.container.implementations.FluidTerminalContainer;
 import appeng.core.AppEng;
-import appeng.fluids.container.FluidTerminalContainer;
 import appeng.items.parts.PartModels;
 import appeng.parts.PartModel;
-import appeng.parts.reporting.AbstractTerminalPart;

 /**
 * @author BrockWS
@@ -110,7 +110,7 @@ public class SpatialStorageCommand implements ISubCommand {
            }
        }

-        throw new CommandException(new StringTextComponent("Couldn't find a plot for the current position."));
+        throw new CommandException(ITextComponent.func_241827_a_("Couldn't find a plot for the current position."));

    }

@@ -120,7 +120,8 @@ public class SpatialStorageCommand implements ISubCommand {
    private void teleportBack(CommandSource source, SpatialStoragePlot plot) {
        TransitionInfo lastTransition = plot.getLastTransition();
        if (lastTransition == null) {
-            throw new CommandException(new StringTextComponent("This plot doesn't have a last known transition."));
+            throw new CommandException(
+                    ITextComponent.func_241827_a_("This plot doesn't have a last known transition."));
        }

        String command = getTeleportCommand(lastTransition.getWorldId(), lastTransition.getMin().add(0, 1, 0));
@@ -211,7 +212,7 @@ public class SpatialStorageCommand implements ISubCommand {

        if (!(cell.getItem() instanceof SpatialStorageCellItem)) {
            throw new CommandException(
-                    new StringTextComponent("Storage cell items don't implement the storage cell interface!"));
+                    ITextComponent.func_241827_a_("Storage cell items don't implement the storage cell interface!"));
        }

        SpatialStorageCellItem spatialCellItem = (SpatialStorageCellItem) cell.getItem();
@@ -320,7 +321,7 @@ public class SpatialStorageCommand implements ISubCommand {
            }
        }

-        throw new CommandException(new StringTextComponent("Couldn't find a plot for the current position."));
+        throw new CommandException(ITextComponent.func_241827_a_("Couldn't find a plot for the current position."));
    }

 }
@@ -172,9 +172,8 @@ public class TestMeteoritesCommand implements ISubCommand {
            msg.append(getClickablePosition(world, settings, pos)).append(restOfLine);

            // Add a tooltip
-            String biomeId = world.func_242406_i(pos).map(bk -> bk.func_240901_a_().toString()).orElse("unknown");
            ITextComponent tooltip = new StringTextComponent(settings.toString() + "\nBiome: ").deepCopy()
-                    .appendString(biomeId);
+                    .append(world.getBiome(pos).getDisplayName());
            msg.modifyStyle(style -> style.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, tooltip)));

            sender.sendFeedback(msg, true);
@@ -31,7 +31,8 @@ import net.minecraft.block.Block;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.ChunkPos;
-import net.minecraft.world.IServerWorld;
+import net.minecraft.world.IWorld;
+import net.minecraft.world.World;
 import net.minecraft.world.chunk.IChunk;
 import net.minecraft.world.server.ServerWorld;
 import net.minecraftforge.event.world.WorldEvent;
@@ -91,14 +92,18 @@ public final class CompassService {
        }
    }

-    public void tryUpdateArea(final IServerWorld w, ChunkPos chunkPos) {
+    public void tryUpdateArea(final IWorld w, ChunkPos chunkPos) {
        // If this seems weird: during worldgen, WorldAccess is a specific region, but
        // getWorld is
        // still the server world. We do need to use the world access to get the chunk
        // in question
        // though, since during worldgen, it's not comitted to the actual world yet.
+        World world = w.getWorld();
+        if (!(world instanceof ServerWorld)) {
+            return;
+        }
        IChunk chunk = w.getChunk(chunkPos.x, chunkPos.z);
-        updateArea(w.getWorld(), chunk);
+        updateArea((ServerWorld) world, chunk);
    }

    public void updateArea(final ServerWorld w, IChunk chunk) {
@@ -323,7 +323,7 @@ public class CachedPlane {

                WorldData.instance().compassData().service().updateArea(this.getWorld(), c);

-                SChunkDataPacket cdp = new SChunkDataPacket(c, verticalBits);
+                SChunkDataPacket cdp = new SChunkDataPacket(c, verticalBits, false);
                world.getChunkProvider().chunkManager.getTrackingPlayers(c.getPos(), false)
                        .forEach(spe -> spe.connection.sendPacket(cdp));
            }
@@ -20,25 +20,33 @@ package appeng.spatial;

 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.biome.BiomeAmbience;
-import net.minecraft.world.biome.BiomeGenerationSettings;
-import net.minecraft.world.biome.MobSpawnInfo;
 import net.minecraft.world.gen.surfacebuilders.ConfiguredSurfaceBuilder;
 import net.minecraft.world.gen.surfacebuilders.SurfaceBuilder;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;

 /**
 * The single biome used within the spatial storage world.
 */
-public class SpatialStorageBiome {
+public class SpatialStorageBiome extends Biome {

-    public static final Biome INSTANCE = new Biome.Builder()
-            .func_242457_a(new BiomeGenerationSettings.Builder().func_242517_a(
-                    new ConfiguredSurfaceBuilder<>(SurfaceBuilder.NOPE, SurfaceBuilder.STONE_STONE_GRAVEL_CONFIG))
-                    .func_242508_a())
-            .precipitation(Biome.RainType.NONE).category(Biome.Category.NONE).depth(0).scale(1)
-            // Copied from the vanilla void biome
-            .temperature(0.5F).downfall(0.5F)
-            .func_235097_a_(new BiomeAmbience.Builder().setWaterColor(4159204).setWaterFogColor(329011).setFogColor(0)
-                    .func_242539_d(0x111111).build())
-            .func_242458_a(new MobSpawnInfo.Builder().func_242572_a(0).func_242577_b()).func_242455_a();
+    public static final SpatialStorageBiome INSTANCE = new SpatialStorageBiome();
+
+    public SpatialStorageBiome() {
+        super(new Biome.Builder()
+                .surfaceBuilder(
+                        new ConfiguredSurfaceBuilder<>(SurfaceBuilder.NOPE, SurfaceBuilder.STONE_STONE_GRAVEL_CONFIG))
+                .precipitation(RainType.NONE).category(Category.NONE).depth(0).scale(1)
+                // Copied from the vanilla void biome
+                .temperature(0.5F).downfall(0.5F).func_235097_a_(new BiomeAmbience.Builder().setWaterColor(4159204)
+                        .setWaterFogColor(329011).setFogColor(0).build())
+                .parent(null));
+    }
+
+    @Override
+    @OnlyIn(Dist.CLIENT)
+    public int getSkyColor() {
+        return 0x111111;
+    }

 }
@@ -23,16 +23,15 @@ import java.util.Collections;
 import java.util.Optional;

 import com.mojang.serialization.Codec;
+import com.mojang.serialization.codecs.RecordCodecBuilder;

 import net.minecraft.block.BlockState;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.registry.Registry;
-import net.minecraft.util.registry.RegistryLookupCodec;
 import net.minecraft.world.Blockreader;
 import net.minecraft.world.IBlockReader;
 import net.minecraft.world.IWorld;
-import net.minecraft.world.biome.Biome;
 import net.minecraft.world.biome.BiomeManager;
+import net.minecraft.world.biome.provider.BiomeProvider;
 import net.minecraft.world.biome.provider.SingleBiomeProvider;
 import net.minecraft.world.chunk.IChunk;
 import net.minecraft.world.gen.ChunkGenerator;
@@ -49,28 +48,18 @@ import appeng.core.Api;
 */
 public class SpatialStorageChunkGenerator extends ChunkGenerator {

-    /**
-     * This codec is necessary to restore the actual instance of the Biome we use,
-     * since it is sources from the dynamic registries and <em>must be the same
-     * object as in the registry!</em>.
-     * <p>
-     * If it was not the same object, then the Object->ID lookup would fail since it
-     * uses an identity hashmap internally.
-     */
-    public static final Codec<SpatialStorageChunkGenerator> CODEC = RegistryLookupCodec
-            .func_244331_a(Registry.BIOME_KEY)
-            .xmap(SpatialStorageChunkGenerator::new, SpatialStorageChunkGenerator::getBiomeRegistry).stable().codec();
-
-    private final Registry<Biome> biomeRegistry;
-
    private final Blockreader columnSample;

+    public static final SpatialStorageChunkGenerator INSTANCE = new SpatialStorageChunkGenerator();
+
+    public static final Codec<SpatialStorageChunkGenerator> CODEC = RecordCodecBuilder
+            .create((instance) -> instance.stable(INSTANCE));
+
    private final BlockState defaultBlockState;

-    public SpatialStorageChunkGenerator(Registry<Biome> biomeRegistry) {
-        super(createBiomeSource(biomeRegistry), createSettings());
+    private SpatialStorageChunkGenerator() {
+        super(createBiomeProvider(), createSettings());
        this.defaultBlockState = Api.instance().definitions().blocks().matrixFrame().block().getDefaultState();
-        this.biomeRegistry = biomeRegistry;

        // Vertical sample is mostly used for Feature generation, for those purposes
        // we're all filled with matrix blocks
@@ -84,13 +73,8 @@ public class SpatialStorageChunkGenerator extends ChunkGenerator {
        return CODEC;
    }

-    private static SingleBiomeProvider createBiomeSource(Registry<Biome> biomeRegistry) {
-        return new SingleBiomeProvider(
-                biomeRegistry.func_243576_d/* getOrThrow */(SpatialStorageDimensionIds.BIOME_KEY));
-    }
-
-    public Registry<Biome> getBiomeRegistry() {
-        return biomeRegistry;
+    private static BiomeProvider createBiomeProvider() {
+        return new SingleBiomeProvider(SpatialStorageBiome.INSTANCE);
    }

    private static DimensionStructuresSettings createSettings() {
@@ -6,7 +6,6 @@ import net.minecraft.util.registry.Registry;
 import net.minecraft.world.Dimension;
 import net.minecraft.world.DimensionType;
 import net.minecraft.world.World;
-import net.minecraft.world.biome.Biome;

 import appeng.core.AppEng;
 import appeng.mixins.spatial.DimensionTypeMixin;
@@ -34,13 +33,13 @@ public final class SpatialStorageDimensionIds {
     * ID of the {@link net.minecraft.world.biome.Biome} used for the spatial
     * storage world.
     */
-    public static final RegistryKey<Biome> BIOME_KEY = RegistryKey.func_240903_a_(Registry.BIOME_KEY,
-            AppEng.makeId("spatial_storage"));
+    public static final ResourceLocation BIOME_ID = AppEng.makeId("spatial_storage");

    /**
     * ID of the {@link Dimension} used for the spatial storage dimension.
     * <p>
-     * This is defined in {@link appeng.mixins.spatial.DimensionTypeMixin}.
+     * This is defined in
+     * <code>data/minecraft/dimension/appliedenergistics2/spatial_storage.json</code>
     */
    public static final RegistryKey<Dimension> DIMENSION_ID = RegistryKey.func_240903_a_(Registry.DIMENSION_KEY,
            AppEng.makeId("spatial_storage"));
@@ -52,12 +51,6 @@ public final class SpatialStorageDimensionIds {
    public static final RegistryKey<World> WORLD_ID = RegistryKey.func_240903_a_(Registry.WORLD_KEY,
            AppEng.makeId("spatial_storage"));

-    /**
-     * ID of the {@link net.minecraft.client.world.DimensionRenderInfo} used for the
-     * spatial storage world.
-     */
-    public static ResourceLocation SKY_PROPERTIES_ID = AppEng.makeId("spatial_storage");
-
    private SpatialStorageDimensionIds() {
    }

@@ -25,13 +25,11 @@ import java.util.function.Function;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
-import net.minecraft.block.PortalInfo;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.ServerPlayerEntity;
 import net.minecraft.util.math.AxisAlignedBB;
 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 net.minecraft.world.chunk.ChunkStatus;
 import net.minecraft.world.server.ServerWorld;
@@ -52,16 +50,6 @@ public class SpatialStorageHelper {
        return instance;
    }

-    private final ThreadLocal<PortalInfo> teleportTarget = new ThreadLocal<>();
-
-    /**
-     * If an entity is currently being teleported, this will return the target
-     * within the target dimension.
-     */
-    public PortalInfo getTeleportTarget() {
-        return teleportTarget.get();
-    }
-
    /**
     * Mostly from dimensional doors.. which mostly got it form X-Comp.
     *
@@ -109,25 +97,12 @@ public class SpatialStorageHelper {
        newWorld.getChunkProvider().getChunk(MathHelper.floor(link.x) >> 4, MathHelper.floor(link.z) >> 4,
                ChunkStatus.FULL, true);

-        if (entity instanceof ServerPlayerEntity && link.dim.func_234923_W_() == SpatialStorageDimensionIds.WORLD_ID) {
+        if (entity instanceof ServerPlayerEntity
+                && link.dim.func_234922_V_() == SpatialStorageDimensionIds.DIMENSION_TYPE_ID) {
            AppEng.instance().getAdvancementTriggers().getSpatialExplorer().trigger((ServerPlayerEntity) entity);
        }

-        // Store in a threadlocal so that EntityMixin can return it for the Vanilla
-        // logic to use
-        teleportTarget.set(new PortalInfo(new Vector3d(link.x, link.y, link.z), Vector3d.ZERO, entity.rotationYaw,
-                entity.rotationPitch));
-        try {
-            entity = entity.changeDimension(link.dim, new ITeleporter() {
-                @Override
-                public Entity placeEntity(Entity entity, ServerWorld currentWorld, ServerWorld destWorld, float yaw,
-                        Function<Boolean, Entity> repositionEntity) {
-                    return repositionEntity.apply(false);
-                }
-            });
-        } finally {
-            teleportTarget.remove();
-        }
+        entity.changeDimension(link.dim, new METeleporter(link));

        if (!passengersOnOtherSide.isEmpty()) {
            for (Entity passanger : passengersOnOtherSide) {
@@ -263,4 +238,22 @@ public class SpatialStorageHelper {
        }
    }

+    private static class METeleporter implements ITeleporter {
+
+        private final TelDestination destination;
+
+        METeleporter(final TelDestination d) {
+            this.destination = d;
+        }
+
+        @Override
+        public Entity placeEntity(Entity entity, ServerWorld currentWorld, ServerWorld destWorld, float yaw,
+                Function<Boolean, Entity> repositionEntity) {
+            Entity newEntity = repositionEntity.apply(false);
+            newEntity.rotationYaw = yaw;
+            newEntity.setPositionAndUpdate(this.destination.x, this.destination.y, this.destination.z);
+            newEntity.setMotion(0, 0, 0);
+            return newEntity;
+        }
+    }
 }
@@ -16,7 +16,7 @@
 * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
 */

-package appeng.fluids.tile;
+package appeng.tile.misc;

 import java.util.EnumSet;

@@ -45,10 +45,10 @@ import appeng.api.util.AECableType;
 import appeng.api.util.AEPartLocation;
 import appeng.api.util.DimensionalCoord;
 import appeng.api.util.IConfigManager;
+import appeng.container.implementations.FluidInterfaceContainer;
 import appeng.core.Api;
-import appeng.fluids.container.FluidInterfaceContainer;
-import appeng.fluids.helper.DualityFluidInterface;
-import appeng.fluids.helper.IFluidInterfaceHost;
+import appeng.helpers.DualityFluidInterface;
+import appeng.helpers.IFluidInterfaceHost;
 import appeng.helpers.IPriorityHost;
 import appeng.tile.grid.AENetworkTileEntity;

@@ -91,10 +91,9 @@ import appeng.api.storage.data.IAEStack;
 import appeng.api.util.AEColor;
 import appeng.api.util.IConfigManager;
 import appeng.capabilities.Capabilities;
+import appeng.container.implementations.FluidTerminalContainer;
 import appeng.container.implementations.MEMonitorableContainer;
 import appeng.core.Api;
-import appeng.fluids.container.FluidTerminalContainer;
-import appeng.fluids.util.AEFluidStack;
 import appeng.helpers.IPriorityHost;
 import appeng.me.GridAccessException;
 import appeng.me.helpers.MEMonitorHandler;
@@ -105,6 +104,7 @@ import appeng.tile.inventory.AppEngInternalInventory;
 import appeng.util.ConfigManager;
 import appeng.util.IConfigManagerHost;
 import appeng.util.Platform;
+import appeng.util.fluid.AEFluidStack;
 import appeng.util.helpers.ItemHandlerUtil;
 import appeng.util.inv.InvOperation;
 import appeng.util.inv.WrapperChainedItemHandler;
@@ -105,12 +105,12 @@ import appeng.core.AEConfig;
 import appeng.core.AELog;
 import appeng.core.Api;
 import appeng.core.stats.AeStats;
-import appeng.fluids.util.AEFluidStack;
 import appeng.hooks.TickHandler;
 import appeng.integration.abstraction.JEIFacade;
 import appeng.me.GridAccessException;
 import appeng.me.GridNode;
 import appeng.me.helpers.AENetworkProxy;
+import appeng.util.fluid.AEFluidStack;
 import appeng.util.helpers.ItemComparisonHelper;
 import appeng.util.helpers.P2PHelper;
 import appeng.util.item.AEItemStack;
@@ -1,5 +1,5 @@

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

 import java.util.Objects;

--- a/Show More
+++ b/Show More