Merge branch 'mc-1.17.x' into mc-1.18.x

It's now impossible to run the client tests (tests are still there, but
none of the other infrastructure is). We've not run these for months now
due to their severe flakiness :(.

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         maven { url = 'https://maven.parchmentmc.org' }
     }
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:5.1.24'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:5.1.+'
         classpath "org.spongepowered:mixingradle:0.7.+"
         classpath 'org.parchmentmc:librarian:1.+'
     }
@@ -31,7 +31,7 @@ version = mod_version
 group = "org.squiddev"
 archivesBaseName = "cc-tweaked-${mc_version}"
 
-def javaVersion = JavaLanguageVersion.of(16)
+def javaVersion = JavaLanguageVersion.of(17)
 java {
     toolchain {
         languageVersion = javaVersion
@@ -88,26 +88,8 @@ minecraft {
             args '--mod', 'computercraft', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
         }
 
-        testClient {
-            workingDirectory project.file('test-files/client')
-            parent runs.client
-
-            mods {
-                cctest {
-                    source sourceSets.testMod
-                }
-            }
-
-            lazyToken('minecraft_classpath') {
-                (configurations.shade.copyRecursive().resolve() + configurations.testModExtra.copyRecursive().resolve())
-                    .collect { it.absolutePath }
-                    .join(File.pathSeparator)
-            }
-        }
-
-        testServer {
+        gameTestServer {
             workingDirectory project.file('test-files/server')
-            parent runs.server
 
             mods {
                 cctest {
@@ -123,7 +105,8 @@ minecraft {
         }
     }
 
-    mappings channel: 'parchment', version: "${mapping_version}-${mc_version}"
+    // mappings channel: 'parchment', version: "${mapping_version}-${mc_version}"
+    mappings channel: 'official', version: mc_version
 
     accessTransformer file('src/main/resources/META-INF/accesstransformer.cfg')
     accessTransformer file('src/testMod/resources/META-INF/accesstransformer.cfg')
@@ -158,9 +141,8 @@ dependencies {
     minecraft "net.minecraftforge:forge:${mc_version}-${forge_version}"
     annotationProcessor 'org.spongepowered:mixin:0.8.4:processor'
 
-    compileOnly fg.deobf("mezz.jei:jei-1.17.1:8.0.0.14:api")
-
-    runtimeOnly fg.deobf("mezz.jei:jei-1.17.1:8.0.0.14")
+    compileOnly fg.deobf("mezz.jei:jei-1.18.2:9.4.1.116:api")
+    runtimeOnly fg.deobf("mezz.jei:jei-1.18.2:9.4.1.116")
 
     shade 'org.squiddev:Cobalt:0.5.2-SNAPSHOT'
 
@@ -172,7 +154,9 @@ dependencies {
     testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2'
 
     testModImplementation sourceSets.main.output
-    testModExtra 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.21'
+    testModExtra('org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0') {
+        exclude group: "org.jetbrains", module: "annotations"
+    }
 
     cctJavadoc 'cc.tweaked:cct-javadoc:1.4.5'
 }
@@ -372,69 +356,49 @@ task licenseFormatAPI(type: LicenseFormat)
     }
 }
 
-task setupServer(type: Copy) {
-    group "test server"
-    description "Sets up the environment for the test server."
+tasks.register("testServer", JavaExec.class).configure {
+    it.group('In-game tests')
+    it.description("Runs tests on a temporary Minecraft instance.")
+    it.dependsOn("prepareRunGameTestServer", "cleanTestServer", 'compileTestModJava')
 
-    from("src/testMod/server-files") {
-        include "eula.txt"
-        include "server.properties"
-    }
-    into "test-files/server"
+    // Copy from runTestServer. We do it in this slightly odd way as runTestServer
+    // isn't created until the task is configured (which is no good for us).
+    JavaExec exec = tasks.getByName("runGameTestServer")
+    exec.copyTo(it)
+    it.setClasspath(exec.getClasspath())
+    it.mainClass = exec.mainClass
+    it.setArgs(exec.getArgs())
+
+    // Jacoco and modlauncher don't play well together as the classes loaded in-game don't
+    // match up with those written to disk. We get Jacoco to dump all classes to disk, and
+    // use that when generating the report.
+    def coverageOut = new File(buildDir, "jacocoClassDump/testServer")
+    jacoco.applyTo(it)
+    it.jacoco.setIncludes(["dan200.computercraft.*"])
+    it.jacoco.setClassDumpDir(coverageOut)
+    it.outputs.dir(coverageOut)
+    // Older versions of modlauncher don't include a protection domain (and thus no code
+    // source). Jacoco skips such classes by default, so we need to explicitly include them.
+    it.jacoco.setIncludeNoLocationClasses(true)
 }
 
-["Client", "Server"].forEach { name ->
-    tasks.register("test$name", JavaExec.class).configure {
-        it.group('In-game tests')
-        it.description("Runs tests on a temporary Minecraft instance.")
-        it.dependsOn(setupServer, "prepareRunTest$name", "cleanTest$name", 'compileTestModJava')
+tasks.register("jacocoTestServerReport", JacocoReport.class).configure {
+    it.group('In-game')
+    it.description("Generate coverage reports for testServer")
+    it.dependsOn("testServer")
 
-        // Copy from runTestServer. We do it in this slightly odd way as runTestServer
-        // isn't created until the task is configured (which is no good for us).
-        JavaExec exec = tasks.getByName("runTest$name")
-        exec.copyTo(it)
-        it.setClasspath(exec.getClasspath())
-        it.mainClass = exec.mainClass
-        it.setArgs(exec.getArgs())
+    it.executionData(new File(buildDir, "jacoco/testServer.exec"))
+    it.sourceDirectories.from(sourceSets.main.allJava.srcDirs)
+    it.classDirectories.from(new File(buildDir, "jacocoClassDump/testServer"))
 
-        it.systemProperty('forge.logging.console.level', 'info')
-        it.systemProperty('cctest.run', 'true')
-
-        // Jacoco and modlauncher don't play well together as the classes loaded in-game don't
-        // match up with those written to disk. We get Jacoco to dump all classes to disk, and
-        // use that when generating the report.
-        def coverageOut = new File(buildDir, "jacocoClassDump/test$name")
-        jacoco.applyTo(it)
-        it.jacoco.setIncludes(["dan200.computercraft.*"])
-        it.jacoco.setClassDumpDir(coverageOut)
-        it.outputs.dir(coverageOut)
-        // Older versions of modlauncher don't include a protection domain (and thus no code
-        // source). Jacoco skips such classes by default, so we need to explicitly include them.
-        it.jacoco.setIncludeNoLocationClasses(true)
-    }
-
-    tasks.register("jacocoTest${name}Report", JacocoReport.class).configure {
-        it.group('In-game')
-        it.description("Generate coverage reports for test$name")
-        it.dependsOn("test$name")
-
-        it.executionData(new File(buildDir, "jacoco/test${name}.exec"))
-        it.sourceDirectories.from(sourceSets.main.allJava.srcDirs)
-        it.classDirectories.from(new File(buildDir, "jacocoClassDump/test$name"))
-
-        it.reports {
-            xml.enabled true
-            html.enabled true
-        }
-    }
-
-    if (name != "Client" || project.findProperty('cc.tweaked.clientTests') == 'true') {
-        // Don't run client tests unless explicitly opted into them. They're a bit of a faff
-        // to run and pretty flakey.
-        check.dependsOn("jacocoTest${name}Report")
+    it.reports {
+        xml.enabled true
+        html.enabled true
     }
 }
 
+check.dependsOn("jacocoTestServerReport")
+
 
 // Upload tasks
 

doc/events/mouse_click.md

@@ -19,8 +19,8 @@ numerical value depending on which button on your mouse was last pressed when th
     <!-- Our markdown parser doesn't work on tables!? Guess I'll have to roll my own soonish :/. -->
     <tr><th>Button code</th><th>Mouse button</th></tr>
     <tr><td align="right">1</td><td>Left button</td></tr>
-    <tr><td align="right">2</td><td>Middle button</td></tr>
-    <tr><td align="right">3</td><td>Right button</td></tr>
+    <tr><td align="right">2</td><td>Right button</td></tr>
+    <tr><td align="right">3</td><td>Middle button</td></tr>
 </table>
 
 ## Example

doc/guides/speaker_audio.md

@@ -18,7 +18,7 @@ representable value.
 
 This representation of sound - a long, uniformally sampled list of amplitudes is referred to as [Pulse-code
 Modulation][PCM] (PCM). PCM can be thought of as the "standard" audio format, as it's incredibly easy to work with. For
-instance, to mix two pieces of audio together, you can just samples from the two tracks together and take the average.
+instance, to mix two pieces of audio together, you can just add samples from the two tracks together and take the average.
 
 CC: Tweaked's speakers also work with PCM audio. It plays back 48,000 samples a second, where each sample is an integer
 between -128 and 127. This is more commonly referred to as 48kHz and an 8-bit resolution.

gradle.properties

@@ -1,10 +1,10 @@
 org.gradle.jvmargs=-Xmx3G
 
 # Mod properties
-mod_version=1.100.1
+mod_version=1.100.3
 
 # Minecraft properties (update mods.toml when changing)
-mc_version=1.17.1
-mapping_version=2021.09.05
-forge_version=37.0.85
+mc_version=1.18.2
+mapping_version=2022.02.13
+forge_version=40.0.2
 # NO SERIOUSLY, UPDATE mods.toml WHEN CHANGING

src/generated/resources/data/computercraft/loot_tables/blocks/cable.json

@@ -22,8 +22,7 @@
             "cable": "true"
           }
         }
-      ],
-      "functions": []
+      ]
     },
     {
       "name": "wired_modem",
@@ -49,8 +48,7 @@
             }
           }
         }
-      ],
-      "functions": []
+      ]
     }
   ]
 }

src/generated/resources/data/computercraft/loot_tables/blocks/computer_advanced.json

@@ -29,8 +29,7 @@
             }
           ]
         }
-      ],
-      "functions": []
+      ]
     }
   ]
 }

src/generated/resources/data/computercraft/loot_tables/blocks/computer_command.json

@@ -29,8 +29,7 @@
             }
           ]
         }
-      ],
-      "functions": []
+      ]
     }
   ]
 }

src/generated/resources/data/computercraft/loot_tables/blocks/computer_normal.json

@@ -29,8 +29,7 @@
             }
           ]
         }
-      ],
-      "functions": []
+      ]
     }
   ]
 }

src/generated/resources/data/computercraft/loot_tables/blocks/disk_drive.json

@@ -15,8 +15,7 @@
         {
           "condition": "minecraft:survives_explosion"
         }
-      ],
-      "functions": []
+      ]
     }
   ]
 }

src/generated/resources/data/computercraft/loot_tables/blocks/monitor_advanced.json

@@ -15,8 +15,7 @@
         {
           "condition": "minecraft:survives_explosion"
         }
-      ],
-      "functions": []
+      ]
     }
   ]
 }

src/generated/resources/data/computercraft/loot_tables/blocks/monitor_normal.json

@@ -15,8 +15,7 @@
         {
           "condition": "minecraft:survives_explosion"
         }
-      ],
-      "functions": []
+      ]
     }
   ]
 }

src/generated/resources/data/computercraft/loot_tables/blocks/printer.json

@@ -15,8 +15,7 @@
         {
           "condition": "minecraft:survives_explosion"
         }
-      ],
-      "functions": []
+      ]
     }
   ]
 }

src/generated/resources/data/computercraft/loot_tables/blocks/speaker.json

