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
144 changed files with 787 additions and 1869 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.3.2.25
-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;
@@ -15,6 +14,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.StringTextComponent;
 import net.minecraft.util.text.TranslationTextComponent;
+import net.minecraftforge.common.util.LazyOptional;
 import net.minecraftforge.fluids.FluidAttributes;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidUtil;
@@ -24,8 +24,8 @@ import appeng.api.storage.data.IAEFluidStack;
 import appeng.client.gui.widgets.CustomSlotWidget;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.FluidSlotPacket;
-import appeng.fluids.util.AEFluidStack;
-import appeng.fluids.util.IAEFluidTank;
+import appeng.util.fluid.AEFluidStack;
+import appeng.util.fluid.IAEFluidTank;

 public class FluidSlotWidget extends CustomSlotWidget {
    private final IAEFluidTank fluids;
@@ -73,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) {
@@ -18,7 +18,6 @@

 package appeng.client.render.cablebus;

-import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.EnumMap;
@@ -52,21 +51,12 @@ import net.minecraftforge.client.model.data.IModelData;
 import appeng.api.parts.IPartModel;
 import appeng.api.util.AECableType;
 import appeng.api.util.AEColor;
-import appeng.metrics.Metrics;

 public class CableBusBakedModel implements IBakedModel {

    // The number of quads overall that will be cached
    private static final int CACHE_QUAD_COUNT = 5000;

-    // Keep a weak-ref to the last created cache for reporting metrics
-    private static WeakReference<LoadingCache<CableBusRenderState, List<BakedQuad>>> cacheForMetrics = new WeakReference<>(
-            null);
-
-    static {
-        Metrics.cache("cable_bus_model_cache", () -> cacheForMetrics.get());
-    }
-
    private final LoadingCache<CableBusRenderState, List<BakedQuad>> cableModelCache;

    private final CableBuilder cableBuilder;
@@ -84,7 +74,6 @@ public class CableBusBakedModel implements IBakedModel {
        this.partModels = partModels;
        this.particleTexture = particleTexture;
        this.cableModelCache = CacheBuilder.newBuilder()//
-                .recordStats()//
                .maximumWeight(CACHE_QUAD_COUNT)//
                .weigher((Weigher<CableBusRenderState, List<BakedQuad>>) (key, value) -> value.size())//
                .build(new CacheLoader<CableBusRenderState, List<BakedQuad>>() {
@@ -95,7 +84,6 @@ public class CableBusBakedModel implements IBakedModel {
                        return model;
                    }
                });
-        cacheForMetrics = new WeakReference<>(cableModelCache);
    }

    @Override
@@ -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,25 +1,26 @@

-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;
 import net.minecraft.inventory.container.IContainerListener;
 import net.minecraft.item.ItemStack;
+import net.minecraftforge.common.util.LazyOptional;
 import net.minecraftforge.fluids.FluidStack;
 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;
@@ -39,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;

@@ -404,10 +404,6 @@ public final class AEConfig {
        return COMMON.improvedFluidMultiplier.get().floatValue();
    }

-    public int getPrometheusMetricsServerPort() {
-        return COMMON.prometheusMetricsServer.get();
-    }
-
    // Setters keep visibility as low as possible.

    private static class ClientConfig {
@@ -478,7 +474,6 @@ public final class AEConfig {
        public final BooleanValue removeCrashingItemsOnLoad;
        public final ConfigValue<Integer> formationPlaneEntityLimit;
        public final ConfigValue<Integer> craftingCalculationTimePerTick;
-        public final ConfigValue<Integer> prometheusMetricsServer;

        // Spatial IO/Dimension
        public final ConfigValue<Double> spatialPowerExponent;
@@ -563,12 +558,6 @@ public final class AEConfig {
                    .define("removeCrashingItemsOnLoad", false);
            builder.pop();

-            builder.push("metrics");
-            prometheusMetricsServer = builder.comment(
-                    "Enables the Prometheus Metrics exporting endpoint on 127.0.0.1 on this port number. 0 to disable.")
-                    .define("prometheusMetricsServer", 0);
-            builder.pop();
-
            builder.push("automation");
            formationPlaneEntityLimit = builder.comment("TODO").define("formationPlaneEntityLimit", 128);
            builder.pop();
@@ -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;
@@ -66,7 +67,6 @@ import appeng.entity.TinyTNTPrimedEntity;
 import appeng.entity.TinyTNTPrimedRenderer;
 import appeng.hooks.TickHandler;
 import appeng.integration.Integrations;
-import appeng.metrics.endpoint.PrometheusEndpoint;
 import appeng.parts.PartPlacement;
 import appeng.server.ServerHelper;

@@ -91,8 +91,6 @@ public final class AppEng {
        }
        INSTANCE = this;

-        startMetricsServer();
-
        ModLoadingContext.get().registerConfig(ModConfig.Type.CLIENT, AEConfig.CLIENT_SPEC);
        ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, AEConfig.COMMON_SPEC);

@@ -103,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);
@@ -111,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);
@@ -129,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);
@@ -151,20 +143,6 @@ public final class AppEng {
        registerNetworkHandler();

        AddonLoader.loadAddons(Api.INSTANCE);
-
-        startMetricsServer();
-    }
-
-    private void startMetricsServer() {
-        int prometheusPort = AEConfig.instance().getPrometheusMetricsServerPort();
-        if (prometheusPort != 0) {
-            try {
-                AELog.info("Starting Prometheus Metrics Server on Port %s", prometheusPort);
-                new PrometheusEndpoint("localhost", prometheusPort);
-            } catch (Exception e) {
-                AELog.warn("Failed to start Prometheus Metrics-Server: %s", e);
-            }
-        }
    }

    @OnlyIn(Dist.CLIENT)
@@ -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);
-    }
-
-}
@@ -22,6 +22,7 @@ import java.util.function.Supplier;

 import net.minecraft.advancements.CriteriaTriggers;
 import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.ScreenManager;
 import net.minecraft.client.particle.ParticleManager;
@@ -32,7 +33,17 @@ import net.minecraft.item.crafting.IRecipeSerializer;
 import net.minecraft.particles.ParticleType;
 import net.minecraft.tileentity.TileEntityType;
 import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.registry.Registry;
 import net.minecraft.world.World;
+import net.minecraft.world.biome.Biome;
+import net.minecraft.world.gen.GenerationStage;
+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;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.client.event.ColorHandlerEvent;
@@ -51,12 +62,14 @@ import net.minecraftforge.fml.event.server.FMLServerStartingEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 import net.minecraftforge.fml.loading.FMLEnvironment;
 import net.minecraftforge.fml.network.IContainerFactory;
