Utils ported

src/main/java/appeng/block/crafting/CraftingStorageItem.java

@@ -33,12 +33,12 @@ public class CraftingStorageItem extends AEBaseBlockItem {
     }
 
     @Override
-    public ItemStack getContainerItem(final ItemStack itemStack) {
+    public ItemStack getRecipeRemainder(final ItemStack itemStack) {
         return AEApi.instance().definitions().blocks().craftingUnit().maybeStack(1).orElse(ItemStack.EMPTY);
     }
 
     @Override
-    public boolean hasContainerItem(final ItemStack stack) {
+    public boolean hasRecipeRemainder(final ItemStack stack) {
         return AEConfig.instance().isFeatureEnabled(AEFeature.ENABLE_DISASSEMBLY_CRAFTING);
     }
 }

src/main/java/appeng/block/misc/ChargerBlock.java

@@ -104,7 +104,7 @@ public class ChargerBlock extends AEBaseTileBlock<ChargerBlockEntity> {
         final ChargerBlockEntity tile = this.getBlockEntity(w, pos);
         if (tile != null) {
             if (AEApi.instance().definitions().materials().certusQuartzCrystalCharged()
-                    .isSameAs(tile.getInternalInventory().getStackInSlot(0))) {
+                    .isSameAs(tile.getInternalInventory().getInvStack(0))) {
                 final double xOff = 0.0;
                 final double yOff = 0.0;
                 final double zOff = 0.0;
@@ -185,7 +185,7 @@ public class ChargerBlock extends AEBaseTileBlock<ChargerBlockEntity> {
     @Environment(EnvType.CLIENT)
     private static Pair<ItemStack, TransformationMatrix> getRenderedItem(ChargerBlockEntity tile) {
         TransformationMatrix transform = new TransformationMatrix(new Vector3f(0.5f, 0.375f, 0.5f), null, null, null);
-        return new ImmutablePair<>(tile.getInternalInventory().getStackInSlot(0), transform);
+        return new ImmutablePair<>(tile.getInternalInventory().getInvStack(0), transform);
     }
 
 }

src/main/java/appeng/block/misc/TinyTNTBlock.java

@@ -85,9 +85,9 @@ public class TinyTNTBlock extends AEBaseBlock {
         if (!w.isClient) {
             final TinyTNTPrimedEntity primedTinyTNTEntity = new TinyTNTPrimedEntity(w, pos.getX() + 0.5F,
                     pos.getY() + 0.5F, pos.getZ() + 0.5F, igniter);
-            w.addEntity(primedTinyTNTEntity);
-            w.playSound(null, primedTinyTNTEntity.getPosX(), primedTinyTNTEntity.getPosY(),
-                    primedTinyTNTEntity.getPosZ(), SoundEvents.ENTITY_TNT_PRIMED, SoundCategory.BLOCKS, 1, 1);
+            w.spawnEntity(primedTinyTNTEntity);
+            w.playSound(null, primedTinyTNTEntity.getX(), primedTinyTNTEntity.getY(),
+                    primedTinyTNTEntity.getZ(), SoundEvents.ENTITY_TNT_PRIMED, SoundCategory.BLOCKS, 1, 1);
         }
     }
 
@@ -145,7 +145,7 @@ public class TinyTNTBlock extends AEBaseBlock {
                     pos.getY() + 0.5F, pos.getZ() + 0.5F, exp.getExplosivePlacedBy());
             primedTinyTNTEntity
                     .setFuse(w.rand.nextInt(primedTinyTNTEntity.getFuse() / 4) + primedTinyTNTEntity.getFuse() / 8);
-            w.addEntity(primedTinyTNTEntity);
+            w.spawnEntity(primedTinyTNTEntity);
         }
     }
 

src/main/java/appeng/block/networking/CableBusBlock.java

@@ -168,7 +168,7 @@ public class CableBusBlock extends AEBaseTileBlock<CableBusBlockEntity> implemen
     @Override
     public ItemStack getPickBlock(BlockState state, HitResult target, BlockView world, BlockPos pos,
             PlayerEntity player) {
-        final Vec3d v3 = target.getHitVec().subtract(pos.getX(), pos.getY(), pos.getZ());
+        final Vec3d v3 = target.getPos().subtract(pos.getX(), pos.getY(), pos.getZ());
         final SelectedPart sp = this.cb(world, pos).selectPart(v3);
 
         if (sp.part != null) {
@@ -194,7 +194,7 @@ public class CableBusBlock extends AEBaseTileBlock<CableBusBlockEntity> implemen
         if (target.getType() != Type.BLOCK) {
             return false;
         }
-        BlockPos blockPos = new BlockPos(target.getHitVec().x, target.getHitVec().y, target.getHitVec().z);
+        BlockPos blockPos = new BlockPos(target.getPos().x, target.getPos().y, target.getPos().z);
 
         ICableBusContainer cb = this.cb(world, blockPos);
 
@@ -214,9 +214,9 @@ public class CableBusBlock extends AEBaseTileBlock<CableBusBlockEntity> implemen
         // Spawn a particle for one of the particle textures
         Sprite texture = Platform.pickRandom(cableBusModel.getParticleTextures(renderState));
         if (texture != null) {
-            double x = target.getHitVec().x;
-            double y = target.getHitVec().y;
-            double z = target.getHitVec().z;
+            double x = target.getPos().x;
+            double y = target.getPos().y;
+            double z = target.getPos().z;
             // FIXME: Check how this looks, probably like shit, maybe provide parts the
             // ability to supply particle textures???
             effectRenderer
@@ -310,7 +310,7 @@ public class CableBusBlock extends AEBaseTileBlock<CableBusBlockEntity> implemen
             if (rtr instanceof BlockHitResult) {
                 BlockHitResult brtr = (BlockHitResult) rtr;
                 if (brtr.getPos().equals(pos)) {
-                    final Vec3d hitVec = rtr.getHitVec().subtract(new Vec3d(pos));
+                    final Vec3d hitVec = rtr.getPos().subtract(new Vec3d(pos));
 
                     if (this.cb(worldIn, pos).clicked(player, Hand.MAIN_HAND, hitVec)) {
                         NetworkHandler.instance().sendToServer(new ClickPacket(pos, brtr.getSide(), (float) hitVec.x,
@@ -329,7 +329,7 @@ public class CableBusBlock extends AEBaseTileBlock<CableBusBlockEntity> implemen
     public ActionResult onActivated(final World w, final BlockPos pos, final PlayerEntity player, final Hand hand,
             final @Nullable ItemStack heldItem, final BlockHitResult hit) {
         // Transform from world into block space
-        Vec3d hitVec = hit.getHitVec();
+        Vec3d hitVec = hit.getPos();
         Vec3d hitInBlock = new Vec3d(hitVec.x - pos.getX(), hitVec.y - pos.getY(), hitVec.z - pos.getZ());
         return this.cb(w, pos).activate(player, hand, hitInBlock) ? ActionResult.SUCCESS : ActionResult.PASS;
     }

src/main/java/appeng/block/storage/ChestBlock.java

@@ -29,6 +29,7 @@ import net.minecraft.state.EnumProperty;
 import net.minecraft.state.StateContainer;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
+import net.minecraft.util.Util;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.world.World;
@@ -82,7 +83,7 @@ public class ChestBlock extends AEBaseTileBlock<ChestBlockEntity> {
 
             if (hit.getSide() == tg.getUp()) {
                 if (!tg.openGui(p)) {
-                    p.sendMessage(PlayerMessages.ChestCannotReadStorageCell.get());
+                    p.sendSystemMessage(PlayerMessages.ChestCannotReadStorageCell.get(), Util.NIL_UUID);
                 }
             } else {
                 ContainerOpener.openContainer(ChestContainer.TYPE, p,