@@ -15,8 +15,7 @@
         {
           "condition": "minecraft:survives_explosion"
         }
-      ],
-      "functions": []
+      ]
     }
   ]
 }

src/generated/resources/data/computercraft/loot_tables/blocks/turtle_advanced.json

@@ -29,8 +29,7 @@
             }
           ]
         }
-      ],
-      "functions": []
+      ]
     }
   ]
 }

src/generated/resources/data/computercraft/loot_tables/blocks/turtle_normal.json

@@ -29,8 +29,7 @@
             }
           ]
         }
-      ],
-      "functions": []
+      ]
     }
   ]
 }

src/generated/resources/data/computercraft/loot_tables/blocks/wired_modem_full.json

@@ -15,8 +15,7 @@
         {
           "condition": "minecraft:survives_explosion"
         }
-      ],
-      "functions": []
+      ]
     }
   ]
 }

src/generated/resources/data/computercraft/loot_tables/blocks/wireless_modem_advanced.json

@@ -15,8 +15,7 @@
         {
           "condition": "minecraft:survives_explosion"
         }
-      ],
-      "functions": []
+      ]
     }
   ]
 }

src/generated/resources/data/computercraft/loot_tables/blocks/wireless_modem_normal.json

@@ -15,8 +15,7 @@
         {
           "condition": "minecraft:survives_explosion"
         }
-      ],
-      "functions": []
+      ]
     }
   ]
 }

src/main/java/dan200/computercraft/ComputerCraftAPIImpl.java

@@ -30,7 +30,6 @@ import dan200.computercraft.shared.wired.WiredNode;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.server.packs.resources.ReloadableResourceManager;
 import net.minecraft.server.packs.resources.ResourceManager;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.Level;
@@ -38,7 +37,7 @@ import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.common.util.LazyOptional;
 import net.minecraftforge.fml.ModList;
-import net.minecraftforge.fmllegacy.server.ServerLifecycleHooks;
+import net.minecraftforge.server.ServerLifecycleHooks;
 
 import javax.annotation.Nonnull;
 import java.io.File;
@@ -59,7 +58,7 @@ public final class ComputerCraftAPIImpl implements IComputerCraftAPI
 
     public static InputStream getResourceFile( String domain, String subPath )
     {
-        ReloadableResourceManager manager = (ReloadableResourceManager) ServerLifecycleHooks.getCurrentServer().getResourceManager();
+        var manager = ServerLifecycleHooks.getCurrentServer().getResourceManager();
         try
         {
             return manager.getResource( new ResourceLocation( domain, subPath ) ).getInputStream();

src/main/java/dan200/computercraft/api/ComputerCraftAPI.java

@@ -111,7 +111,7 @@ public final class ComputerCraftAPI
     }
 
     /**
-     * rers a peripheral provider to convert blocks into {@link IPeripheral} implementations.
+     * Registers a peripheral provider to convert blocks into {@link IPeripheral} implementations.
      *
      * @param provider The peripheral provider to register.
      * @see IPeripheral

src/main/java/dan200/computercraft/api/ComputerCraftTags.java

@@ -9,7 +9,7 @@ import dan200.computercraft.ComputerCraft;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.tags.ItemTags;
-import net.minecraft.tags.Tag;
+import net.minecraft.tags.TagKey;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.Block;
 
@@ -20,47 +20,47 @@ public class ComputerCraftTags
 {
     public static class Items
     {
-        public static final Tag.Named<Item> COMPUTER = make( "computer" );
-        public static final Tag.Named<Item> TURTLE = make( "turtle" );
-        public static final Tag.Named<Item> WIRED_MODEM = make( "wired_modem" );
-        public static final Tag.Named<Item> MONITOR = make( "monitor" );
+        public static final TagKey<Item> COMPUTER = make( "computer" );
+        public static final TagKey<Item> TURTLE = make( "turtle" );
+        public static final TagKey<Item> WIRED_MODEM = make( "wired_modem" );
+        public static final TagKey<Item> MONITOR = make( "monitor" );
 
-        private static Tag.Named<Item> make( String name )
+        private static TagKey<Item> make( String name )
         {
-            return ItemTags.bind( new ResourceLocation( ComputerCraft.MOD_ID, name ).toString() );
+            return ItemTags.create( new ResourceLocation( ComputerCraft.MOD_ID, name ) );
         }
     }
 
     public static class Blocks
     {
-        public static final Tag.Named<Block> COMPUTER = make( "computer" );
-        public static final Tag.Named<Block> TURTLE = make( "turtle" );
-        public static final Tag.Named<Block> WIRED_MODEM = make( "wired_modem" );
-        public static final Tag.Named<Block> MONITOR = make( "monitor" );
+        public static final TagKey<Block> COMPUTER = make( "computer" );
+        public static final TagKey<Block> TURTLE = make( "turtle" );
+        public static final TagKey<Block> WIRED_MODEM = make( "wired_modem" );
+        public static final TagKey<Block> MONITOR = make( "monitor" );
 
         /**
          * Blocks which can be broken by any turtle tool.
          */
-        public static final Tag.Named<Block> TURTLE_ALWAYS_BREAKABLE = make( "turtle_always_breakable" );
+        public static final TagKey<Block> TURTLE_ALWAYS_BREAKABLE = make( "turtle_always_breakable" );
 
         /**
          * Blocks which can be broken by the default shovel tool.
          */
-        public static final Tag.Named<Block> TURTLE_SHOVEL_BREAKABLE = make( "turtle_shovel_harvestable" );
+        public static final TagKey<Block> TURTLE_SHOVEL_BREAKABLE = make( "turtle_shovel_harvestable" );
 
         /**
          * Blocks which can be broken with the default sword tool.
          */
-        public static final Tag.Named<Block> TURTLE_SWORD_BREAKABLE = make( "turtle_sword_harvestable" );
+        public static final TagKey<Block> TURTLE_SWORD_BREAKABLE = make( "turtle_sword_harvestable" );
 
         /**
          * Blocks which can be broken with the default hoe tool.
          */
-        public static final Tag.Named<Block> TURTLE_HOE_BREAKABLE = make( "turtle_hoe_harvestable" );
+        public static final TagKey<Block> TURTLE_HOE_BREAKABLE = make( "turtle_hoe_harvestable" );
 
-        private static Tag.Named<Block> make( String name )
+        private static TagKey<Block> make( String name )
         {
-            return BlockTags.bind( new ResourceLocation( ComputerCraft.MOD_ID, name ).toString() );
+            return BlockTags.create( new ResourceLocation( ComputerCraft.MOD_ID, name ) );
         }
     }
 }

src/main/java/dan200/computercraft/api/turtle/TurtleUpgradeDataProvider.java

@@ -10,7 +10,7 @@ import dan200.computercraft.api.ComputerCraftTags;
 import dan200.computercraft.api.upgrades.UpgradeDataProvider;
 import net.minecraft.data.DataGenerator;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.tags.Tag;
+import net.minecraft.tags.TagKey;
 import net.minecraft.world.entity.ai.attributes.Attributes;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.Block;
@@ -42,7 +42,7 @@ public abstract class TurtleUpgradeDataProvider extends UpgradeDataProvider<ITur
      *
      * @param id   The ID of this tool.
      * @param item The item used for tool actions. Note, this doesn't inherit all properties of the tool, you may need
-     *             to specify {@link ToolBuilder#damageMultiplier(float)} and {@link ToolBuilder#breakable(Tag.Named)}.
+     *             to specify {@link ToolBuilder#damageMultiplier(float)} and {@link ToolBuilder#breakable(TagKey)}.
      * @return A tool builder,
      */
     @Nonnull
@@ -64,7 +64,7 @@ public abstract class TurtleUpgradeDataProvider extends UpgradeDataProvider<ITur
         private String adjective;
         private Item craftingItem;
         private Float damageMultiplier = null;
-        private Tag.Named<Block> breakable;
+        private TagKey<Block> breakable;
 
         ToolBuilder( ResourceLocation id, TurtleUpgradeSerialiser<?> serialiser, Item toolItem )
         {
@@ -123,7 +123,7 @@ public abstract class TurtleUpgradeDataProvider extends UpgradeDataProvider<ITur
          * @return The tool builder, for further use.
          * @see ComputerCraftTags.Blocks
          */
-        public ToolBuilder breakable( @Nonnull Tag.Named<Block> breakable )
+        public ToolBuilder breakable( @Nonnull TagKey<Block> breakable )
         {
             this.breakable = breakable;
             return this;
@@ -141,7 +141,7 @@ public abstract class TurtleUpgradeDataProvider extends UpgradeDataProvider<ITur
                 if( adjective != null ) s.addProperty( "adjective", adjective );
                 if( craftingItem != null ) s.addProperty( "craftItem", craftingItem.getRegistryName().toString() );
                 if( damageMultiplier != null ) s.addProperty( "damageMultiplier", damageMultiplier );
-                if( breakable != null ) s.addProperty( "breakable", breakable.getName().toString() );
+                if( breakable != null ) s.addProperty( "breakable", breakable.location().toString() );
             } ) );
         }
     }

src/main/java/dan200/computercraft/client/ClientRegistry.java

@@ -10,7 +10,6 @@ import dan200.computercraft.client.gui.*;
 import dan200.computercraft.client.render.TileEntityMonitorRenderer;
 import dan200.computercraft.client.render.TileEntityTurtleRenderer;
 import dan200.computercraft.client.render.TurtleModelLoader;
-import dan200.computercraft.client.render.TurtlePlayerRenderer;
 import dan200.computercraft.shared.Registry;
 import dan200.computercraft.shared.common.IColouredItem;
 import dan200.computercraft.shared.computer.inventory.ContainerComputerBase;
@@ -30,9 +29,8 @@ import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.Item;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.client.event.ColorHandlerEvent;
-import net.minecraftforge.client.event.EntityRenderersEvent;
 import net.minecraftforge.client.event.ModelRegistryEvent;
-import net.minecraftforge.client.model.ModelLoader;
+import net.minecraftforge.client.model.ForgeModelBakery;
 import net.minecraftforge.client.model.ModelLoaderRegistry;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
@@ -76,7 +74,7 @@ public final class ClientRegistry
         ModelLoaderRegistry.registerLoader( new ResourceLocation( ComputerCraft.MOD_ID, "turtle" ), TurtleModelLoader.INSTANCE );
         for( String model : EXTRA_MODELS )
         {
-            ModelLoader.addSpecialModel( new ModelResourceLocation( new ResourceLocation( ComputerCraft.MOD_ID, model ), "inventory" ) );
+            ForgeModelBakery.addSpecialModel( new ModelResourceLocation( new ResourceLocation( ComputerCraft.MOD_ID, model ), "inventory" ) );
         }
     }
 
@@ -122,12 +120,6 @@ public final class ClientRegistry
         );
     }
 
-    @SubscribeEvent
-    public static void registerEntityRenderers( EntityRenderersEvent.RegisterRenderers event )
-    {
-        event.registerEntityRenderer( Registry.ModEntities.TURTLE_PLAYER.get(), TurtlePlayerRenderer::new );
-    }
-
     @SubscribeEvent
     public static void setupClient( FMLClientSetupEvent event )
     {

src/main/java/dan200/computercraft/client/gui/widgets/DynamicImageButton.java

@@ -71,12 +71,12 @@ public class DynamicImageButton extends Button
         RenderSystem.disableDepthTest();
 
         int yTex = yTexStart;
-        if( isHovered() ) yTex += yDiffTex;
+        if( isHoveredOrFocused() ) yTex += yDiffTex;
 
         blit( stack, x, y, xTexStart.getAsInt(), yTex, width, height, textureWidth, textureHeight );
         RenderSystem.enableDepthTest();
 
-        if( isHovered() ) renderToolTip( stack, mouseX, mouseY );
+        if( isHovered ) renderToolTip( stack, mouseX, mouseY );
     }
 
     @Nonnull

