Rendering/Model Fixes

src/main/java/appeng/tile/crafting/CraftingBlockEntity.java

@@ -246,7 +246,7 @@ public class CraftingBlockEntity extends AENetworkBlockEntity implements IAEMult
         // Since breaking the cluster will most likely also update the TE's state,
         // it's essential that we're not working with outdated block-state information,
         // since this particular TE's block might already have been removed (state=air)
-        updateContainingBlockInfo();
+        resetBlock();
 
         if (this.cluster != null) {
             this.cluster.cancel();

src/main/java/appeng/tile/inventory/AppEngCellInventory.java

@@ -4,7 +4,7 @@ package appeng.tile.inventory;
 import alexiil.mc.lib.attributes.Simulation;
 import alexiil.mc.lib.attributes.item.filter.ItemFilter;
 import alexiil.mc.lib.attributes.item.impl.DelegatingFixedItemInv;
-import appeng.api.AEApi;
+import appeng.core.Api;
 import appeng.api.storage.cells.ICellInventory;
 import appeng.api.storage.cells.ICellInventoryHandler;
 import appeng.util.inv.IAEAppEngInventory;
@@ -12,7 +12,7 @@ import net.minecraft.item.ItemStack;
 
 public class AppEngCellInventory extends DelegatingFixedItemInv {
     private static final ItemFilter CELL_FILTER = stack -> !stack.isEmpty()
-            && AEApi.instance().registries().cell().isCellHandled(stack);
+            && Api.instance().registries().cell().isCellHandled(stack);
 
     private final ICellInventoryHandler<?>[] handlerForSlot;
 

src/main/java/appeng/tile/misc/InscriberRecipes.java

@@ -1,6 +1,6 @@
 package appeng.tile.misc;
 
-import appeng.api.AEApi;
+import appeng.core.Api;
 import appeng.api.definitions.IComparableDefinition;
 import appeng.api.features.InscriberProcessType;
 import appeng.core.Api;

src/main/java/appeng/tile/qnb/QuantumBridgeBlockEntity.java

@@ -286,7 +286,7 @@ public class QuantumBridgeBlockEntity extends AENetworkInvBlockEntity implements
         // Since breaking the cluster will most likely also update the TE's state,
         // it's essential that we're not working with outdated block-state information,
         // since this particular TE's block might already have been removed (state=air)
-        updateContainingBlockInfo();
+        resetBlock();
 
         if (this.cluster != null) {
             this.cluster.destroy();

src/main/java/appeng/tile/storage/ChestBlockEntity.java

@@ -27,7 +27,7 @@ import alexiil.mc.lib.attributes.fluid.filter.ConstantFluidFilter;
 import alexiil.mc.lib.attributes.fluid.filter.FluidFilter;
 import alexiil.mc.lib.attributes.fluid.volume.FluidVolume;
 import alexiil.mc.lib.attributes.item.FixedItemInv;
-import appeng.api.AEApi;
+import appeng.core.Api;
 import appeng.api.config.*;
 import appeng.api.implementations.tiles.IColorableTile;
 import appeng.api.implementations.tiles.IMEChest;
@@ -74,6 +74,7 @@ import net.minecraft.block.entity.BlockEntityType;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.item.Items;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.PacketByteBuf;
 import net.minecraft.screen.ScreenHandlerType;
@@ -258,7 +259,7 @@ public class ChestBlockEntity extends AENetworkPowerBlockEntity
             return null;
         }
         // Client-side we'll need to actually use the synced state
-        if (world == null || world.isRemote) {
+        if (world == null || world.isClient) {
             return cellItem;
         }
         ItemStack cell = getCell();
@@ -357,7 +358,7 @@ public class ChestBlockEntity extends AENetworkPowerBlockEntity
         // when it changes from
         // empty->non-empty, so when the cell is changed, it should re-send the state
         // because of that
-        data.writeRegistryIdUnsafe(ForgeRegistries.ITEMS, getCell().getItem().getRegistryName());
+        data.writeVarInt(Item.getRawId(getCell().getItem()));
     }
 
     @Override
@@ -369,7 +370,7 @@ public class ChestBlockEntity extends AENetworkPowerBlockEntity
         this.state = data.readByte();
         final AEColor oldPaintedColor = this.paintedColor;
         this.paintedColor = AEColor.values()[data.readByte()];
-        this.cellItem = data.readRegistryIdUnsafe(ForgeRegistries.ITEMS);
+        this.cellItem = Item.byRawId(data.readVarInt());
 
         this.lastStateChange = this.world.getTime();
 

src/main/java/appeng/tile/storage/DriveBlockEntity.java

@@ -30,6 +30,7 @@ import java.util.Map;
 import javax.annotation.Nullable;
 
 import alexiil.mc.lib.attributes.item.FixedItemInv;
+import appeng.client.render.model.DriveModelData;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.entity.BlockEntityType;
 import net.minecraft.screen.ScreenHandlerType;
@@ -37,7 +38,6 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.PacketByteBuf;
-import net.minecraft.util.Identifier;
 
 import appeng.api.implementations.tiles.IChestOrDrive;
 import appeng.api.networking.GridFlags;
@@ -59,7 +59,6 @@ import appeng.api.util.AECableType;
 import appeng.api.util.AEPartLocation;
 import appeng.api.util.DimensionalCoord;
 import appeng.block.storage.DriveSlotsState;
-import appeng.client.render.model.DriveModelData;
 import appeng.container.implementations.DriveContainer;
 import appeng.core.Api;
 import appeng.helpers.IPriorityHost;
@@ -70,9 +69,7 @@ import appeng.tile.grid.AENetworkInvBlockEntity;
 import appeng.tile.inventory.AppEngCellInventory;
 import appeng.util.Platform;
 import appeng.util.inv.InvOperation;
-import appeng.util.inv.filter.IAEItemFilter;
 import net.minecraft.util.math.Direction;
-import net.minecraft.util.registry.Registry;
 
 public class DriveBlockEntity extends AENetworkInvBlockEntity implements IChestOrDrive, IPriorityHost {