+import net.minecraftforge.registries.ForgeRegistries;
 import net.minecraftforge.registries.IForgeRegistry;

 import appeng.api.config.Upgrades;
 import appeng.api.definitions.IBlocks;
 import appeng.api.definitions.IItems;
 import appeng.api.definitions.IParts;
+import appeng.api.features.AEFeature;
 import appeng.api.features.IRegistryContainer;
 import appeng.api.features.IWirelessTermHandler;
 import appeng.api.features.IWorldGen;
@@ -87,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;
@@ -146,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;
@@ -173,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;
@@ -200,14 +213,22 @@ 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;
 import appeng.recipes.handlers.GrinderRecipeSerializer;
 import appeng.recipes.handlers.InscriberRecipeSerializer;
 import appeng.server.AECommand;
+import appeng.spatial.SpatialStorageBiome;
+import appeng.spatial.SpatialStorageChunkGenerator;
+import appeng.spatial.SpatialStorageDimensionIds;
 import appeng.tile.AEBaseTileEntity;
 import appeng.tile.crafting.MolecularAssemblerRenderer;
+import appeng.worldgen.ChargedQuartzOreConfig;
+import appeng.worldgen.ChargedQuartzOreFeature;
+import appeng.worldgen.meteorite.MeteoriteStructure;
+import appeng.worldgen.meteorite.MeteoriteStructurePiece;

 final class Registration {

@@ -661,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;
@@ -312,7 +312,7 @@ public final class ApiItems implements IItems {

        GrowingCrystalEntity.TYPE = registry
                .<GrowingCrystalEntity>entity("growing_crystal", GrowingCrystalEntity::new, EntityClassification.MISC)
-                .customize(builder -> builder.size(0.25F, 0.4F)).build();
+                .customize(builder -> builder.size(0.25F, 0.25F)).build();

        // rv1
        this.encodedPattern = registry.item("encoded_pattern", EncodedPatternItem::new)
@@ -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;
@@ -18,27 +18,15 @@

 package appeng.core.sync.packets;

-import java.util.Arrays;
-
-import javax.annotation.Nullable;
-
-import com.google.common.base.Preconditions;
-import com.mojang.datafixers.util.Pair;
-
 import io.netty.buffer.Unpooled;

 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.ServerPlayerEntity;
 import net.minecraft.inventory.container.Container;
 import net.minecraft.item.ItemStack;
-import net.minecraft.item.crafting.IRecipe;
-import net.minecraft.item.crafting.IRecipeSerializer;
-import net.minecraft.item.crafting.Ingredient;
-import net.minecraft.item.crafting.ShapedRecipe;
+import net.minecraft.nbt.CompoundNBT;
+import net.minecraft.nbt.ListNBT;
 import net.minecraft.network.PacketBuffer;
-import net.minecraft.util.NonNullList;
-import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.common.crafting.IShapedRecipe;
 import net.minecraftforge.items.IItemHandler;

 import appeng.api.config.Actionable;
@@ -52,10 +40,8 @@ import appeng.api.networking.storage.IStorageGrid;
 import appeng.api.storage.IMEMonitor;
 import appeng.api.storage.channels.IItemStorageChannel;
 import appeng.api.storage.data.IAEItemStack;
-import appeng.container.implementations.PatternTermContainer;
 import appeng.core.Api;
 import appeng.core.sync.BasePacket;
-import appeng.core.sync.BasePacketHandler;
 import appeng.core.sync.network.INetworkInfo;
 import appeng.helpers.IContainerCraftingPacket;
 import appeng.items.storage.ViewCellItem;
@@ -68,289 +54,152 @@ import appeng.util.prioritylist.IPartitionList;

 public class JEIRecipePacket extends BasePacket {

-    /**
-     * Transmit only a recipe ID.
-     */
-    private static final int INLINE_RECIPE_NONE = 1;
-
-    /**
-     * Transmit the information about the recipe we actually need. This is
-     * explicitly limited since this is untrusted client->server info.
-     */
-    private static final int INLINE_RECIPE_SHAPED = 2;
-
-    private ResourceLocation recipeId;
-    /**
-     * This is optional, in case the client already knows it could not resolve the
-     * recipe id.
-     */
-    @Nullable
-    private IRecipe<?> recipe;
-    private boolean crafting;
+    private ItemStack[][] recipe;

    public JEIRecipePacket(final PacketBuffer stream) {
-        this.crafting = stream.readBoolean();
-        final String id = stream.readString(Short.MAX_VALUE);
-        this.recipeId = new ResourceLocation(id);
-
-        int inlineRecipeType = stream.readVarInt();
-        switch (inlineRecipeType) {
-            case INLINE_RECIPE_NONE:
-                break;
-            case INLINE_RECIPE_SHAPED:
-                recipe = IRecipeSerializer.CRAFTING_SHAPED.read(this.recipeId, stream);
-                break;
-            default:
-                throw new IllegalArgumentException("Invalid inline recipe type.");
+        final CompoundNBT comp = stream.readCompoundTag();
+        if (comp != null) {
+            this.recipe = new ItemStack[9][];
+            for (int x = 0; x < this.recipe.length; x++) {
+                final ListNBT list = comp.getList("#" + x, 10);
+                if (list.size() > 0) {
+                    this.recipe[x] = new ItemStack[list.size()];
+                    for (int y = 0; y < list.size(); y++) {
+                        this.recipe[x][y] = ItemStack.read(list.getCompound(y));
+                    }
+                }
+            }
        }
    }

-    /**
-     * Sends a recipe identified by the given recipe ID to the server for either
-     * filling a crafting grid or a pattern.
-     */
-    public JEIRecipePacket(final ResourceLocation recipeId, final boolean crafting) {
-        PacketBuffer data = createCommonHeader(recipeId, crafting, INLINE_RECIPE_NONE);
-        this.configureWrite(data);
-    }
-
-    /**
-     * Sends a recipe to the server for either filling a crafting grid or a pattern.
-     * <p>
-     * Prefer the id-based constructor above whereever possible.
-     */
-    public JEIRecipePacket(final ShapedRecipe recipe, final boolean crafting) {
-        PacketBuffer data = createCommonHeader(recipe.getId(), crafting, INLINE_RECIPE_SHAPED);
-        IRecipeSerializer.CRAFTING_SHAPED.write(data, recipe);
-        this.configureWrite(data);
-    }
-
-    private PacketBuffer createCommonHeader(ResourceLocation recipeId, boolean crafting, int inlineRecipeType) {
+    // api
+    public JEIRecipePacket(final CompoundNBT recipe) {
        final PacketBuffer data = new PacketBuffer(Unpooled.buffer());

        data.writeInt(this.getPacketID());
-        data.writeBoolean(crafting);
-        data.writeResourceLocation(recipeId);
-        data.writeVarInt(inlineRecipeType);

-        return data;
+        data.writeCompoundTag(recipe);
+
+        this.configureWrite(data);
    }

-    /**
-     * Servside handler for this packet.
-     * <p>
-     * Makes use of {@link Preconditions#checkArgument(boolean)} as the
-     * {@link BasePacketHandler} is catching them and in general these cases should
-     * never happen except in an error case and should be logged then.
-     */
    @Override
    public void serverPacketData(final INetworkInfo manager, final PlayerEntity player) {
-        // Setup and verification
        final ServerPlayerEntity pmp = (ServerPlayerEntity) player;
        final Container con = pmp.openContainer;
-        Preconditions.checkArgument(con instanceof IContainerCraftingPacket);

-        IRecipe<?> recipe = player.getEntityWorld().getRecipeManager().getRecipe(this.recipeId).orElse(null);
-        if (recipe == null && this.recipe != null) {
-            // Certain recipes (i.e. AE2 facades) are represented in JEI as ShapedRecipe's,
-            // while in reality they
-            // are special recipes. Those recipes are sent across the wire...
-            recipe = this.recipe;
+        if (!(con instanceof IContainerCraftingPacket)) {
+            return;
        }
-        Preconditions.checkArgument(recipe != null);

        final IContainerCraftingPacket cct = (IContainerCraftingPacket) con;
        final IGridNode node = cct.getNetworkNode();

-        Preconditions.checkArgument(node != null);
+        if (node == null) {
+            return;
+        }

        final IGrid grid = node.getGrid();
-        Preconditions.checkArgument(grid != null);
+        if (grid == null) {
+            return;
+        }

        final IStorageGrid inv = grid.getCache(IStorageGrid.class);
-        Preconditions.checkArgument(inv != null);
-
-        final ISecurityGrid security = grid.getCache(ISecurityGrid.class);
-        Preconditions.checkArgument(security != null);
-
        final IEnergyGrid energy = grid.getCache(IEnergyGrid.class);
+        final ISecurityGrid security = grid.getCache(ISecurityGrid.class);
        final ICraftingGrid crafting = grid.getCache(ICraftingGrid.class);
        final IItemHandler craftMatrix = cct.getInventoryByName("crafting");
        final IItemHandler playerInventory = cct.getInventoryByName("player");

-        final IMEMonitor<IAEItemStack> storage = inv
-                .getInventory(Api.instance().storage().getStorageChannel(IItemStorageChannel.class));
-        final IPartitionList<IAEItemStack> filter = ViewCellItem.createFilter(cct.getViewCells());
-        final NonNullList<Ingredient> ingredients = this.ensure3by3CraftingMatrix(recipe);
+        if (inv != null && this.recipe != null && security != null) {
+            final IMEMonitor<IAEItemStack> storage = inv
+                    .getInventory(Api.instance().storage().getStorageChannel(IItemStorageChannel.class));
+            final IPartitionList<IAEItemStack> filter = ViewCellItem.createFilter(cct.getViewCells());

-        // Handle each slot
-        for (int x = 0; x < craftMatrix.getSlots(); x++) {
-            ItemStack currentItem = craftMatrix.getStackInSlot(x);
-            Ingredient ingredient = ingredients.get(x);
+            for (int x = 0; x < craftMatrix.getSlots(); x++) {
+                ItemStack currentItem = craftMatrix.getStackInSlot(x);

-            // prepare slots
-            if (!currentItem.isEmpty()) {
-                // already the correct item? True, skip everything else
-                ItemStack newItem = this.canUseInSlot(ingredient, currentItem);
+                // prepare slots
+                if (!currentItem.isEmpty()) {
+                    // already the correct item?
+                    ItemStack newItem = this.canUseInSlot(x, currentItem);

-                // put away old item, if not correct
-                if (newItem != currentItem && security.hasPermission(player, SecurityPermissions.INJECT)) {
-                    final IAEItemStack in = AEItemStack.fromItemStack(currentItem);
-                    final IAEItemStack out = cct.useRealItems()
-                            ? Platform.poweredInsert(energy, storage, in, cct.getActionSource())
-                            : null;
-                    if (out != null) {
-                        currentItem = out.createItemStack();
-                    } else {
-                        currentItem = ItemStack.EMPTY;
-                    }
-                }
-            }
-
-            // Find item or pattern from the network
-            if (currentItem.isEmpty() && security.hasPermission(player, SecurityPermissions.EXTRACT)) {
-                IAEItemStack out;
-
-                if (cct.useRealItems()) {
-                    IAEItemStack request = findBestMatchingItemStack(ingredient, filter, storage, cct);
-                    out = request != null
-                            ? Platform.poweredExtraction(energy, storage, request.setStackSize(1),
-                                    cct.getActionSource())
-                            : null;
-                } else {
-                    out = findBestMatchingPattern(ingredient, filter, crafting, storage, cct);
-                    if (out == null) {
-                        out = findBestMatchingItemStack(ingredient, filter, storage, cct);
-                    }
-                    if (out == null && ingredient.getMatchingStacks().length > 0) {
-                        out = AEItemStack.fromItemStack(ingredient.getMatchingStacks()[0]);
-                    }
-                }
-
-                if (out != null) {
-                    currentItem = out.createItemStack();
-                }
-            }
-
-            // If still nothing, search the player inventory.
-            if (currentItem.isEmpty()) {
-                ItemStack[] matchingStacks = ingredient.getMatchingStacks();
-                for (ItemStack matchingStack : matchingStacks) {
-                    if (currentItem.isEmpty()) {
-                        AdaptorItemHandler ad = new AdaptorItemHandler(playerInventory);
-
-                        if (cct.useRealItems()) {
-                            currentItem = ad.removeItems(1, matchingStack, null);
+                    // put away old item
+                    if (newItem != currentItem && security.hasPermission(player, SecurityPermissions.INJECT)) {
+                        final IAEItemStack in = AEItemStack.fromItemStack(currentItem);
+                        final IAEItemStack out = cct.useRealItems()
+                                ? Platform.poweredInsert(energy, storage, in, cct.getActionSource())
+                                : null;
+                        if (out != null) {
+                            currentItem = out.createItemStack();
                        } else {
-                            currentItem = ad.simulateRemove(1, matchingStack, null);
+                            currentItem = ItemStack.EMPTY;
                        }
                    }
                }
+
+                if (currentItem.isEmpty() && this.recipe[x] != null) {
+                    // for each variant
+                    for (int y = 0; y < this.recipe[x].length && currentItem.isEmpty(); y++) {
+                        final IAEItemStack request = AEItemStack.fromItemStack(this.recipe[x][y]);
+                        if (request != null) {
+                            // try ae
+                            if ((filter == null || filter.isListed(request))
+                                    && security.hasPermission(player, SecurityPermissions.EXTRACT)) {
+                                request.setStackSize(1);
+                                IAEItemStack out;
+
+                                if (cct.useRealItems()) {
+                                    out = Platform.poweredExtraction(energy, storage, request, cct.getActionSource());
+                                } else {
+                                    // Query the crafting grid if there is a pattern providing the item
+                                    if (!crafting.getCraftingFor(request, null, 0, null).isEmpty()) {
+                                        out = request;
+                                    } else {
+                                        // Fall back using an existing item
+                                        out = storage.extractItems(request, Actionable.SIMULATE, cct.getActionSource());
+                                    }
+                                }
+
+                                if (out != null) {
+                                    currentItem = out.createItemStack();
+                                }
+                            }
+
+                            // try inventory
+                            if (currentItem.isEmpty()) {
+                                AdaptorItemHandler ad = new AdaptorItemHandler(playerInventory);
+
+                                if (cct.useRealItems()) {
+                                    currentItem = ad.removeItems(1, this.recipe[x][y], null);
+                                } else {
+                                    currentItem = ad.simulateRemove(1, this.recipe[x][y], null);
+                                }
+                            }
+                        }
+                    }
+                }
+                ItemHandlerUtil.setStackInSlot(craftMatrix, x, currentItem);
            }
-            ItemHandlerUtil.setStackInSlot(craftMatrix, x, currentItem);
+            con.onCraftMatrixChanged(new WrapperInvItemHandler(craftMatrix));
        }
-
-        if (!this.crafting) {
-            this.handleProcessing(con, cct, recipe);
-        }
-
-        con.onCraftMatrixChanged(new WrapperInvItemHandler(craftMatrix));
    }

    /**
-     * Expand any recipe to a 3x3 matrix.
-     * <p>
-     * Will throw an {@link IllegalArgumentException} in case it has more than 9 or
-     * a shaped recipe is either wider or higher than 3. ingredients.
+     *
+     * @param slot
+     * @param is   itemstack
+     * @return is if it can be used, else EMPTY
     */
-    private NonNullList<Ingredient> ensure3by3CraftingMatrix(IRecipe<?> recipe) {
-        NonNullList<Ingredient> ingredients = recipe.getIngredients();
-        NonNullList<Ingredient> expandedIngredients = NonNullList.withSize(9, Ingredient.EMPTY);
-
-        Preconditions.checkArgument(ingredients.size() <= 9);
-
-        // shaped recipes can be smaller than 3x3, expand to 3x3 to match the crafting
-        // matrix
-        if (recipe instanceof IShapedRecipe) {
-            IShapedRecipe<?> shapedRecipe = (IShapedRecipe<?>) recipe;
-            int width = shapedRecipe.getRecipeWidth();
-            int height = shapedRecipe.getRecipeHeight();
-            Preconditions.checkArgument(width <= 3 && height <= 3);
-
-            for (int h = 0; h < height; h++) {
-                for (int w = 0; w < width; w++) {
-                    int source = w + h * width;
-                    int target = w + h * 3;
-                    Ingredient i = ingredients.get(source);
-                    expandedIngredients.set(target, i);
+    private ItemStack canUseInSlot(int slot, ItemStack is) {
+        if (this.recipe[slot] != null) {
+            for (ItemStack option : this.recipe[slot]) {
+                if (is.isItemEqual(option)) {
+                    return is;
                }
            }
        }
-        // Anything else should be a flat list
-        else {
-            for (int i = 0; i < ingredients.size(); i++) {
-                expandedIngredients.set(i, ingredients.get(i));
-            }
-        }
-
-        return expandedIngredients;
-    }
-
-    /**
-     * @param is itemstack
-     * @return is if it can be used, else EMPTY
-     */
-    private ItemStack canUseInSlot(Ingredient ingredient, ItemStack is) {
-        return Arrays.stream(ingredient.getMatchingStacks()).filter(p -> p.isItemEqual(is)).findFirst()
-                .orElse(ItemStack.EMPTY);
-    }
-
-    /**
-     * Finds the first matching itemstack with the highest stored amount.
-     */
-    private IAEItemStack findBestMatchingItemStack(Ingredient ingredients, IPartitionList<IAEItemStack> filter,
-            IMEMonitor<IAEItemStack> storage, IContainerCraftingPacket cct) {
-        return Arrays.stream(ingredients.getMatchingStacks()).map(AEItemStack::fromItemStack) //
-                .filter(r -> r != null && (filter == null || filter.isListed(r))) //
-                .map(s -> {
-                    // Determine the stored count
-                    IAEItemStack stored = storage.extractItems(s.copy().setStackSize(Long.MAX_VALUE),
-                            Actionable.SIMULATE, cct.getActionSource());
-                    return Pair.of(s, stored != null ? stored.getStackSize() : 0);
-                }).min((left, right) -> Long.compare(right.getSecond(), left.getSecond()))//
-                .map(Pair::getFirst).orElse(null);
-    }
-
-    /**
-     * This tries to find the first pattern matching the list of ingredients.
-     * <p>
-     * As additional condition, it sorts by the stored amount to return the one with
-     * the highest stored amount.
-     */
-    private IAEItemStack findBestMatchingPattern(Ingredient ingredients, IPartitionList<IAEItemStack> filter,
-            ICraftingGrid crafting, IMEMonitor<IAEItemStack> storage, IContainerCraftingPacket cct) {
-        return Arrays.stream(ingredients.getMatchingStacks()).map(AEItemStack::fromItemStack)
-                .filter(r -> r != null && (filter == null || filter.isListed(r)))
-                .map(s -> s.setCraftable(!crafting.getCraftingFor(s, null, 0, null).isEmpty()))
-                .filter(IAEItemStack::isCraftable).map(s -> {
-                    final IAEItemStack stored = storage.extractItems(s, Actionable.SIMULATE, cct.getActionSource());
-                    return s.setStackSize(stored != null ? stored.getStackSize() : 0);
-                }).min((left, right) -> {
-                    final int craftable = Boolean.compare(left.isCraftable(), right.isCraftable());
-                    return craftable != 0 ? craftable : Long.compare(right.getStackSize(), left.getStackSize());
-                }).orElse(null);
-    }
-
-    private void handleProcessing(Container con, IContainerCraftingPacket cct, IRecipe<?> recipe) {
-        if (con instanceof PatternTermContainer) {
-            PatternTermContainer patternTerm = (PatternTermContainer) con;
-            if (!patternTerm.craftingMode) {
-                final IItemHandler output = cct.getInventoryByName("output");
-                ItemHandlerUtil.setStackInSlot(output, 0, recipe.getRecipeOutput());
-                ItemHandlerUtil.setStackInSlot(output, 1, ItemStack.EMPTY);
-                ItemHandlerUtil.setStackInSlot(output, 2, ItemStack.EMPTY);
-            }
-        }
+        return ItemStack.EMPTY;
    }

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

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

 import javax.annotation.Nullable;

@@ -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
@@ -157,8 +157,4 @@ final class StorageData extends WorldSavedData implements IWorldGridStorageData
        return tag;
    }

-    public int size() {
-        return storage.size();
-    }
-
 }
@@ -28,13 +28,12 @@ import com.google.common.base.Preconditions;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.server.ServerWorld;

-import appeng.metrics.Metrics;
 import appeng.services.CompassService;
 import appeng.services.compass.CompassThreadFactory;

 /**
 * Singleton access to anything related to world-based data.
- * <p>
+ *
 * Data will change depending which world is loaded. Will probably not affect
 * SMP at all since only one world is loaded, but SSP more, cause they play on
 * different worlds.
@@ -54,15 +53,8 @@ public final class WorldData implements IWorldData {
    @Nullable
    private static MinecraftServer server;

-    static {
-        Metrics.gauge("grid_storage_count", () -> {
-            WorldData worldData = (WorldData) instance;
-            return worldData != null ? worldData.storageData.size() : 0;
-        });
-    }
-
    private final IWorldPlayerData playerData;
-    private final StorageData storageData;
+    private final IWorldGridStorageData storageData;
    private final IWorldCompassData compassData;

    private WorldData(@Nonnull final ServerWorld overworld) {
@@ -88,6 +80,7 @@ public final class WorldData implements IWorldData {

    /**
     * @return ae2 data related to a specific world
+     *
     * @deprecated do not use singletons which are dependent on specific world state
     */
    @Deprecated
@@ -109,7 +102,7 @@ public final class WorldData implements IWorldData {

    /**
     * Requires to start up from external from here
-     * <p>
+     *
     * drawback of the singleton build style
     */
    public static void onServerStarting(MinecraftServer server) {
@@ -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;
@@ -40,6 +40,7 @@ import net.minecraft.util.SoundEvents;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.Explosion;
+import net.minecraft.world.Explosion.Mode;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.common.registry.IEntityAdditionalSpawnData;
 import net.minecraftforge.fml.network.NetworkHooks;
@@ -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 {
@@ -57,7 +57,6 @@ import appeng.core.AppEng;
 import appeng.core.sync.packets.PaintedEntityPacket;
 import appeng.crafting.CraftingJob;
 import appeng.me.Grid;
-import appeng.metrics.Metrics;
 import appeng.tile.AEBaseTileEntity;
 import appeng.util.IWorldCallable;
 import appeng.util.Platform;
@@ -78,11 +77,6 @@ public class TickHandler {
        return INSTANCE;
    }

-    static {
-        Metrics.gauge("ticking_network_count", () -> INSTANCE.server.networks.size());
-        Metrics.gauge("crafting_job_count", INSTANCE.craftingJobs::size);
-    }
-
    public static void setup(IEventBus eventBus) {
        eventBus.addListener(INSTANCE::onServerTick);
        eventBus.addListener(INSTANCE::onWorldTick);
@@ -18,8 +18,6 @@

 package appeng.integration.abstraction;

-import mezz.jei.api.runtime.IJeiRuntime;
-
 import appeng.integration.IIntegrationModule;

 /**
@@ -27,10 +25,6 @@ import appeng.integration.IIntegrationModule;
 */
 public interface IJEI extends IIntegrationModule {

-    default IJeiRuntime getRuntime() {
-        return null;
-    }
-
    default String getSearchText() {
        return "";
    }
@@ -1,47 +0,0 @@
-/*
- * This file is part of Applied Energistics 2.
- * Copyright (c) 2020 Team Appliedenergistics, All rights reserved.
- *
- * Applied Energistics 2 is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Applied Energistics 2 is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
- */
-
-package appeng.integration.modules.jei;
-
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.item.crafting.IRecipe;
-
-import mezz.jei.api.gui.IRecipeLayout;
-import mezz.jei.api.recipe.transfer.IRecipeTransferError;
-import mezz.jei.api.recipe.transfer.IRecipeTransferHandlerHelper;
-
-import appeng.container.implementations.CraftingTermContainer;
-
-public class CraftingRecipeTransferHandler extends RecipeTransferHandler<CraftingTermContainer> {
-
-    CraftingRecipeTransferHandler(Class<CraftingTermContainer> containerClass, IRecipeTransferHandlerHelper helper) {
-        super(containerClass, helper);
-    }
-
-    @Override
-    protected IRecipeTransferError doTransferRecipe(CraftingTermContainer container, IRecipe<?> recipe,
-            IRecipeLayout recipeLayout, PlayerEntity player, boolean maxTransfer) {
-        return null;
-    }
-
-    @Override
-    protected boolean isCrafting() {
-        return true;
-    }
-
-}
@@ -111,8 +111,6 @@ class FacadeRegistryPlugin implements IRecipeManagerPlugin {
        ingredients.set(7, Ingredient.fromStacks(cableAnchor));
        ingredients.set(4, Ingredient.fromStacks(textureItem));

-        result.setCount(4);
-
        return new ShapedRecipe(id, "", 3, 3, ingredients, result);
    }

@@ -82,15 +82,11 @@ public class JEIPlugin implements IModPlugin {

    @Override
    public void registerRecipeTransferHandlers(IRecipeTransferRegistration registration) {
-
-        // Allow vanilla crafting recipe transfer from JEI to crafting terminal
-        registration.addRecipeTransferHandler(
-                new CraftingRecipeTransferHandler(CraftingTermContainer.class, registration.getTransferHelper()),
+        // Allow recipe transfer from JEI to crafting and pattern terminal
+        registration.addRecipeTransferHandler(new RecipeTransferHandler<>(CraftingTermContainer.class),
+                VanillaRecipeCategoryUid.CRAFTING);
+        registration.addRecipeTransferHandler(new RecipeTransferHandler<>(PatternTermContainer.class),
                VanillaRecipeCategoryUid.CRAFTING);
-
-        // Universal handler for processing to try and handle all IRecipe
-        registration.addUniversalRecipeTransferHandler(
-                new PatternRecipeTransferHandler(PatternTermContainer.class, registration.getTransferHelper()));
    }

    @Override
@@ -37,10 +37,6 @@ class JeiRuntimeAdapter implements IJEI {
        return true;
    }

-    public IJeiRuntime getRuntime() {
-        return runtime;
-    }
-
    @Override
    public String getSearchText() {
        return Strings.nullToEmpty(this.runtime.getIngredientFilter().getFilterText());
@@ -1,58 +0,0 @@
-/*
- * This file is part of Applied Energistics 2.
- * Copyright (c) 2020 Team Appliedenergistics, All rights reserved.
- *
- * Applied Energistics 2 is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Applied Energistics 2 is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
- */
-
-package appeng.integration.modules.jei;
-
-import net.minecraft.client.resources.I18n;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.item.crafting.IRecipe;
-
-import mezz.jei.api.constants.VanillaRecipeCategoryUid;
-import mezz.jei.api.gui.IRecipeLayout;
-import mezz.jei.api.recipe.transfer.IRecipeTransferError;
-import mezz.jei.api.recipe.transfer.IRecipeTransferHandlerHelper;
-
-import appeng.container.implementations.PatternTermContainer;
-
-public class PatternRecipeTransferHandler extends RecipeTransferHandler<PatternTermContainer> {
-
-    PatternRecipeTransferHandler(Class<PatternTermContainer> containerClass, IRecipeTransferHandlerHelper helper) {
-        super(containerClass, helper);
-    }
-
-    protected IRecipeTransferError doTransferRecipe(PatternTermContainer container, IRecipe<?> recipe,
-            IRecipeLayout recipeLayout, PlayerEntity player, boolean maxTransfer) {
-        if (container.isCraftingMode()
-                && recipeLayout.getRecipeCategory().getUid() != VanillaRecipeCategoryUid.CRAFTING) {
-            return this.helper
-                    .createUserErrorWithTooltip(I18n.format("jei.appliedenergistics2.requires_processing_mode"));
-        }
-
-        if (recipe.getRecipeOutput().isEmpty()) {
-            return this.helper.createUserErrorWithTooltip(I18n.format("jei.appliedenergistics2.no_output"));
-        }
-
-        return null;
-    }
-
-    @Override
-    protected boolean isCrafting() {
-        return false;
-    }
-
-}
@@ -18,128 +18,101 @@

 package appeng.integration.modules.jei;

+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;

-import net.minecraft.client.resources.I18n;
+import javax.annotation.Nullable;
+
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.inventory.container.Container;
+import net.minecraft.inventory.container.Slot;
 import net.minecraft.item.ItemStack;
-import net.minecraft.item.crafting.IRecipe;
-import net.minecraft.item.crafting.Ingredient;
-import net.minecraft.item.crafting.ShapedRecipe;
-import net.minecraft.item.crafting.ShapelessRecipe;
-import net.minecraft.util.NonNullList;
-import net.minecraft.util.ResourceLocation;
+import net.minecraft.nbt.CompoundNBT;
+import net.minecraft.nbt.ListNBT;

 import mezz.jei.api.gui.IRecipeLayout;
 import mezz.jei.api.gui.ingredient.IGuiIngredient;
 import mezz.jei.api.recipe.transfer.IRecipeTransferError;
 import mezz.jei.api.recipe.transfer.IRecipeTransferHandler;
-import mezz.jei.api.recipe.transfer.IRecipeTransferHandlerHelper;

+import appeng.container.slot.CraftingMatrixSlot;
+import appeng.container.slot.FakeCraftingMatrixSlot;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.JEIRecipePacket;
-import appeng.helpers.IContainerCraftingPacket;
+import appeng.util.Platform;

-abstract class RecipeTransferHandler<T extends Container & IContainerCraftingPacket>
-        implements IRecipeTransferHandler<T> {
+class RecipeTransferHandler<T extends Container> implements IRecipeTransferHandler<T> {

    private final Class<T> containerClass;
-    protected final IRecipeTransferHandlerHelper helper;

-    RecipeTransferHandler(Class<T> containerClass, IRecipeTransferHandlerHelper helper) {
+    RecipeTransferHandler(Class<T> containerClass) {
        this.containerClass = containerClass;
-        this.helper = helper;
    }

    @Override
-    public final Class<T> getContainerClass() {
+    public Class<T> getContainerClass() {
        return this.containerClass;
    }

+    @Nullable
    @Override
-    public final IRecipeTransferError transferRecipe(T container, Object recipe, IRecipeLayout recipeLayout,
-            PlayerEntity player, boolean maxTransfer, boolean doTransfer) {
-        if (!(recipe instanceof IRecipe)) {
-            return this.helper.createInternalError();
-        }
-        final IRecipe<?> irecipe = (IRecipe<?>) recipe;
-        final ResourceLocation recipeId = irecipe.getId();
-
-        if (recipeId == null) {
-            return this.helper.createUserErrorWithTooltip(I18n.format("jei.appliedenergistics2.missing_id"));
+    public IRecipeTransferError transferRecipe(T container, IRecipeLayout recipeLayout, PlayerEntity player,
+            boolean maxTransfer, boolean doTransfer) {
+        if (!doTransfer) {
+            return null;
        }

-        // Check that the recipe can actually be looked up via the manager, i.e. our
-        // facade recipes
-        // have an ID, but are never registered with the recipe manager.
-        boolean canSendReference = true;
-        if (!player.getEntityWorld().getRecipeManager().getRecipe(recipeId).isPresent()) {
-            // Validate that the recipe is a shapeless or shapedrecipe, since we can
-            // serialize those
-            if (!(recipe instanceof ShapedRecipe) && !(recipe instanceof ShapelessRecipe)) {
-                return this.helper.createUserErrorWithTooltip(I18n.format("jei.appliedenergistics2.missing_id"));
+        Map<Integer, ? extends IGuiIngredient<ItemStack>> ingredients = recipeLayout.getItemStacks()
+                .getGuiIngredients();
+
+        final CompoundNBT recipe = new CompoundNBT();
+
+        int slotIndex = 0;
+        for (Map.Entry<Integer, ? extends IGuiIngredient<ItemStack>> ingredientEntry : ingredients.entrySet()) {
+            IGuiIngredient<ItemStack> ingredient = ingredientEntry.getValue();
+            if (!ingredient.isInput()) {
+                continue;
            }
-            canSendReference = false;
-        }

-        if (!irecipe.canFit(3, 3)) {
-            return this.helper.createUserErrorWithTooltip(I18n.format("jei.appliedenergistics2.recipe_too_large"));
-        }
+            for (final Slot slot : container.inventorySlots) {
+                if (slot instanceof CraftingMatrixSlot || slot instanceof FakeCraftingMatrixSlot) {
+                    if (slot.getSlotIndex() == slotIndex) {
+                        final ListNBT tags = new ListNBT();
+                        final List<ItemStack> list = new ArrayList<>();
+                        final ItemStack displayed = ingredient.getDisplayedIngredient();

-        final IRecipeTransferError error = doTransferRecipe(container, irecipe, recipeLayout, player, maxTransfer);
-
-        if (error != null) {
-            return error;
-        }
-
-        if (doTransfer) {
-            if (canSendReference) {
-                NetworkHandler.instance().sendToServer(new JEIRecipePacket(recipeId, isCrafting()));
-            } else {
-                // To avoid earlier problems of too large packets being sent that crashed the
-                // client,
-                // as a fallback when the recipe ID could not be resolved, we'll just send the
-                // displayed
-                // items.
-                NonNullList<Ingredient> flatIngredients = NonNullList.withSize(9, Ingredient.EMPTY);
-                ItemStack output = ItemStack.EMPTY;
-
-                // Determine the first JEI slot that has an actual input, we'll use this to
-                // offset the
-                // crafting grid target slot
-                int firstInputSlot = recipeLayout.getItemStacks().getGuiIngredients().entrySet().stream()
-                        .filter(e -> e.getValue().isInput()).mapToInt(Map.Entry::getKey).min().orElse(0);
-
-                // Now map the actual ingredients into the output/input
-                for (Map.Entry<Integer, ? extends IGuiIngredient<ItemStack>> entry : recipeLayout.getItemStacks()
-                        .getGuiIngredients().entrySet()) {
-                    IGuiIngredient<ItemStack> item = entry.getValue();
-                    if (item.getDisplayedIngredient() == null) {
-                        continue;
-                    }
-
-                    int inputIndex = entry.getKey() - firstInputSlot;
-                    if (item.isInput() && inputIndex < flatIngredients.size()) {
-                        ItemStack displayedIngredient = item.getDisplayedIngredient();
-                        if (displayedIngredient != null) {
-                            flatIngredients.set(inputIndex, Ingredient.fromStacks(displayedIngredient));
+                        // prefer currently displayed item
+                        if (displayed != null && !displayed.isEmpty()) {
+                            list.add(displayed);
                        }
-                    } else if (!item.isInput() && output.isEmpty()) {
-                        output = item.getDisplayedIngredient();
+
+                        // prefer pure crystals.
+                        for (ItemStack stack : ingredient.getAllIngredients()) {
+                            if (Platform.isRecipePrioritized(stack)) {
+                                list.add(0, stack);
+                            } else {
+                                list.add(stack);
+                            }
+                        }
+
+                        for (final ItemStack is : list) {
+                            final CompoundNBT tag = new CompoundNBT();
+                            is.write(tag);
+                            tags.add(tag);
+                        }
+
+                        recipe.put("#" + slot.getSlotIndex(), tags);
+                        break;
                    }
                }
-
-                ShapedRecipe fallbackRecipe = new ShapedRecipe(recipeId, "", 3, 3, flatIngredients, output);
-                NetworkHandler.instance().sendToServer(new JEIRecipePacket(fallbackRecipe, isCrafting()));
            }
+
+            slotIndex++;
        }

+        NetworkHandler.instance().sendToServer(new JEIRecipePacket(recipe));
+
        return null;
    }
-
-    protected abstract IRecipeTransferError doTransferRecipe(T container, IRecipe<?> recipe, IRecipeLayout recipeLayout,
-            PlayerEntity player, boolean maxTransfer);
-
-    protected abstract boolean isCrafting();
 }
@@ -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,54 +0,0 @@
-package appeng.metrics;
-
-import java.util.function.Supplier;
-
-import com.google.common.cache.Cache;
-import com.google.common.cache.CacheStats;
-
-/**
- * Cache Metrics simplify reporting of metrics for a Guava {@link Cache}.
- */
-public class CacheMetrics extends Metric {
-
-    private final Supplier<Cache<?, ?>> cacheSupplier;
-
-    // Pre-allocate these to avoid repeated concatenation during reporting
-    private final String sizeId;
-    private final String hitCountId;
-    private final String missCountId;
-    private final String loadSuccessCountId;
-    private final String loadExceptionCountId;
-    private final String totalLoadTimeId;
-    private final String evictionCountId;
-
-    public CacheMetrics(String id, Supplier<Cache<?, ?>> cacheSupplier) {
-        super(id);
-        this.cacheSupplier = cacheSupplier;
-
-        this.sizeId = id + ".size";
-        this.hitCountId = id + ".hit-count";
-        this.missCountId = id + ".miss-count";
-        this.loadSuccessCountId = id + ".load-success-count";
-        this.loadExceptionCountId = id + ".load-exception-count";
-        this.totalLoadTimeId = id + ".total-load-time";
-        this.evictionCountId = id + ".eviction-count";
-    }
-
-    @Override
-    public void accept(MetricVisitor visitor) {
-        Cache<?, ?> cache = this.cacheSupplier.get();
-
-        if (cache != null) {
-            visitor.visitGauge(sizeId, cache.size()); // Thread-safe
-
-            CacheStats stats = cache.stats(); // Thread-safe
-            visitor.visitGauge(hitCountId, stats.hitCount());
-            visitor.visitGauge(missCountId, stats.missCount());
-            visitor.visitGauge(loadSuccessCountId, stats.loadSuccessCount());
-            visitor.visitGauge(loadExceptionCountId, stats.loadExceptionCount());
-            visitor.visitGauge(totalLoadTimeId, stats.totalLoadTime());
-            visitor.visitGauge(evictionCountId, stats.evictionCount());
-        }
-    }
-
-}
@@ -1,31 +0,0 @@
-package appeng.metrics;
-
-import java.util.function.Supplier;
-
-/**
- * A Gauge is a Metric that will simply read the current value of something when
- * the metrics are being reported.
- */
-class Gauge extends Metric {
-
-    private final Supplier<Number> valueSupplier;
-
-    public Gauge(String id, Supplier<Number> valueSupplier) {
-        super(id);
-        this.valueSupplier = valueSupplier;
-    }
-
-    public Supplier<Number> getValueSupplier() {
-        return valueSupplier;
-    }
-
-    public Number getValue() {
-        return valueSupplier.get();
-    }
-
-    @Override
-    public void accept(MetricVisitor visitor) {
-        visitor.visitGauge(getId(), getValue());
-    }
-
-}
@@ -1,34 +0,0 @@
-package appeng.metrics;
-
-import java.util.Objects;
-
-abstract class Metric {
-
-    private final String id;
-
-    public Metric(String id) {
-        this.id = Objects.requireNonNull(id);
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o)
-            return true;
-        if (o == null || getClass() != o.getClass())
-            return false;
-        Metric metric = (Metric) o;
-        return id.equals(metric.id);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(id);
-    }
-
-    public abstract void accept(MetricVisitor visitor);
-
-}
@@ -1,7 +0,0 @@
-package appeng.metrics;
-
-public interface MetricVisitor {
-
-    void visitGauge(String id, Number value);
-
-}
@@ -1,51 +0,0 @@
-package appeng.metrics;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.function.LongSupplier;
-import java.util.function.Supplier;
-
-import com.google.common.base.Suppliers;
-import com.google.common.cache.Cache;
-import com.google.common.cache.CacheStats;
-
-/**
- * Registry to register Metrics.
- */
-public final class Metrics {
-
-    private static final List<Metric> metrics = new ArrayList<>();
-
-    private Metrics() {
-    }
-
-    /**
-     * Registers a Gauge, which is a simple metric with no state that will be
-     * queried for its current value whenever metrics are being reported.
-     */
-    public static synchronized void gauge(String id, Supplier<Number> valueSupplier) {
-        metrics.add(new Gauge(id, valueSupplier));
-    }
-
-    /**
-     * Register several standard metrics for a Guava {@link Cache}.
-     */
-    public static synchronized void cache(String name, Cache<?, ?> cache) {
-        metrics.add(new CacheMetrics(name, () -> cache));
-    }
-
-    /**
-     * Register several standard metrics for a Guava {@link Cache} based on a
-     * supplier to support an underlying changing cache.
-     */
-    public static synchronized void cache(String name, Supplier<Cache<?, ?>> cacheSupplier) {
-        metrics.add(new CacheMetrics(name, cacheSupplier));
-    }
-
-    public static synchronized void visit(MetricVisitor visitor) {
-        for (Metric metric : metrics) {
-            metric.accept(visitor);
-        }
-    }
-
-}
@@ -1,78 +0,0 @@
-package appeng.metrics.endpoint;
-
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.nio.charset.StandardCharsets;
-
-import com.sun.net.httpserver.HttpExchange;
-import com.sun.net.httpserver.HttpServer;
-
-import appeng.metrics.Metrics;
-import appeng.metrics.reporter.PrometheusReporter;
-
-/**
- * Starts an embedded HTTP-Server that will expose the Metrics in a format
- * compatible with Prometheus.
- */
-public class PrometheusEndpoint implements AutoCloseable {
-
-    private final HttpServer server;
-
-    private final PrometheusReporter reporter = new PrometheusReporter();
-
-    public PrometheusEndpoint(String hostname, int port) {
-        try {
-            this.server = HttpServer.create();
-        } catch (IOException e) {
-            throw new RuntimeException("Failed to create metrics HTTP-server", e);
-        }
-
-        InetSocketAddress address;
-        if (hostname.isEmpty()) {
-            address = new InetSocketAddress((InetAddress) null, port);
-        } else {
-            address = new InetSocketAddress(hostname, port);
-        }
-
-        // Default endpoint is /metrics in Prometheus
-        this.server.createContext("/metrics", this::handler);
-
-        try {
-            this.server.bind(address, 0);
-        } catch (IOException e) {
-            throw new RuntimeException("Failed to bind metrics HTTP server to " + address, e);
-        }
-
-        this.server.start();
-
-    }
-
-    @Override
-    public void close() {
-        this.server.stop(0);
-    }
-
-    private synchronized void handler(HttpExchange exchange) throws IOException {
-        // Update metrics
-        reporter.reset();
-        Metrics.visit(reporter);
-
-        CharSequence report = getReport();
-
-        exchange.getResponseHeaders().add("Content-Type", "text/plain; version=0.0.4");
-        exchange.sendResponseHeaders(200, report.length());
-
-        try (Writer writer = new OutputStreamWriter(exchange.getResponseBody(), StandardCharsets.US_ASCII)) {
-            writer.append(report);
-        }
-        exchange.close();
-    }
-
-    private CharSequence getReport() {
-        return reporter.getReport();
-    }
-
-}
@@ -1,24 +0,0 @@
-package appeng.metrics.reporter;
-
-import java.io.PrintStream;
-
-import appeng.metrics.MetricVisitor;
-
-/**
- * Reports Metrics as simple key-value pairs to a {@link PrintStream} (i.e.
- * {@link System#out}).
- */
-public class PrintStreamReporter implements MetricVisitor {
-
-    private final PrintStream out;
-
-    public PrintStreamReporter(PrintStream out) {
-        this.out = out;
-    }
-
-    @Override
-    public void visitGauge(String id, Number value) {
-        out.println(id + '=' + value);
-    }
-
-}
@@ -1,54 +0,0 @@
-package appeng.metrics.reporter;
-
-import appeng.metrics.MetricVisitor;
-
-/**
- * Reports the metrics in a format compatible with Prometheus.
- * <p>
- * See <a href=
- * "https://prometheus.io/docs/instrumenting/exposition_formats/">Prometheus
- * Docs</a>
- */
-public class PrometheusReporter implements MetricVisitor {
-
-    private final StringBuilder response = new StringBuilder();
-
-    @Override
-    public void visitGauge(String id, Number value) {
-        printType(id, "gauge");
-        appendId(id);
-        response.append(' ').append(value.toString()).append('\n');
-    }
-
-    private void printType(String id, String type) {
-        response.append("# TYPE ");
-        appendId(id);
-        response.append(' ').append(type).append('\n');
-    }
-
-    public void reset() {
-        response.setLength(0);
-    }
-
-    public int length() {
-        return response.length();
-    }
-
-    public CharSequence getReport() {
-        return response;
-    }
-
-    private void appendId(String id) {
-        response.append("appeng_");
-        // Sanitize to [a-zA-Z0-9:_]
-        for (int i = 0; i < id.length(); i++) {
-            char ch = id.charAt(i);
-            if (ch >= 'a' && ch <= 'z' || ch >= 'A' && ch <= 'Z' || ch >= '0' && ch <= '9' || ch == ':' || ch == '_') {
-                response.append(ch);
-            } else {
-                response.append('_');
-            }
-        }
-    }
-
-}
@@ -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,25 +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.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);
-
-}
@@ -82,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
@@ -531,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);
    }

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