src/main/java/dan200/computercraft/client/render/CableHighlightRenderer.java

@@ -45,8 +45,8 @@ public final class CableHighlightRenderer
     {
         BlockHitResult hit = event.getTarget();
         BlockPos pos = hit.getBlockPos();
-        Level world = event.getInfo().getEntity().getCommandSenderWorld();
-        Camera info = event.getInfo();
+        Level world = event.getCamera().getEntity().getCommandSenderWorld();
+        Camera info = event.getCamera();
 
         BlockState state = world.getBlockState( pos );
 
@@ -67,9 +67,9 @@ public final class CableHighlightRenderer
         double yOffset = pos.getY() - cameraPos.y();
         double zOffset = pos.getZ() - cameraPos.z();
 
-        VertexConsumer buffer = event.getBuffers().getBuffer( RenderType.lines() );
-        Matrix4f matrix4f = event.getMatrix().last().pose();
-        Matrix3f normal = event.getMatrix().last().normal();
+        VertexConsumer buffer = event.getMultiBufferSource().getBuffer( RenderType.lines() );
+        Matrix4f matrix4f = event.getPoseStack().last().pose();
+        Matrix3f normal = event.getPoseStack().last().normal();
         // TODO: Can we just accesstransformer out LevelRenderer.renderShape?
         shape.forAllEdges( ( x1, y1, z1, x2, y2, z2 ) -> {
             float xDelta = (float) (x2 - x1);

src/main/java/dan200/computercraft/client/render/ItemPocketRenderer.java

@@ -48,7 +48,7 @@ public final class ItemPocketRenderer extends ItemMapLikeRenderer
 
         event.setCanceled( true );
         INSTANCE.renderItemFirstPerson(
-            event.getMatrixStack(), event.getBuffers(), event.getLight(),
+            event.getPoseStack(), event.getMultiBufferSource(), event.getPackedLight(),
             event.getHand(), event.getInterpolatedPitch(), event.getEquipProgress(), event.getSwingProgress(), event.getItemStack()
         );
     }

src/main/java/dan200/computercraft/client/render/ItemPrintoutRenderer.java

@@ -45,7 +45,7 @@ public final class ItemPrintoutRenderer extends ItemMapLikeRenderer
 
         event.setCanceled( true );
         INSTANCE.renderItemFirstPerson(
-            event.getMatrixStack(), event.getBuffers(), event.getLight(),
+            event.getPoseStack(), event.getMultiBufferSource(), event.getPackedLight(),
             event.getHand(), event.getInterpolatedPitch(), event.getEquipProgress(), event.getSwingProgress(), event.getItemStack()
         );
     }
@@ -63,11 +63,11 @@ public final class ItemPrintoutRenderer extends ItemMapLikeRenderer
     @SubscribeEvent
     public static void onRenderInFrame( RenderItemInFrameEvent event )
     {
-        ItemStack stack = event.getItem();
+        ItemStack stack = event.getItemStack();
         if( !(stack.getItem() instanceof ItemPrintout) ) return;
         event.setCanceled( true );
 
-        PoseStack transform = event.getMatrix();
+        PoseStack transform = event.getPoseStack();
 
         // Move a little bit forward to ensure we're not clipping with the frame
         transform.translate( 0.0f, 0.0f, -0.001f );
@@ -75,8 +75,8 @@ public final class ItemPrintoutRenderer extends ItemMapLikeRenderer
         transform.scale( 0.95f, 0.95f, -0.95f );
         transform.translate( -0.5f, -0.5f, 0.0f );
 
-        int light = event.getEntityItemFrame().getType() == EntityType.GLOW_ITEM_FRAME ? 0xf000d2 : event.getLight(); // See getLightVal.
-        drawPrintout( transform, event.getBuffers(), stack, light );
+        int light = event.getItemFrameEntity().getType() == EntityType.GLOW_ITEM_FRAME ? 0xf000d2 : event.getPackedLight(); // See getLightVal.
+        drawPrintout( transform, event.getMultiBufferSource(), stack, light );
     }
 
     private static void drawPrintout( PoseStack transform, MultiBufferSource render, ItemStack stack, int light )

src/main/java/dan200/computercraft/client/render/MonitorHighlightRenderer.java

@@ -41,9 +41,9 @@ public final class MonitorHighlightRenderer
     public static void drawHighlight( DrawSelectionEvent.HighlightBlock event )
     {
         // Preserve normal behaviour when crouching.
-        if( event.getInfo().getEntity().isCrouching() ) return;
+        if( event.getCamera().getEntity().isCrouching() ) return;
 
-        Level world = event.getInfo().getEntity().getCommandSenderWorld();
+        Level world = event.getCamera().getEntity().getCommandSenderWorld();
         BlockPos pos = event.getTarget().getBlockPos();
 
         BlockEntity tile = world.getBlockEntity( pos );
@@ -60,13 +60,13 @@ public final class MonitorHighlightRenderer
         if( monitor.getYIndex() != 0 ) faces.remove( monitor.getDown().getOpposite() );
         if( monitor.getYIndex() != monitor.getHeight() - 1 ) faces.remove( monitor.getDown() );
 
-        PoseStack transformStack = event.getMatrix();
-        Vec3 cameraPos = event.getInfo().getPosition();
+        PoseStack transformStack = event.getPoseStack();
+        Vec3 cameraPos = event.getCamera().getPosition();
         transformStack.pushPose();
         transformStack.translate( pos.getX() - cameraPos.x(), pos.getY() - cameraPos.y(), pos.getZ() - cameraPos.z() );
 
         // I wish I could think of a better way to do this
-        VertexConsumer buffer = event.getBuffers().getBuffer( RenderType.lines() );
+        VertexConsumer buffer = event.getMultiBufferSource().getBuffer( RenderType.lines() );
         Matrix4f transform = transformStack.last().pose();
         Matrix3f normal = transformStack.last().normal();
         if( faces.contains( NORTH ) || faces.contains( WEST ) ) line( buffer, transform, normal, 0, 0, 0, UP );

src/main/java/dan200/computercraft/client/sound/SpeakerManager.java

@@ -29,11 +29,11 @@ public class SpeakerManager
         if( !(event.getSound() instanceof SpeakerSound sound) ) return;
         if( sound.stream == null ) return;
 
-        event.getSource().attachBufferStream( sound.stream );
-        event.getSource().play();
+        event.getChannel().attachBufferStream( sound.stream );
+        event.getChannel().play();
 
-        sound.channel = event.getSource();
-        sound.executor = event.getManager().executor;
+        sound.channel = event.getChannel();
+        sound.executor = event.getEngine().executor;
     }
 
     public static SpeakerInstance getSound( UUID source )

src/main/java/dan200/computercraft/core/lua/CobaltLuaMachine.java

@@ -14,8 +14,8 @@ import dan200.computercraft.core.computer.TimeoutState;
 import dan200.computercraft.core.tracking.Tracking;
 import dan200.computercraft.core.tracking.TrackingField;
 import dan200.computercraft.shared.util.ThreadUtils;
-import org.squiddev.cobalt.*;
 import org.squiddev.cobalt.LuaTable;
+import org.squiddev.cobalt.*;
 import org.squiddev.cobalt.compiler.CompileException;
 import org.squiddev.cobalt.compiler.LoadState;
 import org.squiddev.cobalt.debug.DebugFrame;

src/main/java/dan200/computercraft/data/LootTableGenerator.java

@@ -26,7 +26,7 @@ import net.minecraft.world.level.storage.loot.predicates.AlternativeLootItemCond
 import net.minecraft.world.level.storage.loot.predicates.ExplosionCondition;
 import net.minecraft.world.level.storage.loot.predicates.LootItemBlockStatePropertyCondition;
 import net.minecraft.world.level.storage.loot.providers.number.ConstantValue;
-import net.minecraftforge.fmllegacy.RegistryObject;
+import net.minecraftforge.registries.RegistryObject;
 
 import java.util.function.BiConsumer;
 

src/main/java/dan200/computercraft/data/RecipeGenerator.java

@@ -27,7 +27,7 @@ import net.minecraft.data.DataGenerator;
 import net.minecraft.data.recipes.*;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.tags.Tag;
+import net.minecraft.tags.TagKey;
 import net.minecraft.world.item.*;
 import net.minecraft.world.item.crafting.RecipeSerializer;
 import net.minecraft.world.item.crafting.SimpleRecipeSerializer;
@@ -370,7 +370,7 @@ class RecipeGenerator extends RecipeProvider
         return DyeColor.byId( 15 - colour.ordinal() );
     }
 
-    private static InventoryChangeTrigger.TriggerInstance inventoryChange( Tag<Item> stack )
+    private static InventoryChangeTrigger.TriggerInstance inventoryChange( TagKey<Item> stack )
     {
         return InventoryChangeTrigger.TriggerInstance.hasItems( ItemPredicate.Builder.item().of( stack ).build() );
     }

src/main/java/dan200/computercraft/shared/CommonHooks.java

@@ -21,6 +21,7 @@ import dan200.computercraft.shared.peripheral.modem.wireless.WirelessNetwork;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.dedicated.DedicatedServer;
+import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.level.storage.loot.BuiltInLootTables;
 import net.minecraft.world.level.storage.loot.LootPool;
@@ -28,11 +29,11 @@ import net.minecraft.world.level.storage.loot.entries.LootTableReference;
 import net.minecraft.world.level.storage.loot.providers.number.ConstantValue;
 import net.minecraftforge.event.*;
 import net.minecraftforge.event.entity.player.PlayerContainerEvent;
+import net.minecraftforge.event.server.ServerStartedEvent;
+import net.minecraftforge.event.server.ServerStartingEvent;
+import net.minecraftforge.event.server.ServerStoppedEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fmlserverevents.FMLServerStartedEvent;
-import net.minecraftforge.fmlserverevents.FMLServerStartingEvent;
-import net.minecraftforge.fmlserverevents.FMLServerStoppedEvent;
 
 import java.util.Arrays;
 import java.util.HashSet;
@@ -84,7 +85,7 @@ public final class CommonHooks
     }
 
     @SubscribeEvent
-    public static void onServerStarting( FMLServerStartingEvent event )
+    public static void onServerStarting( ServerStartingEvent event )
     {
         MinecraftServer server = event.getServer();
         if( server instanceof DedicatedServer dediServer && dediServer.getProperties().enableJmxMonitoring )
@@ -94,7 +95,7 @@ public final class CommonHooks
     }
 
     @SubscribeEvent
-    public static void onServerStarted( FMLServerStartedEvent event )
+    public static void onServerStarted( ServerStartedEvent event )
     {
         ComputerCraft.serverComputerRegistry.reset();
         WirelessNetwork.resetNetworks();
@@ -104,7 +105,7 @@ public final class CommonHooks
     }
 
     @SubscribeEvent
-    public static void onServerStopped( FMLServerStoppedEvent event )
+    public static void onServerStopped( ServerStoppedEvent event )
     {
         ComputerCraft.serverComputerRegistry.reset();
         WirelessNetwork.resetNetworks();
@@ -161,4 +162,14 @@ public final class CommonHooks
             NetworkHandler.sendToPlayer( event.getPlayer(), packet );
         }
     }
