More moves and compilation fixes

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

@@ -6,7 +6,7 @@ import java.util.Map;
 
 import alexiil.mc.lib.attributes.fluid.volume.FluidVolume;
 import net.minecraft.entity.player.PlayerInventory;
-import net.minecraft.inventory.container.ContainerType;
+import net.minecraft.screen.ScreenHandlerType;
 import net.minecraft.inventory.container.IContainerListener;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.LazyOptional;
@@ -24,7 +24,7 @@ import appeng.util.Platform;
 public abstract class FluidConfigurableContainer extends UpgradeableContainer implements IFluidSyncContainer {
     private FluidSyncHelper sync = null;
 
-    public FluidConfigurableContainer(ContainerType<?> containerType, int id, PlayerInventory ip, IUpgradeableHost te) {
+    public FluidConfigurableContainer(ScreenHandlerType<?> containerType, int id, PlayerInventory ip, IUpgradeableHost te) {
         super(containerType, id, ip, te);
     }
 

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

@@ -4,7 +4,7 @@ package appeng.fluids.container;
 import alexiil.mc.lib.attributes.item.FixedItemInv;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
-import net.minecraft.inventory.container.ContainerType;
+import net.minecraft.screen.ScreenHandlerType;
 import net.minecraft.network.PacketByteBuf;
 
 import appeng.api.config.SecurityPermissions;
@@ -18,7 +18,7 @@ import appeng.fluids.util.IAEFluidTank;
 
 public class FluidFormationPlaneContainer extends FluidConfigurableContainer {
 
-    public static ContainerType<FluidFormationPlaneContainer> TYPE;
+    public static ScreenHandlerType<FluidFormationPlaneContainer> TYPE;
 
     private static final ContainerHelper<FluidFormationPlaneContainer, FluidFormationPlanePart> helper = new ContainerHelper<>(
             FluidFormationPlaneContainer::new, FluidFormationPlanePart.class, SecurityPermissions.BUILD);

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

@@ -20,7 +20,7 @@ package appeng.fluids.container;
 
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
-import net.minecraft.inventory.container.ContainerType;
+import net.minecraft.screen.ScreenHandlerType;
 import net.minecraft.network.PacketByteBuf;
 
 import appeng.api.config.SecurityPermissions;
@@ -36,7 +36,7 @@ import appeng.fluids.util.IAEFluidTank;
  */
 public class FluidIOContainer extends FluidConfigurableContainer {
 
-    public static ContainerType<FluidIOContainer> TYPE;
+    public static ScreenHandlerType<FluidIOContainer> TYPE;
 
     private static final ContainerHelper<FluidIOContainer, SharedFluidBusPart> helper = new ContainerHelper<>(
             FluidIOContainer::new, SharedFluidBusPart.class, SecurityPermissions.BUILD);

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

@@ -23,7 +23,7 @@ import java.util.Map;
 
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
-import net.minecraft.inventory.container.ContainerType;
+import net.minecraft.screen.ScreenHandlerType;
 import net.minecraft.inventory.container.IContainerListener;
 import net.minecraft.network.PacketByteBuf;
 
@@ -40,7 +40,7 @@ import appeng.util.Platform;
 
 public class FluidInterfaceContainer extends FluidConfigurableContainer {
 
-    public static ContainerType<FluidInterfaceContainer> TYPE;
+    public static ScreenHandlerType<FluidInterfaceContainer> TYPE;
 
     private static final ContainerHelper<FluidInterfaceContainer, IFluidInterfaceHost> helper = new ContainerHelper<>(
             FluidInterfaceContainer::new, IFluidInterfaceHost.class, SecurityPermissions.BUILD);

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

@@ -3,7 +3,7 @@ package appeng.fluids.container;
 import net.minecraft.client.gui.widget.TextFieldWidget;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
-import net.minecraft.inventory.container.ContainerType;
+import net.minecraft.screen.ScreenHandlerType;
 import net.minecraft.network.PacketByteBuf;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
@@ -19,7 +19,7 @@ import appeng.fluids.util.IAEFluidTank;
 import appeng.util.Platform;
 
 public class FluidLevelEmitterContainer extends FluidConfigurableContainer {
-    public static ContainerType<FluidLevelEmitterContainer> TYPE;
+    public static ScreenHandlerType<FluidLevelEmitterContainer> TYPE;
 
     private static final ContainerHelper<FluidLevelEmitterContainer, FluidLevelEmitterPart> helper = new ContainerHelper<>(
             FluidLevelEmitterContainer::new, FluidLevelEmitterPart.class, SecurityPermissions.BUILD);

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

@@ -22,7 +22,7 @@ import java.util.Iterator;
 
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
-import net.minecraft.inventory.container.ContainerType;
+import net.minecraft.screen.ScreenHandlerType;
 import net.minecraft.network.PacketByteBuf;
 import alexiil.mc.lib.attributes.item.FixedItemInv;
 
@@ -53,7 +53,7 @@ import appeng.util.iterators.NullIterator;
  */
 public class FluidStorageBusContainer extends FluidConfigurableContainer {
 
-    public static ContainerType<FluidStorageBusContainer> TYPE;
+    public static ScreenHandlerType<FluidStorageBusContainer> TYPE;
 
     private static final ContainerHelper<FluidStorageBusContainer, FluidStorageBusPart> helper = new ContainerHelper<>(
             FluidStorageBusContainer::new, FluidStorageBusPart.class);

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

@@ -27,7 +27,7 @@ import alexiil.mc.lib.attributes.fluid.volume.FluidVolume;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.inventory.container.ContainerType;
+import net.minecraft.screen.ScreenHandlerType;
 import net.minecraft.inventory.container.IContainerListener;
 import net.minecraft.item.ItemStack;
 import net.minecraft.network.PacketByteBuf;
@@ -85,7 +85,7 @@ import appeng.util.Platform;
 public class FluidTerminalContainer extends AEBaseContainer
         implements IConfigManagerHost, IConfigurableObject, IMEMonitorHandlerReceiver<IAEFluidStack> {
 
-    public static ContainerType<FluidTerminalContainer> TYPE;
+    public static ScreenHandlerType<FluidTerminalContainer> TYPE;
 
     private static final ContainerHelper<FluidTerminalContainer, ITerminalHost> helper = new ContainerHelper<>(
             FluidTerminalContainer::new, ITerminalHost.class, SecurityPermissions.BUILD);