Fabric port in progress

src/main/java/appeng/spatial/CachedPlane.java

@@ -120,7 +120,7 @@ public class CachedPlane {
                 final Chunk c = w.getChunk(minCX + cx, minCZ + cz);
                 this.myChunks[cx][cz] = c;
 
-                final List<Entry<BlockPos, BlockEntity>> rawTiles = new ArrayList<>(c.getTileEntityMap().entrySet());
+                final List<Entry<BlockPos, BlockEntity>> rawTiles = new ArrayList<>(c.getBlockEntityMap().entrySet());
                 for (final Entry<BlockPos, BlockEntity> tx : rawTiles) {
                     final BlockPos cp = tx.getKey();
                     final BlockEntity te = tx.getValue();
@@ -146,7 +146,7 @@ public class CachedPlane {
                 }
 
                 for (final BlockPos cp : deadTiles) {
-                    c.getTileEntityMap().remove(cp);
+                    c.getBlockEntityMap().remove(cp);
                 }
 
                 final long gameTime = this.getWorld().getGameTime();
@@ -286,7 +286,7 @@ public class CachedPlane {
                     // attempt recovery...
                     c.c.addTileEntity(te);
 
-                    this.world.notifyBlockUpdate(pos, this.world.getBlockState(pos), this.world.getBlockState(pos), z);
+                    this.world.updateListeners(pos, this.world.getBlockState(pos), this.world.getBlockState(pos), z);
                 }
 
                 mr.doneMoving(te);

src/main/java/appeng/spatial/DefaultSpatialHandler.java

@@ -50,7 +50,7 @@ public class DefaultSpatialHandler implements IMovableHandler {
         if (w.getChunkProvider().isChunkLoaded(c.getPos())) {
             final BlockState state = w.getBlockState(newPosition);
             w.addTileEntity(te);
-            w.notifyBlockUpdate(newPosition, state, state, 1);
+            w.updateListeners(newPosition, state, state, 1);
         }
     }
 }

src/main/java/appeng/spatial/StorageHelper.java

@@ -26,7 +26,7 @@ import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.ServerPlayerEntity;
+import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.util.math.Box;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;