+
+    @SubscribeEvent
+    public static void onMissingEntityMappingsEvent( RegistryEvent.MissingMappings<EntityType<?>> event )
+    {
+        ResourceLocation id = new ResourceLocation( ComputerCraft.MOD_ID, "turtle_player" );
+        for( RegistryEvent.MissingMappings.Mapping<EntityType<?>> mapping : event.getMappings( ComputerCraft.MOD_ID ) )
+        {
+            if( mapping.key.equals( id ) ) mapping.ignore();
+        }
+    }
 }

src/main/java/dan200/computercraft/shared/Registry.java

@@ -61,7 +61,6 @@ import dan200.computercraft.shared.pocket.peripherals.PocketSpeaker;
 import dan200.computercraft.shared.pocket.recipes.PocketComputerUpgradeRecipe;
 import dan200.computercraft.shared.turtle.blocks.BlockTurtle;
 import dan200.computercraft.shared.turtle.blocks.TileTurtle;
-import dan200.computercraft.shared.turtle.core.TurtlePlayer;
 import dan200.computercraft.shared.turtle.inventory.ContainerTurtle;
 import dan200.computercraft.shared.turtle.items.ItemTurtle;
 import dan200.computercraft.shared.turtle.recipes.TurtleRecipe;
@@ -73,8 +72,6 @@ import dan200.computercraft.shared.util.ImpostorRecipe;
 import dan200.computercraft.shared.util.ImpostorShapelessRecipe;
 import net.minecraft.core.cauldron.CauldronInteraction;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.entity.EntityType;
-import net.minecraft.world.entity.MobCategory;
 import net.minecraft.world.inventory.MenuType;
 import net.minecraft.world.item.BlockItem;
 import net.minecraft.world.item.CreativeModeTab;
@@ -96,11 +93,11 @@ import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
-import net.minecraftforge.fmllegacy.RegistryObject;
 import net.minecraftforge.items.CapabilityItemHandler;
 import net.minecraftforge.registries.DeferredRegister;
 import net.minecraftforge.registries.ForgeRegistries;
 import net.minecraftforge.registries.RegistryBuilder;
+import net.minecraftforge.registries.RegistryObject;
 
 import java.util.function.BiFunction;
 
@@ -285,18 +282,6 @@ public final class Registry
             SERIALISERS.register( "wireless_modem_advanced", () -> PocketUpgradeSerialiser.simpleWithCustomItem( ( id, item ) -> new PocketModem( id, item, true ) ) );
     }
 
-    public static class ModEntities
-    {
-        static final DeferredRegister<EntityType<?>> ENTITIES = DeferredRegister.create( ForgeRegistries.ENTITIES, ComputerCraft.MOD_ID );
-
-        public static final RegistryObject<EntityType<TurtlePlayer>> TURTLE_PLAYER = ENTITIES.register( "turtle_player", () ->
-            EntityType.Builder.<TurtlePlayer>createNothing( MobCategory.MISC )
-                .noSave()
-                .noSummon()
-                .sized( 0, 0 )
-                .build( ComputerCraft.MOD_ID + ":turtle_player" ) );
-    }
-
     public static class ModContainers
     {
         static final DeferredRegister<MenuType<?>> CONTAINERS = DeferredRegister.create( ForgeRegistries.CONTAINERS, ComputerCraft.MOD_ID );
@@ -425,7 +410,6 @@ public final class Registry
         ModItems.ITEMS.register( bus );
         ModTurtleSerialisers.SERIALISERS.register( bus );
         ModPocketUpgradeSerialisers.SERIALISERS.register( bus );
-        ModEntities.ENTITIES.register( bus );
         ModContainers.CONTAINERS.register( bus );
     }
 }

src/main/java/dan200/computercraft/shared/command/ClientCommands.java

@@ -13,7 +13,7 @@ import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.client.event.ClientChatEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fmllegacy.server.ServerLifecycleHooks;
+import net.minecraftforge.server.ServerLifecycleHooks;
 
 import java.io.File;
 

src/main/java/dan200/computercraft/shared/command/CommandUtils.java

@@ -32,7 +32,7 @@ public final class CommandUtils
     }
 
     @SuppressWarnings( "unchecked" )
-    public static CompletableFuture<Suggestions> suggestOnServer( CommandContext<?> context, SuggestionsBuilder builder, Function<CommandContext<CommandSourceStack>, CompletableFuture<Suggestions>> supplier )
+    public static CompletableFuture<Suggestions> suggestOnServer( CommandContext<?> context, Function<CommandContext<CommandSourceStack>, CompletableFuture<Suggestions>> supplier )
     {
         Object source = context.getSource();
         if( !(source instanceof SharedSuggestionProvider) )
@@ -45,7 +45,7 @@ public final class CommandUtils
         }
         else
         {
-            return ((SharedSuggestionProvider) source).customSuggestion( (CommandContext<SharedSuggestionProvider>) context, builder );
+            return ((SharedSuggestionProvider) source).customSuggestion( context );
         }
     }
 

src/main/java/dan200/computercraft/shared/command/arguments/ComputersArgumentType.java

@@ -121,7 +121,7 @@ public final class ComputersArgumentType implements ArgumentType<ComputersArgume
         }
 
         // Verify we've a command source and we're running on the server
