Merge branch 'mc-1.20.x' into mc-1.21.x

buildSrc/src/main/kotlin/cc-tweaked.java-convention.gradle.kts

@@ -91,7 +91,6 @@ sourceSets.all {
 
         options.errorprone {
             check("InvalidBlockTag", CheckSeverity.OFF) // Broken by @cc.xyz
-            check("InvalidParam", CheckSeverity.OFF) // Broken by records.
             check("InlineMeSuggester", CheckSeverity.OFF) // Minecraft uses @Deprecated liberally
             // Too many false positives right now. Maybe we need an indirection for it later on.
             check("ReferenceEquality", CheckSeverity.OFF)

config/checkstyle/checkstyle.xml

@@ -101,7 +101,10 @@ SPDX-License-Identifier: MPL-2.0
         <module name="InvalidJavadocPosition" />
         <module name="JavadocBlockTagLocation" />
         <module name="JavadocMethod"/>
-        <module name="JavadocType"/>
+        <module name="JavadocType">
+            <!-- Seems to complain about @hidden!? -->
+            <property name="allowUnknownTags" value="true" />
+        </module>
         <module name="JavadocStyle">
             <property name="checkHtml" value="false" />
         </module>
@@ -152,7 +155,10 @@ SPDX-License-Identifier: MPL-2.0
         <module name="NoWhitespaceAfter">
             <property name="tokens" value="AT,INC,DEC,UNARY_MINUS,UNARY_PLUS,BNOT,LNOT,DOT,ARRAY_DECLARATOR,INDEX_OP,METHOD_REF" />
         </module>
-        <module name="NoWhitespaceBefore" />
+        <module name="NoWhitespaceBefore">
+            <!-- Allow whitespace before "..." for @Nullable annotations -->
+            <property name="tokens" value="COMMA,SEMI,POST_INC,POST_DEC,LABELED_STAT" />
+        </module>
         <!-- TODO: Decide on an OperatorWrap style. -->
         <module name="ParenPad" />
         <module name="SeparatorWrap">

gradle/libs.versions.toml

@@ -29,9 +29,9 @@ checkerFramework = "3.42.0"
 cobalt = { strictly = "0.9.5" }
 commonsCli = "1.6.0"
 jetbrainsAnnotations = "24.1.0"
-jsr305 = "3.0.2"
+jspecify = "1.0.0"
 jzlib = "1.1.3"
-kotlin = "2.1.0"
+kotlin = "2.1.10"
 kotlin-coroutines = "1.10.1"
 nightConfig = "3.8.1"
 
@@ -59,9 +59,9 @@ jmh = "1.37"
 
 # Build tools
 cctJavadoc = "1.8.3"
-checkstyle = "10.20.1"
+checkstyle = "10.21.2"
-errorProne-core = "2.27.0"
+errorProne-core = "2.36.0"
-errorProne-plugin = "3.1.0"
+errorProne-plugin = "4.1.0"
 fabric-loom = "1.9.2"
 githubRelease = "2.5.2"
 gradleVersions = "0.50.0"
@@ -70,7 +70,7 @@ illuaminate = "0.1.0-74-gf1551d5"
 lwjgl = "3.3.3"
 minotaur = "2.8.7"
 modDevGradle = "2.0.74"
-nullAway = "0.10.25"
+nullAway = "0.12.3"
 shadow = "8.3.1"
 spotless = "6.23.3"
 taskTree = "2.1.1"
@@ -90,7 +90,7 @@ fastutil = { module = "it.unimi.dsi:fastutil", version.ref = "fastutil" }
 neoForgeSpi = { module = "net.neoforged:neoforgespi", version.ref = "neoForgeSpi" }
 guava = { module = "com.google.guava:guava", version.ref = "guava" }
 jetbrainsAnnotations = { module = "org.jetbrains:annotations", version.ref = "jetbrainsAnnotations" }
-jsr305 = { module = "com.google.code.findbugs:jsr305", version.ref = "jsr305" }
+jspecify = { module = "org.jspecify:jspecify", version.ref = "jspecify" }
 jzlib = { module = "com.jcraft:jzlib", version.ref = "jzlib" }
 kotlin-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlin-coroutines" }
 kotlin-platform = { module = "org.jetbrains.kotlin:kotlin-bom", version.ref = "kotlin" }
@@ -180,7 +180,7 @@ taskTree = { id = "com.dorongold.task-tree", version.ref = "taskTree" }
 versionCatalogUpdate = { id = "nl.littlerobots.version-catalog-update", version.ref = "versionCatalogUpdate" }
 
 [bundles]
-annotations = ["jsr305", "checkerFramework", "jetbrainsAnnotations"]
+annotations = ["checkerFramework", "jetbrainsAnnotations", "jspecify"]
 kotlin = ["kotlin-stdlib", "kotlin-coroutines"]
 
 # Minecraft

projects/common-api/src/client/java/dan200/computercraft/api/client/ModelLocation.java

@@ -10,7 +10,7 @@ import net.minecraft.client.resources.model.BakedModel;
 import net.minecraft.client.resources.model.ModelManager;
 import net.minecraft.client.resources.model.ModelResourceLocation;
 import net.minecraft.resources.ResourceLocation;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.stream.Stream;
 

projects/common-api/src/client/java/dan200/computercraft/api/client/turtle/TurtleUpgradeModeller.java

@@ -12,8 +12,8 @@ import dan200.computercraft.api.turtle.TurtleSide;
 import net.minecraft.client.resources.model.UnbakedModel;
 import net.minecraft.core.component.DataComponentPatch;
 import net.minecraft.resources.ResourceLocation;
+import org.jspecify.annotations.Nullable;
 
-import javax.annotation.Nullable;
 import java.util.stream.Stream;
 
 /**

projects/common-api/src/client/java/dan200/computercraft/api/client/turtle/TurtleUpgradeModellers.java

@@ -13,8 +13,7 @@ import dan200.computercraft.impl.client.ClientPlatformHelper;
 import net.minecraft.client.Minecraft;
 import net.minecraft.core.component.DataComponentPatch;
 import org.joml.Matrix4f;
-
+import org.jspecify.annotations.Nullable;
-import javax.annotation.Nullable;
 
 final class TurtleUpgradeModellers {
     private static final Transformation leftTransform = getMatrixFor(-0.4065f);

projects/common-api/src/client/java/dan200/computercraft/impl/client/ClientPlatformHelper.java

@@ -12,8 +12,7 @@ import net.minecraft.client.resources.model.ModelManager;
 import net.minecraft.client.resources.model.ModelResourceLocation;
 import net.minecraft.resources.ResourceLocation;
 import org.jetbrains.annotations.ApiStatus;
-
+import org.jspecify.annotations.Nullable;
-import javax.annotation.Nullable;
 
 @ApiStatus.Internal
 public interface ClientPlatformHelper {

projects/common-api/src/main/java/dan200/computercraft/api/ComputerCraftAPI.java

@@ -26,8 +26,7 @@ import net.minecraft.core.Direction;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
-
+import org.jspecify.annotations.Nullable;
-import javax.annotation.Nullable;
 
 /**
  * The static entry point to the ComputerCraft API.
@@ -148,7 +147,10 @@ public final class ComputerCraftAPI {
      *
      * @param provider The media provider to register.
      * @see MediaProvider
+     * @deprecated Prefer {@code dan200.computercraft.api.media.MediaLookup} (Fabric) or
+     * {@code dan200.computercraft.api.media.MediaCapability} (NeoForge).
      */
+    @Deprecated
     public static void registerMediaProvider(MediaProvider provider) {
         getInstance().registerMediaProvider(provider);
     }

projects/common-api/src/main/java/dan200/computercraft/api/detail/BasicItemDetailProvider.java

@@ -6,8 +6,8 @@ package dan200.computercraft.api.detail;
 
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
+import org.jspecify.annotations.Nullable;
 
-import javax.annotation.Nullable;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;

projects/common-api/src/main/java/dan200/computercraft/api/detail/BlockReference.java

@@ -8,8 +8,7 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
-
+import org.jspecify.annotations.Nullable;
-import javax.annotation.Nullable;
 
 /**
  * A reference to a block in the world, used by block detail providers.

projects/common-api/src/main/java/dan200/computercraft/api/detail/ComponentDetailProvider.java

@@ -7,8 +7,8 @@ package dan200.computercraft.api.detail;
 import net.minecraft.core.component.DataComponentHolder;
 import net.minecraft.core.component.DataComponentType;
 import net.minecraft.world.item.ItemStack;
+import org.jspecify.annotations.Nullable;
 
-import javax.annotation.Nullable;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;

projects/common-api/src/main/java/dan200/computercraft/api/lua/IComputerSystem.java

@@ -9,8 +9,7 @@ import dan200.computercraft.api.peripheral.IComputerAccess;
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
 import org.jetbrains.annotations.ApiStatus;
-
+import org.jspecify.annotations.Nullable;
-import javax.annotation.Nullable;
 
 /**
  * An interface passed to {@link ILuaAPIFactory} in order to provide additional information

projects/common-api/src/main/java/dan200/computercraft/api/lua/ILuaAPIFactory.java

@@ -5,8 +5,7 @@
 package dan200.computercraft.api.lua;
 
 import dan200.computercraft.api.ComputerCraftAPI;
-
+import org.jspecify.annotations.Nullable;
-import javax.annotation.Nullable;
 
 /**
  * Construct an {@link ILuaAPI} for a computer.

projects/common-api/src/main/java/dan200/computercraft/api/media/IMedia.java

@@ -14,14 +14,14 @@ import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.JukeboxSong;
-
+import org.jspecify.annotations.Nullable;
-import javax.annotation.Nullable;
 
 /**
  * Represents an item that can be placed in a disk drive and used by a Computer.
  * <p>
- * Implement this interface on your {@link Item} class to allow it to be used in the drive. Alternatively, register
+ * Implement this interface on your {@link Item} class to allow it to be used in the drive, or register via
- * a {@link MediaProvider}.
+ * {@code dan200.computercraft.api.media.MediaLookup} (Fabric) or {@code dan200.computercraft.api.media.MediaCapability}
+ * (NeoForge).
  */
 public interface IMedia {
     /**

projects/common-api/src/main/java/dan200/computercraft/api/media/MediaProvider.java

@@ -5,8 +5,7 @@
 package dan200.computercraft.api.media;
 
 import net.minecraft.world.item.ItemStack;
-
+import org.jspecify.annotations.Nullable;
-import javax.annotation.Nullable;
 
 /**
  * This interface is used to provide {@link IMedia} implementations for {@link ItemStack}.

projects/common-api/src/main/java/dan200/computercraft/api/media/PrintoutContents.java

@@ -6,8 +6,8 @@ package dan200.computercraft.api.media;
 
 import dan200.computercraft.impl.ComputerCraftAPIService;
 import net.minecraft.world.item.ItemStack;
+import org.jspecify.annotations.Nullable;
 
-import javax.annotation.Nullable;
 import java.util.stream.Stream;
 
 /**

projects/common-api/src/main/java/dan200/computercraft/api/pocket/IPocketAccess.java

@@ -12,8 +12,7 @@ import net.minecraft.world.entity.Entity;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.phys.Vec3;
 import org.jetbrains.annotations.ApiStatus;
-
+import org.jspecify.annotations.Nullable;
-import javax.annotation.Nullable;
 
 /**
  * Wrapper class for pocket computers.

projects/common-api/src/main/java/dan200/computercraft/api/pocket/IPocketUpgrade.java

@@ -13,8 +13,7 @@ import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.Level;
-
+import org.jspecify.annotations.Nullable;
-import javax.annotation.Nullable;
 
 /**
  * A peripheral which can be equipped to the back side of a pocket computer.

projects/common-api/src/main/java/dan200/computercraft/api/turtle/ITurtleAccess.java

@@ -17,8 +17,7 @@ import net.minecraft.world.Container;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
 import org.jetbrains.annotations.ApiStatus;
-
+import org.jspecify.annotations.Nullable;
-import javax.annotation.Nullable;
 
 /**
  * The interface passed to turtle by turtles, providing methods that they can call.

projects/common-api/src/main/java/dan200/computercraft/api/turtle/ITurtleUpgrade.java

@@ -16,8 +16,8 @@ import net.minecraft.core.component.DataComponentPatch;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.Items;
+import org.jspecify.annotations.Nullable;
 
-import javax.annotation.Nullable;
 import java.util.function.Function;
 
 /**

projects/common-api/src/main/java/dan200/computercraft/api/turtle/TurtleCommandResult.java

@@ -5,8 +5,7 @@
 package dan200.computercraft.api.turtle;
 
 import net.minecraft.core.Direction;
-
+import org.jspecify.annotations.Nullable;
-import javax.annotation.Nullable;
 
 /**
  * Used to indicate the result of executing a turtle command.
@@ -60,9 +59,9 @@ public final class TurtleCommandResult {
 
     private final boolean success;
     private final @Nullable String errorMessage;
-    private final @Nullable Object[] results;
+    private final @Nullable Object @Nullable [] results;
 
-    private TurtleCommandResult(boolean success, @Nullable String errorMessage, @Nullable Object[] results) {
+    private TurtleCommandResult(boolean success, @Nullable String errorMessage, @Nullable Object @Nullable [] results) {
         this.success = success;
         this.errorMessage = errorMessage;
         this.results = results;
@@ -92,8 +91,7 @@ public final class TurtleCommandResult {
      *
      * @return The command's result, or {@code null} if it was a failure.
      */
-    @Nullable
+    public @Nullable Object @Nullable [] getResults() {
-    public Object[] getResults() {
         return results;
     }
 }

projects/common-api/src/main/java/dan200/computercraft/api/turtle/TurtleToolBuilder.java

@@ -18,8 +18,8 @@ import net.minecraft.world.entity.ai.attributes.Attributes;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.Block;
+import org.jspecify.annotations.Nullable;
 
-import javax.annotation.Nullable;
 import java.util.Optional;
 
 /**

projects/common-api/src/main/java/dan200/computercraft/impl/ComputerCraftAPIService.java

@@ -31,8 +31,7 @@ import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
 import org.jetbrains.annotations.ApiStatus;
-
+import org.jspecify.annotations.Nullable;
-import javax.annotation.Nullable;
 
 /**
  * Backing interface for {@link ComputerCraftAPI}

projects/common-api/src/main/java/dan200/computercraft/impl/ServiceException.java

@@ -5,8 +5,8 @@
 package dan200.computercraft.impl;
 
 import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.Nullable;
 
-import javax.annotation.Nullable;
 import java.io.Serial;
 
 /**

projects/common-api/src/main/java/dan200/computercraft/impl/Services.java

@@ -5,8 +5,8 @@
 package dan200.computercraft.impl;
 
 import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.Nullable;
 
-import javax.annotation.Nullable;
 import java.util.ServiceLoader;
 import java.util.stream.Collectors;
 

projects/common/src/client/java/dan200/computercraft/client/ClientHooks.java

@@ -38,8 +38,8 @@ import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.HitResult;
+import org.jspecify.annotations.Nullable;
 
-import javax.annotation.Nullable;
 import java.util.function.Consumer;
 
 /**

projects/common/src/client/java/dan200/computercraft/client/ClientRegistry.java

@@ -51,8 +51,8 @@ import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.component.DyedItemColor;
 import net.minecraft.world.level.ItemLike;
+import org.jspecify.annotations.Nullable;
 
-import javax.annotation.Nullable;
 import java.io.File;
 import java.io.IOException;
 import java.util.Collection;

projects/common/src/client/java/dan200/computercraft/client/ClientTableFormatter.java

@@ -15,8 +15,8 @@ import net.minecraft.client.gui.components.ChatComponent;
 import net.minecraft.network.chat.Component;
 import net.minecraft.util.Mth;
 import org.apache.commons.lang3.StringUtils;
+import org.jspecify.annotations.Nullable;
 
-import javax.annotation.Nullable;
 import java.util.Objects;
 
 /**

projects/common/src/client/java/dan200/computercraft/client/gui/AbstractComputerScreen.java

@@ -26,11 +26,11 @@ import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.item.ItemStack;
+import org.jspecify.annotations.Nullable;
 import org.lwjgl.glfw.GLFW;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.Nullable;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.file.Files;

projects/common/src/client/java/dan200/computercraft/client/gui/GuiSprites.java

@@ -11,8 +11,8 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.client.renderer.texture.TextureManager;
 import net.minecraft.client.resources.TextureAtlasHolder;
 import net.minecraft.resources.ResourceLocation;
+import org.jspecify.annotations.Nullable;
 
-import javax.annotation.Nullable;
 import java.util.Objects;
 import java.util.stream.Stream;
 

projects/common/src/client/java/dan200/computercraft/client/gui/NoTermComputerScreen.java

@@ -15,9 +15,9 @@ import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.screens.inventory.MenuAccess;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.Inventory;
+import org.jspecify.annotations.Nullable;
 import org.lwjgl.glfw.GLFW;
 
-import javax.annotation.Nullable;
 import java.util.Objects;
 
 import static dan200.computercraft.core.util.Nullability.assertNonNull;

projects/common/src/client/java/dan200/computercraft/client/gui/OptionScreen.java

@@ -12,8 +12,8 @@ import net.minecraft.client.gui.components.MultiLineLabel;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
+import org.jspecify.annotations.Nullable;
 
-import javax.annotation.Nullable;
 import java.util.List;
 
 import static dan200.computercraft.core.util.Nullability.assertNonNull;

projects/common/src/client/java/dan200/computercraft/client/gui/PrintoutScreen.java

@@ -127,6 +127,7 @@ public final class PrintoutScreen extends AbstractContainerScreen<PrintoutMenu>
         // Skip rendering labels.
     }
 
+    @SuppressWarnings("ArrayRecordComponent")
     record PrintoutInfo(int pages, boolean book, TextBuffer[] text, TextBuffer[] colour) {
         public static final PrintoutInfo DEFAULT = of(PrintoutData.EMPTY, false);
 

projects/common/src/client/java/dan200/computercraft/client/gui/widgets/DynamicImageButton.java

@@ -12,8 +12,8 @@ import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.components.Tooltip;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
+import org.jspecify.annotations.Nullable;
 
-import javax.annotation.Nullable;
 import java.util.function.Supplier;
 
 /**

projects/common/src/client/java/dan200/computercraft/client/model/turtle/ModelTransformer.java

@@ -11,8 +11,8 @@ import net.minecraft.client.resources.model.BakedModel;
 import net.minecraft.core.Direction;
 import org.joml.Matrix4f;
 import org.joml.Vector4f;
+import org.jspecify.annotations.Nullable;
 
-import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.List;
 

projects/common/src/client/java/dan200/computercraft/client/model/turtle/TurtleModelParts.java

@@ -23,8 +23,8 @@ import net.minecraft.client.resources.model.ModelManager;
 import net.minecraft.core.component.DataComponents;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
+import org.jspecify.annotations.Nullable;
 
-import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;

projects/common/src/client/java/dan200/computercraft/client/platform/ClientNetworkContextImpl.java

@@ -27,8 +27,8 @@ import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.JukeboxSong;
 import net.minecraft.world.level.Level;
+import org.jspecify.annotations.Nullable;
 
-import javax.annotation.Nullable;
 import java.util.UUID;
 
 /**

projects/common/src/client/java/dan200/computercraft/client/platform/ClientPlatformHelper.java

@@ -7,8 +7,7 @@ package dan200.computercraft.client.platform;
 import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.resources.model.BakedModel;
-
+import org.jspecify.annotations.Nullable;
-import javax.annotation.Nullable;
 
 public interface ClientPlatformHelper extends dan200.computercraft.impl.client.ClientPlatformHelper {
     static ClientPlatformHelper get() {
@@ -25,5 +24,5 @@ public interface ClientPlatformHelper extends dan200.computercraft.impl.client.C
      * @param overlayLight  The current overlay light.
      * @param tints         Block colour tints to apply to the model.
      */
-    void renderBakedModel(PoseStack transform, MultiBufferSource buffers, BakedModel model, int lightmapCoord, int overlayLight, @Nullable int[] tints);
+    void renderBakedModel(PoseStack transform, MultiBufferSource buffers, BakedModel model, int lightmapCoord, int overlayLight, int @Nullable [] tints);
 }

projects/common/src/client/java/dan200/computercraft/client/pocket/ClientPocketComputers.java

@@ -10,8 +10,8 @@ import dan200.computercraft.shared.computer.core.ServerComputer;
 import dan200.computercraft.shared.computer.terminal.TerminalState;
 import dan200.computercraft.shared.network.client.PocketComputerDataMessage;
 import net.minecraft.world.item.ItemStack;
+import org.jspecify.annotations.Nullable;
 
-import javax.annotation.Nullable;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;

projects/common/src/client/java/dan200/computercraft/client/pocket/PocketComputerData.java

@@ -8,8 +8,7 @@ import dan200.computercraft.shared.computer.core.ComputerState;
 import dan200.computercraft.shared.computer.terminal.NetworkedTerminal;
 import dan200.computercraft.shared.computer.terminal.TerminalState;
 import dan200.computercraft.shared.pocket.core.PocketServerComputer;
-
+import org.jspecify.annotations.Nullable;
-import javax.annotation.Nullable;
 
 /**
  * Clientside data about a pocket computer.

projects/common/src/client/java/dan200/computercraft/client/render/ModelRenderer.java

@@ -14,8 +14,8 @@ import net.minecraft.client.renderer.entity.ItemRenderer;
 import net.minecraft.client.resources.model.BakedModel;
 import net.minecraft.world.item.ItemStack;
 import org.joml.Vector4f;
+import org.jspecify.annotations.Nullable;
 
-import javax.annotation.Nullable;
 import java.util.List;
 
 /**
@@ -39,7 +39,7 @@ public final class ModelRenderer {
      * @param overlayLight  The current overlay light.
      * @param tints         Block colour tints to apply to the model.
      */
-    public static void renderQuads(PoseStack transform, VertexConsumer buffer, List<BakedQuad> quads, int lightmapCoord, int overlayLight, @Nullable int[] tints) {
+    public static void renderQuads(PoseStack transform, VertexConsumer buffer, List<BakedQuad> quads, int lightmapCoord, int overlayLight, int @Nullable [] tints) {
         var matrix = transform.last();
         var inverted = matrix.pose().determinant() < 0;
 

projects/common/src/client/java/dan200/computercraft/client/render/RenderTypes.java

@@ -16,8 +16,8 @@ import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.ShaderInstance;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.packs.resources.ResourceProvider;
+import org.jspecify.annotations.Nullable;
 
-import javax.annotation.Nullable;
 import java.io.IOException;
 import java.util.Objects;
 import java.util.function.BiConsumer;

projects/common/src/client/java/dan200/computercraft/client/render/TurtleBlockEntityRenderer.java

@@ -26,8 +26,7 @@ import net.minecraft.util.CommonColors;
 import net.minecraft.util.FastColor;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.HitResult;
-
+import org.jspecify.annotations.Nullable;
-import javax.annotation.Nullable;
 
 public class TurtleBlockEntityRenderer implements BlockEntityRenderer<TurtleBlockEntity> {
     public static final ResourceLocation COLOUR_TURTLE_MODEL = ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "block/turtle_colour");
@@ -124,7 +123,7 @@ public class TurtleBlockEntityRenderer implements BlockEntityRenderer<TurtleBloc
         transform.popPose();
     }
 
-    private void renderModel(PoseStack transform, MultiBufferSource buffers, int lightmapCoord, int overlayLight, ResourceLocation modelLocation, @Nullable int[] tints) {
+    private void renderModel(PoseStack transform, MultiBufferSource buffers, int lightmapCoord, int overlayLight, ResourceLocation modelLocation, int @Nullable [] tints) {
         var modelManager = Minecraft.getInstance().getItemRenderer().getItemModelShaper().getModelManager();
         renderModel(transform, buffers, lightmapCoord, overlayLight, ClientPlatformHelper.get().getModel(modelManager, modelLocation), tints);
     }
@@ -140,7 +139,7 @@ public class TurtleBlockEntityRenderer implements BlockEntityRenderer<TurtleBloc
      * @param tints         Tints for the quads, as an array of RGB values.
      * @see net.minecraft.client.renderer.block.ModelBlockRenderer#renderModel
      */
-    private void renderModel(PoseStack transform, MultiBufferSource renderer, int lightmapCoord, int overlayLight, BakedModel model, @Nullable int[] tints) {
+    private void renderModel(PoseStack transform, MultiBufferSource renderer, int lightmapCoord, int overlayLight, BakedModel model, int @Nullable [] tints) {
         ClientPlatformHelper.get().renderBakedModel(transform, renderer, model, lightmapCoord, overlayLight, tints);
     }
 

projects/common/src/client/java/dan200/computercraft/client/render/monitor/MonitorBlockEntityRenderer.java

@@ -31,12 +31,12 @@ import net.minecraft.client.renderer.blockentity.BlockEntityRenderer;
 import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
 import net.minecraft.world.phys.AABB;
 import org.joml.Matrix4f;
+import org.jspecify.annotations.Nullable;
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL20;
 import org.lwjgl.opengl.GL31;
 import org.lwjgl.system.MemoryUtil;
 
-import javax.annotation.Nullable;
 import java.nio.ByteBuffer;
 import java.util.function.Consumer;
 

projects/common/src/client/java/dan200/computercraft/client/render/monitor/MonitorRenderState.java

@@ -11,12 +11,12 @@ import dan200.computercraft.client.render.vbo.DirectVertexBuffer;
 import dan200.computercraft.shared.peripheral.monitor.ClientMonitor;
 import dan200.computercraft.shared.peripheral.monitor.MonitorRenderer;
 import net.minecraft.core.BlockPos;
+import org.jspecify.annotations.Nullable;
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL15;
 import org.lwjgl.opengl.GL30;
 import org.lwjgl.opengl.GL31;
 
-import javax.annotation.Nullable;
 import java.util.HashSet;
 import java.util.Set;
 

projects/common/src/client/java/dan200/computercraft/client/render/monitor/MonitorTextureBufferShader.java

@@ -14,12 +14,12 @@ import dan200.computercraft.core.terminal.TextBuffer;
 import dan200.computercraft.core.util.Colour;
 import net.minecraft.client.renderer.ShaderInstance;
 import net.minecraft.server.packs.resources.ResourceProvider;
+import org.jspecify.annotations.Nullable;
 import org.lwjgl.opengl.GL13;
 import org.lwjgl.opengl.GL31;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.Nullable;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 

projects/common/src/client/java/dan200/computercraft/client/sound/DfpwmStream.java

@@ -10,9 +10,9 @@ import dan200.computercraft.shared.peripheral.speaker.SpeakerPeripheral;
 import dan200.computercraft.shared.peripheral.speaker.SpeakerPosition;
 import net.minecraft.client.sounds.AudioStream;
 import net.minecraft.client.sounds.SoundEngine;
+import org.jspecify.annotations.Nullable;
 import org.lwjgl.BufferUtils;
 
-import javax.annotation.Nullable;
 import javax.sound.sampled.AudioFormat;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;

projects/common/src/client/java/dan200/computercraft/client/sound/SpeakerInstance.java

@@ -10,8 +10,7 @@ import dan200.computercraft.shared.peripheral.speaker.EncodedAudio;
 import dan200.computercraft.shared.peripheral.speaker.SpeakerPosition;
 import net.minecraft.client.Minecraft;
 import net.minecraft.resources.ResourceLocation;
-
+import org.jspecify.annotations.Nullable;
-import javax.annotation.Nullable;
 
 /**
  * An instance of a speaker, which is either playing a {@link DfpwmStream} stream or a normal sound.

projects/common/src/client/java/dan200/computercraft/client/sound/SpeakerSound.java

@@ -16,8 +16,8 @@ import net.minecraft.client.sounds.SoundBufferLibrary;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.sounds.SoundSource;
 import net.minecraft.world.entity.Entity;
+import org.jspecify.annotations.Nullable;
 
-import javax.annotation.Nullable;
 import java.util.concurrent.CompletableFuture;
 
 /**

projects/common/src/client/java/dan200/computercraft/client/turtle/TurtleModemModeller.java

@@ -15,7 +15,7 @@ import dan200.computercraft.shared.turtle.upgrades.TurtleModem;
 import dan200.computercraft.shared.util.DataComponentUtil;
 import net.minecraft.core.component.DataComponentPatch;
 import net.minecraft.resources.ResourceLocation;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.stream.Stream;
 

projects/common/src/examples/java/com/example/examplemod/ExampleAPI.java

@@ -6,7 +6,7 @@ import dan200.computercraft.api.lua.Coerced;
 import dan200.computercraft.api.lua.ILuaAPI;
 import dan200.computercraft.api.lua.LuaFunction;
 import dan200.computercraft.api.turtle.ITurtleAccess;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * An example API that will be available on every turtle. This demonstrates both registering an API, and how to write

projects/common/src/examples/java/com/example/examplemod/peripheral/BrewingStandPeripheral.java

@@ -3,7 +3,7 @@ package com.example.examplemod.peripheral;
 import dan200.computercraft.api.lua.LuaFunction;
 import dan200.computercraft.api.peripheral.IPeripheral;
 import net.minecraft.world.level.block.entity.BrewingStandBlockEntity;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * A peripheral that adds a {@code getFuel()} method to brewing stands. This demonstrates the usage of

projects/common/src/examples/java/com/example/examplemod/peripheral/ComputerTrackingPeripheral.java

@@ -4,7 +4,7 @@ import dan200.computercraft.api.lua.LuaFunction;
 import dan200.computercraft.api.peripheral.AttachedComputerSet;
 import dan200.computercraft.api.peripheral.IComputerAccess;
 import dan200.computercraft.api.peripheral.IPeripheral;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * A peripheral that tracks what computers it is attached to.

projects/common/src/main/java/dan200/computercraft/impl/AbstractComputerCraftAPI.java

@@ -12,7 +12,6 @@ import dan200.computercraft.api.filesystem.Mount;
 import dan200.computercraft.api.filesystem.WritableMount;
 import dan200.computercraft.api.lua.GenericSource;
 import dan200.computercraft.api.lua.ILuaAPIFactory;
-import dan200.computercraft.api.media.MediaProvider;
 import dan200.computercraft.api.media.PrintoutContents;
 import dan200.computercraft.api.network.PacketNetwork;
 import dan200.computercraft.api.network.wired.WiredElement;
@@ -40,8 +39,8 @@ import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
+import org.jspecify.annotations.Nullable;
 
-import javax.annotation.Nullable;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -96,11 +95,6 @@ public abstract class AbstractComputerCraftAPI implements ComputerCraftAPIServic
         return BundledRedstone.getDefaultOutput(world, pos, side);
     }
 
-    @Override
-    public final void registerMediaProvider(MediaProvider provider) {
-        MediaProviders.register(provider);
-    }
-
     @Override
     public final PacketNetwork getWirelessNetwork(MinecraftServer server) {
         return ServerContext.get(server).wirelessNetwork();

projects/common/src/main/java/dan200/computercraft/impl/Peripherals.java

@@ -11,8 +11,7 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.block.entity.BlockEntity;
-
+import org.jspecify.annotations.Nullable;
-import javax.annotation.Nullable;
 
 /**
  * The registry for peripheral providers.

projects/common/src/main/java/dan200/computercraft/impl/UpgradeManager.java

@@ -21,8 +21,8 @@ import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.resources.RegistryFixedCodec;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.world.item.ItemStack;
+import org.jspecify.annotations.Nullable;
 
-import javax.annotation.Nullable;
 import java.util.function.Function;
 
 /**

projects/common/src/main/java/dan200/computercraft/impl/network/wired/InvariantChecker.java

@@ -5,11 +5,10 @@
 package dan200.computercraft.impl.network.wired;
 
 import org.jetbrains.annotations.Contract;
+import org.jspecify.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.Nullable;
-
 /**
  * Verifies certain elements of a network are well-formed.
  * <p>

projects/common/src/main/java/dan200/computercraft/impl/network/wired/NodeSet.java

@@ -5,8 +5,8 @@
 package dan200.computercraft.impl.network.wired;
 
 import dan200.computercraft.api.network.wired.WiredNode;
+import org.jspecify.annotations.Nullable;
 
-import javax.annotation.Nullable;
 import java.util.Objects;
 
 /**

projects/common/src/main/java/dan200/computercraft/impl/network/wired/WiredNodeImpl.java

@@ -11,8 +11,8 @@ import dan200.computercraft.api.network.wired.WiredElement;
 import dan200.computercraft.api.network.wired.WiredNode;
 import dan200.computercraft.api.network.wired.WiredSender;
 import dan200.computercraft.api.peripheral.IPeripheral;
+import org.jspecify.annotations.Nullable;
 
-import javax.annotation.Nullable;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Objects;

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

@@ -38,8 +38,8 @@ import net.minecraft.world.level.storage.loot.LootTable;
 import net.minecraft.world.level.storage.loot.entries.NestedLootTable;
 import net.minecraft.world.level.storage.loot.providers.number.ConstantValue;
 import net.minecraft.world.phys.BlockHitResult;
+import org.jspecify.annotations.Nullable;
 
-import javax.annotation.Nullable;
 import java.util.Set;
 import java.util.function.BiConsumer;
 
@@ -129,7 +129,7 @@ public final class CommonHooks {
         BuiltInLootTables.VILLAGE_CARTOGRAPHER
     );
 
-    public static @Nullable LootPool.Builder getExtraLootPool(ResourceKey<LootTable> lootTable) {
+    public static LootPool.@Nullable Builder getExtraLootPool(ResourceKey<LootTable> lootTable) {
         if (!TREASURE_DISK_LOOT_TABLES.contains(lootTable)) {
             return null;
         }

projects/common/src/main/java/dan200/computercraft/shared/ModRegistry.java

@@ -12,6 +12,8 @@ import dan200.computercraft.api.component.ComputerComponents;
 import dan200.computercraft.api.detail.DetailProvider;
 import dan200.computercraft.api.detail.VanillaDetailRegistries;
 import dan200.computercraft.api.media.IMedia;
+import dan200.computercraft.api.network.wired.WiredElement;
+import dan200.computercraft.api.peripheral.IPeripheral;
 import dan200.computercraft.api.pocket.IPocketUpgrade;
 import dan200.computercraft.api.turtle.ITurtleUpgrade;
 import dan200.computercraft.api.upgrades.UpgradeBase;
@@ -46,12 +48,14 @@ import dan200.computercraft.shared.details.ItemDetails;
 import dan200.computercraft.shared.integration.PermissionRegistry;
 import dan200.computercraft.shared.lectern.CustomLecternBlock;
 import dan200.computercraft.shared.lectern.CustomLecternBlockEntity;
+import dan200.computercraft.shared.media.MountMedia;
 import dan200.computercraft.shared.media.PrintoutMenu;
 import dan200.computercraft.shared.media.items.*;
 import dan200.computercraft.shared.media.recipes.DiskRecipe;
 import dan200.computercraft.shared.media.recipes.PrintoutRecipe;
 import dan200.computercraft.shared.network.container.ComputerContainerData;
 import dan200.computercraft.shared.network.container.ContainerData;
+import dan200.computercraft.shared.peripheral.commandblock.CommandBlockPeripheral;
 import dan200.computercraft.shared.peripheral.diskdrive.DiskDriveBlock;
 import dan200.computercraft.shared.peripheral.diskdrive.DiskDriveBlockEntity;
 import dan200.computercraft.shared.peripheral.diskdrive.DiskDriveMenu;
@@ -97,6 +101,7 @@ import dan200.computercraft.shared.util.StorageCapacity;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.synchronization.ArgumentTypeInfo;
 import net.minecraft.commands.synchronization.SingletonArgumentInfo;
+import net.minecraft.core.Direction;
 import net.minecraft.core.Holder;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.core.cauldron.CauldronInteraction;
@@ -117,6 +122,7 @@ import net.minecraft.world.item.crafting.CustomRecipe;
 import net.minecraft.world.item.crafting.Recipe;
 import net.minecraft.world.item.crafting.RecipeSerializer;
 import net.minecraft.world.item.crafting.SimpleCraftingRecipeSerializer;
+import net.minecraft.world.level.ItemLike;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.SoundType;
 import net.minecraft.world.level.block.entity.BlockEntity;
@@ -125,6 +131,7 @@ import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.properties.NoteBlockInstrument;
 import net.minecraft.world.level.material.MapColor;
 import net.minecraft.world.level.storage.loot.predicates.LootItemConditionType;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Objects;
 import java.util.function.BiFunction;
@@ -607,11 +614,6 @@ public final class ModRegistry {
         // Register bundled power providers
         ComputerCraftAPI.registerBundledRedstoneProvider(new DefaultBundledRedstoneProvider());
         ComputerCraftAPI.registerRefuelHandler(new FurnaceRefuelHandler());
-        ComputerCraftAPI.registerMediaProvider(stack -> {
-            if (stack.getItem() instanceof IMedia media) return media;
-            if (stack.has(net.minecraft.core.component.DataComponents.JUKEBOX_PLAYABLE)) return RecordMedia.INSTANCE;
-            return null;
-        });
 
         ComputerCraftAPI.registerAPIFactory(computer -> {
             var turtle = computer.getComponent(ComputerComponents.TURTLE);
@@ -641,6 +643,76 @@ public final class ModRegistry {
         CauldronInteraction.WATER.map().put(Items.TURTLE_ADVANCED.get(), TurtleItem.CAULDRON_INTERACTION);
     }
 
+    /**
+     * Register our peripherals.
+     *
+     * @param peripherals The object to register our peripheral capability/lookups with.
+     */
+    public static void registerPeripherals(BlockComponent<IPeripheral, Direction> peripherals) {
+        peripherals.registerForBlockEntity(ModRegistry.BlockEntities.COMPUTER_NORMAL.get(), (b, d) -> b.peripheral());
+        peripherals.registerForBlockEntity(ModRegistry.BlockEntities.COMPUTER_ADVANCED.get(), (b, d) -> b.peripheral());
+        peripherals.registerForBlockEntity(ModRegistry.BlockEntities.TURTLE_NORMAL.get(), (b, d) -> b.peripheral());
+        peripherals.registerForBlockEntity(ModRegistry.BlockEntities.TURTLE_ADVANCED.get(), (b, d) -> b.peripheral());
+        peripherals.registerForBlockEntity(ModRegistry.BlockEntities.SPEAKER.get(), (b, d) -> b.peripheral());
+        peripherals.registerForBlockEntity(ModRegistry.BlockEntities.PRINTER.get(), (b, d) -> b.peripheral());
+        peripherals.registerForBlockEntity(ModRegistry.BlockEntities.DISK_DRIVE.get(), (b, d) -> b.peripheral());
+        peripherals.registerForBlockEntity(ModRegistry.BlockEntities.MONITOR_NORMAL.get(), (b, d) -> b.peripheral());
+        peripherals.registerForBlockEntity(ModRegistry.BlockEntities.MONITOR_ADVANCED.get(), (b, d) -> b.peripheral());
+        peripherals.registerForBlockEntity(ModRegistry.BlockEntities.WIRELESS_MODEM_NORMAL.get(), WirelessModemBlockEntity::getPeripheral);
+        peripherals.registerForBlockEntity(ModRegistry.BlockEntities.WIRELESS_MODEM_ADVANCED.get(), WirelessModemBlockEntity::getPeripheral);
+        peripherals.registerForBlockEntity(ModRegistry.BlockEntities.WIRED_MODEM_FULL.get(), WiredModemFullBlockEntity::getPeripheral);
+        peripherals.registerForBlockEntity(ModRegistry.BlockEntities.CABLE.get(), CableBlockEntity::getPeripheral);
+        peripherals.registerForBlockEntity(ModRegistry.BlockEntities.REDSTONE_RELAY.get(), (b, d) -> b.peripheral());
+
+        peripherals.registerForBlockEntity(BlockEntityType.COMMAND_BLOCK, (b, d) -> Config.enableCommandBlock ? new CommandBlockPeripheral(b) : null);
+    }
+
+    public static void registerWiredElements(BlockComponent<WiredElement, Direction> wiredElements) {
+        wiredElements.registerForBlockEntity(ModRegistry.BlockEntities.WIRED_MODEM_FULL.get(), (b, d) -> b.getElement());
+        wiredElements.registerForBlockEntity(ModRegistry.BlockEntities.CABLE.get(), CableBlockEntity::getWiredElement);
+    }
+
+    /**
+     * Register our custom {@link IMedia} implementations.
+     *
+     * @param media The object to register our media capabilities/lookups with.
+     */
+    public static void registerMedia(ItemComponent<IMedia> media) {
+        media.registerForItems((s, c) -> MountMedia.COMPUTER,
+            ModRegistry.Items.COMPUTER_NORMAL.get(), ModRegistry.Items.COMPUTER_ADVANCED.get(),
+            ModRegistry.Items.TURTLE_NORMAL.get(), ModRegistry.Items.TURTLE_ADVANCED.get(),
+            ModRegistry.Items.POCKET_COMPUTER_NORMAL.get(), ModRegistry.Items.POCKET_COMPUTER_ADVANCED.get()
+        );
+        media.registerForItems((s, c) -> MountMedia.DISK, ModRegistry.Items.DISK.get());
+        media.registerForItems((s, c) -> TreasureDiskMedia.INSTANCE, ModRegistry.Items.TREASURE_DISK.get());
+        media.registerFallback((stack, ctx) -> {
+            if (stack.getItem() instanceof IMedia m) return m;
+            if (stack.has(net.minecraft.core.component.DataComponents.JUKEBOX_PLAYABLE)) return RecordMedia.INSTANCE;
+            return null;
+        });
+    }
+
+    /**
+     * An abstraction for registering capabilities/block lookups for blocks and block entities.
+     *
+     * @param <T> The type of the component.
+     * @param <C> The context parameter to the component.
+     */
+    public interface BlockComponent<T, C extends @Nullable Object> {
+        <B extends BlockEntity> void registerForBlockEntity(BlockEntityType<B> blockEntityType, BiFunction<? super B, C, @Nullable T> provider);
+    }
+
+    /**
+     * An abstraction for registering capabilities/block lookups for items.
+     *
+     * @param <T> The type of the component.
+     */
+    public interface ItemComponent<T> {
+        void registerForItems(BiFunction<ItemStack, @Nullable Void, @Nullable T> provider, ItemLike... items);
+
+        void registerFallback(BiFunction<ItemStack, @Nullable Void, @Nullable T> provider);
+    }
+
     private static void addTurtle(CreativeModeTab.Output out, TurtleItem turtle, HolderLookup.Provider registries) {
         out.accept(new ItemStack(turtle));
         registries.lookupOrThrow(ITurtleUpgrade.REGISTRY).listElements()

projects/common/src/main/java/dan200/computercraft/shared/command/CommandComputerCraft.java

@@ -34,8 +34,8 @@ import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.Vec3;
+import org.jspecify.annotations.Nullable;
 
-import javax.annotation.Nullable;
 import java.io.File;
 import java.util.*;
 

projects/common/src/main/java/dan200/computercraft/shared/command/arguments/ComputerSelector.java

@@ -20,8 +20,8 @@ import net.minecraft.commands.arguments.UuidArgument;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.Vec3;
+import org.jspecify.annotations.Nullable;
 
-import javax.annotation.Nullable;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Function;
@@ -40,7 +40,7 @@ public record ComputerSelector(
     @Nullable String label,
     @Nullable ComputerFamily family,
     @Nullable AABB bounds,
-    @Nullable MinMaxBounds.Doubles range
+    MinMaxBounds.@Nullable Doubles range
 ) {
     private static final ComputerSelector all = new ComputerSelector("@c[]", null, OptionalInt.empty(), null, null, null, null);
 
@@ -258,7 +258,7 @@ public record ComputerSelector(
         private @Nullable String label;
         private @Nullable ComputerFamily family;
         private @Nullable AABB bounds;
-        private @Nullable MinMaxBounds.Doubles range;
+        private MinMaxBounds.@Nullable Doubles range;
     }
 
     private static final Map<String, Option> options;

projects/common/src/main/java/dan200/computercraft/shared/command/builder/CommandBuilder.java

@@ -12,8 +12,8 @@ import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.tree.CommandNode;
 import dan200.computercraft.shared.command.arguments.RepeatArgumentType;
 import net.minecraft.commands.CommandSourceStack;
+import org.jspecify.annotations.Nullable;
 
-import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Predicate;

projects/common/src/main/java/dan200/computercraft/shared/command/builder/HelpingArgumentBuilder.java

@@ -14,8 +14,8 @@ import net.minecraft.ChatFormatting;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.network.chat.ClickEvent;
 import net.minecraft.network.chat.Component;
+import org.jspecify.annotations.Nullable;
 
-import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.function.Predicate;

projects/common/src/main/java/dan200/computercraft/shared/command/text/ChatHelpers.java

@@ -11,8 +11,7 @@ import net.minecraft.network.chat.ClickEvent;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.HoverEvent;
 import net.minecraft.network.chat.MutableComponent;
-
+import org.jspecify.annotations.Nullable;
-import javax.annotation.Nullable;
 
 /**
  * Various helpers for building chat messages.

projects/common/src/main/java/dan200/computercraft/shared/command/text/ServerTableFormatter.java

@@ -7,8 +7,7 @@ package dan200.computercraft.shared.command.text;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.network.chat.Component;
 import org.apache.commons.lang3.StringUtils;
-
+import org.jspecify.annotations.Nullable;
-import javax.annotation.Nullable;
 
 public class ServerTableFormatter implements TableFormatter {
     private final CommandSourceStack source;

projects/common/src/main/java/dan200/computercraft/shared/command/text/TableBuilder.java

@@ -11,15 +11,15 @@ import dan200.computercraft.shared.network.server.ServerNetworking;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.network.chat.Component;
 import net.minecraft.server.level.ServerPlayer;
+import org.jspecify.annotations.Nullable;
 
-import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.List;
 
 public class TableBuilder {
     private final String id;
     private int columns = -1;
-    private final @Nullable Component[] headers;
+    private final Component @Nullable [] headers;
     private final ArrayList<Component[]> rows = new ArrayList<>();
     private int additional;
 
@@ -72,8 +72,7 @@ public class TableBuilder {
         return columns;
     }
 
-    @Nullable
+    public Component @Nullable [] getHeaders() {
-    public Component[] getHeaders() {
         return headers;
     }
 

projects/common/src/main/java/dan200/computercraft/shared/command/text/TableFormatter.java

@@ -7,8 +7,7 @@ package dan200.computercraft.shared.command.text;
 import net.minecraft.ChatFormatting;
 import net.minecraft.network.chat.Component;
 import org.apache.commons.lang3.StringUtils;
-
+import org.jspecify.annotations.Nullable;
-import javax.annotation.Nullable;
 
 import static dan200.computercraft.shared.command.text.ChatHelpers.coloured;
 

projects/common/src/main/java/dan200/computercraft/shared/common/HorizontalContainerBlock.java

@@ -21,7 +21,6 @@ import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.block.state.properties.DirectionProperty;
 import net.minecraft.world.phys.BlockHitResult;
 
-
 /**
  * A block which has a container and can be placed in a horizontal direction.
  *

projects/common/src/main/java/dan200/computercraft/shared/computer/blocks/AbstractComputerBlock.java

@@ -28,8 +28,7 @@ import net.minecraft.world.level.block.entity.BlockEntityTicker;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.BlockHitResult;
-
+import org.jspecify.annotations.Nullable;
-import javax.annotation.Nullable;
 
 public abstract class AbstractComputerBlock<T extends AbstractComputerBlockEntity> extends HorizontalDirectionalBlock implements IBundledRedstoneBlock, EntityBlock {
     protected final RegistryEntry<BlockEntityType<T>> type;

projects/common/src/main/java/dan200/computercraft/shared/computer/blocks/AbstractComputerBlockEntity.java

@@ -36,8 +36,8 @@ import net.minecraft.world.level.block.entity.BaseContainerBlockEntity;
 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 org.jspecify.annotations.Nullable;
 
-import javax.annotation.Nullable;
 import java.util.Objects;
 import java.util.UUID;
 

projects/common/src/main/java/dan200/computercraft/shared/computer/blocks/ComputerBlock.java

@@ -18,8 +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 org.jspecify.annotations.Nullable;
-import javax.annotation.Nullable;
 
 public class ComputerBlock<T extends ComputerBlockEntity> extends AbstractComputerBlock<T> {
     private static final MapCodec<ComputerBlock<?>> CODEC = RecordCodecBuilder.mapCodec(instance -> instance.group(

projects/common/src/main/java/dan200/computercraft/shared/computer/blocks/ComputerBlockEntity.java

@@ -20,8 +20,7 @@ import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
-
+import org.jspecify.annotations.Nullable;
-import javax.annotation.Nullable;
 
 public class ComputerBlockEntity extends AbstractComputerBlockEntity {
     private @Nullable IPeripheral peripheral;

projects/common/src/main/java/dan200/computercraft/shared/computer/blocks/ComputerPeripheral.java

@@ -7,8 +7,7 @@ package dan200.computercraft.shared.computer.blocks;
 import dan200.computercraft.api.lua.LuaFunction;
 import dan200.computercraft.api.peripheral.IPeripheral;
 import dan200.computercraft.core.apis.OSAPI;
-
+import org.jspecify.annotations.Nullable;
-import javax.annotation.Nullable;
 
 /**
  * A computer or turtle wrapped as a peripheral.

projects/common/src/main/java/dan200/computercraft/shared/computer/core/ComputerSystem.java

@@ -13,8 +13,8 @@ import dan200.computercraft.core.apis.IAPIEnvironment;
 import dan200.computercraft.core.computer.ApiLifecycle;
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
+import org.jspecify.annotations.Nullable;
 
-import javax.annotation.Nullable;
 import java.util.Map;
 
 /**

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

@@ -30,8 +30,8 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.inventory.AbstractContainerMenu;
+import org.jspecify.annotations.Nullable;
 
-import javax.annotation.Nullable;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
@@ -213,7 +213,7 @@ public class ServerComputer implements ComputerEnvironment, ComputerEvents.Recei
     }
 
     @Override
-    public final void queueEvent(String event, @Nullable Object[] arguments) {
+    public final void queueEvent(String event, @Nullable Object @Nullable [] arguments) {
         computer.queueEvent(event, arguments);
     }
 

projects/common/src/main/java/dan200/computercraft/shared/computer/core/ServerComputerRegistry.java

@@ -4,7 +4,8 @@
 
 package dan200.computercraft.shared.computer.core;
 
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
+
 import java.util.*;
 
 public class ServerComputerRegistry {

projects/common/src/main/java/dan200/computercraft/shared/computer/core/ServerContext.java

@@ -26,10 +26,10 @@ import dan200.computercraft.shared.util.IDAssigner;
 import net.minecraft.SharedConstants;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.level.storage.LevelResource;
+import org.jspecify.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.Nullable;
 import java.io.InputStream;
 import java.nio.file.Path;
 import java.util.Objects;

projects/common/src/main/java/dan200/computercraft/shared/computer/inventory/AbstractComputerMenu.java

@@ -21,8 +21,8 @@ import net.minecraft.world.inventory.ContainerData;
 import net.minecraft.world.inventory.MenuType;
 import net.minecraft.world.inventory.SimpleContainerData;
 import net.minecraft.world.item.ItemStack;
+import org.jspecify.annotations.Nullable;
 
-import javax.annotation.Nullable;
 import java.util.function.Predicate;
 
 public abstract class AbstractComputerMenu extends AbstractContainerMenu implements ComputerMenu {

projects/common/src/main/java/dan200/computercraft/shared/computer/items/AbstractComputerItem.java

@@ -4,27 +4,18 @@
 
 package dan200.computercraft.shared.computer.items;
 
-import dan200.computercraft.api.ComputerCraftAPI;
-import dan200.computercraft.api.filesystem.Mount;
-import dan200.computercraft.api.media.IMedia;
 import dan200.computercraft.shared.ModRegistry;
 import dan200.computercraft.shared.computer.blocks.AbstractComputerBlock;
-import dan200.computercraft.shared.config.ConfigSpec;
-import dan200.computercraft.shared.util.DataComponentUtil;
-import dan200.computercraft.shared.util.StorageCapacity;
 import net.minecraft.ChatFormatting;
-import net.minecraft.core.HolderLookup;
 import net.minecraft.core.component.DataComponents;
 import net.minecraft.network.chat.Component;
-import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.item.BlockItem;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.TooltipFlag;
 
-import javax.annotation.Nullable;
 import java.util.List;
 
-public class AbstractComputerItem extends BlockItem implements IMedia {
+public class AbstractComputerItem extends BlockItem {
     public AbstractComputerItem(AbstractComputerBlock<?> block, Properties settings) {
         super(block, settings);
     }
@@ -39,24 +30,4 @@ public class AbstractComputerItem extends BlockItem implements IMedia {
             }
         }
     }
-
-    @Override
-    public @Nullable String getLabel(HolderLookup.Provider registries, ItemStack stack) {
-        return DataComponentUtil.getCustomName(stack);
-    }
-
-    @Override
-    public boolean setLabel(ItemStack stack, @Nullable String label) {
-        DataComponentUtil.setCustomName(stack, label);
-        return true;
-    }
-
-    @Override
-    public @Nullable Mount createDataMount(ItemStack stack, ServerLevel level) {
-        var id = stack.get(ModRegistry.DataComponents.COMPUTER_ID.get());
-        if (id == null) return null;
-
-        var capacity = StorageCapacity.getOrDefault(stack.get(ModRegistry.DataComponents.STORAGE_CAPACITY.get()), ConfigSpec.computerSpaceLimit);
-        return ComputerCraftAPI.createSaveDirMount(level.getServer(), "computer/" + id.id(), capacity);
-    }
 }

projects/common/src/main/java/dan200/computercraft/shared/computer/items/CommandComputerItem.java

@@ -4,13 +4,10 @@
 
 package dan200.computercraft.shared.computer.items;
 
-import dan200.computercraft.api.filesystem.Mount;
 import dan200.computercraft.shared.computer.blocks.ComputerBlock;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.context.BlockPlaceContext;
 import net.minecraft.world.level.block.state.BlockState;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * A {@link ComputerItem} which prevents players placing it without permission.
@@ -29,10 +26,4 @@ public class CommandComputerItem extends ComputerItem {
         var player = context.getPlayer();
         return player != null && !player.canUseGameMasterBlocks() ? null : super.getPlacementState(context);
     }
-
-    @Override
-    public @Nullable Mount createDataMount(ItemStack stack, ServerLevel level) {
-        // Don't allow command computers to be mounted in disk drives.
-        return null;
-    }
 }

projects/common/src/main/java/dan200/computercraft/shared/computer/items/ServerComputerReference.java

@@ -14,8 +14,8 @@ import net.minecraft.core.component.DataComponentHolder;
 import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.network.codec.ByteBufCodecs;
 import net.minecraft.network.codec.StreamCodec;
+import org.jspecify.annotations.Nullable;
 
-import javax.annotation.Nullable;
 import java.util.UUID;
 
 /**

projects/common/src/main/java/dan200/computercraft/shared/computer/menu/ServerInputState.java

@@ -19,10 +19,10 @@ import it.unimi.dsi.fastutil.ints.IntSet;
 import net.minecraft.network.chat.Component;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.inventory.AbstractContainerMenu;
+import org.jspecify.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.Nullable;
 import java.nio.ByteBuffer;
 import java.util.List;
 import java.util.UUID;

projects/common/src/main/java/dan200/computercraft/shared/computer/metrics/ComputerMBean.java

@@ -14,10 +14,10 @@ import dan200.computercraft.shared.computer.metrics.basic.AggregatedMetric;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import net.minecraft.server.MinecraftServer;
+import org.jspecify.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.Nullable;
 import javax.management.*;
 import java.lang.management.ManagementFactory;
 import java.util.ArrayList;

projects/common/src/main/java/dan200/computercraft/shared/computer/metrics/basic/BasicComputerMetricsObserver.java

@@ -5,12 +5,12 @@
 package dan200.computercraft.shared.computer.metrics.basic;
 
 import com.google.common.collect.MapMaker;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import dan200.computercraft.core.metrics.Metric;
 import dan200.computercraft.shared.computer.core.ServerComputer;
 import dan200.computercraft.shared.computer.metrics.ComputerMetricsObserver;
 import dan200.computercraft.shared.computer.metrics.GlobalMetrics;
 
-import javax.annotation.concurrent.GuardedBy;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;

projects/common/src/main/java/dan200/computercraft/shared/computer/metrics/basic/ComputerMetrics.java

@@ -6,8 +6,8 @@ package dan200.computercraft.shared.computer.metrics.basic;
 
 import dan200.computercraft.core.metrics.Metric;
 import dan200.computercraft.shared.computer.core.ServerComputer;
+import org.jspecify.annotations.Nullable;
 
-import javax.annotation.Nullable;
 import java.lang.ref.WeakReference;
 import java.util.Arrays;
 

projects/common/src/main/java/dan200/computercraft/shared/computer/terminal/TerminalState.java

@@ -7,8 +7,7 @@ package dan200.computercraft.shared.computer.terminal;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.codec.StreamCodec;
 import org.jetbrains.annotations.Contract;
-
+import org.jspecify.annotations.Nullable;
-import javax.annotation.Nullable;
 
 /**
  * A snapshot of a terminal's state.

projects/common/src/main/java/dan200/computercraft/shared/computer/upload/FileUpload.java

@@ -4,10 +4,10 @@
 
 package dan200.computercraft.shared.computer.upload;
 
+import org.jspecify.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.Nullable;
 import java.nio.ByteBuffer;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
@@ -52,8 +52,7 @@ public class FileUpload {
         return digest != null && Arrays.equals(checksum, digest);
     }
 
-    @Nullable
+    public static byte @Nullable [] getDigest(ByteBuffer bytes) {
-    public static byte[] getDigest(ByteBuffer bytes) {
         try {
             var digest = MessageDigest.getInstance("SHA-256");
             digest.update(bytes.duplicate());

projects/common/src/main/java/dan200/computercraft/shared/config/ConfigFile.java

@@ -5,9 +5,9 @@
 package dan200.computercraft.shared.config;
 
 import com.google.common.base.Splitter;
+import com.google.errorprone.annotations.OverridingMethodsMustInvokeSuper;
+import org.jspecify.annotations.Nullable;
 
-import javax.annotation.Nullable;
-import javax.annotation.OverridingMethodsMustInvokeSuper;
 import java.nio.file.Path;
 import java.util.*;
 import java.util.function.Predicate;

projects/common/src/main/java/dan200/computercraft/shared/config/ConfigSpec.java

@@ -16,8 +16,8 @@ import dan200.computercraft.shared.platform.PlatformHelper;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.core.Filter;
 import org.apache.logging.log4j.core.filter.MarkerFilter;
+import org.jspecify.annotations.Nullable;
 
-import javax.annotation.Nullable;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.concurrent.TimeUnit;

projects/common/src/main/java/dan200/computercraft/shared/config/ProxyPasswordConfig.java

@@ -5,10 +5,10 @@
 package dan200.computercraft.shared.config;
 
 import dan200.computercraft.core.CoreConfig;
+import org.jspecify.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.Nullable;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;

projects/common/src/main/java/dan200/computercraft/shared/container/BasicWorldlyContainer.java

@@ -7,8 +7,7 @@ package dan200.computercraft.shared.container;
 import net.minecraft.core.Direction;
 import net.minecraft.world.WorldlyContainer;
 import net.minecraft.world.item.ItemStack;
-
+import org.jspecify.annotations.Nullable;
-import javax.annotation.Nullable;
 
 /**
  * A basic implementation of {@link WorldlyContainer} which operates on a {@linkplain #getItems() list of stacks}.

projects/common/src/main/java/dan200/computercraft/shared/details/ItemDetails.java

@@ -16,8 +16,8 @@ import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.enchantment.Enchantment;
 import net.minecraft.world.item.enchantment.EnchantmentHelper;
 import net.minecraft.world.item.enchantment.ItemEnchantments;
+import org.jspecify.annotations.Nullable;
 
-import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;

projects/common/src/main/java/dan200/computercraft/shared/integration/PermissionRegistry.java

@@ -4,13 +4,13 @@
 
 package dan200.computercraft.shared.integration;
 
+import com.google.errorprone.annotations.OverridingMethodsMustInvokeSuper;
 import com.mojang.brigadier.builder.ArgumentBuilder;
 import dan200.computercraft.shared.command.CommandComputerCraft;
 import dan200.computercraft.shared.command.UserLevel;
 import dan200.computercraft.shared.platform.RegistrationHelper;
 import net.minecraft.commands.CommandSourceStack;
 
-import javax.annotation.OverridingMethodsMustInvokeSuper;
 import java.util.Optional;
 import java.util.ServiceLoader;
 import java.util.function.Predicate;

projects/common/src/main/java/dan200/computercraft/shared/integration/UpgradeRecipeGenerator.java

@@ -22,8 +22,8 @@ import net.minecraft.world.item.crafting.CraftingBookCategory;
 import net.minecraft.world.item.crafting.Ingredient;
 import net.minecraft.world.item.crafting.ShapedRecipe;
 import net.minecraft.world.item.crafting.ShapedRecipePattern;
+import org.jspecify.annotations.Nullable;
 
-import javax.annotation.Nullable;
 import java.util.*;
 import java.util.function.Function;
 
@@ -251,12 +251,12 @@ public class UpgradeRecipeGenerator<T> {
     private class UpgradeInfo {
         final ItemStack stack;
         final Ingredient ingredient;
-        final @Nullable Holder.Reference<ITurtleUpgrade> turtle;
+        final Holder.@Nullable Reference<ITurtleUpgrade> turtle;
-        final @Nullable Holder.Reference<IPocketUpgrade> pocket;
+        final Holder.@Nullable Reference<IPocketUpgrade> pocket;
         final UpgradeBase upgrade;
         private @Nullable ArrayList<T> recipes;
 
-        UpgradeInfo(ItemStack stack, UpgradeBase upgrade, @Nullable Holder.Reference<ITurtleUpgrade> turtle, @Nullable Holder.Reference<IPocketUpgrade> pocket) {
+        UpgradeInfo(ItemStack stack, UpgradeBase upgrade, Holder.@Nullable Reference<ITurtleUpgrade> turtle, Holder.@Nullable Reference<IPocketUpgrade> pocket) {
             this.stack = stack;
             ingredient = Ingredient.of(stack);
             this.turtle = turtle;

projects/common/src/main/java/dan200/computercraft/shared/lectern/CustomLecternBlock.java

@@ -27,7 +27,7 @@ import net.minecraft.world.level.block.entity.BlockEntityTicker;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.BlockHitResult;
-import org.jetbrains.annotations.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Extends {@link LecternBlock} with support for {@linkplain PrintoutItem printouts}.

projects/common/src/main/java/dan200/computercraft/shared/media/MountMedia.java

@@ -0,0 +1,85 @@
+// SPDX-FileCopyrightText: 2025 The CC: Tweaked Developers
+//
+// SPDX-License-Identifier: MPL-2.0
+
+package dan200.computercraft.shared.media;
+
+import dan200.computercraft.api.ComputerCraftAPI;
+import dan200.computercraft.api.filesystem.Mount;
+import dan200.computercraft.api.media.IMedia;
+import dan200.computercraft.shared.ModRegistry;
+import dan200.computercraft.shared.computer.items.AbstractComputerItem;
+import dan200.computercraft.shared.config.ConfigSpec;
+import dan200.computercraft.shared.media.items.DiskItem;
+import dan200.computercraft.shared.util.DataComponentUtil;
+import dan200.computercraft.shared.util.NonNegativeId;
+import dan200.computercraft.shared.util.StorageCapacity;
+import net.minecraft.core.HolderLookup;
+import net.minecraft.core.component.DataComponentType;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.item.ItemStack;
+import org.jspecify.annotations.Nullable;
+
+import java.util.function.Supplier;
+
+/**
+ * Media that provides a {@link Mount}.
+ */
+public final class MountMedia implements IMedia {
+    /**
+     * A {@link MountMedia} implementation for {@linkplain AbstractComputerItem computers}.
+     */
+    public static final IMedia COMPUTER = new MountMedia("computer", ModRegistry.DataComponents.COMPUTER_ID, false, ConfigSpec.computerSpaceLimit);
+
+    /**
+     * A {@link MountMedia} implementation for {@linkplain DiskItem disks}.
+     */
+    public static final IMedia DISK = new MountMedia("disk", ModRegistry.DataComponents.DISK_ID, true, ConfigSpec.floppySpaceLimit);
+
+    private final String subPath;
+    private final Supplier<DataComponentType<NonNegativeId>> id;
+    private final boolean createId;
+    private final Supplier<Integer> defaultCapacity;
+
+    /**
+     * Create a new {@link MountMedia}.
+     *
+     * @param subPath         The sub-path to expose the mount under, for instance {@code "computer"}.
+     * @param id              The component that stores the ID.
+     * @param createId        Whether to allocate a new ID if the item does not yet have one.
+     * @param defaultCapacity A function to get the default capacity of the stack.
+     */
+    public MountMedia(
+        String subPath,
+        Supplier<DataComponentType<NonNegativeId>> id,
+        boolean createId,
+        Supplier<Integer> defaultCapacity
+    ) {
+        this.subPath = subPath;
+        this.id = id;
+        this.createId = createId;
+        this.defaultCapacity = defaultCapacity;
+    }
+
+    @Override
+    public @Nullable String getLabel(HolderLookup.Provider registries, ItemStack stack) {
+        return DataComponentUtil.getCustomName(stack);
+    }
+
+    @Override
+    public boolean setLabel(ItemStack stack, @Nullable String label) {
+        DataComponentUtil.setCustomName(stack, label);
+        return true;
+    }
+
+    @Override
+    public @Nullable Mount createDataMount(ItemStack stack, ServerLevel level) {
+        var id = createId
+            ? NonNegativeId.getOrCreate(level.getServer(), stack, this.id.get(), subPath)
+            : NonNegativeId.getId(stack.get(this.id.get()));
+        if (id < 0) return null;
+
+        var capacity = StorageCapacity.getOrDefault(stack.get(ModRegistry.DataComponents.STORAGE_CAPACITY.get()), defaultCapacity);
+        return ComputerCraftAPI.createSaveDirMount(level.getServer(), subPath + "/" + id, capacity);
+    }
+}

projects/common/src/main/java/dan200/computercraft/shared/media/items/DiskItem.java

@@ -5,20 +5,12 @@
 package dan200.computercraft.shared.media.items;
 
 import dan200.computercraft.annotations.ForgeOverride;
-import dan200.computercraft.api.ComputerCraftAPI;
-import dan200.computercraft.api.filesystem.Mount;
-import dan200.computercraft.api.media.IMedia;
 import dan200.computercraft.core.util.Colour;
 import dan200.computercraft.shared.ModRegistry;
-import dan200.computercraft.shared.config.ConfigSpec;
 import dan200.computercraft.shared.util.NonNegativeId;
-import dan200.computercraft.shared.util.StorageCapacity;
 import net.minecraft.ChatFormatting;
 import net.minecraft.core.BlockPos;
-import net.minecraft.core.HolderLookup;
-import net.minecraft.core.component.DataComponents;
 import net.minecraft.network.chat.Component;
-import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
@@ -26,10 +18,9 @@ import net.minecraft.world.item.TooltipFlag;
 import net.minecraft.world.item.component.DyedItemColor;
 import net.minecraft.world.level.LevelReader;
 
-import javax.annotation.Nullable;
 import java.util.List;
 
-public class DiskItem extends Item implements IMedia {
+public class DiskItem extends Item {
     public DiskItem(Properties settings) {
         super(settings);
     }
@@ -50,25 +41,6 @@ public class DiskItem extends Item implements IMedia {
         return true;
     }
 
-    @Override
-    public @Nullable String getLabel(HolderLookup.Provider registries, ItemStack stack) {
-        var label = stack.get(DataComponents.CUSTOM_NAME);
-        return label != null ? label.getString() : null;
-    }
-
-    @Override
-    public boolean setLabel(ItemStack stack, @Nullable String label) {
-        stack.set(DataComponents.CUSTOM_NAME, label != null ? Component.literal(label) : null);
-        return true;
-    }
-
-    @Override
-    public @Nullable Mount createDataMount(ItemStack stack, ServerLevel level) {
-        var diskID = NonNegativeId.getOrCreate(level.getServer(), stack, ModRegistry.DataComponents.DISK_ID.get(), "disk");
-        var capacity = StorageCapacity.getOrDefault(stack.get(ModRegistry.DataComponents.STORAGE_CAPACITY.get()), ConfigSpec.floppySpaceLimit);
-        return ComputerCraftAPI.createSaveDirMount(level.getServer(), "disk/" + diskID, capacity);
-    }
-
     public static int getDiskID(ItemStack stack) {
         return NonNegativeId.getId(stack.get(ModRegistry.DataComponents.DISK_ID.get()));
     }

projects/common/src/main/java/dan200/computercraft/shared/media/items/RecordMedia.java

@@ -8,8 +8,7 @@ import dan200.computercraft.api.media.IMedia;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.JukeboxSong;
-
+import org.jspecify.annotations.Nullable;
-import javax.annotation.Nullable;
 
 /**
  * An implementation of {@link IMedia} for items with a {@link JukeboxSong}.