More moves and compilation fixes

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

@@ -26,7 +26,7 @@ import com.google.common.collect.ImmutableSet;
 
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.inventory.CraftingInventory;
-import net.minecraft.inventory.container.ContainerType;
+import net.minecraft.screen.ScreenHandlerType;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.block.entity.BlockEntity;
@@ -274,7 +274,7 @@ public class InterfacePart extends BasicStatePart implements IGridTickable, ISto
     }
 
     @Override
-    public ContainerType<?> getContainerType() {
+    public ScreenHandlerType<?> getContainerType() {
         return InterfaceContainer.TYPE;
     }
 }

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

@@ -24,7 +24,7 @@ import java.util.Objects;
 
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.inventory.container.ContainerType;
+import net.minecraft.screen.ScreenHandlerType;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.util.Identifier;
@@ -438,7 +438,7 @@ public class StorageBusPart extends UpgradeablePart
                         .getStorageChannel(IItemStorageChannel.class).createList();
 
                 final int slotsToUse = 18 + this.getInstalledUpgrades(Upgrades.CAPACITY) * 9;
-                for (int x = 0; x < this.Config.getSlots() && x < slotsToUse; x++) {
+                for (int x = 0; x < this.Config.getSlotCount() && x < slotsToUse; x++) {
                     final IAEItemStack is = this.Config.getAEStackInSlot(x);
                     if (is != null) {
                         priorityList.add(is);
@@ -563,7 +563,7 @@ public class StorageBusPart extends UpgradeablePart
     }
 
     @Override
-    public ContainerType<?> getContainerType() {
+    public ScreenHandlerType<?> getContainerType() {
         return StorageBusContainer.TYPE;
     }
 }