-        return suggestOnServer( context, builder, s -> {
+        return suggestOnServer( context, s -> {
             if( remaining.startsWith( "@" ) )
             {
                 suggestComputers( builder, remaining, x -> {

src/main/java/dan200/computercraft/shared/common/BlockGeneric.java

@@ -19,7 +19,7 @@ import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.BlockHitResult;
-import net.minecraftforge.fmllegacy.RegistryObject;
+import net.minecraftforge.registries.RegistryObject;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;

src/main/java/dan200/computercraft/shared/common/TileGeneric.java

@@ -12,11 +12,11 @@ import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.BlockHitResult;
-import net.minecraftforge.common.util.Constants;
 
 import javax.annotation.Nonnull;
 
@@ -36,7 +36,7 @@ public abstract class TileGeneric extends BlockEntity
         setChanged();
         BlockPos pos = getBlockPos();
         BlockState state = getBlockState();
-        getLevel().sendBlockUpdated( pos, state, state, Constants.BlockFlags.DEFAULT );
+        getLevel().sendBlockUpdated( pos, state, state, Block.UPDATE_ALL );
     }
 
     @Nonnull
@@ -76,7 +76,8 @@ public abstract class TileGeneric extends BlockEntity
     @Override
     public final void onDataPacket( Connection net, ClientboundBlockEntityDataPacket packet )
     {
-        if( packet.getType() == 0 ) handleUpdateTag( packet.getTag() );
+        var tag = packet.getTag();
+        if( tag != null ) handleUpdateTag( tag );
     }
 
     @Override

src/main/java/dan200/computercraft/shared/computer/apis/CommandAPI.java

@@ -16,7 +16,6 @@ import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.Commands;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Registry;
-import net.minecraft.nbt.CompoundTag;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.MinecraftServer;
@@ -81,7 +80,7 @@ public class CommandAPI implements ILuaAPI
         Map<String, Object> table = BlockData.fill( new HashMap<>(), state );
 
         BlockEntity tile = world.getBlockEntity( pos );
-        if( tile != null ) table.put( "nbt", NBTUtil.toLua( tile.save( new CompoundTag() ) ) );
+        if( tile != null ) table.put( "nbt", NBTUtil.toLua( tile.saveWithFullMetadata() ) );
 
         return table;
     }

src/main/java/dan200/computercraft/shared/computer/blocks/BlockComputer.java

@@ -18,7 +18,7 @@ import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.block.state.properties.DirectionProperty;
 import net.minecraft.world.level.block.state.properties.EnumProperty;
-import net.minecraftforge.fmllegacy.RegistryObject;
+import net.minecraftforge.registries.RegistryObject;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;

src/main/java/dan200/computercraft/shared/computer/blocks/BlockComputerBase.java

@@ -32,7 +32,7 @@ import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
 import net.minecraft.world.phys.HitResult;
 import net.minecraft.world.phys.Vec3;
-import net.minecraftforge.fmllegacy.RegistryObject;
+import net.minecraftforge.registries.RegistryObject;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -119,7 +119,7 @@ public abstract class BlockComputerBase<T extends TileComputerBase> extends Bloc
 
     @Nonnull
     @Override
-    public ItemStack getPickBlock( BlockState state, HitResult target, BlockGetter world, BlockPos pos, Player player )
+    public ItemStack getCloneItemStack( BlockState state, HitResult target, BlockGetter world, BlockPos pos, Player player )
     {
         BlockEntity tile = world.getBlockEntity( pos );
         if( tile instanceof TileComputerBase )
@@ -128,7 +128,7 @@ public abstract class BlockComputerBase<T extends TileComputerBase> extends Bloc
             if( !result.isEmpty() ) return result;
         }
 
-        return super.getPickBlock( state, target, world, pos, player );
+        return super.getCloneItemStack( state, target, world, pos, player );
     }
 
     @Override

src/main/java/dan200/computercraft/shared/computer/blocks/TileComputerBase.java

@@ -188,16 +188,15 @@ public abstract class TileComputerBase extends TileGeneric implements IComputerT
 
     protected abstract void updateBlockState( ComputerState newState );
 
-    @Nonnull
     @Override
-    public CompoundTag save( @Nonnull CompoundTag nbt )
+    public void saveAdditional( @Nonnull CompoundTag nbt )
     {
         // Save ID, label and power state
         if( computerID >= 0 ) nbt.putInt( NBT_ID, computerID );
         if( label != null ) nbt.putString( NBT_LABEL, label );
         nbt.putBoolean( NBT_ON, on );
 
-        return super.save( nbt );
+        super.saveAdditional( nbt );
     }
 
     @Override
@@ -388,7 +387,7 @@ public abstract class TileComputerBase extends TileGeneric implements IComputerT
     @Override
     public final ClientboundBlockEntityDataPacket getUpdatePacket()
     {
-        return new ClientboundBlockEntityDataPacket( worldPosition, 0, getUpdateTag() );
+        return ClientboundBlockEntityDataPacket.create( this );
     }
 
     @Nonnull

src/main/java/dan200/computercraft/shared/computer/core/ServerComputer.java

@@ -28,7 +28,7 @@ import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.level.Level;
-import net.minecraftforge.fmllegacy.server.ServerLifecycleHooks;
+import net.minecraftforge.server.ServerLifecycleHooks;
 import net.minecraftforge.versions.mcp.MCPVersion;
 
 import javax.annotation.Nonnull;

src/main/java/dan200/computercraft/shared/integration/jei/JEIComputerCraft.java

@@ -96,7 +96,7 @@ public class JEIComputerCraft implements IModPlugin
         IRecipeCategory<?> category = registry.getRecipeCategory( VanillaRecipeCategoryUid.CRAFTING, false );
         if( category != null )
         {
-            for( Object wrapper : registry.getRecipes( category, null, false ) )
+            for( Object wrapper : registry.getRecipes( category, List.of(), false ) )
             {
                 if( !(wrapper instanceof Recipe) ) continue;
                 ResourceLocation id = ((Recipe<?>) wrapper).getId();

src/main/java/dan200/computercraft/shared/integration/jei/RecipeResolver.java

@@ -97,10 +97,10 @@ class RecipeResolver implements IRecipeManagerPlugin
     @Override
     public <V> List<ResourceLocation> getRecipeCategoryUids( @Nonnull IFocus<V> focus )
     {
-        V value = focus.getValue();
+        V value = focus.getTypedValue().getIngredient();
         if( !(value instanceof ItemStack stack) ) return Collections.emptyList();
 
-        switch( focus.getMode() )
+        switch( focus.getRole() )
         {
             case INPUT:
                 return stack.getItem() instanceof ITurtleItem || stack.getItem() instanceof ItemPocketComputer ||
@@ -120,12 +120,12 @@ class RecipeResolver implements IRecipeManagerPlugin
     @Override
     public <T, V> List<T> getRecipes( @Nonnull IRecipeCategory<T> recipeCategory, @Nonnull IFocus<V> focus )
     {
-        if( !(focus.getValue() instanceof ItemStack stack) || !recipeCategory.getUid().equals( VanillaRecipeCategoryUid.CRAFTING ) )
+        if( !(focus.getTypedValue().getIngredient() instanceof ItemStack stack) || !recipeCategory.getUid().equals( VanillaRecipeCategoryUid.CRAFTING ) )
         {
             return Collections.emptyList();
         }
 
-        switch( focus.getMode() )
+        switch( focus.getRole() )
         {
             case INPUT:
                 return cast( findRecipesWithInput( stack ) );

src/main/java/dan200/computercraft/shared/media/recipes/DiskRecipe.java

@@ -46,7 +46,7 @@ public class DiskRecipe extends CustomRecipe
                     if( paperFound ) return false;
                     paperFound = true;
                 }
-                else if( Tags.Items.DUSTS_REDSTONE.contains( stack.getItem() ) )
+                else if( stack.is( Tags.Items.DUSTS_REDSTONE ) )
                 {
                     if( redstoneFound ) return false;
                     redstoneFound = true;
@@ -73,7 +73,7 @@ public class DiskRecipe extends CustomRecipe
 
             if( stack.isEmpty() ) continue;
 
-            if( stack.getItem() != Items.PAPER && !Tags.Items.DUSTS_REDSTONE.contains( stack.getItem() ) )
+            if( stack.getItem() != Items.PAPER && !stack.is( Tags.Items.DUSTS_REDSTONE ) )
             {
                 DyeColor dye = ColourUtils.getStackColour( stack );
                 if( dye != null ) tracker.addColour( dye );

src/main/java/dan200/computercraft/shared/media/recipes/PrintoutRecipe.java

@@ -80,11 +80,11 @@ public final class PrintoutRecipe extends CustomRecipe
                         numPages++;
                         numPrintouts++;
                     }
-                    else if( Tags.Items.STRING.contains( stack.getItem() ) && !stringFound )
+                    else if( stack.is( Tags.Items.STRING ) && !stringFound )
                     {
                         stringFound = true;
                     }
-                    else if( Tags.Items.LEATHER.contains( stack.getItem() ) && !leatherFound )
+                    else if( stack.is( Tags.Items.LEATHER ) && !leatherFound )
                     {
                         leatherFound = true;
                     }

src/main/java/dan200/computercraft/shared/network/NetworkHandler.java

@@ -16,11 +16,11 @@ import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.chunk.LevelChunk;
 import net.minecraft.world.phys.Vec3;
-import net.minecraftforge.fmllegacy.network.NetworkDirection;
-import net.minecraftforge.fmllegacy.network.NetworkEvent;
-import net.minecraftforge.fmllegacy.network.NetworkRegistry;
-import net.minecraftforge.fmllegacy.network.PacketDistributor;
-import net.minecraftforge.fmllegacy.network.simple.SimpleChannel;
+import net.minecraftforge.network.NetworkDirection;
+import net.minecraftforge.network.NetworkEvent;
+import net.minecraftforge.network.NetworkRegistry;
+import net.minecraftforge.network.PacketDistributor;
+import net.minecraftforge.network.simple.SimpleChannel;
 
 import java.util.function.Function;
 import java.util.function.Supplier;

src/main/java/dan200/computercraft/shared/network/NetworkMessage.java

@@ -6,7 +6,7 @@
 package dan200.computercraft.shared.network;
 
 import net.minecraft.network.FriendlyByteBuf;
-import net.minecraftforge.fmllegacy.network.NetworkEvent;
+import net.minecraftforge.network.NetworkEvent;
 
 import javax.annotation.Nonnull;
 

src/main/java/dan200/computercraft/shared/network/client/ChatTableClientMessage.java

@@ -10,7 +10,7 @@ import dan200.computercraft.shared.command.text.TableBuilder;
 import dan200.computercraft.shared.network.NetworkMessage;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.chat.Component;
-import net.minecraftforge.fmllegacy.network.NetworkEvent;
+import net.minecraftforge.network.NetworkEvent;
 
 import javax.annotation.Nonnull;
 

src/main/java/dan200/computercraft/shared/network/client/ComputerDataClientMessage.java

@@ -9,7 +9,7 @@ import dan200.computercraft.shared.computer.core.ComputerState;
 import dan200.computercraft.shared.computer.core.ServerComputer;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.FriendlyByteBuf;
-import net.minecraftforge.fmllegacy.network.NetworkEvent;
+import net.minecraftforge.network.NetworkEvent;
 
 import javax.annotation.Nonnull;
 

src/main/java/dan200/computercraft/shared/network/client/ComputerDeletedClientMessage.java

@@ -7,7 +7,7 @@ package dan200.computercraft.shared.network.client;
 
 import dan200.computercraft.ComputerCraft;
 import net.minecraft.network.FriendlyByteBuf;
-import net.minecraftforge.fmllegacy.network.NetworkEvent;
+import net.minecraftforge.network.NetworkEvent;
 
 public class ComputerDeletedClientMessage extends ComputerClientMessage
 {

src/main/java/dan200/computercraft/shared/network/client/ComputerTerminalClientMessage.java

@@ -6,7 +6,7 @@
 package dan200.computercraft.shared.network.client;
 
 import net.minecraft.network.FriendlyByteBuf;
-import net.minecraftforge.fmllegacy.network.NetworkEvent;
+import net.minecraftforge.network.NetworkEvent;
 
 import javax.annotation.Nonnull;
 

src/main/java/dan200/computercraft/shared/network/client/MonitorClientMessage.java

@@ -12,7 +12,7 @@ import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraftforge.fmllegacy.network.NetworkEvent;
+import net.minecraftforge.network.NetworkEvent;
 
 import javax.annotation.Nonnull;
 

src/main/java/dan200/computercraft/shared/network/client/PlayRecordClientMessage.java

@@ -13,7 +13,7 @@ import net.minecraft.network.chat.TextComponent;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
-import net.minecraftforge.fmllegacy.network.NetworkEvent;
+import net.minecraftforge.network.NetworkEvent;
 
 import javax.annotation.Nonnull;
 

src/main/java/dan200/computercraft/shared/network/client/SpeakerAudioClientMessage.java

@@ -11,7 +11,7 @@ import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.world.phys.Vec3;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
-import net.minecraftforge.fmllegacy.network.NetworkEvent;
+import net.minecraftforge.network.NetworkEvent;
 
 import javax.annotation.Nonnull;
 import java.nio.ByteBuffer;

src/main/java/dan200/computercraft/shared/network/client/SpeakerMoveClientMessage.java

@@ -11,7 +11,7 @@ import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.world.phys.Vec3;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
-import net.minecraftforge.fmllegacy.network.NetworkEvent;
+import net.minecraftforge.network.NetworkEvent;
 
 import javax.annotation.Nonnull;
 import java.util.UUID;

src/main/java/dan200/computercraft/shared/network/client/SpeakerPlayClientMessage.java

@@ -12,7 +12,7 @@ import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.phys.Vec3;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
-import net.minecraftforge.fmllegacy.network.NetworkEvent;
+import net.minecraftforge.network.NetworkEvent;
 
 import javax.annotation.Nonnull;
 import java.util.UUID;

src/main/java/dan200/computercraft/shared/network/client/SpeakerStopClientMessage.java

@@ -10,7 +10,7 @@ import dan200.computercraft.shared.network.NetworkMessage;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
-import net.minecraftforge.fmllegacy.network.NetworkEvent;
+import net.minecraftforge.network.NetworkEvent;
 
 import javax.annotation.Nonnull;
 import java.util.UUID;

src/main/java/dan200/computercraft/shared/network/client/UpgradesLoadedMessage.java

@@ -17,7 +17,7 @@ import dan200.computercraft.shared.UpgradeManager;
 import dan200.computercraft.shared.network.NetworkMessage;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraftforge.fmllegacy.network.NetworkEvent;
+import net.minecraftforge.network.NetworkEvent;
 import net.minecraftforge.registries.IForgeRegistry;
 import net.minecraftforge.registries.RegistryManager;
 

src/main/java/dan200/computercraft/shared/network/client/UploadResultMessage.java

@@ -13,7 +13,7 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.chat.Component;
-import net.minecraftforge.fmllegacy.network.NetworkEvent;
+import net.minecraftforge.network.NetworkEvent;
 
 import javax.annotation.Nonnull;
 

src/main/java/dan200/computercraft/shared/network/container/ContainerData.java

@@ -12,16 +12,16 @@ import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.inventory.MenuType;
-import net.minecraftforge.common.extensions.IForgeContainerType;
-import net.minecraftforge.fmllegacy.network.IContainerFactory;
-import net.minecraftforge.fmllegacy.network.NetworkHooks;
+import net.minecraftforge.common.extensions.IForgeMenuType;
+import net.minecraftforge.network.IContainerFactory;
+import net.minecraftforge.network.NetworkHooks;
 
 import javax.annotation.Nonnull;
 import java.util.function.Consumer;
 import java.util.function.Function;
 
 /**
- * An extension over the basic {@link IForgeContainerType}/{@link NetworkHooks#openGui(ServerPlayer, MenuProvider, Consumer)}
+ * An extension over the basic {@link IForgeMenuType}/{@link NetworkHooks#openGui(ServerPlayer, MenuProvider, Consumer)}
  * hooks, with a more convenient way of reading and writing data.
  */
 public interface ContainerData
@@ -35,7 +35,7 @@ public interface ContainerData
 
     static <C extends AbstractContainerMenu, T extends ContainerData> MenuType<C> toType( Function<FriendlyByteBuf, T> reader, Factory<C, T> factory )
     {
-        return IForgeContainerType.create( ( id, player, data ) -> factory.create( id, player, reader.apply( data ) ) );
+        return IForgeMenuType.create( ( id, player, data ) -> factory.create( id, player, reader.apply( data ) ) );
     }
 
     static <C extends AbstractContainerMenu, T extends ContainerData> MenuType<C> toType( Function<FriendlyByteBuf, T> reader, FixedFactory<C, T> factory )
@@ -60,7 +60,7 @@ public interface ContainerData
 
         private FixedPointContainerFactory( Function<FriendlyByteBuf, T> reader, FixedFactory<C, T> factory )
         {
-            MenuType<C> type = this.type = IForgeContainerType.create( this );
+            MenuType<C> type = this.type = IForgeMenuType.create( this );
             impl = ( id, player, data ) -> factory.create( type, id, player, reader.apply( data ) );
         }
 

src/main/java/dan200/computercraft/shared/network/server/ComputerActionServerMessage.java

@@ -8,7 +8,7 @@ package dan200.computercraft.shared.network.server;
 import dan200.computercraft.shared.computer.core.IContainerComputer;
 import dan200.computercraft.shared.computer.core.ServerComputer;
 import net.minecraft.network.FriendlyByteBuf;
-import net.minecraftforge.fmllegacy.network.NetworkEvent;
+import net.minecraftforge.network.NetworkEvent;
 
 import javax.annotation.Nonnull;
 

src/main/java/dan200/computercraft/shared/network/server/ComputerServerMessage.java

@@ -10,7 +10,7 @@ import dan200.computercraft.shared.computer.core.IContainerComputer;
 import dan200.computercraft.shared.computer.core.ServerComputer;
 import dan200.computercraft.shared.network.NetworkMessage;
 import net.minecraft.network.FriendlyByteBuf;
-import net.minecraftforge.fmllegacy.network.NetworkEvent;
+import net.minecraftforge.network.NetworkEvent;
 
 import javax.annotation.Nonnull;
 

src/main/java/dan200/computercraft/shared/network/server/ContinueUploadMessage.java

@@ -9,7 +9,7 @@ import dan200.computercraft.shared.computer.core.IContainerComputer;
 import dan200.computercraft.shared.computer.core.ServerComputer;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.server.level.ServerPlayer;
-import net.minecraftforge.fmllegacy.network.NetworkEvent;
+import net.minecraftforge.network.NetworkEvent;
 
 import javax.annotation.Nonnull;
 

src/main/java/dan200/computercraft/shared/network/server/KeyEventServerMessage.java

@@ -9,7 +9,7 @@ import dan200.computercraft.shared.computer.core.IContainerComputer;
 import dan200.computercraft.shared.computer.core.InputState;
 import dan200.computercraft.shared.computer.core.ServerComputer;
 import net.minecraft.network.FriendlyByteBuf;
-import net.minecraftforge.fmllegacy.network.NetworkEvent;
+import net.minecraftforge.network.NetworkEvent;
 
 import javax.annotation.Nonnull;
 

src/main/java/dan200/computercraft/shared/network/server/MouseEventServerMessage.java

@@ -9,7 +9,7 @@ import dan200.computercraft.shared.computer.core.IContainerComputer;
 import dan200.computercraft.shared.computer.core.InputState;
 import dan200.computercraft.shared.computer.core.ServerComputer;
 import net.minecraft.network.FriendlyByteBuf;
-import net.minecraftforge.fmllegacy.network.NetworkEvent;
+import net.minecraftforge.network.NetworkEvent;
 
 import javax.annotation.Nonnull;
 

src/main/java/dan200/computercraft/shared/network/server/QueueEventServerMessage.java

@@ -10,7 +10,7 @@ import dan200.computercraft.shared.computer.core.ServerComputer;
 import dan200.computercraft.shared.util.NBTUtil;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.FriendlyByteBuf;
-import net.minecraftforge.fmllegacy.network.NetworkEvent;
+import net.minecraftforge.network.NetworkEvent;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;

src/main/java/dan200/computercraft/shared/network/server/RequestComputerMessage.java

@@ -9,7 +9,7 @@ import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.shared.computer.core.ServerComputer;
 import dan200.computercraft.shared.network.NetworkMessage;
 import net.minecraft.network.FriendlyByteBuf;
-import net.minecraftforge.fmllegacy.network.NetworkEvent;
+import net.minecraftforge.network.NetworkEvent;
 
 import javax.annotation.Nonnull;
 

src/main/java/dan200/computercraft/shared/network/server/UploadFileMessage.java

@@ -13,7 +13,7 @@ import dan200.computercraft.shared.network.NetworkHandler;
 import io.netty.handler.codec.DecoderException;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.server.level.ServerPlayer;
-import net.minecraftforge.fmllegacy.network.NetworkEvent;
+import net.minecraftforge.network.NetworkEvent;
 
 import javax.annotation.Nonnull;
 import java.nio.ByteBuffer;
@@ -160,6 +160,7 @@ public class UploadFileMessage extends ComputerServerMessage
                 contents.position( currentOffset ).limit( currentOffset + canWrite );
                 slices.add( new FileSlice( fileId, currentOffset, contents.slice() ) );
                 currentOffset += canWrite;
+                remaining -= canWrite;
             }
 
             contents.position( 0 ).limit( capacity );

src/main/java/dan200/computercraft/shared/peripheral/diskdrive/TileDiskDrive.java

@@ -37,9 +37,9 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.common.util.LazyOptional;
-import net.minecraftforge.fmllegacy.network.NetworkHooks;
 import net.minecraftforge.items.IItemHandlerModifiable;
 import net.minecraftforge.items.wrapper.InvWrapper;
+import net.minecraftforge.network.NetworkHooks;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -137,9 +137,8 @@ public final class TileDiskDrive extends TileGeneric implements DefaultInventory
         }
     }
 
-    @Nonnull
     @Override
-    public CompoundTag save( @Nonnull CompoundTag nbt )
+    public void saveAdditional( @Nonnull CompoundTag nbt )
     {
         if( customName != null ) nbt.putString( NBT_NAME, Component.Serializer.toJson( customName ) );
 
@@ -149,7 +148,7 @@ public final class TileDiskDrive extends TileGeneric implements DefaultInventory
             diskStack.save( item );
             nbt.put( NBT_ITEM, item );
         }
-        return super.save( nbt );
+        super.saveAdditional( nbt );
     }
 
     void serverTick()

src/main/java/dan200/computercraft/shared/peripheral/generic/data/BlockData.java

@@ -26,7 +26,7 @@ public class BlockData
             stateTable.put( property.getName(), getPropertyValue( property, entry.getValue() ) );
         }
         data.put( "state", stateTable );
-        data.put( "tags", DataHelpers.getTags( state.getBlock().getTags() ) );
+        data.put( "tags", DataHelpers.getTags( state.getTags() ) );
 
         return data;
     }

src/main/java/dan200/computercraft/shared/peripheral/generic/data/DataHelpers.java

@@ -5,26 +5,31 @@
  */
 package dan200.computercraft.shared.peripheral.generic.data;
 
+import net.minecraft.core.Holder;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.tags.TagKey;
 import net.minecraftforge.registries.IForgeRegistryEntry;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import java.util.Collection;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 public final class DataHelpers
 {
     private DataHelpers()
     {}
 
-    @Nonnull
-    public static Map<String, Boolean> getTags( @Nonnull Collection<ResourceLocation> tags )
+    public static <T> Map<String, Boolean> getTags( Holder.Reference<T> object )
     {
-        Map<String, Boolean> result = new HashMap<>( tags.size() );
-        for( ResourceLocation location : tags ) result.put( location.toString(), true );
-        return result;
+        return getTags( object.tags() );
+    }
+
+    @Nonnull
+    public static <T> Map<String, Boolean> getTags( @Nonnull Stream<TagKey<T>> tags )
+    {
+        return tags.collect( Collectors.toMap( x -> x.location().toString(), x -> true ) );
     }
 
     @Nullable

src/main/java/dan200/computercraft/shared/peripheral/generic/data/FluidData.java

@@ -24,7 +24,10 @@ public class FluidData
     public static <T extends Map<? super String, Object>> T fill( @Nonnull T data, @Nonnull FluidStack stack )
     {
         fillBasic( data, stack );
-        data.put( "tags", DataHelpers.getTags( stack.getFluid().getTags() ) );
+        // FluidStack doesn't have a getTags method, so we need to use the deprecated builtInRegistryHolder.
+        @SuppressWarnings( "deprecation" )
+        var holder = stack.getFluid().builtInRegistryHolder();
+        data.put( "tags", DataHelpers.getTags( holder ) );
         return data;
     }
 }

src/main/java/dan200/computercraft/shared/peripheral/generic/data/ItemData.java

@@ -60,12 +60,12 @@ public class ItemData
             data.put( "maxDamage", stack.getMaxDamage() );
         }
 
-        if( stack.getItem().showDurabilityBar( stack ) )
+        if( stack.getItem().isBarVisible( stack ) )
         {
-            data.put( "durability", stack.getItem().getDurabilityForDisplay( stack ) );
+            data.put( "durability", stack.getItem().getBarWidth( stack ) / 13.0 );
         }
 
-        data.put( "tags", DataHelpers.getTags( stack.getItem().getTags() ) );
+        data.put( "tags", DataHelpers.getTags( stack.getTags() ) );
 
         CompoundTag tag = stack.getTag();
         if( tag != null && tag.contains( "display", Tag.TAG_COMPOUND ) )

src/main/java/dan200/computercraft/shared/peripheral/modem/wired/BlockCable.java

@@ -98,7 +98,7 @@ public class BlockCable extends BlockGeneric implements SimpleWaterloggedBlock
     }
 
     @Override
-    public boolean removedByPlayer( BlockState state, Level world, BlockPos pos, Player player, boolean willHarvest, FluidState fluid )
+    public boolean onDestroyedByPlayer( BlockState state, Level world, BlockPos pos, Player player, boolean willHarvest, FluidState fluid )
     {
         if( state.getValue( CABLE ) && state.getValue( MODEM ).getFacing() != null )
         {
@@ -140,12 +140,12 @@ public class BlockCable extends BlockGeneric implements SimpleWaterloggedBlock
             }
         }
 
-        return super.removedByPlayer( state, world, pos, player, willHarvest, fluid );
+        return super.onDestroyedByPlayer( state, world, pos, player, willHarvest, fluid );
     }
 
     @Nonnull
     @Override
-    public ItemStack getPickBlock( BlockState state, HitResult hit, BlockGetter world, BlockPos pos, Player player )
+    public ItemStack getCloneItemStack( BlockState state, HitResult hit, BlockGetter world, BlockPos pos, Player player )
     {
         Direction modem = state.getValue( MODEM ).getFacing();
         boolean cable = state.getValue( CABLE );

src/main/java/dan200/computercraft/shared/peripheral/modem/wired/CableModemVariant.java

@@ -59,7 +59,7 @@ public enum CableModemVariant implements StringRepresentable
     @Nonnull
     public static CableModemVariant from( Direction facing, boolean modem, boolean peripheral )
     {
-        int state = (modem ? 2 : 0) + (peripheral ? 1 : 0);
+        int state = (modem ? 1 : 0) + (peripheral ? 2 : 0);
         return facing == null ? None : VALUES[1 + 6 * state + facing.get3DDataValue()];
     }
 

src/main/java/dan200/computercraft/shared/peripheral/modem/wired/TileCable.java

@@ -292,13 +292,12 @@ public class TileCable extends TileGeneric
         peripheral.read( nbt, "" );
     }
 
-    @Nonnull
     @Override
-    public CompoundTag save( CompoundTag nbt )
+    public void saveAdditional( CompoundTag nbt )
     {
         nbt.putBoolean( NBT_PERIPHERAL_ENABLED, peripheralAccessAllowed );
         peripheral.write( nbt, "" );
-        return super.save( nbt );
+        super.saveAdditional( nbt );
     }
 
     private void updateBlockState()
@@ -346,7 +345,7 @@ public class TileCable extends TileGeneric
         for( Direction facing : DirectionUtil.FACINGS )
         {
             BlockPos offset = current.relative( facing );
-            if( !world.isAreaLoaded( offset, 0 ) ) continue;
+            if( !world.isLoaded( offset ) ) continue;
 
             LazyOptional<IWiredElement> element = ComputerCraftAPI.getWiredElementAt( world, offset, facing.getOpposite() );
             if( !element.isPresent() ) continue;

src/main/java/dan200/computercraft/shared/peripheral/modem/wired/TileWiredModemFull.java

@@ -241,13 +241,12 @@ public class TileWiredModemFull extends TileGeneric
         for( int i = 0; i < peripherals.length; i++ ) peripherals[i].read( nbt, Integer.toString( i ) );
     }
 
-    @Nonnull
     @Override
-    public CompoundTag save( CompoundTag nbt )
+    public void saveAdditional( CompoundTag nbt )
     {
         nbt.putBoolean( NBT_PERIPHERAL_ENABLED, peripheralAccessAllowed );
         for( int i = 0; i < peripherals.length; i++ ) peripherals[i].write( nbt, Integer.toString( i ) );
-        return super.save( nbt );
+        super.saveAdditional( nbt );
     }
 
     private void updateBlockState()
@@ -306,7 +305,7 @@ public class TileWiredModemFull extends TileGeneric
         for( Direction facing : DirectionUtil.FACINGS )
         {
             BlockPos offset = current.relative( facing );
-            if( !world.isAreaLoaded( offset, 0 ) ) continue;
+            if( !world.isLoaded( offset ) ) continue;
 
             LazyOptional<IWiredElement> element = ComputerCraftAPI.getWiredElementAt( world, offset, facing.getOpposite() );
             if( !element.isPresent() ) continue;

src/main/java/dan200/computercraft/shared/peripheral/modem/wireless/BlockWirelessModem.java

@@ -25,7 +25,7 @@ import net.minecraft.world.level.block.state.properties.DirectionProperty;
 import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
-import net.minecraftforge.fmllegacy.RegistryObject;
+import net.minecraftforge.registries.RegistryObject;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;

src/main/java/dan200/computercraft/shared/peripheral/monitor/BlockMonitor.java

@@ -21,7 +21,7 @@ import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.block.state.properties.DirectionProperty;
 import net.minecraft.world.level.block.state.properties.EnumProperty;
 import net.minecraftforge.common.util.FakePlayer;
-import net.minecraftforge.fmllegacy.RegistryObject;
+import net.minecraftforge.registries.RegistryObject;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;

src/main/java/dan200/computercraft/shared/peripheral/monitor/MonitorWatcher.java

@@ -101,7 +101,7 @@ public final class MonitorWatcher
             if( !(world instanceof ServerLevel) ) continue;
 
             LevelChunk chunk = world.getChunkAt( pos );
-            if( ((ServerLevel) world).getChunkSource().chunkMap.getPlayers( chunk.getPos(), false ).findAny().isEmpty() )
+            if( ((ServerLevel) world).getChunkSource().chunkMap.getPlayers( chunk.getPos(), false ).isEmpty() )
             {
                 continue;
             }

src/main/java/dan200/computercraft/shared/peripheral/monitor/TileMonitor.java

@@ -127,15 +127,14 @@ public class TileMonitor extends TileGeneric
         return InteractionResult.PASS;
     }
 
-    @Nonnull
     @Override
-    public CompoundTag save( CompoundTag tag )
+    public void saveAdditional( CompoundTag tag )
     {
         tag.putInt( NBT_X, xIndex );
         tag.putInt( NBT_Y, yIndex );
         tag.putInt( NBT_WIDTH, width );
         tag.putInt( NBT_HEIGHT, height );
-        return super.save( tag );
+        super.saveAdditional( tag );
     }
 
     @Override
@@ -261,7 +260,7 @@ public class TileMonitor extends TileGeneric
     @Override
     public final ClientboundBlockEntityDataPacket getUpdatePacket()
     {
-        return new ClientboundBlockEntityDataPacket( worldPosition, 0, getUpdateTag() );
+        return ClientboundBlockEntityDataPacket.create( this );
     }
 
     @Nonnull
@@ -398,7 +397,7 @@ public class TileMonitor extends TileGeneric
         BlockPos pos = toWorldPos( x, y );
 
         Level world = getLevel();
-        if( world == null || !world.isAreaLoaded( pos, 0 ) ) return MonitorState.UNLOADED;
+        if( world == null || !world.isLoaded( pos ) ) return MonitorState.UNLOADED;
 
         BlockEntity tile = world.getBlockEntity( pos );
         if( !(tile instanceof TileMonitor monitor) ) return MonitorState.MISSING;

src/main/java/dan200/computercraft/shared/peripheral/printer/TilePrinter.java

@@ -31,10 +31,10 @@ import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.Vec3;
 import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.common.util.LazyOptional;
-import net.minecraftforge.fmllegacy.network.NetworkHooks;
 import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.wrapper.InvWrapper;
 import net.minecraftforge.items.wrapper.SidedInvWrapper;
+import net.minecraftforge.network.NetworkHooks;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -113,9 +113,8 @@ public final class TilePrinter extends TileGeneric implements DefaultSidedInvent
         ContainerHelper.loadAllItems( nbt, inventory );
     }
 
-    @Nonnull
     @Override
-    public CompoundTag save( @Nonnull CompoundTag nbt )
+    public void saveAdditional( @Nonnull CompoundTag nbt )
     {
         if( customName != null ) nbt.putString( NBT_NAME, Component.Serializer.toJson( customName ) );
 
@@ -130,7 +129,7 @@ public final class TilePrinter extends TileGeneric implements DefaultSidedInvent
         // Write inventory
         ContainerHelper.saveAllItems( nbt, inventory );
 
-        return super.save( nbt );
+        super.saveAdditional( nbt );
     }
 
     boolean isPrinting()

src/main/java/dan200/computercraft/shared/peripheral/speaker/UpgradeSpeakerPeripheral.java

@@ -9,7 +9,7 @@ import dan200.computercraft.api.peripheral.IComputerAccess;
 import dan200.computercraft.shared.network.NetworkHandler;
 import dan200.computercraft.shared.network.client.SpeakerStopClientMessage;
 import net.minecraft.server.MinecraftServer;
-import net.minecraftforge.fmllegacy.server.ServerLifecycleHooks;
+import net.minecraftforge.server.ServerLifecycleHooks;
 
 import javax.annotation.Nonnull;
 

src/main/java/dan200/computercraft/shared/turtle/blocks/BlockTurtle.java

@@ -42,7 +42,7 @@ import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.VoxelShape;
-import net.minecraftforge.fmllegacy.RegistryObject;
+import net.minecraftforge.registries.RegistryObject;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;

src/main/java/dan200/computercraft/shared/turtle/blocks/TileTurtle.java

@@ -289,9 +289,8 @@ public class TileTurtle extends TileComputerBase implements ITurtleTile, Default
         brain.readFromNBT( nbt );
     }
 
