Fabric port in progress

src/main/java/appeng/tile/spatial/SpatialIOPortBlockEntity.java

@@ -21,6 +21,7 @@ package appeng.tile.spatial;
 import javax.annotation.Nonnull;
 
 import alexiil.mc.lib.attributes.item.ItemTransferable;
+import net.minecraft.block.BlockState;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.block.entity.BlockEntityType;
@@ -43,7 +44,7 @@ import appeng.api.util.AEPartLocation;
 import appeng.api.util.DimensionalCoord;
 import appeng.hooks.TickHandler;
 import appeng.me.cache.SpatialPylonCache;
-import appeng.tile.grid.AENetworkInvTileEntity;
+import appeng.tile.grid.AENetworkInvBlockEntity;
 import appeng.tile.inventory.AppEngInternalInventory;
 import appeng.util.IWorldCallable;
 import appeng.util.Platform;
@@ -51,27 +52,27 @@ import appeng.util.inv.InvOperation;
 import appeng.util.inv.WrapperFilteredItemHandler;
 import appeng.util.inv.filter.IAEItemFilter;
 
-public class SpatialIOPortTileEntity extends AENetworkInvTileEntity implements IWorldCallable<Void> {
+public class SpatialIOPortBlockEntity extends AENetworkInvBlockEntity implements IWorldCallable<Void> {
 
     private final AppEngInternalInventory inv = new AppEngInternalInventory(this, 2);
     private final ItemTransferable invExt = new WrapperFilteredItemHandler(this.inv, new SpatialIOFilter());
     private YesNo lastRedstoneState = YesNo.UNDECIDED;
 
-    public SpatialIOPortTileEntity(BlockEntityType<?> tileEntityTypeIn) {
+    public SpatialIOPortBlockEntity(BlockEntityType<?> tileEntityTypeIn) {
         super(tileEntityTypeIn);
         this.getProxy().setFlags(GridFlags.REQUIRE_CHANNEL);
     }
 
     @Override
-    public CompoundTag write(final CompoundTag data) {
-        super.write(data);
+    public CompoundTag toTag(final CompoundTag data) {
+        super.toTag(data);
         data.putInt("lastRedstoneState", this.lastRedstoneState.ordinal());
         return data;
     }
 
     @Override
-    public void read(final CompoundTag data) {
-        super.read(data);
+    public void fromTag(BlockState state, final CompoundTag data) {
+        super.fromTag(state, data);
         if (data.contains("lastRedstoneState")) {
             this.lastRedstoneState = YesNo.values()[data.getInt("lastRedstoneState")];
         }
@@ -183,7 +184,7 @@ public class SpatialIOPortTileEntity extends AENetworkInvTileEntity implements I
 
         @Override
         public boolean allowInsert(ItemTransferable inv, int slot, ItemStack stack) {
-            return (slot == 0 && SpatialIOPortTileEntity.this.isSpatialCell(stack));
+            return (slot == 0 && SpatialIOPortBlockEntity.this.isSpatialCell(stack));
         }
 
     }

src/main/java/appeng/tile/spatial/SpatialPylonBlockEntity.java

@@ -40,9 +40,9 @@ import appeng.me.cluster.implementations.SpatialPylonCalculator;
 import appeng.me.cluster.implementations.SpatialPylonCluster;
 import appeng.me.helpers.AENetworkProxy;
 import appeng.me.helpers.AENetworkProxyMultiblock;
-import appeng.tile.grid.AENetworkTileEntity;
+import appeng.tile.grid.AENetworkBlockEntity;
 
-public class SpatialPylonTileEntity extends AENetworkTileEntity implements IAEMultiBlock {
+public class SpatialPylonBlockEntity extends AENetworkBlockEntity implements IAEMultiBlock {
 
     public static final ModelProperty<Integer> STATE = new ModelProperty<>(value -> {
         // The lower 6 bits are used
@@ -66,7 +66,7 @@ public class SpatialPylonTileEntity extends AENetworkTileEntity implements IAEMu
     private SpatialPylonCluster cluster;
     private boolean didHaveLight = false;
 
-    public SpatialPylonTileEntity(BlockEntityType<?> tileEntityTypeIn) {
+    public SpatialPylonBlockEntity(BlockEntityType<?> tileEntityTypeIn) {
         super(tileEntityTypeIn);
         this.getProxy().setFlags(GridFlags.REQUIRE_CHANNEL, GridFlags.MULTIBLOCK);
         this.getProxy().setIdlePowerUsage(0.5);