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

There's a couple of alternative ways to solve this. Ideally we'd send
our network messages at the same time as MC does
(ChunkManager.playerLoadedChunk), but this'd require a mixin.

Instead we just rely on the fact that if the chunk isn't loaded,
monitors won't have done anything and so we don't need to send their
contents!

Fixes #1047, probably doesn't cause any regressions. I've not seen any
issues on 1.16, but I also hadn't before so ¯\_(ツ)_/¯.

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         maven { url = 'https://maven.parchmentmc.org' }
     }
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:5.1.+'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:5.1.24'
         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(17)
+def javaVersion = JavaLanguageVersion.of(16)
 java {
     toolchain {
         languageVersion = javaVersion
@@ -123,8 +123,7 @@ minecraft {
         }
     }
 
-    // mappings channel: 'parchment', version: "${mapping_version}-${mc_version}"
-    mappings channel: 'official', version: mc_version
+    mappings channel: 'parchment', version: "${mapping_version}-${mc_version}"
 
     accessTransformer file('src/main/resources/META-INF/accesstransformer.cfg')
     accessTransformer file('src/testMod/resources/META-INF/accesstransformer.cfg')
@@ -159,8 +158,9 @@ dependencies {
     minecraft "net.minecraftforge:forge:${mc_version}-${forge_version}"
     annotationProcessor 'org.spongepowered:mixin:0.8.4:processor'
 
-    compileOnly fg.deobf("mezz.jei:jei-1.18.1:9.1.0.47:api")
-    runtimeOnly fg.deobf("mezz.jei:jei-1.18.1:9.1.0.47")
+    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")
 
     shade 'org.squiddev:Cobalt:0.5.2-SNAPSHOT'
 
@@ -172,9 +172,7 @@ dependencies {
     testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2'
 
     testModImplementation sourceSets.main.output
-    testModExtra('org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0') {
-        exclude group: "org.jetbrains", module: "annotations"
-    }
+    testModExtra 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.21'
 
     cctJavadoc 'cc.tweaked:cct-javadoc:1.4.5'
 }

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

gradle.properties

@@ -1,10 +1,10 @@
 org.gradle.jvmargs=-Xmx3G
 
 # Mod properties
-mod_version=1.100.2
+mod_version=1.100.4
 
 # Minecraft properties (update mods.toml when changing)
-mc_version=1.18.1
+mc_version=1.17.1
 mapping_version=2021.09.05
-forge_version=39.0.0
+forge_version=37.0.85
 # NO SERIOUSLY, UPDATE mods.toml WHEN CHANGING

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

@@ -38,7 +38,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.server.ServerLifecycleHooks;
+import net.minecraftforge.fmllegacy.server.ServerLifecycleHooks;
 
 import javax.annotation.Nonnull;
 import java.io.File;

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/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.ForgeModelBakery;
+import net.minecraftforge.client.model.ModelLoader;
 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 )
         {
-            ForgeModelBakery.addSpecialModel( new ModelResourceLocation( new ResourceLocation( ComputerCraft.MOD_ID, model ), "inventory" ) );
+            ModelLoader.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( isHoveredOrFocused() ) yTex += yDiffTex;
+        if( isHovered() ) 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.getCamera().getEntity().getCommandSenderWorld();
-        Camera info = event.getCamera();
+        Level world = event.getInfo().getEntity().getCommandSenderWorld();
+        Camera info = event.getInfo();
 
         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.getMultiBufferSource().getBuffer( RenderType.lines() );
-        Matrix4f matrix4f = event.getPoseStack().last().pose();
-        Matrix3f normal = event.getPoseStack().last().normal();
+        VertexConsumer buffer = event.getBuffers().getBuffer( RenderType.lines() );
+        Matrix4f matrix4f = event.getMatrix().last().pose();
+        Matrix3f normal = event.getMatrix().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.getPoseStack(), event.getMultiBufferSource(), event.getPackedLight(),
+            event.getMatrixStack(), event.getBuffers(), event.getLight(),
             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.getPoseStack(), event.getMultiBufferSource(), event.getPackedLight(),
+            event.getMatrixStack(), event.getBuffers(), event.getLight(),
             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.getItemStack();
+        ItemStack stack = event.getItem();
         if( !(stack.getItem() instanceof ItemPrintout) ) return;
         event.setCanceled( true );
 
-        PoseStack transform = event.getPoseStack();
+        PoseStack transform = event.getMatrix();
 
         // 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.getItemFrameEntity().getType() == EntityType.GLOW_ITEM_FRAME ? 0xf000d2 : event.getPackedLight(); // See getLightVal.
-        drawPrintout( transform, event.getMultiBufferSource(), stack, light );
+        int light = event.getEntityItemFrame().getType() == EntityType.GLOW_ITEM_FRAME ? 0xf000d2 : event.getLight(); // See getLightVal.
+        drawPrintout( transform, event.getBuffers(), 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.getCamera().getEntity().isCrouching() ) return;
+        if( event.getInfo().getEntity().isCrouching() ) return;
 
-        Level world = event.getCamera().getEntity().getCommandSenderWorld();
+        Level world = event.getInfo().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.getPoseStack();
-        Vec3 cameraPos = event.getCamera().getPosition();
+        PoseStack transformStack = event.getMatrix();
+        Vec3 cameraPos = event.getInfo().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.getMultiBufferSource().getBuffer( RenderType.lines() );
+        VertexConsumer buffer = event.getBuffers().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.getChannel().attachBufferStream( sound.stream );
-        event.getChannel().play();
+        event.getSource().attachBufferStream( sound.stream );
+        event.getSource().play();
 
-        sound.channel = event.getChannel();
-        sound.executor = event.getEngine().executor;
+        sound.channel = event.getSource();
+        sound.executor = event.getManager().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.LuaTable;
 import org.squiddev.cobalt.*;
+import org.squiddev.cobalt.LuaTable;
 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.registries.RegistryObject;
+import net.minecraftforge.fmllegacy.RegistryObject;
 
 import java.util.function.BiConsumer;
 

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( ServerStartingEvent event )
+    public static void onServerStarting( FMLServerStartingEvent 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( ServerStartedEvent event )
+    public static void onServerStarted( FMLServerStartedEvent event )
     {
         ComputerCraft.serverComputerRegistry.reset();
         WirelessNetwork.resetNetworks();
@@ -104,7 +105,7 @@ public final class CommonHooks
     }
 
     @SubscribeEvent
-    public static void onServerStopped( ServerStoppedEvent event )
+    public static void onServerStopped( FMLServerStoppedEvent 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.server.ServerLifecycleHooks;
+import net.minecraftforge.fmllegacy.server.ServerLifecycleHooks;
 
 import java.io.File;
 

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.registries.RegistryObject;
+import net.minecraftforge.fmllegacy.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, Block.UPDATE_ALL );
+        getLevel().sendBlockUpdated( pos, state, state, Constants.BlockFlags.DEFAULT );
     }
 
     @Nonnull
@@ -76,8 +76,7 @@ public abstract class TileGeneric extends BlockEntity
     @Override
     public final void onDataPacket( Connection net, ClientboundBlockEntityDataPacket packet )
     {
-        var tag = packet.getTag();
-        if( tag != null ) handleUpdateTag( tag );
+        if( packet.getType() == 0 ) handleUpdateTag( packet.getTag() );
     }
 
     @Override

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.registries.RegistryObject;
+import net.minecraftforge.fmllegacy.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.registries.RegistryObject;
+import net.minecraftforge.fmllegacy.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 getCloneItemStack( BlockState state, HitResult target, BlockGetter world, BlockPos pos, Player player )
+    public ItemStack getPickBlock( 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.getCloneItemStack( state, target, world, pos, player );
+        return super.getPickBlock( state, target, world, pos, player );
     }
 
     @Override

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

@@ -188,15 +188,16 @@ public abstract class TileComputerBase extends TileGeneric implements IComputerT
 
     protected abstract void updateBlockState( ComputerState newState );
 
+    @Nonnull
     @Override
-    public void saveAdditional( @Nonnull CompoundTag nbt )
+    public CompoundTag save( @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 );
 
-        super.saveAdditional( nbt );
+        return super.save( nbt );
     }
 
     @Override
@@ -387,7 +388,7 @@ public abstract class TileComputerBase extends TileGeneric implements IComputerT
     @Override
     public final ClientboundBlockEntityDataPacket getUpdatePacket()
     {
-        return ClientboundBlockEntityDataPacket.create( this );
+        return new ClientboundBlockEntityDataPacket( worldPosition, 0, getUpdateTag() );
     }
 
     @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.server.ServerLifecycleHooks;
+import net.minecraftforge.fmllegacy.server.ServerLifecycleHooks;
 import net.minecraftforge.versions.mcp.MCPVersion;
 
 import javax.annotation.Nonnull;

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.network.NetworkDirection;
-import net.minecraftforge.network.NetworkEvent;
-import net.minecraftforge.network.NetworkRegistry;
-import net.minecraftforge.network.PacketDistributor;
-import net.minecraftforge.network.simple.SimpleChannel;
+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 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.network.NetworkEvent;
+import net.minecraftforge.fmllegacy.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.network.NetworkEvent;
+import net.minecraftforge.fmllegacy.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.network.NetworkEvent;
+import net.minecraftforge.fmllegacy.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.network.NetworkEvent;
+import net.minecraftforge.fmllegacy.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.network.NetworkEvent;
+import net.minecraftforge.fmllegacy.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.network.NetworkEvent;
+import net.minecraftforge.fmllegacy.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.network.NetworkEvent;
+import net.minecraftforge.fmllegacy.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.network.NetworkEvent;
+import net.minecraftforge.fmllegacy.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.network.NetworkEvent;
+import net.minecraftforge.fmllegacy.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.network.NetworkEvent;
+import net.minecraftforge.fmllegacy.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.network.NetworkEvent;
+import net.minecraftforge.fmllegacy.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.network.NetworkEvent;
+import net.minecraftforge.fmllegacy.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.network.NetworkEvent;
+import net.minecraftforge.fmllegacy.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.IForgeMenuType;
-import net.minecraftforge.network.IContainerFactory;
-import net.minecraftforge.network.NetworkHooks;
+import net.minecraftforge.common.extensions.IForgeContainerType;
+import net.minecraftforge.fmllegacy.network.IContainerFactory;
+import net.minecraftforge.fmllegacy.network.NetworkHooks;
 
 import javax.annotation.Nonnull;
 import java.util.function.Consumer;
 import java.util.function.Function;
 
 /**
- * An extension over the basic {@link IForgeMenuType}/{@link NetworkHooks#openGui(ServerPlayer, MenuProvider, Consumer)}
+ * An extension over the basic {@link IForgeContainerType}/{@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 IForgeMenuType.create( ( id, player, data ) -> factory.create( id, player, reader.apply( data ) ) );
+        return IForgeContainerType.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 = IForgeMenuType.create( this );
+            MenuType<C> type = this.type = IForgeContainerType.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.network.NetworkEvent;
+import net.minecraftforge.fmllegacy.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.network.NetworkEvent;
+import net.minecraftforge.fmllegacy.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.network.NetworkEvent;
+import net.minecraftforge.fmllegacy.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.network.NetworkEvent;
+import net.minecraftforge.fmllegacy.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.network.NetworkEvent;
+import net.minecraftforge.fmllegacy.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.network.NetworkEvent;
+import net.minecraftforge.fmllegacy.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.network.NetworkEvent;
+import net.minecraftforge.fmllegacy.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.network.NetworkEvent;
+import net.minecraftforge.fmllegacy.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,8 +137,9 @@ public final class TileDiskDrive extends TileGeneric implements DefaultInventory
         }
     }
 
+    @Nonnull
     @Override
-    public void saveAdditional( @Nonnull CompoundTag nbt )
+    public CompoundTag save( @Nonnull CompoundTag nbt )
     {
         if( customName != null ) nbt.putString( NBT_NAME, Component.Serializer.toJson( customName ) );
 
@@ -148,7 +149,7 @@ public final class TileDiskDrive extends TileGeneric implements DefaultInventory
             diskStack.save( item );
             nbt.put( NBT_ITEM, item );
         }
-        super.saveAdditional( nbt );
+        return super.save( nbt );
     }
 
     void serverTick()

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

@@ -60,9 +60,9 @@ public class ItemData
             data.put( "maxDamage", stack.getMaxDamage() );
         }
 
-        if( stack.getItem().isBarVisible( stack ) )
+        if( stack.getItem().showDurabilityBar( stack ) )
         {
-            data.put( "durability", stack.getItem().getBarWidth( stack ) / 13.0 );
+            data.put( "durability", stack.getItem().getDurabilityForDisplay( stack ) );
         }
 
         data.put( "tags", DataHelpers.getTags( stack.getItem().getTags() ) );

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 onDestroyedByPlayer( BlockState state, Level world, BlockPos pos, Player player, boolean willHarvest, FluidState fluid )
+    public boolean removedByPlayer( 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.onDestroyedByPlayer( state, world, pos, player, willHarvest, fluid );
+        return super.removedByPlayer( state, world, pos, player, willHarvest, fluid );
     }
 
     @Nonnull
     @Override
-    public ItemStack getCloneItemStack( BlockState state, HitResult hit, BlockGetter world, BlockPos pos, Player player )
+    public ItemStack getPickBlock( 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/TileCable.java

@@ -292,12 +292,13 @@ public class TileCable extends TileGeneric
         peripheral.read( nbt, "" );
     }
 
+    @Nonnull
     @Override
-    public void saveAdditional( CompoundTag nbt )
+    public CompoundTag save( CompoundTag nbt )
     {
         nbt.putBoolean( NBT_PERIPHERAL_ENABLED, peripheralAccessAllowed );
         peripheral.write( nbt, "" );
-        super.saveAdditional( nbt );
+        return super.save( nbt );
     }
 
     private void updateBlockState()
@@ -345,7 +346,7 @@ public class TileCable extends TileGeneric
         for( Direction facing : DirectionUtil.FACINGS )
         {
             BlockPos offset = current.relative( facing );
-            if( !world.isLoaded( offset ) ) continue;
+            if( !world.isAreaLoaded( offset, 0 ) ) 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,12 +241,13 @@ public class TileWiredModemFull extends TileGeneric
         for( int i = 0; i < peripherals.length; i++ ) peripherals[i].read( nbt, Integer.toString( i ) );
     }
 
+    @Nonnull
     @Override
-    public void saveAdditional( CompoundTag nbt )
+    public CompoundTag save( CompoundTag nbt )
     {
         nbt.putBoolean( NBT_PERIPHERAL_ENABLED, peripheralAccessAllowed );
         for( int i = 0; i < peripherals.length; i++ ) peripherals[i].write( nbt, Integer.toString( i ) );
-        super.saveAdditional( nbt );
+        return super.save( nbt );
     }
 
     private void updateBlockState()
@@ -305,7 +306,7 @@ public class TileWiredModemFull extends TileGeneric
         for( Direction facing : DirectionUtil.FACINGS )
         {
             BlockPos offset = current.relative( facing );
-            if( !world.isLoaded( offset ) ) continue;
+            if( !world.isAreaLoaded( offset, 0 ) ) 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.registries.RegistryObject;
+import net.minecraftforge.fmllegacy.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.registries.RegistryObject;
+import net.minecraftforge.fmllegacy.RegistryObject;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;

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

@@ -15,7 +15,6 @@ import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.chunk.ChunkStatus;
 import net.minecraft.world.level.chunk.LevelChunk;
 import net.minecraftforge.event.TickEvent;
 import net.minecraftforge.event.world.ChunkWatchEvent;
@@ -47,8 +46,10 @@ public final class MonitorWatcher
     @SubscribeEvent
     public static void onWatch( ChunkWatchEvent.Watch event )
     {
+        // Get the current chunk if it has been loaded. This is safe as, if the chunk hasn't been loaded yet, then the
+        // monitor will have no contents, and so we won't need to send an update anyway.
         ChunkPos chunkPos = event.getPos();
-        LevelChunk chunk = (LevelChunk) event.getWorld().getChunk( chunkPos.x, chunkPos.z, ChunkStatus.FULL, false );
+        LevelChunk chunk = event.getWorld().getChunkSource().getChunkNow( chunkPos.x, chunkPos.z );
         if( chunk == null ) return;
 
         for( BlockEntity te : chunk.getBlockEntities().values() )
@@ -101,7 +102,7 @@ public final class MonitorWatcher
             if( !(world instanceof ServerLevel) ) continue;
 
             LevelChunk chunk = world.getChunkAt( pos );
-            if( ((ServerLevel) world).getChunkSource().chunkMap.getPlayers( chunk.getPos(), false ).isEmpty() )
+            if( ((ServerLevel) world).getChunkSource().chunkMap.getPlayers( chunk.getPos(), false ).findAny().isEmpty() )
             {
                 continue;
             }

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

@@ -127,14 +127,15 @@ public class TileMonitor extends TileGeneric
         return InteractionResult.PASS;
     }
 
+    @Nonnull
     @Override
-    public void saveAdditional( CompoundTag tag )
+    public CompoundTag save( CompoundTag tag )
     {
         tag.putInt( NBT_X, xIndex );
         tag.putInt( NBT_Y, yIndex );
         tag.putInt( NBT_WIDTH, width );
         tag.putInt( NBT_HEIGHT, height );
-        super.saveAdditional( tag );
+        return super.save( tag );
     }
 
     @Override
@@ -260,7 +261,7 @@ public class TileMonitor extends TileGeneric
     @Override
     public final ClientboundBlockEntityDataPacket getUpdatePacket()
     {
-        return ClientboundBlockEntityDataPacket.create( this );
+        return new ClientboundBlockEntityDataPacket( worldPosition, 0, getUpdateTag() );
     }
 
     @Nonnull
@@ -397,7 +398,7 @@ public class TileMonitor extends TileGeneric
         BlockPos pos = toWorldPos( x, y );
 
         Level world = getLevel();
-        if( world == null || !world.isLoaded( pos ) ) return MonitorState.UNLOADED;
+        if( world == null || !world.isAreaLoaded( pos, 0 ) ) 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,8 +113,9 @@ public final class TilePrinter extends TileGeneric implements DefaultSidedInvent
         ContainerHelper.loadAllItems( nbt, inventory );
     }
 
+    @Nonnull
     @Override
-    public void saveAdditional( @Nonnull CompoundTag nbt )
+    public CompoundTag save( @Nonnull CompoundTag nbt )
     {
         if( customName != null ) nbt.putString( NBT_NAME, Component.Serializer.toJson( customName ) );
 
@@ -129,7 +130,7 @@ public final class TilePrinter extends TileGeneric implements DefaultSidedInvent
         // Write inventory
         ContainerHelper.saveAllItems( nbt, inventory );
 
-        super.saveAdditional( nbt );
+        return super.save( 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.server.ServerLifecycleHooks;
+import net.minecraftforge.fmllegacy.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.registries.RegistryObject;
+import net.minecraftforge.fmllegacy.RegistryObject;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;

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

@@ -289,8 +289,9 @@ public class TileTurtle extends TileComputerBase implements ITurtleTile, Default
         brain.readFromNBT( nbt );
     }
 
+    @Nonnull
     @Override
-    public void saveAdditional( @Nonnull CompoundTag nbt )
+    public CompoundTag save( @Nonnull CompoundTag nbt )
     {
         // Write inventory
         ListTag nbttaglist = new ListTag();
@@ -309,7 +310,7 @@ public class TileTurtle extends TileComputerBase implements ITurtleTile, Default
         // Write brain
         nbt = brain.writeToNBT( nbt );
 
-        super.saveAdditional( nbt );
+        return super.save( 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.isLoaded( pos ) ) return false;
+        if( !world.isAreaLoaded( pos, 0 ) ) 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.isLoaded( position ) ) return TurtleCommandResult.failure( "Cannot leave loaded world" );
+        if( !world.isAreaLoaded( position, 0 ) ) 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(), Block.UPDATE_ALL );
+        world.sendBlockUpdated( tile.getBlockPos(), tile.getBlockState(), tile.getBlockState(), Constants.BlockFlags.DEFAULT );
     }
 
     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.event.ForgeEventFactory;
+import net.minecraftforge.fmllegacy.hooks.BasicEventHooks;
 
 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() );
-            ForgeEventFactory.firePlayerCraftingEvent( player, result, this );
+            BasicEventHooks.firePlayerCraftingEvent( player, result, this );
 
             ForgeHooks.setCraftingPlayer( player );
             NonNullList<ItemStack> remainders = recipe.getRemainingItems( this );

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

@@ -255,7 +255,7 @@ public class TurtleTool extends AbstractTurtleUpgrade
 
         // Destroy the block
         boolean canHarvest = state.canHarvestBlock( world, blockPosition, turtlePlayer );
-        boolean canBreak = state.onDestroyedByPlayer( world, blockPosition, turtlePlayer, canHarvest, fluidState );
+        boolean canBreak = state.removedByPlayer( world, blockPosition, turtlePlayer, canHarvest, fluidState );
         if( canBreak ) state.getBlock().destroy( world, blockPosition, state );
         if( canHarvest && canBreak )
         {

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.server.ServerLifecycleHooks;
+import net.minecraftforge.fmllegacy.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/TickScheduler.java

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

src/main/resources/META-INF/mods.toml

@@ -1,5 +1,5 @@
 modLoader="javafml"
-loaderVersion="[39,40)"
+loaderVersion="[37,38)"
 
 issueTrackerURL="https://github.com/cc-tweaked/CC-Tweaked/issues"
 logoFile="pack.png"
@@ -21,6 +21,6 @@ CC: Tweaked is a fork of ComputerCraft, adding programmable computers, turtles a
 [[dependencies.computercraft]]
     modId="forge"
     mandatory=true
-    versionRange="[39.0.0,40)"
+    versionRange="[37.0.85,38)"
     ordering="NONE"
     side="BOTH"

src/main/resources/data/computercraft/advancements/recipes/turtle_normal.json

@@ -1,7 +1,7 @@
 {
     "parent": "minecraft:recipes/root",
     "rewards": {
-        "recipes": [ "computercraft:normal_turtle_normal" ]
+        "recipes": [ "computercraft:turtle_normal" ]
     },
     "criteria": {
         "has_normal": {

src/main/resources/data/computercraft/lua/rom/help/changelog.md

@@ -1,3 +1,16 @@
+# New features in CC: Tweaked 1.100.4
+
+Several bug fixes:
+* Fix the monitor watching blocking the main thread when chunks are slow to load.
+
+# New features in CC: Tweaked 1.100.3
+
+Several bug fixes:
+* Fix client disconnect when uploading large files.
+* Correctly handling empty computer ID file.
+* Fix the normal turtle recipe not being unlocked.
+* Remove turtle fake EntityType.
+
 # New features in CC: Tweaked 1.100.2
 
 Several bug fixes:

src/main/resources/data/computercraft/lua/rom/help/whatsnew.md

@@ -1,7 +1,6 @@
-New features in CC: Tweaked 1.100.2
+New features in CC: Tweaked 1.100.4
 
 Several bug fixes:
-* Fix wired modems swapping the modem/peripheral block state.
-* Remove debugging logging line from `turtle.attack`.
+* Fix the monitor watching blocking the main thread when chunks are slow to load.
 
 Type "help changelog" to see the full version history.

src/testMod/java/dan200/computercraft/ingame/mod/ClientHooks.java

@@ -27,7 +27,7 @@ import net.minecraft.world.level.levelgen.WorldGenSettings;
 import net.minecraft.world.level.levelgen.flat.FlatLayerInfo;
 import net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorSettings;
 import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.client.event.ScreenEvent;
+import net.minecraftforge.client.event.GuiScreenEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
 import org.apache.logging.log4j.LogManager;
@@ -50,9 +50,9 @@ public final class ClientHooks
     }
 
     @SubscribeEvent
-    public static void onGuiInit( ScreenEvent.InitScreenEvent event )
+    public static void onGuiInit( GuiScreenEvent.InitGuiEvent event )
     {
-        if( triggered || !(event.getScreen() instanceof TitleScreen) ) return;
+        if( triggered || !(event.getGui() instanceof TitleScreen) ) return;
         triggered = true;
 
         ClientHooks.openWorld();
@@ -93,7 +93,7 @@ public final class ClientHooks
 
             WorldGenSettings generator = new WorldGenSettings( 0, false, false, withOverworld(
                 dimensions,
-                DimensionType.defaultDimensions( registries, 0 ),
+                DimensionType.defaultDimensions( dimensions, biomes, registries.registryOrThrow( Registry.NOISE_GENERATOR_SETTINGS_REGISTRY ), 0 ),
                 new FlatLevelSource( flatSettings )
             ) );
 

src/testMod/java/dan200/computercraft/ingame/mod/TestHooks.java

@@ -5,9 +5,9 @@
  */
 package dan200.computercraft.ingame.mod;
 
-import dan200.computercraft.ingame.api.Times;
 import net.minecraft.ChatFormatting;
 import net.minecraft.SharedConstants;
+import dan200.computercraft.ingame.api.Times;
 import net.minecraft.client.Minecraft;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.core.BlockPos;
@@ -21,11 +21,11 @@ import net.minecraft.world.level.block.Rotation;
 import net.minecraft.world.level.levelgen.Heightmap;
 import net.minecraftforge.event.RegisterCommandsEvent;
 import net.minecraftforge.event.TickEvent;
-import net.minecraftforge.event.server.ServerStartedEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.loading.FMLLoader;
-import net.minecraftforge.server.ServerLifecycleHooks;
+import net.minecraftforge.fmllegacy.server.ServerLifecycleHooks;
+import net.minecraftforge.fmlserverevents.FMLServerStartedEvent;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -49,7 +49,7 @@ public class TestHooks
     }
 
     @SubscribeEvent
-    public static void onServerStarted( ServerStartedEvent event )
+    public static void onServerStarted( FMLServerStartedEvent event )
     {
         MinecraftServer server = event.getServer();
         GameRules rules = server.getGameRules();