-    @Nonnull
     @Override
-    public CompoundTag save( @Nonnull CompoundTag nbt )
+    public void saveAdditional( @Nonnull CompoundTag nbt )
     {
         // Write inventory
         ListTag nbttaglist = new ListTag();
@@ -310,7 +309,7 @@ public class TileTurtle extends TileComputerBase implements ITurtleTile, Default
         // Write brain
         nbt = brain.writeToNBT( nbt );
 
-        return super.save( nbt );
+        super.saveAdditional( nbt );
     }
 
     @Override

src/main/java/dan200/computercraft/shared/turtle/core/TurtleBrain.java

@@ -307,7 +307,7 @@ public class TurtleBrain implements ITurtleAccess
         }
 
         // Ensure the chunk is loaded
-        if( !world.isAreaLoaded( pos, 0 ) ) return false;
+        if( !world.isLoaded( pos ) ) return false;
 
         // Ensure we're inside the world border
         if( !world.getWorldBorder().isWithinBounds( pos ) ) return false;

src/main/java/dan200/computercraft/shared/turtle/core/TurtleMoveCommand.java

@@ -137,7 +137,7 @@ public class TurtleMoveCommand implements ITurtleCommand
             return TurtleCommandResult.failure( "Cannot enter protected area" );
         }
 
-        if( !world.isAreaLoaded( position, 0 ) ) return TurtleCommandResult.failure( "Cannot leave loaded world" );
+        if( !world.isLoaded( position ) ) return TurtleCommandResult.failure( "Cannot leave loaded world" );
         if( !world.getWorldBorder().isWithinBounds( position ) )
         {
             return TurtleCommandResult.failure( "Cannot pass the world border" );

src/main/java/dan200/computercraft/shared/turtle/core/TurtlePlaceCommand.java

@@ -27,13 +27,13 @@ import net.minecraft.world.item.*;
 import net.minecraft.world.item.context.BlockPlaceContext;
 import net.minecraft.world.item.context.UseOnContext;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.SignBlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.Vec3;
 import net.minecraftforge.common.ForgeHooks;
-import net.minecraftforge.common.util.Constants;
 import net.minecraftforge.event.entity.player.PlayerInteractEvent;
 import net.minecraftforge.eventbus.api.Event.Result;
 import net.minecraftforge.items.IItemHandler;
@@ -321,7 +321,7 @@ public class TurtlePlaceCommand implements ITurtleCommand
             }
         }
         signTile.setChanged();
-        world.sendBlockUpdated( tile.getBlockPos(), tile.getBlockState(), tile.getBlockState(), Constants.BlockFlags.DEFAULT );
+        world.sendBlockUpdated( tile.getBlockPos(), tile.getBlockState(), tile.getBlockState(), Block.UPDATE_ALL );
     }
 
     private static class ErrorMessage

src/main/java/dan200/computercraft/shared/turtle/core/TurtlePlayer.java

@@ -8,7 +8,6 @@ package dan200.computercraft.shared.turtle.core;
 import com.mojang.authlib.GameProfile;
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.api.turtle.ITurtleAccess;
-import dan200.computercraft.shared.Registry;
 import dan200.computercraft.shared.util.DirectionUtil;
 import dan200.computercraft.shared.util.InventoryUtil;
 import dan200.computercraft.shared.util.WorldUtil;
@@ -22,7 +21,6 @@ import net.minecraft.world.MenuProvider;
 import net.minecraft.world.effect.MobEffectInstance;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntityDimensions;
-import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.Pose;
 import net.minecraft.world.entity.animal.horse.AbstractHorse;
 import net.minecraft.world.item.ItemStack;
@@ -197,13 +195,6 @@ public final class TurtlePlayer extends FakePlayer
         getInventory().setChanged();
     }
 
-    @Nonnull
-    @Override
-    public EntityType<?> getType()
-    {
-        return Registry.ModEntities.TURTLE_PLAYER.get();
-    }
-
     @Override
     public Vec3 position()
     {

src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleInventoryCrafting.java

@@ -17,7 +17,7 @@ import net.minecraft.world.item.crafting.Recipe;
 import net.minecraft.world.item.crafting.RecipeType;
 import net.minecraft.world.level.Level;
 import net.minecraftforge.common.ForgeHooks;
-import net.minecraftforge.fmllegacy.hooks.BasicEventHooks;
+import net.minecraftforge.event.ForgeEventFactory;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -91,7 +91,7 @@ public class TurtleInventoryCrafting extends CraftingContainer
             results.add( result );
 
             result.onCraftedBy( world, player, result.getCount() );
-            BasicEventHooks.firePlayerCraftingEvent( player, result, this );
+            ForgeEventFactory.firePlayerCraftingEvent( player, result, this );
 
             ForgeHooks.setCraftingPlayer( player );
             NonNullList<ItemStack> remainders = recipe.getRemainingItems( this );

src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleTool.java

@@ -22,7 +22,7 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.tags.Tag;
+import net.minecraft.tags.TagKey;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.ai.attributes.Attributes;
@@ -60,16 +60,13 @@ public class TurtleTool extends AbstractTurtleUpgrade
     final ItemStack item;
     final float damageMulitiplier;
     @Nullable
-    final ResourceLocation breakableName;
-    @Nullable
-    final Tag<Block> breakable;
+    final TagKey<Block> breakable;
 
-    public TurtleTool( ResourceLocation id, String adjective, Item craftItem, ItemStack toolItem, float damageMulitiplier, @Nullable ResourceLocation breakableName, @Nullable Tag<Block> breakable )
+    public TurtleTool( ResourceLocation id, String adjective, Item craftItem, ItemStack toolItem, float damageMulitiplier, @Nullable TagKey<Block> breakable )
     {
         super( id, TurtleUpgradeType.TOOL, adjective, new ItemStack( craftItem ) );
         item = toolItem;
         this.damageMulitiplier = damageMulitiplier;
-        this.breakableName = breakableName;
         this.breakable = breakable;
     }
 
@@ -124,7 +121,7 @@ public class TurtleTool extends AbstractTurtleUpgrade
             return UNBREAKABLE;
         }
 
-        return breakable == null || breakable.contains( state.getBlock() ) || isTriviallyBreakable( world, pos, state )
+        return breakable == null || state.is( breakable ) || isTriviallyBreakable( world, pos, state )
             ? TurtleCommandResult.success() : INEFFECTIVE;
     }
 
@@ -255,7 +252,7 @@ public class TurtleTool extends AbstractTurtleUpgrade
 
         // Destroy the block
         boolean canHarvest = state.canHarvestBlock( world, blockPosition, turtlePlayer );
-        boolean canBreak = state.removedByPlayer( world, blockPosition, turtlePlayer, canHarvest, fluidState );
+        boolean canBreak = state.onDestroyedByPlayer( world, blockPosition, turtlePlayer, canHarvest, fluidState );
         if( canBreak ) state.getBlock().destroy( world, blockPosition, state );
         if( canHarvest && canBreak )
         {

src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleToolSerialiser.java

@@ -6,14 +6,12 @@
 package dan200.computercraft.shared.turtle.upgrades;
 
 import com.google.gson.JsonObject;
-import com.google.gson.JsonSyntaxException;
 import dan200.computercraft.api.turtle.TurtleUpgradeSerialiser;
 import dan200.computercraft.api.upgrades.IUpgradeBase;
 import net.minecraft.core.Registry;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.tags.SerializationTags;
-import net.minecraft.tags.Tag;
+import net.minecraft.tags.TagKey;
 import net.minecraft.util.GsonHelper;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.Block;
@@ -36,18 +34,14 @@ public final class TurtleToolSerialiser extends TurtleUpgradeSerialiser.Base<Tur
         var craftingItem = GsonHelper.getAsItem( object, "craftingItem", toolItem );
         var damageMultiplier = GsonHelper.getAsFloat( object, "damageMultiplier", 3.0f );
 
-        ResourceLocation breakableName = null;
-        Tag<Block> breakable = null;
+        TagKey<Block> breakable = null;
         if( object.has( "breakable" ) )
         {
-            breakableName = new ResourceLocation( GsonHelper.getAsString( object, "breakable" ) );
-            breakable = SerializationTags.getInstance().getTagOrThrow(
-                Registry.BLOCK_REGISTRY, breakableName,
-                tagId -> new JsonSyntaxException( "Unknown item tag '" + tagId + "'" )
-            );
+            ResourceLocation tag = new ResourceLocation( GsonHelper.getAsString( object, "breakable" ) );
+            breakable = TagKey.create( Registry.BLOCK_REGISTRY, tag );
         }
 
-        return new TurtleTool( id, adjective, craftingItem, new ItemStack( toolItem ), damageMultiplier, breakableName, breakable );
+        return new TurtleTool( id, adjective, craftingItem, new ItemStack( toolItem ), damageMultiplier, breakable );
     }
 
     @Nonnull
@@ -61,14 +55,8 @@ public final class TurtleToolSerialiser extends TurtleUpgradeSerialiser.Base<Tur
         // as otherwise syncing on an SP world will overwrite the (shared) upgrade registry with an invalid upgrade!
         var damageMultiplier = buffer.readFloat();
 
-        ResourceLocation breakableName = null;
-        Tag<Block> breakable = null;
-        if( buffer.readBoolean() )
-        {
-            breakableName = buffer.readResourceLocation();
-            breakable = SerializationTags.getInstance().getOrEmpty( Registry.BLOCK_REGISTRY ).getTagOrEmpty( breakableName );
-        }
-        return new TurtleTool( id, adjective, craftingItem, toolItem, damageMultiplier, breakableName, breakable );
+        TagKey<Block> breakable = buffer.readBoolean() ? TagKey.create( Registry.BLOCK_REGISTRY, buffer.readResourceLocation() ) : null;
+        return new TurtleTool( id, adjective, craftingItem, toolItem, damageMultiplier, breakable );
     }
 
     @Override
@@ -78,7 +66,7 @@ public final class TurtleToolSerialiser extends TurtleUpgradeSerialiser.Base<Tur
         buffer.writeRegistryIdUnsafe( ForgeRegistries.ITEMS, upgrade.getCraftingItem().getItem() );
         buffer.writeItem( upgrade.item );
         buffer.writeFloat( upgrade.damageMulitiplier );
-        buffer.writeBoolean( upgrade.breakableName != null );
-        if( upgrade.breakableName != null ) buffer.writeResourceLocation( upgrade.breakableName );
+        buffer.writeBoolean( upgrade.breakable != null );
+        if( upgrade.breakable != null ) buffer.writeResourceLocation( upgrade.breakable.location() );
     }
 }

src/main/java/dan200/computercraft/shared/util/ColourUtils.java

@@ -5,7 +5,7 @@
  */
 package dan200.computercraft.shared.util;
 
-import net.minecraft.tags.Tag;
+import net.minecraft.tags.TagKey;
 import net.minecraft.world.item.DyeColor;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
@@ -14,7 +14,7 @@ import net.minecraftforge.common.Tags;
 public final class ColourUtils
 {
     @SuppressWarnings( { "unchecked", "rawtypes" } )
-    private static final Tag<Item>[] DYES = new Tag[] {
+    private static final TagKey<Item>[] DYES = new TagKey[] {
         Tags.Items.DYES_WHITE,
         Tags.Items.DYES_ORANGE,
         Tags.Items.DYES_MAGENTA,
@@ -41,8 +41,8 @@ public final class ColourUtils
 
         for( int i = 0; i < DYES.length; i++ )
         {
-            Tag<Item> dye = DYES[i];
-            if( dye.contains( stack.getItem() ) ) return DyeColor.byId( i );
+            TagKey<Item> dye = DYES[i];
+            if( stack.is( dye ) ) return DyeColor.byId( i );
         }
 
         return null;

src/main/java/dan200/computercraft/shared/util/IDAssigner.java

@@ -11,7 +11,7 @@ import com.google.gson.reflect.TypeToken;
 import dan200.computercraft.ComputerCraft;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.level.storage.LevelResource;
-import net.minecraftforge.fmllegacy.server.ServerLifecycleHooks;
+import net.minecraftforge.server.ServerLifecycleHooks;
 
 import java.io.File;
 import java.io.Reader;
@@ -45,21 +45,17 @@ public final class IDAssigner
         return ServerLifecycleHooks.getCurrentServer().getWorldPath( FOLDER ).toFile();
     }
 
-    private static MinecraftServer getCachedServer()
+    private static boolean hasServerChanged()
     {
-        if( server == null ) return null;
+        if( server == null ) return true;
 
         MinecraftServer currentServer = server.get();
-        if( currentServer == null ) return null;
-
-        if( currentServer != ServerLifecycleHooks.getCurrentServer() ) return null;
-        return currentServer;
+        return currentServer == null || currentServer != ServerLifecycleHooks.getCurrentServer();
     }
 
     public static synchronized int getNextId( String kind )
     {
-        MinecraftServer currentServer = getCachedServer();
-        if( currentServer == null )
+        if( hasServerChanged() )
         {
             // The server has changed, refetch our ID map
             server = new WeakReference<>( ServerLifecycleHooks.getCurrentServer() );
@@ -68,23 +64,22 @@ public final class IDAssigner
             dir.mkdirs();
 
             // Load our ID file from disk
+            Map<String, Integer> newIds = null;
             idFile = new File( dir, "ids.json" ).toPath();
             if( Files.isRegularFile( idFile ) )
             {
                 try( Reader reader = Files.newBufferedReader( idFile, StandardCharsets.UTF_8 ) )
                 {
-                    ids = GSON.fromJson( reader, ID_TOKEN );
+                    newIds = GSON.fromJson( reader, ID_TOKEN );
                 }
                 catch( Exception e )
                 {
                     ComputerCraft.log.error( "Cannot load id file '" + idFile + "'", e );
-                    ids = new HashMap<>();
                 }
             }
-            else
-            {
-                ids = new HashMap<>();
-            }
+
+            if( newIds == null ) newIds = new HashMap<>();
+            ids = newIds;
         }
 
         Integer existing = ids.get( kind );

src/main/java/dan200/computercraft/shared/util/NBTUtil.java

@@ -5,9 +5,9 @@
  */
 package dan200.computercraft.shared.util;
 
+import com.google.common.io.BaseEncoding;
 import dan200.computercraft.ComputerCraft;
 import net.minecraft.nbt.*;
-import org.apache.commons.codec.binary.Hex;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -22,6 +22,8 @@ import java.util.Map;
 
 public final class NBTUtil
 {
+    private static final BaseEncoding ENCODING = BaseEncoding.base16().lowerCase();
+
     private NBTUtil() {}
 
     private static Tag toNBTTag( Object object )
@@ -177,7 +179,7 @@ public final class NBTUtil
             DataOutput output = new DataOutputStream( new DigestOutputStream( digest ) );
             NbtIo.write( tag, output );
             byte[] hash = digest.digest();
-            return new String( Hex.encodeHex( hash ) );
+            return ENCODING.encode( hash );
         }
         catch( NoSuchAlgorithmException | IOException e )
         {

src/main/java/dan200/computercraft/shared/util/TickScheduler.java

@@ -10,7 +10,8 @@ import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.shared.common.TileGeneric;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
-import net.minecraft.world.level.TickList;
+import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraftforge.event.TickEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
@@ -21,7 +22,7 @@ import java.util.Iterator;
 import java.util.Set;
 
 /**
- * A thread-safe version of {@link TickList#scheduleTick(BlockPos, Object, int)}.
+ * A thread-safe version of {@link LevelAccessor#scheduleTick(BlockPos, Block, int)}.
  *
  * We use this when modems and other peripherals change a block in a different thread.
  */
@@ -58,9 +59,9 @@ public final class TickScheduler
             Level world = tile.getLevel();
             BlockPos pos = tile.getBlockPos();
 
-            if( world != null && pos != null && world.isAreaLoaded( pos, 0 ) && world.getBlockEntity( pos ) == tile )
+            if( world != null && pos != null && world.isLoaded( pos ) && world.getBlockEntity( pos ) == tile )
             {
-                world.getBlockTicks().scheduleTick( pos, tile.getBlockState().getBlock(), 0 );
+                world.scheduleTick( pos, tile.getBlockState().getBlock(), 0 );
             }
         }
     }

src/main/java/dan200/computercraft/shared/util/WaterloggableHelpers.java

@@ -48,7 +48,7 @@ public final class WaterloggableHelpers
     {
         if( state.getValue( WATERLOGGED ) )
         {
-            world.getLiquidTicks().scheduleTick( pos, Fluids.WATER, Fluids.WATER.getTickDelay( world ) );
+            world.scheduleTick( pos, Fluids.WATER, Fluids.WATER.getTickDelay( world ) );
         }
     }