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

- Use GuiGraphics for rendering UI elements. Almost definitely some
   z-fighting issues slipped in here.

 - Use Forge's loot modifier system for handling treasure disks. I have
   mixed feelings about this - it's a nice system, but also is far less
   efficient than the previous approach.

 - Regenerate data. This is the brunt of the commit, but nothing
   especially interesting here.

.github/workflows/main-ci.yml

@@ -28,13 +28,10 @@ jobs:
         echo "org.gradle.daemon=false" >> ~/.gradle/gradle.properties
 
     - name: Build with Gradle
-      run: ./gradlew assemble || ./gradlew assemble
-
-    - name: Download assets for game tests
-      run: ./gradlew downloadAssets || ./gradlew downloadAssets
-
-    - name: Run tests and linters
-      run: ./gradlew build
+      run: |
+        ./gradlew assemble || ./gradlew assemble
+        ./gradlew downloadAssets || ./gradlew downloadAssets
+        ./gradlew build
 
     - name: Run client tests
       run: ./gradlew runGametestClient # Not checkClient, as no point running rendering tests.

.github/workflows/make-doc.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches:
     - mc-1.19.x
-    - mc-1.20.x
 
 jobs:
   make_doc:

buildSrc/src/main/kotlin/cc-tweaked.forge.gradle.kts

@@ -10,9 +10,8 @@ import cc.tweaked.gradle.IdeaRunConfigurations
 import cc.tweaked.gradle.MinecraftConfigurations
 
 plugins {
-    id("net.minecraftforge.gradle")
-    // We must apply java-convention after Forge, as we need the fg extension to be present.
     id("cc-tweaked.java-convention")
+    id("net.minecraftforge.gradle")
     id("org.parchmentmc.librarian.forgegradle")
 }
 

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

@@ -37,35 +37,20 @@ java {
 
 repositories {
     mavenCentral()
-
-    val mainMaven = maven("https://squiddev.cc/maven") {
+    maven("https://squiddev.cc/maven") {
         name = "SquidDev"
         content {
-            // Until https://github.com/SpongePowered/Mixin/pull/593 is merged
-            includeModule("org.spongepowered", "mixin")
-        }
-    }
-
-    exclusiveContent {
-        forRepositories(mainMaven)
-
-        // Include the ForgeGradle repository if present. This requires that ForgeGradle is already present, which we
-        // enforce in our Forge overlay.
-        val fg =
-            project.extensions.findByType(net.minecraftforge.gradle.userdev.DependencyManagementExtension::class.java)
-        if (fg != null) forRepositories(fg.repository)
-
-        filter {
             includeGroup("org.squiddev")
             includeGroup("cc.tweaked")
             // Things we mirror
-            includeGroup("alexiil.mc.lib")
             includeGroup("dev.architectury")
             includeGroup("maven.modrinth")
             includeGroup("me.shedaniel")
             includeGroup("me.shedaniel.cloth")
             includeGroup("mezz.jei")
             includeModule("com.terraformersmc", "modmenu")
+            // Until https://github.com/SpongePowered/Mixin/pull/593 is merged
+            includeModule("org.spongepowered", "mixin")
         }
     }
 }
@@ -119,7 +104,6 @@ tasks.withType(JavaCompile::class.java).configureEach {
 
 tasks.processResources {
     exclude("**/*.license")
-    exclude(".cache")
 }
 
 tasks.withType(AbstractArchiveTask::class.java).configureEach {

buildSrc/src/main/kotlin/cc/tweaked/gradle/Extensions.kt

@@ -49,7 +49,6 @@ fun JavaExec.copyToFull(spec: JavaExec) {
  * Copy additional [BaseExecSpec] options which aren't handled by [ProcessForkOptions.copyTo].
  */
 fun BaseExecSpec.copyToExec(spec: BaseExecSpec) {
-    spec.workingDir = workingDir
     spec.isIgnoreExitValue = isIgnoreExitValue
     if (standardInput != null) spec.standardInput = standardInput
     if (standardOutput != null) spec.standardOutput = standardOutput

buildSrc/src/main/kotlin/cc/tweaked/gradle/ForgeExtensions.kt

@@ -1,26 +0,0 @@
-// SPDX-FileCopyrightText: 2023 The CC: Tweaked Developers
-//
-// SPDX-License-Identifier: MPL-2.0
-
-package cc.tweaked.gradle
-
-import net.minecraftforge.gradle.common.util.RunConfig
-import net.minecraftforge.gradle.common.util.runs.setRunConfigInternal
-import org.gradle.api.plugins.JavaPluginExtension
-import org.gradle.api.tasks.JavaExec
-import org.gradle.jvm.toolchain.JavaToolchainService
-import java.nio.file.Files
-
-/**
- * Set [JavaExec] task to run a given [RunConfig].
- */
-fun JavaExec.setRunConfig(config: RunConfig) {
-    dependsOn("prepareRuns")
-    setRunConfigInternal(project, this, config)
-    doFirst("Create working directory") { Files.createDirectories(workingDir.toPath()) }
-
-    javaLauncher.set(
-        project.extensions.getByType(JavaToolchainService::class.java)
-            .launcherFor(project.extensions.getByType(JavaPluginExtension::class.java).toolchain),
-    )
-}

buildSrc/src/main/kotlin/cc/tweaked/gradle/Illuaminate.kt

@@ -60,7 +60,7 @@ class IlluaminatePlugin : Plugin<Project> {
 
     /** Define a dependency for illuaminate from a version number and the current operating system. */
     private fun illuaminateArtifact(project: Project, version: String): Dependency {
-        val osName = System.getProperty("os.name").lowercase()
+        val osName = System.getProperty("os.name").toLowerCase()
         val (os, suffix) = when {
             osName.contains("windows") -> Pair("windows", ".exe")
             osName.contains("mac os") || osName.contains("darwin") -> Pair("macos", "")
@@ -68,7 +68,7 @@ class IlluaminatePlugin : Plugin<Project> {
             else -> error("Unsupported OS $osName for illuaminate")
         }
 
-        val osArch = System.getProperty("os.arch").lowercase()
+        val osArch = System.getProperty("os.arch").toLowerCase()
         val arch = when {
             // On macOS the x86_64 binary will work for both ARM and Intel Macs through Rosetta.
             os == "macos" -> "x86_64"

buildSrc/src/main/kotlin/cc/tweaked/gradle/MinecraftExec.kt

@@ -32,14 +32,11 @@ abstract class ClientJavaExec : JavaExec() {
         usesService(clientRunner)
     }
 
-    @get:Input
-    val renderdoc get() = project.hasProperty("renderdoc")
-
     /**
      * When [false], tests will not be run automatically, allowing the user to debug rendering.
      */
     @get:Input
-    val clientDebug get() = renderdoc || project.hasProperty("clientDebug")
+    val clientDebug get() = project.hasProperty("clientDebug")
 
     /**
      * When [false], tests will not run under a framebuffer.
@@ -66,7 +63,6 @@ abstract class ClientJavaExec : JavaExec() {
         task.copyToFull(this)
 
         if (!clientDebug) systemProperty("cctest.client", "")
-        if (renderdoc) environment("LD_PRELOAD", "/usr/lib/librenderdoc.so")
         systemProperty("cctest.gametest-report", testResults.get().asFile.absoluteFile)
         workingDir(project.buildDir.resolve("gametest").resolve(name))
     }

buildSrc/src/main/kotlin/net/minecraftforge/gradle/common/util/runs/RunConfigSetup.kt

@@ -1,70 +0,0 @@
-// SPDX-FileCopyrightText: 2023 The CC: Tweaked Developers
-//
-// SPDX-License-Identifier: MPL-2.0
-
-package net.minecraftforge.gradle.common.util.runs
-
-import net.minecraftforge.gradle.common.util.RunConfig
-import org.gradle.api.Project
-import org.gradle.process.CommandLineArgumentProvider
-import org.gradle.process.JavaExecSpec
-import java.io.File
-import java.util.function.Supplier
-import java.util.stream.Collectors
-import java.util.stream.Stream
-
-/**
- * Set up a [JavaExecSpec] to execute a [RunConfig].
- *
- * [MinecraftRunTask] sets up all its properties when the task is executed, rather than when configured. As such, it's
- * not possible to use [cc.tweaked.gradle.copyToFull] like we do for Fabric. Instead, we set up the task manually.
- *
- * Unfortunately most of the functionality we need is package-private, and so we have to put our code into the package.
- */
-internal fun setRunConfigInternal(project: Project, spec: JavaExecSpec, config: RunConfig) {
-    spec.workingDir = File(config.workingDirectory)
-
-    spec.mainClass.set(config.main)
-    for (source in config.allSources) spec.classpath(source.runtimeClasspath)
-
-    val originalTask = project.tasks.named(config.taskName, MinecraftRunTask::class.java)
-
-    // Add argument and JVM argument via providers, to be as lazy as possible with fetching artifacts.
-    fun lazyTokens(): MutableMap<String, Supplier<String>> {
-        return RunConfigGenerator.configureTokensLazy(
-            project, config, RunConfigGenerator.mapModClassesToGradle(project, config),
-            originalTask.get().minecraftArtifacts.files,
-            originalTask.get().runtimeClasspathArtifacts.files,
-        )
-    }
-    spec.argumentProviders.add(
-        CommandLineArgumentProvider {
-            RunConfigGenerator.getArgsStream(config, lazyTokens(), false).toList()
-        },
-    )
-    spec.jvmArgumentProviders.add(
-        CommandLineArgumentProvider {
-            val lazyTokens = lazyTokens()
-            (if (config.isClient) config.jvmArgs + originalTask.get().additionalClientArgs.get() else config.jvmArgs).map { config.replace(lazyTokens, it) } +
-                config.properties.map { (k, v) -> "-D${k}=${config.replace(lazyTokens, v)}" }
-        },
-    )
-
-    // We can't configure environment variables lazily, so we do these now with a more minimal lazyTokens set.
-    val lazyTokens = mutableMapOf<String, Supplier<String>>()
-    for ((k, v) in config.tokens) lazyTokens[k] = Supplier<String> { v }
-    for ((k, v) in config.lazyTokens) lazyTokens[k] = v
-    lazyTokens.compute(
-        "source_roots",
-        { _, sourceRoots ->
-            Supplier<String> {
-                val modClasses = RunConfigGenerator.mapModClassesToGradle(project, config)
-                (when (sourceRoots) {
-                    null -> modClasses
-                    else -> Stream.concat<String>(sourceRoots.get().split(File.pathSeparator).stream(), modClasses)
-                }).distinct().collect(Collectors.joining(File.pathSeparator))
-            }
-        },
-    )
-    for ((key, value) in config.environment) spec.environment(key, config.replace(lazyTokens, value))
-}

gradle.properties

@@ -13,4 +13,4 @@ isUnstable=false
 modVersion=1.105.0
 
 # Minecraft properties: We want to configure this here so we can read it in settings.gradle
-mcVersion=1.19.4
+mcVersion=1.20

gradle/libs.versions.toml

@@ -7,9 +7,9 @@
 # Minecraft
 # MC version is specified in gradle.properties, as we need that in settings.gradle.
 # Remember to update corresponding versions in fabric.mod.json/mods.toml
-fabric-api = "0.80.0+1.19.4"
-fabric-loader = "0.14.19"
-forge = "45.0.42"
+fabric-api = "0.83.0+1.20"
+fabric-loader = "0.14.21"
+forge = "46.0.1"
 forgeSpi = "6.0.0"
 mixin = "0.8.5"
 parchment = "2023.03.12"
@@ -35,7 +35,6 @@ slf4j = "1.7.36"
 # Minecraft mods
 iris = "1.5.2+1.19.4"
 jei = "13.1.0.11"
-libmultipart = "0.10.0"
 modmenu = "6.1.0-rc.1"
 oculus = "1.2.5"
 rei = "10.0.578"
@@ -54,11 +53,11 @@ checkstyle = "10.3.4"
 curseForgeGradle = "1.0.14"
 errorProne-core = "2.18.0"
 errorProne-plugin = "3.0.1"
-fabric-loom = "1.2.7"
-forgeGradle = "6.0.6"
+fabric-loom = "1.1.10"
+forgeGradle = "5.1.+"
 githubRelease = "2.2.12"
 ideaExt = "1.1.6"
-illuaminate = "0.1.0-28-ga7efd71"
+illuaminate = "0.1.0-24-gdb28902"
 librarian = "1.+"
 minotaur = "2.+"
 mixinGradle = "0.7.+"
@@ -97,7 +96,6 @@ iris = { module = "maven.modrinth:iris", version.ref = "iris" }
 jei-api = { module = "mezz.jei:jei-1.19.4-common-api", version.ref = "jei" }
 jei-fabric = { module = "mezz.jei:jei-1.19.4-fabric", version.ref = "jei" }
 jei-forge = { module = "mezz.jei:jei-1.19.4-forge", version.ref = "jei" }
-libmultipart = { module = "alexiil.mc.lib:libmultipart-all", version.ref = "libmultipart" }
 mixin = { module = "org.spongepowered:mixin", version.ref = "mixin" }
 modmenu = { module = "com.terraformersmc:modmenu", version.ref = "modmenu" }
 oculus = { module = "maven.modrinth:oculus", version.ref = "oculus" }
@@ -152,10 +150,10 @@ kotlin = ["kotlin-stdlib", "kotlin-coroutines"]
 # Minecraft
 externalMods-common = ["jei-api", "nightConfig-core", "nightConfig-toml"]
 externalMods-forge-compile = ["oculus", "jei-api"]
-externalMods-forge-runtime = ["jei-forge"]
+externalMods-forge-runtime = []
 externalMods-fabric = ["nightConfig-core", "nightConfig-toml"]
-externalMods-fabric-compile = ["iris", "jei-api", "rei-api", "rei-builtin", "libmultipart"]
-externalMods-fabric-runtime = ["jei-fabric", "modmenu"]
+externalMods-fabric-compile = ["iris", "jei-api", "rei-api", "rei-builtin"]
+externalMods-fabric-runtime = []
 
 # Testing
 test = ["junit-jupiter-api", "junit-jupiter-params", "hamcrest", "jqwik-api"]

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
-networkTimeout=10000
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,11 +80,14 @@ do
     esac
 done
 
-# This is normally unused
-# shellcheck disable=SC2034
-APP_BASE_NAME=${0##*/}
 APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
+APP_NAME="Gradle"
+APP_BASE_NAME=${0##*/}
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
 
@@ -140,16 +143,12 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
-        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
-        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -194,10 +193,6 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in

gradlew.bat

@@ -26,7 +26,6 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
-@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 

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

@@ -11,7 +11,6 @@ import dan200.computercraft.api.turtle.ITurtleUpgrade;
 import dan200.computercraft.api.turtle.TurtleSide;
 import dan200.computercraft.api.turtle.TurtleUpgradeSerialiser;
 import net.minecraft.client.resources.model.ModelResourceLocation;
-import net.minecraft.nbt.CompoundTag;
 import net.minecraft.resources.ResourceLocation;
 
 import javax.annotation.Nullable;
@@ -29,27 +28,12 @@ public interface TurtleUpgradeModeller<T extends ITurtleUpgrade> {
      * When the current turtle is {@literal null}, this function should be constant for a given upgrade and side.
      *
      * @param upgrade The upgrade that you're getting the model for.
-     * @param turtle  Access to the turtle that the upgrade resides on. This will be null when getting item models, unless
-     *                {@link #getModel(ITurtleUpgrade, CompoundTag, TurtleSide)} is overriden.
+     * @param turtle  Access to the turtle that the upgrade resides on. This will be null when getting item models!
      * @param side    Which side of the turtle (left or right) the upgrade resides on.
      * @return The model that you wish to be used to render your upgrade.
      */
     TransformedModel getModel(T upgrade, @Nullable ITurtleAccess turtle, TurtleSide side);
 
-    /**
-     * Obtain the model to be used when rendering a turtle peripheral.
-     * <p>
-     * This is used when rendering the turtle's item model, and so no {@link ITurtleAccess} is available.
-     *
-     * @param upgrade The upgrade that you're getting the model for.
-     * @param data    Upgrade data instance for current turtle side.
-     * @param side    Which side of the turtle (left or right) the upgrade resides on.
-     * @return The model that you wish to be used to render your upgrade.
-     */
-    default TransformedModel getModel(T upgrade, CompoundTag data, TurtleSide side) {
-        return getModel(upgrade, (ITurtleAccess) null, side);
-    }
-
     /**
      * A basic {@link TurtleUpgradeModeller} which renders using the upgrade's {@linkplain ITurtleUpgrade#getCraftingItem()
      * crafting item}.

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

@@ -5,11 +5,9 @@
 package dan200.computercraft.api.pocket;
 
 import dan200.computercraft.api.peripheral.IPeripheral;
-import dan200.computercraft.api.upgrades.UpgradeBase;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.Entity;
-import net.minecraft.world.item.ItemStack;
 
 import javax.annotation.Nullable;
 import java.util.Map;
@@ -71,8 +69,6 @@ public interface IPocketAccess {
      *
      * @return The upgrade's NBT.
      * @see #updateUpgradeNBTData()
-     * @see UpgradeBase#getUpgradeItem(CompoundTag)
-     * @see UpgradeBase#getUpgradeData(ItemStack)
      */
     CompoundTag getUpgradeNBTData();
 
@@ -84,10 +80,7 @@ public interface IPocketAccess {
     void updateUpgradeNBTData();
 
     /**
-     * Remove the current peripheral and create a new one.
-     * <p>
-     * You may wish to do this if the methods available change, for instance when the {@linkplain #getEntity() owning
-     * entity} changes.
+     * Remove the current peripheral and create a new one. You may wish to do this if the methods available change.
      */
     void invalidatePeripheral();
 
@@ -95,8 +88,6 @@ public interface IPocketAccess {
      * Get a list of all upgrades for the pocket computer.
      *
      * @return A collection of all upgrade names.
-     * @deprecated This is a relic of a previous API, which no longer makes sense with newer versions of ComputerCraft.
      */
-    @Deprecated(forRemoval = true)
     Map<ResourceLocation, IPeripheral> getUpgrades();
 }

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

@@ -4,7 +4,6 @@
 
 package dan200.computercraft.api.pocket;
 
-import dan200.computercraft.api.ComputerCraftAPI;
 import dan200.computercraft.api.upgrades.UpgradeBase;
 import dan200.computercraft.api.upgrades.UpgradeSerialiser;
 import dan200.computercraft.impl.ComputerCraftAPIService;
@@ -30,14 +29,6 @@ import java.util.function.Function;
  * @see PocketUpgradeDataProvider
  */
 public interface PocketUpgradeSerialiser<T extends IPocketUpgrade> extends UpgradeSerialiser<T> {
-    /**
-     * The ID for the associated registry.
-     *
-     * @deprecated Use {@link #registryId()} instead.
-     */
-    @Deprecated(forRemoval = true)
-    ResourceKey<Registry<PocketUpgradeSerialiser<?>>> REGISTRY_ID = ResourceKey.createRegistryKey(new ResourceLocation(ComputerCraftAPI.MOD_ID, "pocket_upgrade_serialiser"));
-
     /**
      * The ID for the associated registry.
      *

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

@@ -8,15 +8,11 @@ import com.mojang.authlib.GameProfile;
 import dan200.computercraft.api.lua.ILuaCallback;
 import dan200.computercraft.api.lua.MethodResult;
 import dan200.computercraft.api.peripheral.IPeripheral;
-import dan200.computercraft.api.upgrades.UpgradeBase;
-import dan200.computercraft.api.upgrades.UpgradeData;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.Container;
-import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
-import net.minecraft.world.phys.Vec3;
 import org.jetbrains.annotations.ApiStatus;
 
 import javax.annotation.Nullable;
@@ -71,29 +67,6 @@ public interface ITurtleAccess {
      */
     boolean teleportTo(Level world, BlockPos pos);
 
-    /**
-     * Returns a vector containing the floating point co-ordinates at which the turtle is rendered.
-     * This will shift when the turtle is moving.
-     *
-     * @param f The subframe fraction.
-     * @return A vector containing the floating point co-ordinates at which the turtle resides.
-     * @see #getVisualYaw(float)
-     * @deprecated Will be removed in 1.20.
-     */
-    @Deprecated(forRemoval = true)
-    Vec3 getVisualPosition(float f);
-
-    /**
-     * Returns the yaw the turtle is facing when it is rendered.
-     *
-     * @param f The subframe fraction.
-     * @return The yaw the turtle is facing.
-     * @see #getVisualPosition(float)
-     * @deprecated Will be removed in 1.20.
-     */
-    @Deprecated(forRemoval = true)
-    float getVisualYaw(float f);
-
     /**
      * Returns the world direction the turtle is currently facing.
      *
@@ -248,51 +221,23 @@ public interface ITurtleAccess {
     void playAnimation(TurtleAnimation animation);
 
     /**
-     * Returns the upgrade on the specified side of the turtle, if there is one.
+     * Returns the turtle on the specified side of the turtle, if there is one.
      *
      * @param side The side to get the upgrade from.
      * @return The upgrade on the specified side of the turtle, if there is one.
-     * @see #getUpgradeWithData(TurtleSide)
-     * @see #setUpgradeWithData(TurtleSide, UpgradeData)
+     * @see #setUpgrade(TurtleSide, ITurtleUpgrade)
      */
     @Nullable
     ITurtleUpgrade getUpgrade(TurtleSide side);
 
-    /**
-     * Returns the upgrade on the specified side of the turtle, along with its {@linkplain #getUpgradeNBTData(TurtleSide)
-     * update data}.
-     *
-     * @param side The side to get the upgrade from.
-     * @return The upgrade on the specified side of the turtle, along with its upgrade data, if there is one.
-     * @see #getUpgradeWithData(TurtleSide)
-     * @see #setUpgradeWithData(TurtleSide, UpgradeData)
-     */
-    default @Nullable UpgradeData<ITurtleUpgrade> getUpgradeWithData(TurtleSide side) {
-        var upgrade = getUpgrade(side);
-        return upgrade == null ? null : UpgradeData.of(upgrade, getUpgradeNBTData(side));
-    }
-
     /**
      * Set the upgrade for a given side, resetting peripherals and clearing upgrade specific data.
      *
      * @param side    The side to set the upgrade on.
      * @param upgrade The upgrade to set, may be {@code null} to clear.
      * @see #getUpgrade(TurtleSide)
-     * @deprecated Use {@link #setUpgradeWithData(TurtleSide, UpgradeData)}
      */
-    @Deprecated
-    default void setUpgrade(TurtleSide side, @Nullable ITurtleUpgrade upgrade) {
-        setUpgradeWithData(side, upgrade == null ? null : UpgradeData.ofDefault(upgrade));
-    }
-
-    /**
-     * Set the upgrade for a given side and its upgrade data.
-     *
-     * @param side    The side to set the upgrade on.
-     * @param upgrade The upgrade to set, may be {@code null} to clear.
-     * @see #getUpgradeWithData(TurtleSide)
-     */
-    void setUpgradeWithData(TurtleSide side, @Nullable UpgradeData<ITurtleUpgrade> upgrade);
+    void setUpgrade(TurtleSide side, @Nullable ITurtleUpgrade upgrade);
 
     /**
      * Returns the peripheral created by the upgrade on the specified side of the turtle, if there is one.
@@ -312,8 +257,6 @@ public interface ITurtleAccess {
      * @param side The side to get the upgrade data for.
      * @return The upgrade-specific data.
      * @see #updateUpgradeNBTData(TurtleSide)
-     * @see UpgradeBase#getUpgradeItem(CompoundTag)
-     * @see UpgradeBase#getUpgradeData(ItemStack)
      */
     CompoundTag getUpgradeNBTData(TurtleSide side);
 

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

@@ -7,7 +7,6 @@ package dan200.computercraft.api.turtle;
 import dan200.computercraft.api.peripheral.IPeripheral;
 import dan200.computercraft.api.upgrades.UpgradeBase;
 import net.minecraft.core.Direction;
-import net.minecraft.nbt.CompoundTag;
 
 import javax.annotation.Nullable;
 
@@ -80,17 +79,4 @@ public interface ITurtleUpgrade extends UpgradeBase {
      */
     default void update(ITurtleAccess turtle, TurtleSide side) {
     }
-
-    /**
-     * Get upgrade data that should be persisted when the turtle was broken.
-     * <p>
-     * This method should be overridden when you don't need to store all upgrade data by default. For instance, if you
-     * store peripheral state in the upgrade data, which should be lost when the turtle is broken.
-     *
-     * @param upgradeData Data that currently stored for this upgrade
-     * @return Filtered version of this data.
-     */
-    default CompoundTag getPersistedData(CompoundTag upgradeData) {
-        return upgradeData;
-    }
 }

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

@@ -4,7 +4,6 @@
 
 package dan200.computercraft.api.turtle;
 
-import dan200.computercraft.api.ComputerCraftAPI;
 import dan200.computercraft.api.upgrades.UpgradeBase;
 import dan200.computercraft.api.upgrades.UpgradeSerialiser;
 import dan200.computercraft.impl.ComputerCraftAPIService;
@@ -65,14 +64,6 @@ import java.util.function.Function;
  * @see dan200.computercraft.api.client.turtle.TurtleUpgradeModeller
  */
 public interface TurtleUpgradeSerialiser<T extends ITurtleUpgrade> extends UpgradeSerialiser<T> {
-    /**
-     * The ID for the associated registry.
-     *
-     * @deprecated Use {@link #registryId()} instead.
-     */
-    @Deprecated(forRemoval = true)
-    ResourceKey<Registry<TurtleUpgradeSerialiser<?>>> REGISTRY_ID = ResourceKey.createRegistryKey(new ResourceLocation(ComputerCraftAPI.MOD_ID, "turtle_upgrade_serialiser"));
-
     /**
      * The ID for the associated registry.
      *

projects/common-api/src/main/java/dan200/computercraft/api/upgrades/UpgradeBase.java

@@ -4,14 +4,10 @@
 
 package dan200.computercraft.api.upgrades;
 
-import dan200.computercraft.api.pocket.IPocketAccess;
 import dan200.computercraft.api.pocket.IPocketUpgrade;
-import dan200.computercraft.api.turtle.ITurtleAccess;
 import dan200.computercraft.api.turtle.ITurtleUpgrade;
-import dan200.computercraft.api.turtle.TurtleSide;
 import dan200.computercraft.impl.PlatformHelper;
 import net.minecraft.Util;
-import net.minecraft.nbt.CompoundTag;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
 
@@ -54,42 +50,6 @@ public interface UpgradeBase {
      */
     ItemStack getCraftingItem();
 
-    /**
-     * Returns the item stack representing a currently equipped turtle upgrade.
-     * <p>
-     * While upgrades can store upgrade data ({@link ITurtleAccess#getUpgradeNBTData(TurtleSide)} and
-     * {@link IPocketAccess#getUpgradeNBTData()}}, by default this data is discarded when an upgrade is unequipped,
-     * and the original item stack is returned.
-     * <p>
-     * By overriding this method, you can create a new {@link ItemStack} which contains enough data to
-     * {@linkplain #getUpgradeData(ItemStack) re-create the upgrade data} if the item is re-equipped.
-     * <p>
-     * When overriding this, you should override {@link #getUpgradeData(ItemStack)} and {@link #isItemSuitable(ItemStack)}
-     * at the same time,
-     *
-     * @param upgradeData The current upgrade data. This should <strong>NOT</strong> be mutated.
-     * @return The item stack returned when unequipping.
-     */
-    default ItemStack getUpgradeItem(CompoundTag upgradeData) {
-        return getCraftingItem();
-    }
-
-    /**
-     * Extract upgrade data from an {@link ItemStack}.
-     * <p>
-     * This upgrade data will be available with {@link ITurtleAccess#getUpgradeNBTData(TurtleSide)} or
-     * {@link IPocketAccess#getUpgradeNBTData()}.
-     * <p>
-     * This should be an inverse to {@link #getUpgradeItem(CompoundTag)}.
-     *
-     * @param stack The stack that was equipped by the turtle or pocket computer. This will have the same item as
-     *              {@link #getCraftingItem()}.
-     * @return The upgrade data that should be set on the turtle or pocket computer.
-     */
-    default CompoundTag getUpgradeData(ItemStack stack) {
-        return new CompoundTag();
-    }
-
     /**
      * Determine if an item is suitable for being used for this upgrade.
      * <p>

projects/common-api/src/main/java/dan200/computercraft/api/upgrades/UpgradeData.java

@@ -1,82 +0,0 @@
-// SPDX-FileCopyrightText: 2023 The CC: Tweaked Developers
-//
-// SPDX-License-Identifier: MPL-2.0
-
-package dan200.computercraft.api.upgrades;
-
-import dan200.computercraft.api.pocket.IPocketUpgrade;
-import dan200.computercraft.api.turtle.ITurtleUpgrade;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.world.item.ItemStack;
-import org.jetbrains.annotations.Contract;
-
-import javax.annotation.Nullable;
-
-/**
- * An upgrade (i.e. a {@link ITurtleUpgrade}) and its current upgrade data.
- * <p>
- * <strong>IMPORTANT:</strong> The {@link #data()} in an upgrade data is often a reference to the original upgrade data.
- * Be careful to take a {@linkplain #copy() defensive copy} if you plan to use the data in this upgrade.
- *
- * @param upgrade The current upgrade.
- * @param data    The upgrade's data.
- * @param <T>     The type of upgrade, either {@link ITurtleUpgrade} or {@link IPocketUpgrade}.
- */
-public record UpgradeData<T extends UpgradeBase>(T upgrade, CompoundTag data) {
-    /**
-     * A utility method to construct a new {@link UpgradeData} instance.
-     *
-     * @param upgrade An upgrade.
-     * @param data    The upgrade's data.
-     * @param <T>     The type of upgrade.
-     * @return The new {@link UpgradeData} instance.
-     */
-    public static <T extends UpgradeBase> UpgradeData<T> of(T upgrade, CompoundTag data) {
-        return new UpgradeData<>(upgrade, data);
-    }
-
-    /**
-     * Create an {@link UpgradeData} containing the default {@linkplain #data() data} for an upgrade.
-     *
-     * @param upgrade The upgrade instance.
-     * @param <T>     The type of upgrade.
-     * @return The default upgrade data.
-     */
-    public static <T extends UpgradeBase> UpgradeData<T> ofDefault(T upgrade) {
-        return of(upgrade, upgrade.getUpgradeData(upgrade.getCraftingItem()));
-    }
-
-    /**
-     * Take a copy of a (possibly {@code null}) {@link UpgradeData} instance.
-     *
-     * @param upgrade The copied upgrade data.
-     * @param <T>     The type of upgrade.
-     * @return The newly created upgrade data.
-     */
-    @Contract("!null -> !null; null -> null")
-    public static <T extends UpgradeBase> @Nullable UpgradeData<T> copyOf(@Nullable UpgradeData<T> upgrade) {
-        return upgrade == null ? null : upgrade.copy();
-    }
-
-    /**
-     * Get the {@linkplain UpgradeBase#getUpgradeItem(CompoundTag) upgrade item} for this upgrade.
-     * <p>
-     * This returns a defensive copy of the item, to prevent accidental mutation of the upgrade data or original
-     * {@linkplain UpgradeBase#getCraftingItem() upgrade stack}.
-     *
-     * @return This upgrade's item.
-     */
-    public ItemStack getUpgradeItem() {
-        return upgrade.getUpgradeItem(data).copy();
-    }
-
-    /**
-     * Take a copy of this {@link UpgradeData}. This returns a new instance with the same upgrade and a fresh copy of
-     * the upgrade data.
-     *
-     * @return A copy of the current instance.
-     */
-    public UpgradeData<T> copy() {
-        return new UpgradeData<>(upgrade(), data().copy());
-    }
-}

projects/common-api/src/main/java/dan200/computercraft/api/upgrades/UpgradeDataProvider.java

@@ -24,7 +24,6 @@ import org.apache.logging.log4j.Logger;
 
 import javax.annotation.Nullable;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -105,7 +104,7 @@ public abstract class UpgradeDataProvider<T extends UpgradeBase, R extends Upgra
     protected abstract void addUpgrades(Consumer<Upgrade<R>> addUpgrade);
 
     @Override
-    public CompletableFuture<?> run(CachedOutput cache) {
+    public final CompletableFuture<?> run(CachedOutput cache) {
         var base = output.getOutputFolder().resolve("data");
 
         Set<ResourceLocation> seen = new HashSet<>();
@@ -128,7 +127,7 @@ public abstract class UpgradeDataProvider<T extends UpgradeBase, R extends Upgra
             }
         });
 
-        this.upgrades = Collections.unmodifiableList(upgrades);
+        this.upgrades = upgrades;
         return Util.sequenceFailFast(futures);
     }
 

projects/common/build.gradle.kts

@@ -7,7 +7,6 @@ import cc.tweaked.gradle.clientClasses
 import cc.tweaked.gradle.commonClasses
 
 plugins {
-    id("cc-tweaked.publishing")
     id("cc-tweaked.vanilla")
     id("cc-tweaked.gametest")
 }

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

@@ -4,7 +4,6 @@
 
 package dan200.computercraft.client.gui;
 
-import com.mojang.blaze3d.vertex.PoseStack;
 import dan200.computercraft.client.gui.widgets.ComputerSidebar;
 import dan200.computercraft.client.gui.widgets.DynamicImageButton;
 import dan200.computercraft.client.gui.widgets.TerminalWidget;
@@ -19,6 +18,7 @@ import dan200.computercraft.shared.config.Config;
 import dan200.computercraft.shared.network.server.UploadFileMessage;
 import net.minecraft.ChatFormatting;
 import net.minecraft.Util;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.Inventory;
@@ -124,10 +124,10 @@ public abstract class AbstractComputerScreen<T extends AbstractComputerMenu> ext
     }
 
     @Override
-    public void render(PoseStack stack, int mouseX, int mouseY, float partialTicks) {
-        renderBackground(stack);
-        super.render(stack, mouseX, mouseY, partialTicks);
-        renderTooltip(stack, mouseX, mouseY);
+    public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) {
+        renderBackground(graphics);
+        super.render(graphics, mouseX, mouseY, partialTicks);
+        renderTooltip(graphics, mouseX, mouseY);
     }
 
     @Override
@@ -147,7 +147,7 @@ public abstract class AbstractComputerScreen<T extends AbstractComputerMenu> ext
 
 
     @Override
-    protected void renderLabels(PoseStack transform, int mouseX, int mouseY) {
+    protected void renderLabels(GuiGraphics graphics, int mouseX, int mouseY) {
         // Skip rendering labels.
     }
 

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

@@ -4,11 +4,11 @@
 
 package dan200.computercraft.client.gui;
 
-import com.mojang.blaze3d.vertex.PoseStack;
 import dan200.computercraft.client.gui.widgets.ComputerSidebar;
 import dan200.computercraft.client.gui.widgets.TerminalWidget;
 import dan200.computercraft.client.render.ComputerBorderRenderer;
 import dan200.computercraft.shared.computer.inventory.AbstractComputerMenu;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.Inventory;
 
@@ -36,13 +36,14 @@ public final class ComputerScreen<T extends AbstractComputerMenu> extends Abstra
     }
 
     @Override
-    public void renderBg(PoseStack stack, float partialTicks, int mouseX, int mouseY) {
+    public void renderBg(GuiGraphics graphics, float partialTicks, int mouseX, int mouseY) {
         // Draw a border around the terminal
         var terminal = getTerminal();
+        var texture = ComputerBorderRenderer.getTexture(family);
         ComputerBorderRenderer.render(
-            stack.last().pose(), ComputerBorderRenderer.getTexture(family), terminal.getX(), terminal.getY(),
+            graphics.pose().last().pose(), texture, terminal.getX(), terminal.getY(),
             FULL_BRIGHT_LIGHTMAP, terminal.getWidth(), terminal.getHeight()
         );
-        ComputerSidebar.renderBackground(stack, leftPos, topPos + sidebarYOffset);
+        ComputerSidebar.renderBackground(graphics, texture, leftPos, topPos + sidebarYOffset);
     }
 }

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

@@ -4,9 +4,8 @@
 
 package dan200.computercraft.client.gui;
 
-import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.vertex.PoseStack;
 import dan200.computercraft.shared.peripheral.diskdrive.DiskDriveMenu;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
@@ -23,16 +22,14 @@ public class DiskDriveScreen extends AbstractContainerScreen<DiskDriveMenu> {
     }
 
     @Override
-    protected void renderBg(PoseStack transform, float partialTicks, int mouseX, int mouseY) {
-        RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
-        RenderSystem.setShaderTexture(0, BACKGROUND);
-        blit(transform, leftPos, topPos, 0, 0, imageWidth, imageHeight);
+    protected void renderBg(GuiGraphics graphics, float partialTicks, int mouseX, int mouseY) {
+        graphics.blit(BACKGROUND, leftPos, topPos, 0, 0, imageWidth, imageHeight);
     }
 
     @Override
-    public void render(PoseStack transform, int mouseX, int mouseY, float partialTicks) {
-        renderBackground(transform);
-        super.render(transform, mouseX, mouseY, partialTicks);
-        renderTooltip(transform, mouseX, mouseY);
+    public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) {
+        renderBackground(graphics);
+        super.render(graphics, mouseX, mouseY, partialTicks);
+        renderTooltip(graphics, mouseX, mouseY);
     }
 }

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

@@ -4,10 +4,8 @@
 
 package dan200.computercraft.client.gui;
 
-import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiComponent;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.toasts.Toast;
 import net.minecraft.client.gui.components.toasts.ToastComponent;
 import net.minecraft.network.chat.Component;
@@ -73,55 +71,52 @@ public class ItemToast implements Toast {
     }
 
     @Override
-    public Visibility render(PoseStack transform, ToastComponent component, long time) {
+    public Visibility render(GuiGraphics graphics, ToastComponent component, long time) {
         if (isNew) {
 
             firstDisplay = time;
             isNew = false;
         }
 
-        RenderSystem.setShaderTexture(0, TEXTURE);
-        RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
-
         if (width == 160 && message.size() <= 1) {
-            GuiComponent.blit(transform, 0, 0, 0, 64, width, height());
+            graphics.blit(TEXTURE, 0, 0, 0, 64, width, height());
         } else {
 
             var height = height();
 
             var bottom = Math.min(4, height - 28);
-            renderBackgroundRow(transform, component, width, 0, 0, 28);
+            renderBackgroundRow(graphics, width, 0, 0, 28);
 
             for (var i = 28; i < height - bottom; i += 10) {
-                renderBackgroundRow(transform, component, width, 16, i, Math.min(16, height - i - bottom));
+                renderBackgroundRow(graphics, width, 16, i, Math.min(16, height - i - bottom));
             }
 
-            renderBackgroundRow(transform, component, width, 32 - bottom, height - bottom, bottom);
+            renderBackgroundRow(graphics, width, 32 - bottom, height - bottom, bottom);
         }
 
         var textX = MARGIN;
         if (!stack.isEmpty()) {
             textX += MARGIN + IMAGE_SIZE;
-            component.getMinecraft().getItemRenderer().renderAndDecorateFakeItem(transform, stack, MARGIN, MARGIN + height() / 2 - IMAGE_SIZE);
+            graphics.renderFakeItem(stack, MARGIN, MARGIN + height() / 2 - IMAGE_SIZE);
         }
 
-        component.getMinecraft().font.draw(transform, title, textX, MARGIN, 0xff500050);
+        graphics.drawString(component.getMinecraft().font, title, textX, MARGIN, 0xff500050);
         for (var i = 0; i < message.size(); ++i) {
-            component.getMinecraft().font.draw(transform, message.get(i), textX, (float) (LINE_SPACING + (i + 1) * LINE_SPACING), 0xff000000);
+            graphics.drawString(component.getMinecraft().font, message.get(i), textX, LINE_SPACING + (i + 1) * LINE_SPACING, 0xff000000);
         }
 
         return time - firstDisplay < DISPLAY_TIME ? Visibility.SHOW : Visibility.HIDE;
     }
 
-    private static void renderBackgroundRow(PoseStack transform, ToastComponent component, int x, int u, int y, int height) {
+    private static void renderBackgroundRow(GuiGraphics graphics, int x, int u, int y, int height) {
         var leftOffset = 5;
         var rightOffset = Math.min(60, x - leftOffset);
 
-        GuiComponent.blit(transform, 0, y, 0, 32 + u, leftOffset, height);
+        graphics.blit(TEXTURE, 0, y, 0, 32 + u, leftOffset, height);
         for (var k = leftOffset; k < x - rightOffset; k += 64) {
-            GuiComponent.blit(transform, k, y, 32, 32 + u, Math.min(64, x - k - rightOffset), height);
+            graphics.blit(TEXTURE, k, y, 32, 32 + u, Math.min(64, x - k - rightOffset), height);
         }
 
-        GuiComponent.blit(transform, x - rightOffset, y, 160 - rightOffset, 32 + u, rightOffset, height);
+        graphics.blit(TEXTURE, x - rightOffset, y, 160 - rightOffset, 32 + u, rightOffset, height);
     }
 }

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

@@ -4,11 +4,11 @@
 
 package dan200.computercraft.client.gui;
 
-import com.mojang.blaze3d.vertex.PoseStack;
 import dan200.computercraft.client.gui.widgets.TerminalWidget;
 import dan200.computercraft.core.terminal.Terminal;
 import dan200.computercraft.shared.computer.inventory.AbstractComputerMenu;
 import net.minecraft.client.KeyMapping;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.screens.inventory.MenuAccess;
 import net.minecraft.network.chat.Component;
@@ -42,7 +42,7 @@ public class NoTermComputerScreen<T extends AbstractComputerMenu> extends Screen
 
     @Override
     protected void init() {
-        passEvents = true; // Pass mouse vents through to the game's mouse handler.
+        // FIXME: passEvents = true; // Pass mouse vents through to the game's mouse handler.
         // First ensure we're still grabbing the mouse, so the user can look around. Then reset bits of state that
         // grabbing unsets.
         minecraft.mouseHandler.grabMouse();
@@ -91,15 +91,15 @@ public class NoTermComputerScreen<T extends AbstractComputerMenu> extends Screen
     }
 
     @Override
-    public void render(PoseStack transform, int mouseX, int mouseY, float partialTicks) {
-        super.render(transform, mouseX, mouseY, partialTicks);
+    public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) {
+        super.render(graphics, mouseX, mouseY, partialTicks);
 
         var font = minecraft.font;
         var lines = font.split(Component.translatable("gui.computercraft.pocket_computer_overlay"), (int) (width * 0.8));
-        var y = 10.0f;
+        var y = 10;
         for (var line : lines) {
-            font.drawShadow(transform, line, (float) ((width / 2) - (minecraft.font.width(line) / 2)), y, 0xFFFFFF);
-            y += 9.0f;
+            graphics.drawString(font, line, (width / 2) - (minecraft.font.width(line) / 2), y, 0xFFFFFF, true);
+            y += 9;
         }
     }
 }

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

@@ -4,9 +4,8 @@
 
 package dan200.computercraft.client.gui;
 
-import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.components.MultiLineLabel;
@@ -86,20 +85,19 @@ public final class OptionScreen extends Screen {
     }
 
     @Override
-    public void render(PoseStack transform, int mouseX, int mouseY, float partialTicks) {
-        renderBackground(transform);
+    public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) {
+        renderBackground(graphics);
 
         // Render the actual texture.
-        RenderSystem.setShaderTexture(0, BACKGROUND);
-        blit(transform, x, y, 0, 0, innerWidth, PADDING);
-        blit(transform,
+        graphics.blit(BACKGROUND, x, y, 0, 0, innerWidth, PADDING);
+        graphics.blit(BACKGROUND,
             x, y + PADDING, 0, PADDING, innerWidth, innerHeight - PADDING * 2,
             innerWidth, PADDING
         );
-        blit(transform, x, y + innerHeight - PADDING, 0, 256 - PADDING, innerWidth, PADDING);
+        graphics.blit(BACKGROUND, x, y + innerHeight - PADDING, 0, 256 - PADDING, innerWidth, PADDING);
 
-        assertNonNull(messageRenderer).renderLeftAlignedNoShadow(transform, x + PADDING, y + PADDING, FONT_HEIGHT, 0x404040);
-        super.render(transform, mouseX, mouseY, partialTicks);
+        assertNonNull(messageRenderer).renderLeftAlignedNoShadow(graphics, x + PADDING, y + PADDING, FONT_HEIGHT, 0x404040);
+        super.render(graphics, mouseX, mouseY, partialTicks);
     }
 
     @Override

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

@@ -4,9 +4,8 @@
 
 package dan200.computercraft.client.gui;
 
-import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.vertex.PoseStack;
 import dan200.computercraft.shared.peripheral.printer.PrinterMenu;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
@@ -23,18 +22,16 @@ public class PrinterScreen extends AbstractContainerScreen<PrinterMenu> {
     }
 
     @Override
-    protected void renderBg(PoseStack transform, float partialTicks, int mouseX, int mouseY) {
-        RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
-        RenderSystem.setShaderTexture(0, BACKGROUND);
-        blit(transform, leftPos, topPos, 0, 0, imageWidth, imageHeight);
+    protected void renderBg(GuiGraphics graphics, float partialTicks, int mouseX, int mouseY) {
+        graphics.blit(BACKGROUND, leftPos, topPos, 0, 0, imageWidth, imageHeight);
 
-        if (getMenu().isPrinting()) blit(transform, leftPos + 34, topPos + 21, 176, 0, 25, 45);
+        if (getMenu().isPrinting()) graphics.blit(BACKGROUND, leftPos + 34, topPos + 21, 176, 0, 25, 45);
     }
 
     @Override
-    public void render(PoseStack stack, int mouseX, int mouseY, float partialTicks) {
-        renderBackground(stack);
-        super.render(stack, mouseX, mouseY, partialTicks);
-        renderTooltip(stack, mouseX, mouseY);
+    public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) {
+        renderBackground(graphics);
+        super.render(graphics, mouseX, mouseY, partialTicks);
+        renderTooltip(graphics, mouseX, mouseY);
     }
 }

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

@@ -4,12 +4,11 @@
 
 package dan200.computercraft.client.gui;
 
-import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.Tesselator;
 import dan200.computercraft.core.terminal.TextBuffer;
 import dan200.computercraft.shared.common.HeldItemMenu;
 import dan200.computercraft.shared.media.items.PrintoutItem;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.network.chat.Component;
@@ -83,30 +82,27 @@ public class PrintoutScreen extends AbstractContainerScreen<HeldItemMenu> {
     }
 
     @Override
-    protected void renderBg(PoseStack transform, float partialTicks, int mouseX, int mouseY) {
+    protected void renderBg(GuiGraphics graphics, float partialTicks, int mouseX, int mouseY) {
         // Draw the printout
-        RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f);
-        RenderSystem.enableDepthTest();
-
         var renderer = MultiBufferSource.immediate(Tesselator.getInstance().getBuilder());
-        drawBorder(transform, renderer, leftPos, topPos, 0, page, pages, book, FULL_BRIGHT_LIGHTMAP);
-        drawText(transform, renderer, leftPos + X_TEXT_MARGIN, topPos + Y_TEXT_MARGIN, PrintoutItem.LINES_PER_PAGE * page, FULL_BRIGHT_LIGHTMAP, text, colours);
+        drawBorder(graphics.pose(), renderer, leftPos, topPos, 0, page, pages, book, FULL_BRIGHT_LIGHTMAP);
+        drawText(graphics.pose(), renderer, leftPos + X_TEXT_MARGIN, topPos + Y_TEXT_MARGIN, PrintoutItem.LINES_PER_PAGE * page, FULL_BRIGHT_LIGHTMAP, text, colours);
         renderer.endBatch();
     }
 
     @Override
-    public void render(PoseStack stack, int mouseX, int mouseY, float partialTicks) {
+    public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) {
         // We must take the background further back in order to not overlap with our printed pages.
-        stack.pushPose();
-        stack.translate(0, 0, -1);
-        renderBackground(stack);
-        stack.popPose();
+        graphics.pose().pushPose();
+        graphics.pose().translate(0, 0, -1);
+        renderBackground(graphics);
+        graphics.pose().popPose();
 
-        super.render(stack, mouseX, mouseY, partialTicks);
+        super.render(graphics, mouseX, mouseY, partialTicks);
     }
 
     @Override
-    protected void renderLabels(PoseStack transform, int mouseX, int mouseY) {
+    protected void renderLabels(GuiGraphics graphics, int mouseX, int mouseY) {
         // Skip rendering labels.
     }
 }

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

@@ -4,8 +4,6 @@
 
 package dan200.computercraft.client.gui;
 
-import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.vertex.PoseStack;
 import dan200.computercraft.api.ComputerCraftAPI;
 import dan200.computercraft.client.gui.widgets.ComputerSidebar;
 import dan200.computercraft.client.gui.widgets.TerminalWidget;
@@ -13,6 +11,7 @@ import dan200.computercraft.client.render.ComputerBorderRenderer;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
 import dan200.computercraft.shared.computer.inventory.AbstractComputerMenu;
 import dan200.computercraft.shared.turtle.inventory.TurtleMenu;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.player.Inventory;
@@ -26,11 +25,9 @@ public class TurtleScreen extends AbstractComputerScreen<TurtleMenu> {
     private static final ResourceLocation BACKGROUND_NORMAL = new ResourceLocation(ComputerCraftAPI.MOD_ID, "textures/gui/turtle_normal.png");
     private static final ResourceLocation BACKGROUND_ADVANCED = new ResourceLocation(ComputerCraftAPI.MOD_ID, "textures/gui/turtle_advanced.png");
 
-    private static final int TEX_WIDTH = 278;
+    private static final int TEX_WIDTH = 254;
     private static final int TEX_HEIGHT = 217;
 
-    private static final int FULL_TEX_SIZE = 512;
-
     public TurtleScreen(TurtleMenu container, Inventory player, Component title) {
         super(container, player, title, BORDER);
 
@@ -44,23 +41,21 @@ public class TurtleScreen extends AbstractComputerScreen<TurtleMenu> {
     }
 
     @Override
-    protected void renderBg(PoseStack transform, float partialTicks, int mouseX, int mouseY) {
+    protected void renderBg(GuiGraphics graphics, float partialTicks, int mouseX, int mouseY) {
         var advanced = family == ComputerFamily.ADVANCED;
-        RenderSystem.setShaderTexture(0, advanced ? BACKGROUND_ADVANCED : BACKGROUND_NORMAL);
-        blit(transform, leftPos + AbstractComputerMenu.SIDEBAR_WIDTH, topPos, 0, 0, 0, TEX_WIDTH, TEX_HEIGHT, FULL_TEX_SIZE, FULL_TEX_SIZE);
+        var texture = advanced ? BACKGROUND_ADVANCED : BACKGROUND_NORMAL;
+        graphics.blit(texture, leftPos + AbstractComputerMenu.SIDEBAR_WIDTH, topPos, 0, 0, TEX_WIDTH, TEX_HEIGHT);
 
-        // Render selected slot
         var slot = getMenu().getSelectedSlot();
         if (slot >= 0) {
             var slotX = slot % 4;
             var slotY = slot / 4;
-            blit(transform,
-                leftPos + TURTLE_START_X - 2 + slotX * 18, topPos + PLAYER_START_Y - 2 + slotY * 18, 0,
-                0, 217, 24, 24, FULL_TEX_SIZE, FULL_TEX_SIZE
+            graphics.blit(texture,
+                leftPos + TURTLE_START_X - 2 + slotX * 18, topPos + PLAYER_START_Y - 2 + slotY * 18,
+                0, 217, 24, 24
             );
         }
 
-        RenderSystem.setShaderTexture(0, advanced ? ComputerBorderRenderer.BACKGROUND_ADVANCED : ComputerBorderRenderer.BACKGROUND_NORMAL);
-        ComputerSidebar.renderBackground(transform, leftPos, topPos + sidebarYOffset);
+        ComputerSidebar.renderBackground(graphics, ComputerBorderRenderer.getTexture(family), leftPos, topPos + sidebarYOffset);
     }
 }

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

@@ -4,14 +4,13 @@
 
 package dan200.computercraft.client.gui.widgets;
 
-import com.mojang.blaze3d.vertex.PoseStack;
 import dan200.computercraft.api.ComputerCraftAPI;
 import dan200.computercraft.client.gui.widgets.DynamicImageButton.HintedMessage;
 import dan200.computercraft.client.render.ComputerBorderRenderer;
 import dan200.computercraft.shared.computer.core.InputHandler;
 import dan200.computercraft.shared.computer.inventory.AbstractComputerMenu;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.AbstractWidget;
-import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 
@@ -68,19 +67,19 @@ public final class ComputerSidebar {
         ));
     }
 
-    public static void renderBackground(PoseStack transform, int x, int y) {
-        Screen.blit(transform,
+    public static void renderBackground(GuiGraphics graphics, ResourceLocation texture, int x, int y) {
+        graphics.blit(texture,
             x, y, 0, 102, AbstractComputerMenu.SIDEBAR_WIDTH, FULL_BORDER,
             ComputerBorderRenderer.TEX_SIZE, ComputerBorderRenderer.TEX_SIZE
         );
 
-        Screen.blit(transform,
+        graphics.blit(texture,
             x, y + FULL_BORDER, AbstractComputerMenu.SIDEBAR_WIDTH, HEIGHT - FULL_BORDER * 2,
             0, 107, AbstractComputerMenu.SIDEBAR_WIDTH, 4,
             ComputerBorderRenderer.TEX_SIZE, ComputerBorderRenderer.TEX_SIZE
         );
 
-        Screen.blit(transform,
+        graphics.blit(texture,
             x, y + HEIGHT - FULL_BORDER, 0, 111, AbstractComputerMenu.SIDEBAR_WIDTH, FULL_BORDER,
             ComputerBorderRenderer.TEX_SIZE, ComputerBorderRenderer.TEX_SIZE
         );

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

@@ -5,8 +5,8 @@
 package dan200.computercraft.client.gui.widgets;
 
 import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.ChatFormatting;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.components.Tooltip;
 import net.minecraft.network.chat.Component;
@@ -57,15 +57,14 @@ public class DynamicImageButton extends Button {
     }
 
     @Override
-    public void renderWidget(PoseStack stack, int mouseX, int mouseY, float partialTicks) {
-        RenderSystem.setShaderTexture(0, texture);
-        RenderSystem.disableDepthTest();
+    public void renderWidget(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) {
+        RenderSystem.enableBlend();
+        RenderSystem.enableDepthTest();
 
         var yTex = yTexStart;
         if (isHoveredOrFocused()) yTex += yDiffTex;
 
-        blit(stack, getX(), getY(), xTexStart.getAsInt(), yTex, width, height, textureWidth, textureHeight);
-        RenderSystem.enableDepthTest();
+        graphics.blit(texture, getX(), getY(), xTexStart.getAsInt(), yTex, width, height, textureWidth, textureHeight);
     }
 
     @Override
@@ -74,9 +73,9 @@ public class DynamicImageButton extends Button {
     }
 
     @Override
-    public void render(PoseStack stack, int mouseX, int mouseY, float partialTicks) {
+    public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) {
         setTooltip(message.get().tooltip());
-        super.render(stack, mouseX, mouseY, partialTicks);
+        super.render(graphics, mouseX, mouseY, partialTicks);
     }
 
     public record HintedMessage(Component message, Tooltip tooltip) {

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

@@ -4,7 +4,6 @@
 
 package dan200.computercraft.client.gui.widgets;
 
-import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.Tesselator;
 import dan200.computercraft.client.render.RenderTypes;
 import dan200.computercraft.client.render.text.FixedWidthFontRenderer;
@@ -12,6 +11,7 @@ import dan200.computercraft.core.terminal.Terminal;
 import dan200.computercraft.shared.computer.core.InputHandler;
 import net.minecraft.SharedConstants;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraft.client.gui.narration.NarratedElementType;
 import net.minecraft.client.gui.narration.NarrationElementOutput;
@@ -274,11 +274,11 @@ public class TerminalWidget extends AbstractWidget {
     }
 
     @Override
-    public void renderWidget(PoseStack transform, int mouseX, int mouseY, float partialTicks) {
+    public void renderWidget(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) {
         if (!visible) return;
 
         var bufferSource = MultiBufferSource.immediate(Tesselator.getInstance().getBuilder());
-        var emitter = FixedWidthFontRenderer.toVertexConsumer(transform, bufferSource.getBuffer(RenderTypes.TERMINAL));
+        var emitter = FixedWidthFontRenderer.toVertexConsumer(graphics.pose(), bufferSource.getBuffer(RenderTypes.TERMINAL));
 
         FixedWidthFontRenderer.drawTerminal(
             emitter,

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

@@ -1,98 +0,0 @@
-// SPDX-FileCopyrightText: 2023 The CC: Tweaked Developers
-//
-// SPDX-License-Identifier: MPL-2.0
-
-package dan200.computercraft.client.model.turtle;
-
-import com.mojang.blaze3d.vertex.DefaultVertexFormat;
-import com.mojang.blaze3d.vertex.VertexFormat;
-import com.mojang.blaze3d.vertex.VertexFormatElement;
-import com.mojang.math.Transformation;
-import net.minecraft.client.renderer.block.model.BakedQuad;
-import net.minecraft.client.resources.model.BakedModel;
-import net.minecraft.core.Direction;
-import org.joml.Matrix4f;
-import org.joml.Vector4f;
-
-import javax.annotation.Nullable;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Applies a {@link Transformation} (or rather a {@link Matrix4f}) to a list of {@link BakedQuad}s.
- * <p>
- * This does a little bit of magic compared with other system (i.e. Forge's {@code QuadTransformers}), as it needs to
- * handle flipping models upside down.
- * <p>
- * This is typically used with a {@link BakedModel} subclass - see the loader-specific projects.
- */
-public final class ModelTransformer {
-    public static final int[] ORDER = new int[]{ 3, 2, 1, 0 };
-    public static final int STRIDE = DefaultVertexFormat.BLOCK.getIntegerSize();
-    private static final int POS_OFFSET = findOffset(DefaultVertexFormat.BLOCK, DefaultVertexFormat.ELEMENT_POSITION);
-
-    private final Matrix4f transformation;
-    private final boolean invert;
-    private @Nullable TransformedQuads cache;
-
-    public ModelTransformer(Transformation transformation) {
-        this.transformation = transformation.getMatrix();
-        invert = transformation.getMatrix().determinant() < 0;
-    }
-
-    public List<BakedQuad> transform(List<BakedQuad> quads) {
-        if (quads.isEmpty()) return List.of();
-
-        // We do some basic caching here to avoid recomputing every frame. Most turtle models don't have culled faces,
-        // so it's not worth being smarter here.
-        var cache = this.cache;
-        if (cache != null && quads.equals(cache.original())) return cache.transformed();
-
-        List<BakedQuad> transformed = new ArrayList<>(quads.size());
-        for (var quad : quads) transformed.add(transformQuad(quad));
-        this.cache = new TransformedQuads(quads, transformed);
-        return transformed;
-    }
-
-    private BakedQuad transformQuad(BakedQuad quad) {
-        var inputData = quad.getVertices();
-        var outputData = new int[inputData.length];
-        for (var i = 0; i < 4; i++) {
-            var inStart = STRIDE * i;
-            // Reverse the order of the quads if we're inverting
-            var outStart = STRIDE * (invert ? ORDER[i] : i);
-            System.arraycopy(inputData, inStart, outputData, outStart, STRIDE);
-
-            // Apply the matrix to our position
-            var inPosStart = inStart + POS_OFFSET;
-            var outPosStart = outStart + POS_OFFSET;
-
-            var x = Float.intBitsToFloat(inputData[inPosStart]);
-            var y = Float.intBitsToFloat(inputData[inPosStart + 1]);
-            var z = Float.intBitsToFloat(inputData[inPosStart + 2]);
-
-            // Transform the position
-            var pos = new Vector4f(x, y, z, 1);
-            transformation.transformProject(pos);
-
-            outputData[outPosStart] = Float.floatToRawIntBits(pos.x());
-            outputData[outPosStart + 1] = Float.floatToRawIntBits(pos.y());
-            outputData[outPosStart + 2] = Float.floatToRawIntBits(pos.z());
-        }
-
-        var direction = Direction.rotate(transformation, quad.getDirection());
-        return new BakedQuad(outputData, quad.getTintIndex(), direction, quad.getSprite(), quad.isShade());
-    }
-
-    private record TransformedQuads(List<BakedQuad> original, List<BakedQuad> transformed) {
-    }
-
-    private static int findOffset(VertexFormat format, VertexFormatElement element) {
-        var offset = 0;
-        for (var other : format.getElements()) {
-            if (other == element) return offset / Integer.BYTES;
-            offset += element.getByteSize();
-        }
-        throw new IllegalArgumentException("Cannot find " + element + " in " + format);
-    }
-}

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

@@ -4,13 +4,11 @@
 
 package dan200.computercraft.client.model.turtle;
 
-import com.google.common.cache.CacheBuilder;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Transformation;
 import dan200.computercraft.api.client.TransformedModel;
 import dan200.computercraft.api.turtle.ITurtleUpgrade;
 import dan200.computercraft.api.turtle.TurtleSide;
-import dan200.computercraft.api.upgrades.UpgradeData;
 import dan200.computercraft.client.platform.ClientPlatformHelper;
 import dan200.computercraft.client.render.TurtleBlockEntityRenderer;
 import dan200.computercraft.client.turtle.TurtleUpgradeModellers;
@@ -23,17 +21,15 @@ import net.minecraft.world.item.ItemStack;
 
 import javax.annotation.Nullable;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 
 /**
  * Combines several individual models together to form a turtle.
- *
- * @param <T> The type of the resulting "baked model".
  */
-public final class TurtleModelParts<T> {
+public final class TurtleModelParts {
     private static final Transformation identity, flip;
 
     static {
@@ -46,67 +42,33 @@ public final class TurtleModelParts<T> {
         flip = new Transformation(stack.last().pose());
     }
 
-    private record Combination(
+    public record Combination(
         boolean colour,
-        @Nullable UpgradeData<ITurtleUpgrade> leftUpgrade,
-        @Nullable UpgradeData<ITurtleUpgrade> rightUpgrade,
+        @Nullable ITurtleUpgrade leftUpgrade,
+        @Nullable ITurtleUpgrade rightUpgrade,
         @Nullable ResourceLocation overlay,
         boolean christmas,
         boolean flip
     ) {
-        Combination copy() {
-            if (leftUpgrade == null && rightUpgrade == null) return this;
-            return new Combination(
-                colour, UpgradeData.copyOf(leftUpgrade), UpgradeData.copyOf(rightUpgrade),
-                overlay, christmas, flip
-            );
-        }
     }
 
     private final BakedModel familyModel;
     private final BakedModel colourModel;
     private final Function<TransformedModel, BakedModel> transformer;
-    private final Function<Combination, T> buildModel;
 
     /**
      * A cache of {@link TransformedModel} to the transformed {@link BakedModel}. This helps us pool the transformed
      * instances, reducing memory usage and hopefully ensuring their caches are hit more often!
      */
-    private final Map<TransformedModel, BakedModel> transformCache = CacheBuilder.newBuilder()
-        .concurrencyLevel(1)
-        .expireAfterAccess(30, TimeUnit.SECONDS)
-        .<TransformedModel, BakedModel>build()
-        .asMap();
+    private final Map<TransformedModel, BakedModel> transformCache = new HashMap<>();
 
-    /**
-     * A cache of {@link Combination}s to the combined model.
-     */
-    private final Map<Combination, T> modelCache = CacheBuilder.newBuilder()
-        .concurrencyLevel(1)
-        .expireAfterAccess(30, TimeUnit.SECONDS)
-        .<Combination, T>build()
-        .asMap();
-
-    public TurtleModelParts(BakedModel familyModel, BakedModel colourModel, ModelTransformer transformer, Function<List<BakedModel>, T> combineModel) {
+    public TurtleModelParts(BakedModel familyModel, BakedModel colourModel, ModelTransformer transformer) {
         this.familyModel = familyModel;
         this.colourModel = colourModel;
         this.transformer = x -> transformer.transform(x.getModel(), x.getMatrix());
-        buildModel = x -> combineModel.apply(buildModel(x));
     }
 
-    public T getModel(ItemStack stack) {
-        var combination = getCombination(stack);
-        var existing = modelCache.get(combination);
-        if (existing != null) return existing;
-
-        // Take a defensive copy of the upgrade data, and add it to the cache.
-        var newCombination = combination.copy();
-        var newModel = buildModel.apply(newCombination);
-        modelCache.put(newCombination, newModel);
-        return newModel;
-    }
-
-    private Combination getCombination(ItemStack stack) {
+    public Combination getCombination(ItemStack stack) {
         var christmas = Holiday.getCurrent() == Holiday.CHRISTMAS;
 
         if (!(stack.getItem() instanceof TurtleItem turtle)) {
@@ -114,8 +76,8 @@ public final class TurtleModelParts<T> {
         }
 
         var colour = turtle.getColour(stack);
-        var leftUpgrade = turtle.getUpgradeWithData(stack, TurtleSide.LEFT);
-        var rightUpgrade = turtle.getUpgradeWithData(stack, TurtleSide.RIGHT);
+        var leftUpgrade = turtle.getUpgrade(stack, TurtleSide.LEFT);
+        var rightUpgrade = turtle.getUpgrade(stack, TurtleSide.RIGHT);
         var overlay = turtle.getOverlay(stack);
         var label = turtle.getLabel(stack);
         var flip = label != null && (label.equals("Dinnerbone") || label.equals("Grumm"));
@@ -123,7 +85,7 @@ public final class TurtleModelParts<T> {
         return new Combination(colour != -1, leftUpgrade, rightUpgrade, overlay, christmas, flip);
     }
 
-    private List<BakedModel> buildModel(Combination combo) {
+    public List<BakedModel> buildModel(Combination combo) {
         var mc = Minecraft.getInstance();
         var modelManager = mc.getItemRenderer().getItemModelShaper().getModelManager();
 
@@ -135,20 +97,19 @@ public final class TurtleModelParts<T> {
         if (overlayModelLocation != null) {
             parts.add(transform(ClientPlatformHelper.get().getModel(modelManager, overlayModelLocation), transformation));
         }
-
-        addUpgrade(parts, transformation, TurtleSide.LEFT, combo.leftUpgrade());
-        addUpgrade(parts, transformation, TurtleSide.RIGHT, combo.rightUpgrade());
+        if (combo.leftUpgrade() != null) {
+            var model = TurtleUpgradeModellers.getModel(combo.leftUpgrade(), null, TurtleSide.LEFT);
+            parts.add(transform(model.getModel(), transformation.compose(model.getMatrix())));
+        }
+        if (combo.rightUpgrade() != null) {
+            var model = TurtleUpgradeModellers.getModel(combo.rightUpgrade(), null, TurtleSide.RIGHT);
+            parts.add(transform(model.getModel(), transformation.compose(model.getMatrix())));
+        }
 
         return parts;
     }
 
-    private void addUpgrade(List<BakedModel> parts, Transformation transformation, TurtleSide side, @Nullable UpgradeData<ITurtleUpgrade> upgrade) {
-        if (upgrade == null) return;
-        var model = TurtleUpgradeModellers.getModel(upgrade.upgrade(), upgrade.data(), side);
-        parts.add(transform(model.getModel(), transformation.compose(model.getMatrix())));
-    }
-
-    private BakedModel transform(BakedModel model, Transformation transformation) {
+    public BakedModel transform(BakedModel model, Transformation transformation) {
         if (transformation.equals(Transformation.identity())) return model;
         return transformCache.computeIfAbsent(new TransformedModel(model, transformation), transformer);
     }

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

@@ -52,7 +52,7 @@ public abstract class AbstractClientNetworkContext implements ClientNetworkConte
         var player = Minecraft.getInstance().player;
         if (player == null) return;
 
-        var te = player.level.getBlockEntity(pos);
+        var te = player.level().getBlockEntity(pos);
         if (!(te instanceof MonitorBlockEntity monitor)) return;
 
         monitor.read(terminal);

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

@@ -18,9 +18,9 @@ import org.joml.Matrix4f;
  * {@linkplain PocketItemRenderer in-hand pocket computers}.
  */
 public class ComputerBorderRenderer {
-    public static final ResourceLocation BACKGROUND_NORMAL = new ResourceLocation(ComputerCraftAPI.MOD_ID, "textures/gui/corners_normal.png");
-    public static final ResourceLocation BACKGROUND_ADVANCED = new ResourceLocation(ComputerCraftAPI.MOD_ID, "textures/gui/corners_advanced.png");
-    public static final ResourceLocation BACKGROUND_COMMAND = new ResourceLocation(ComputerCraftAPI.MOD_ID, "textures/gui/corners_command.png");
+    private static final ResourceLocation BACKGROUND_NORMAL = new ResourceLocation(ComputerCraftAPI.MOD_ID, "textures/gui/corners_normal.png");
+    private static final ResourceLocation BACKGROUND_ADVANCED = new ResourceLocation(ComputerCraftAPI.MOD_ID, "textures/gui/corners_advanced.png");
+    private static final ResourceLocation BACKGROUND_COMMAND = new ResourceLocation(ComputerCraftAPI.MOD_ID, "textures/gui/corners_command.png");
     public static final ResourceLocation BACKGROUND_COLOUR = new ResourceLocation(ComputerCraftAPI.MOD_ID, "textures/gui/corners_colour.png");
 
     /**

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

@@ -10,7 +10,6 @@ import com.mojang.math.Axis;
 import com.mojang.math.Transformation;
 import dan200.computercraft.api.ComputerCraftAPI;
 import dan200.computercraft.api.turtle.TurtleSide;
-import dan200.computercraft.client.model.turtle.ModelTransformer;
 import dan200.computercraft.client.platform.ClientPlatformHelper;
 import dan200.computercraft.client.turtle.TurtleUpgradeModellers;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
@@ -31,7 +30,6 @@ import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.RandomSource;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.HitResult;
-import org.joml.Vector4f;
 
 import javax.annotation.Nullable;
 import java.util.List;
@@ -148,30 +146,16 @@ public class TurtleBlockEntityRenderer implements BlockEntityRenderer<TurtleBloc
         renderModel(transform, renderer, lightmapCoord, overlayLight, ClientPlatformHelper.get().getModel(modelManager, modelLocation), tints);
     }
 
-    /**
-     * Render a block model.
-     *
-     * @param transform     The current matrix stack.
-     * @param renderer      The buffer to write to.
-     * @param lightmapCoord The current lightmap coordinate.
-     * @param overlayLight  The overlay light.
-     * @param model         The model to render.
-     * @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, VertexConsumer renderer, int lightmapCoord, int overlayLight, BakedModel model, @Nullable int[] tints) {
+        random.setSeed(0);
+        renderQuads(transform, renderer, lightmapCoord, overlayLight, model.getQuads(null, null, random), tints);
         for (var facing : DirectionUtil.FACINGS) {
-            random.setSeed(42);
             renderQuads(transform, renderer, lightmapCoord, overlayLight, model.getQuads(null, facing, random), tints);
         }
-
-        random.setSeed(42);
-        renderQuads(transform, renderer, lightmapCoord, overlayLight, model.getQuads(null, null, random), tints);
     }
 
     private static void renderQuads(PoseStack transform, VertexConsumer buffer, int lightmapCoord, int overlayLight, List<BakedQuad> quads, @Nullable int[] tints) {
         var matrix = transform.last();
-        var inverted = matrix.pose().determinant() < 0;
 
         for (var bakedquad : quads) {
             var tint = -1;
@@ -183,50 +167,7 @@ public class TurtleBlockEntityRenderer implements BlockEntityRenderer<TurtleBloc
             var r = (float) (tint >> 16 & 255) / 255.0F;
             var g = (float) (tint >> 8 & 255) / 255.0F;
             var b = (float) (tint & 255) / 255.0F;
-            if (inverted) {
-                putBulkQuadInvert(buffer, matrix, bakedquad, r, g, b, lightmapCoord, overlayLight);
-            } else {
-                buffer.putBulkData(matrix, bakedquad, r, g, b, lightmapCoord, overlayLight);
-            }
-        }
-    }
-
-    /**
-     * A version of {@link VertexConsumer#putBulkData(PoseStack.Pose, BakedQuad, float, float, float, int, int)} for
-     * when the matrix is inverted.
-     *
-     * @param buffer        The buffer to draw to.
-     * @param pose          The current matrix stack.
-     * @param quad          The quad to draw.
-     * @param red           The red tint of this quad.
-     * @param green         The  green tint of this quad.
-     * @param blue          The blue tint of this quad.
-     * @param lightmapCoord The lightmap coordinate
-     * @param overlayLight  The overlay light.
-     */
-    private static void putBulkQuadInvert(VertexConsumer buffer, PoseStack.Pose pose, BakedQuad quad, float red, float green, float blue, int lightmapCoord, int overlayLight) {
-        var matrix = pose.pose();
-        // It's a little dubious to transform using this matrix rather than the normal matrix. This mirrors the logic in
-        // Direction.rotate (so not out of nowhere!), but is a little suspicious.
-        var dirNormal = quad.getDirection().getNormal();
-        var normal = matrix.transform(new Vector4f(dirNormal.getX(), dirNormal.getY(), dirNormal.getZ(), 0.0f)).normalize();
-
-        var vertices = quad.getVertices();
-        for (var vertex : ModelTransformer.ORDER) {
-            var i = vertex * ModelTransformer.STRIDE;
-
-            var x = Float.intBitsToFloat(vertices[i]);
-            var y = Float.intBitsToFloat(vertices[i + 1]);
-            var z = Float.intBitsToFloat(vertices[i + 2]);
-            var transformed = matrix.transform(new Vector4f(x, y, z, 1));
-
-            var u = Float.intBitsToFloat(vertices[i + 4]);
-            var v = Float.intBitsToFloat(vertices[i + 5]);
-            buffer.vertex(
-                transformed.x(), transformed.y(), transformed.z(),
-                red, green, blue, 1.0F, u, v, overlayLight, lightmapCoord,
-                normal.x(), normal.y(), normal.z()
-            );
+            buffer.putBulkData(matrix, bakedquad, r, g, b, lightmapCoord, overlayLight);
         }
     }
 

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

@@ -7,10 +7,7 @@ package dan200.computercraft.client.render.monitor;
 import com.mojang.blaze3d.platform.GlStateManager;
 import com.mojang.blaze3d.platform.MemoryTracker;
 import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.blaze3d.vertex.Tesselator;
-import com.mojang.blaze3d.vertex.VertexBuffer;
-import com.mojang.blaze3d.vertex.VertexConsumer;
+import com.mojang.blaze3d.vertex.*;
 import com.mojang.math.Axis;
 import dan200.computercraft.client.FrameInfo;
 import dan200.computercraft.client.integration.ShaderMod;
@@ -170,7 +167,7 @@ public class MonitorBlockEntityRenderer implements BlockEntityRenderer<MonitorBl
                 tboVertex(buffer, matrix, -xMargin, pixelHeight + yMargin);
                 tboVertex(buffer, matrix, pixelWidth + xMargin, -yMargin);
                 tboVertex(buffer, matrix, pixelWidth + xMargin, pixelHeight + yMargin);
-                RenderTypes.MONITOR_TBO.end(buffer, 0, 0, 0);
+                RenderTypes.MONITOR_TBO.end(buffer, VertexSorting.DISTANCE_TO_ORIGIN);
             }
             case VBO -> {
                 var backgroundBuffer = assertNonNull(renderState.backgroundBuffer);

projects/common/src/client/java/dan200/computercraft/client/render/vbo/DirectVertexBuffer.java

@@ -25,6 +25,7 @@ public class DirectVertexBuffer extends VertexBuffer {
     private int actualIndexCount;
 
     public DirectVertexBuffer() {
+        super(Usage.STATIC);
         if (DirectBuffers.HAS_DSA) {
             RenderSystem.glDeleteBuffers(vertexBufferId);
             if (DirectBuffers.ON_LINUX) BufferUploader.reset(); // See comment on DirectBuffers.deleteBuffer.

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

@@ -14,8 +14,8 @@ import dan200.computercraft.api.turtle.TurtleUpgradeSerialiser;
 import dan200.computercraft.impl.TurtleUpgrades;
 import dan200.computercraft.impl.UpgradeManager;
 import net.minecraft.client.Minecraft;
-import net.minecraft.nbt.CompoundTag;
 
+import javax.annotation.Nullable;
 import java.util.Map;
 import java.util.WeakHashMap;
 import java.util.concurrent.ConcurrentHashMap;
@@ -52,18 +52,12 @@ public final class TurtleUpgradeModellers {
         }
     }
 
-    public static TransformedModel getModel(ITurtleUpgrade upgrade, ITurtleAccess access, TurtleSide side) {
+    public static TransformedModel getModel(ITurtleUpgrade upgrade, @Nullable ITurtleAccess access, TurtleSide side) {
         @SuppressWarnings("unchecked")
         var modeller = (TurtleUpgradeModeller<ITurtleUpgrade>) modelCache.computeIfAbsent(upgrade, TurtleUpgradeModellers::getModeller);
         return modeller.getModel(upgrade, access, side);
     }
 
-    public static TransformedModel getModel(ITurtleUpgrade upgrade, CompoundTag data, TurtleSide side) {
-        @SuppressWarnings("unchecked")
-        var modeller = (TurtleUpgradeModeller<ITurtleUpgrade>) modelCache.computeIfAbsent(upgrade, TurtleUpgradeModellers::getModeller);
-        return modeller.getModel(upgrade, data, side);
-    }
-
     private static TurtleUpgradeModeller<?> getModeller(ITurtleUpgrade upgradeA) {
         var wrapper = TurtleUpgrades.instance().getWrapper(upgradeA);
         if (wrapper == null) return NULL_TURTLE_MODELLER;

projects/common/src/client/java/dan200/computercraft/data/client/ClientDataProviders.java

@@ -1,34 +0,0 @@
-// SPDX-FileCopyrightText: 2023 The CC: Tweaked Developers
-//
-// SPDX-License-Identifier: MPL-2.0
-
-package dan200.computercraft.data.client;
-
-import dan200.computercraft.data.DataProviders;
-import dan200.computercraft.shared.turtle.inventory.UpgradeSlot;
-import net.minecraft.client.renderer.texture.atlas.SpriteSources;
-import net.minecraft.client.renderer.texture.atlas.sources.SingleFile;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.server.packs.PackType;
-
-import java.util.List;
-import java.util.Optional;
-
-/**
- * A version of {@link DataProviders} which relies on client-side classes.
- * <p>
- * This is called from {@link DataProviders#add(DataProviders.GeneratorSink)}.
- */
-public final class ClientDataProviders {
-    private ClientDataProviders() {
-    }
-
-    public static void add(DataProviders.GeneratorSink generator) {
-        generator.addFromCodec("Block atlases", PackType.CLIENT_RESOURCES, "atlases", SpriteSources.FILE_CODEC, out -> {
-            out.accept(new ResourceLocation("blocks"), List.of(
-                new SingleFile(UpgradeSlot.LEFT_UPGRADE, Optional.empty()),
-                new SingleFile(UpgradeSlot.RIGHT_UPGRADE, Optional.empty())
-            ));
-        });
-    }
-}

projects/common/src/main/java/dan200/computercraft/data/BlockModelProvider.java

@@ -37,14 +37,6 @@ import static net.minecraft.data.models.model.ModelLocationUtils.getModelLocatio
 import static net.minecraft.data.models.model.TextureMapping.getBlockTexture;
 
 class BlockModelProvider {
-    private static final TextureSlot CURSOR = TextureSlot.create("cursor");
-
-    private static final ModelTemplate COMPUTER_ON = new ModelTemplate(
-        Optional.of(new ResourceLocation(ComputerCraftAPI.MOD_ID, "block/computer_on")),
-        Optional.empty(),
-        TextureSlot.FRONT, TextureSlot.SIDE, TextureSlot.TOP, CURSOR
-    );
-
     private static final ModelTemplate MONITOR_BASE = new ModelTemplate(
         Optional.of(new ResourceLocation(ComputerCraftAPI.MOD_ID, "block/monitor_base")),
         Optional.empty(),
@@ -150,18 +142,11 @@ class BlockModelProvider {
     private static void registerComputer(BlockModelGenerators generators, ComputerBlock<?> block) {
         generators.blockStateOutput.accept(MultiVariantGenerator.multiVariant(block)
             .with(createHorizontalFacingDispatch())
-            .with(createModelDispatch(ComputerBlock.STATE, state -> switch (state) {
-                case OFF -> ModelTemplates.CUBE_ORIENTABLE.createWithSuffix(
-                    block, "_" + state.getSerializedName(),
-                    TextureMapping.orientableCube(block),
-                    generators.modelOutput
-                );
-                case ON, BLINKING -> COMPUTER_ON.createWithSuffix(
-                    block, "_" + state.getSerializedName(),
-                    TextureMapping.orientableCube(block).put(CURSOR, new ResourceLocation(ComputerCraftAPI.MOD_ID, "block/computer" + state.getTexture())),
-                    generators.modelOutput
-                );
-            }))
+            .with(createModelDispatch(ComputerBlock.STATE, state -> ModelTemplates.CUBE_ORIENTABLE.createWithSuffix(
+                block, "_" + state.getSerializedName(),
+                TextureMapping.orientableCube(block).put(TextureSlot.FRONT, getBlockTexture(block, "_front" + state.getTexture())),
+                generators.modelOutput
+            )))
         );
         generators.delegateItemModel(block, getModelLocation(block, "_blinking"));
     }

projects/common/src/main/java/dan200/computercraft/data/DataProviders.java

@@ -4,20 +4,16 @@
 
 package dan200.computercraft.data;
 
-import com.mojang.serialization.Codec;
 import net.minecraft.data.DataProvider;
 import net.minecraft.data.PackOutput;
 import net.minecraft.data.loot.LootTableProvider.SubProviderEntry;
 import net.minecraft.data.models.BlockModelGenerators;
 import net.minecraft.data.models.ItemModelGenerators;
 import net.minecraft.data.tags.TagsProvider;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.server.packs.PackType;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.Block;
 
 import java.util.List;
-import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 
 /**
@@ -41,22 +37,11 @@ public final class DataProviders {
         generator.models(BlockModelProvider::addBlockModels, ItemModelProvider::addItemModels);
 
         generator.add(out -> new LanguageProvider(out, turtleUpgrades, pocketUpgrades));
-
-        // Unfortunately we rely on some client-side classes in this code. We just load in the client side data provider
-        // and invoke that.
-        try {
-            Class.forName("dan200.computercraft.data.client.ClientDataProviders")
-                .getMethod("add", GeneratorSink.class).invoke(null, generator);
-        } catch (ReflectiveOperationException e) {
-            throw new RuntimeException(e);
-        }
     }
 
-    public interface GeneratorSink {
+    interface GeneratorSink {
         <T extends DataProvider> T add(DataProvider.Factory<T> factory);
 
-        <T> void addFromCodec(String name, PackType type, String directory, Codec<T> codec, Consumer<BiConsumer<ResourceLocation, T>> output);
-
         void lootTable(List<SubProviderEntry> tables);
 
         TagsProvider<Block> blockTags(Consumer<TagProvider.TagConsumer<Block>> tags);

projects/common/src/main/java/dan200/computercraft/data/LootTableProvider.java

@@ -23,7 +23,7 @@ import net.minecraft.world.level.storage.loot.entries.LootItem;
 import net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer;
 import net.minecraft.world.level.storage.loot.functions.CopyNameFunction;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets;
-import net.minecraft.world.level.storage.loot.predicates.AlternativeLootItemCondition;
+import net.minecraft.world.level.storage.loot.predicates.AnyOfCondition;
 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.predicates.LootItemCondition;
@@ -79,7 +79,7 @@ class LootTableProvider {
     }
 
     private static void registerGeneric(BiConsumer<ResourceLocation, LootTable.Builder> add) {
-        add.accept(CommonHooks.LOOT_TREASURE_DISK, LootTable.lootTable());
+        add.accept(CommonHooks.TREASURE_DISK_LOOT, LootTable.lootTable());
     }
 
     private static void selfDrop(BiConsumer<ResourceLocation, LootTable.Builder> add, Supplier<? extends Block> wrapper) {
@@ -98,7 +98,7 @@ class LootTableProvider {
         blockDrop(
             add, block,
             DynamicLoot.dynamicEntry(new ResourceLocation(ComputerCraftAPI.MOD_ID, "computer")),
-            AlternativeLootItemCondition.alternative(
+            AnyOfCondition.anyOf(
                 BlockNamedEntityLootCondition.BUILDER,
                 HasComputerIdLootCondition.BUILDER,
                 PlayerCreativeLootCondition.BUILDER.invert()

projects/common/src/main/java/dan200/computercraft/data/RecipeProvider.java

@@ -8,7 +8,6 @@ import com.google.gson.JsonObject;
 import dan200.computercraft.api.ComputerCraftAPI;
 import dan200.computercraft.api.pocket.PocketUpgradeDataProvider;
 import dan200.computercraft.api.turtle.TurtleUpgradeDataProvider;
-import dan200.computercraft.api.upgrades.UpgradeData;
 import dan200.computercraft.core.util.Colour;
 import dan200.computercraft.shared.ModRegistry;
 import dan200.computercraft.shared.common.IColouredItem;
@@ -111,7 +110,7 @@ class RecipeProvider extends net.minecraft.data.recipes.RecipeProvider {
             var nameId = turtleItem.getFamily().name().toLowerCase(Locale.ROOT);
 
             for (var upgrade : turtleUpgrades.getGeneratedUpgrades()) {
-                var result = turtleItem.create(-1, null, -1, null, UpgradeData.ofDefault(upgrade), -1, null);
+                var result = turtleItem.create(-1, null, -1, null, upgrade, -1, null);
                 ShapedRecipeBuilder
                     .shaped(RecipeCategory.REDSTONE, result.getItem())
                     .group(String.format("%s:turtle_%s", ComputerCraftAPI.MOD_ID, nameId))
@@ -147,7 +146,7 @@ class RecipeProvider extends net.minecraft.data.recipes.RecipeProvider {
             var nameId = pocket.getFamily().name().toLowerCase(Locale.ROOT);
 
             for (var upgrade : pocketUpgrades.getGeneratedUpgrades()) {
-                var result = pocket.create(-1, null, -1, UpgradeData.ofDefault(upgrade));
+                var result = pocket.create(-1, null, -1, upgrade);
                 ShapedRecipeBuilder
                     .shaped(RecipeCategory.REDSTONE, result.getItem())
                     .group(String.format("%s:pocket_%s", ComputerCraftAPI.MOD_ID, nameId))

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

@@ -19,6 +19,8 @@ import dan200.computercraft.api.pocket.PocketUpgradeSerialiser;
 import dan200.computercraft.api.redstone.BundledRedstoneProvider;
 import dan200.computercraft.api.turtle.TurtleRefuelHandler;
 import dan200.computercraft.api.turtle.TurtleUpgradeSerialiser;
+import dan200.computercraft.core.apis.ApiFactories;
+import dan200.computercraft.core.asm.GenericMethod;
 import dan200.computercraft.core.filesystem.WritableFileMount;
 import dan200.computercraft.impl.detail.DetailRegistryImpl;
 import dan200.computercraft.impl.network.wired.WiredNodeImpl;
@@ -77,7 +79,7 @@ public abstract class AbstractComputerCraftAPI implements ComputerCraftAPIServic
 
     @Override
     public final void registerGenericSource(GenericSource source) {
-        GenericSources.register(source);
+        GenericMethod.register(source);
     }
 
     @Override

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

@@ -1,34 +0,0 @@
-// SPDX-FileCopyrightText: 2023 The CC: Tweaked Developers
-//
-// SPDX-License-Identifier: MPL-2.0
-
-package dan200.computercraft.impl;
-
-import dan200.computercraft.api.lua.GenericSource;
-import dan200.computercraft.core.asm.GenericMethod;
-
-import java.util.Collection;
-import java.util.LinkedHashSet;
-import java.util.Objects;
-
-/**
- * The global registry for {@link GenericSource}s.
- *
- * @see dan200.computercraft.core.ComputerContext.Builder#genericMethods(Collection)
- * @see dan200.computercraft.api.ComputerCraftAPI#registerGenericSource(GenericSource)
- */
-public final class GenericSources {
-    private GenericSources() {
-    }
-
-    private static final Collection<GenericSource> sources = new LinkedHashSet<>();
-
-    static synchronized void register(GenericSource source) {
-        Objects.requireNonNull(source, "provider cannot be null");
-        sources.add(source);
-    }
-
-    public static Collection<GenericMethod> getAllMethods() {
-        return sources.stream().flatMap(GenericMethod::getMethods).toList();
-    }
-}

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

@@ -7,7 +7,6 @@ package dan200.computercraft.impl;
 import com.google.gson.*;
 import dan200.computercraft.api.ComputerCraftAPI;
 import dan200.computercraft.api.upgrades.UpgradeBase;
-import dan200.computercraft.api.upgrades.UpgradeData;
 import dan200.computercraft.api.upgrades.UpgradeSerialiser;
 import dan200.computercraft.shared.platform.PlatformHelper;
 import net.minecraft.core.Registry;
@@ -75,13 +74,13 @@ public class UpgradeManager<R extends UpgradeSerialiser<? extends T>, T extends
     }
 
     @Nullable
-    public UpgradeData<T> get(ItemStack stack) {
+    public T get(ItemStack stack) {
         if (stack.isEmpty()) return null;
 
         for (var wrapper : current.values()) {
             var craftingStack = wrapper.upgrade().getCraftingItem();
             if (!craftingStack.isEmpty() && craftingStack.getItem() == stack.getItem() && wrapper.upgrade().isItemSuitable(stack)) {
-                return UpgradeData.of(wrapper.upgrade, wrapper.upgrade.getUpgradeData(stack));
+                return wrapper.upgrade();
             }
         }
 

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

@@ -23,13 +23,7 @@ import net.minecraft.world.entity.Entity;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.chunk.LevelChunk;
 import net.minecraft.world.level.storage.loot.BuiltInLootTables;
-import net.minecraft.world.level.storage.loot.LootPool;
-import net.minecraft.world.level.storage.loot.entries.LootTableReference;
-import net.minecraft.world.level.storage.loot.providers.number.ConstantValue;
 
-import javax.annotation.Nullable;
-import java.util.Arrays;
-import java.util.HashSet;
 import java.util.Set;
 import java.util.function.BiConsumer;
 
@@ -75,9 +69,9 @@ public final class CommonHooks {
         MonitorWatcher.onWatch(chunk, player);
     }
 
-    public static final ResourceLocation LOOT_TREASURE_DISK = new ResourceLocation(ComputerCraftAPI.MOD_ID, "treasure_disk");
+    public static final ResourceLocation TREASURE_DISK_LOOT = new ResourceLocation(ComputerCraftAPI.MOD_ID, "treasure_disk");
 
-    private static final Set<ResourceLocation> TABLES = new HashSet<>(Arrays.asList(
+    public static final Set<ResourceLocation> TREASURE_DISK_LOOT_TABLES = Set.of(
         BuiltInLootTables.SIMPLE_DUNGEON,
         BuiltInLootTables.ABANDONED_MINESHAFT,
         BuiltInLootTables.STRONGHOLD_CORRIDOR,
@@ -88,16 +82,7 @@ public final class CommonHooks {
         BuiltInLootTables.IGLOO_CHEST,
         BuiltInLootTables.WOODLAND_MANSION,
         BuiltInLootTables.VILLAGE_CARTOGRAPHER
-    ));
-
-
-    public static @Nullable LootPool.Builder getExtraLootPool(ResourceLocation lootTable) {
-        if (!lootTable.getNamespace().equals("minecraft") || !TABLES.contains(lootTable)) return null;
-
-        return LootPool.lootPool()
-            .add(LootTableReference.lootTableReference(LOOT_TREASURE_DISK))
-            .setRolls(ConstantValue.exactly(1));
-    }
+    );
 
     public static void onDatapackReload(BiConsumer<String, PreparableReloadListener> addReload) {
         addReload.accept("mounts", ResourceMount.RELOAD_LISTENER);

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

@@ -11,7 +11,6 @@ import dan200.computercraft.api.detail.VanillaDetailRegistries;
 import dan200.computercraft.api.media.IMedia;
 import dan200.computercraft.api.pocket.PocketUpgradeSerialiser;
 import dan200.computercraft.api.turtle.TurtleUpgradeSerialiser;
-import dan200.computercraft.api.upgrades.UpgradeData;
 import dan200.computercraft.core.util.Colour;
 import dan200.computercraft.impl.PocketUpgrades;
 import dan200.computercraft.impl.TurtleUpgrades;
@@ -94,7 +93,7 @@ import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.material.Material;
+import net.minecraft.world.level.material.MapColor;
 import net.minecraft.world.level.storage.loot.predicates.LootItemConditionType;
 
 import java.util.function.BiFunction;
@@ -113,7 +112,7 @@ public final class ModRegistry {
         static final RegistrationHelper<Block> REGISTRY = PlatformHelper.get().createRegistrationHelper(Registries.BLOCK);
 
         private static BlockBehaviour.Properties properties() {
-            return BlockBehaviour.Properties.of(Material.STONE).strength(2);
+            return BlockBehaviour.Properties.of().strength(2);
         }
 
         private static BlockBehaviour.Properties computerProperties() {
@@ -123,17 +122,17 @@ public final class ModRegistry {
         }
 
         private static BlockBehaviour.Properties turtleProperties() {
-            return BlockBehaviour.Properties.of(Material.STONE).strength(2.5f);
+            return BlockBehaviour.Properties.of().strength(2.5f);
         }
 
         private static BlockBehaviour.Properties modemProperties() {
-            return BlockBehaviour.Properties.of(Material.STONE).strength(1.5f);
+            return BlockBehaviour.Properties.of().strength(1.5f);
         }
 
         public static final RegistryEntry<ComputerBlock<ComputerBlockEntity>> COMPUTER_NORMAL = REGISTRY.register("computer_normal",
-            () -> new ComputerBlock<>(computerProperties(), ComputerFamily.NORMAL, BlockEntities.COMPUTER_NORMAL));
+            () -> new ComputerBlock<>(computerProperties().mapColor(MapColor.STONE), ComputerFamily.NORMAL, BlockEntities.COMPUTER_NORMAL));
         public static final RegistryEntry<ComputerBlock<ComputerBlockEntity>> COMPUTER_ADVANCED = REGISTRY.register("computer_advanced",
-            () -> new ComputerBlock<>(computerProperties(), ComputerFamily.ADVANCED, BlockEntities.COMPUTER_ADVANCED));
+            () -> new ComputerBlock<>(computerProperties().mapColor(MapColor.GOLD), ComputerFamily.ADVANCED, BlockEntities.COMPUTER_ADVANCED));
 
         public static final RegistryEntry<ComputerBlock<CommandComputerBlockEntity>> COMPUTER_COMMAND = REGISTRY.register("computer_command", () -> new ComputerBlock<>(
             computerProperties().strength(-1, 6000000.0F),
@@ -141,27 +140,27 @@ public final class ModRegistry {
         ));
 
         public static final RegistryEntry<TurtleBlock> TURTLE_NORMAL = REGISTRY.register("turtle_normal",
-            () -> new TurtleBlock(turtleProperties(), ComputerFamily.NORMAL, BlockEntities.TURTLE_NORMAL));
+            () -> new TurtleBlock(turtleProperties().mapColor(MapColor.STONE), ComputerFamily.NORMAL, BlockEntities.TURTLE_NORMAL));
         public static final RegistryEntry<TurtleBlock> TURTLE_ADVANCED = REGISTRY.register("turtle_advanced",
-            () -> new TurtleBlock(turtleProperties(), ComputerFamily.ADVANCED, BlockEntities.TURTLE_ADVANCED));
+            () -> new TurtleBlock(turtleProperties().mapColor(MapColor.GOLD), ComputerFamily.ADVANCED, BlockEntities.TURTLE_ADVANCED));
 
-        public static final RegistryEntry<SpeakerBlock> SPEAKER = REGISTRY.register("speaker", () -> new SpeakerBlock(properties()));
-        public static final RegistryEntry<DiskDriveBlock> DISK_DRIVE = REGISTRY.register("disk_drive", () -> new DiskDriveBlock(properties()));
-        public static final RegistryEntry<PrinterBlock> PRINTER = REGISTRY.register("printer", () -> new PrinterBlock(properties()));
+        public static final RegistryEntry<SpeakerBlock> SPEAKER = REGISTRY.register("speaker", () -> new SpeakerBlock(properties().mapColor(MapColor.STONE)));
+        public static final RegistryEntry<DiskDriveBlock> DISK_DRIVE = REGISTRY.register("disk_drive", () -> new DiskDriveBlock(properties().mapColor(MapColor.STONE)));
+        public static final RegistryEntry<PrinterBlock> PRINTER = REGISTRY.register("printer", () -> new PrinterBlock(properties().mapColor(MapColor.STONE)));
 
         public static final RegistryEntry<MonitorBlock> MONITOR_NORMAL = REGISTRY.register("monitor_normal",
-            () -> new MonitorBlock(properties(), BlockEntities.MONITOR_NORMAL));
+            () -> new MonitorBlock(properties().mapColor(MapColor.STONE), BlockEntities.MONITOR_NORMAL));
         public static final RegistryEntry<MonitorBlock> MONITOR_ADVANCED = REGISTRY.register("monitor_advanced",
-            () -> new MonitorBlock(properties(), BlockEntities.MONITOR_ADVANCED));
+            () -> new MonitorBlock(properties().mapColor(MapColor.GOLD), BlockEntities.MONITOR_ADVANCED));
 
         public static final RegistryEntry<WirelessModemBlock> WIRELESS_MODEM_NORMAL = REGISTRY.register("wireless_modem_normal",
-            () -> new WirelessModemBlock(properties(), BlockEntities.WIRELESS_MODEM_NORMAL));
+            () -> new WirelessModemBlock(properties().mapColor(MapColor.STONE), BlockEntities.WIRELESS_MODEM_NORMAL));
         public static final RegistryEntry<WirelessModemBlock> WIRELESS_MODEM_ADVANCED = REGISTRY.register("wireless_modem_advanced",
-            () -> new WirelessModemBlock(properties(), BlockEntities.WIRELESS_MODEM_ADVANCED));
+            () -> new WirelessModemBlock(properties().mapColor(MapColor.GOLD), BlockEntities.WIRELESS_MODEM_ADVANCED));
 
         public static final RegistryEntry<WiredModemFullBlock> WIRED_MODEM_FULL = REGISTRY.register("wired_modem_full",
-            () -> new WiredModemFullBlock(modemProperties()));
-        public static final RegistryEntry<CableBlock> CABLE = REGISTRY.register("cable", () -> new CableBlock(modemProperties()));
+            () -> new WiredModemFullBlock(modemProperties().mapColor(MapColor.STONE)));
+        public static final RegistryEntry<CableBlock> CABLE = REGISTRY.register("cable", () -> new CableBlock(modemProperties().mapColor(MapColor.STONE)));
     }
 
     public static class BlockEntities {
@@ -366,50 +365,11 @@ public final class ModRegistry {
         public static final RegistryEntry<ImpostorShapelessRecipe.Serializer> IMPOSTOR_SHAPELESS = REGISTRY.register("impostor_shapeless", ImpostorShapelessRecipe.Serializer::new);
     }
 
-    /**
-     * Register any objects which don't have to be done on the main thread.
-     */
-    public static void register() {
-        Blocks.REGISTRY.register();
-        BlockEntities.REGISTRY.register();
-        Items.REGISTRY.register();
-        TurtleSerialisers.REGISTRY.register();
-        PocketUpgradeSerialisers.REGISTRY.register();
-        Menus.REGISTRY.register();
-        ArgumentTypes.REGISTRY.register();
-        LootItemConditionTypes.REGISTRY.register();
-        RecipeSerializers.REGISTRY.register();
+    static class CreativeTabs {
+        static final RegistrationHelper<CreativeModeTab> REGISTRY = PlatformHelper.get().createRegistrationHelper(Registries.CREATIVE_MODE_TAB);
 
-        // Register bundled power providers
-        ComputerCraftAPI.registerBundledRedstoneProvider(new DefaultBundledRedstoneProvider());
-        ComputerCraftAPI.registerRefuelHandler(new FurnaceRefuelHandler());
-        ComputerCraftAPI.registerMediaProvider(stack -> {
-            var item = stack.getItem();
-            if (item instanceof IMedia media) return media;
-            if (item instanceof RecordItem) return RecordMedia.INSTANCE;
-            return null;
-        });
-
-        VanillaDetailRegistries.ITEM_STACK.addProvider(ItemDetails::fill);
-        VanillaDetailRegistries.BLOCK_IN_WORLD.addProvider(BlockDetails::fill);
-    }
-
-    /**
-     * Register any objects which must be done on the main thread.
-     */
-    public static void registerMainThread() {
-        CauldronInteraction.WATER.put(ModRegistry.Items.TURTLE_NORMAL.get(), TurtleItem.CAULDRON_INTERACTION);
-        CauldronInteraction.WATER.put(ModRegistry.Items.TURTLE_ADVANCED.get(), TurtleItem.CAULDRON_INTERACTION);
-    }
-
-    /**
-     * Configure a {@link CreativeModeTab.Builder} to contain all of ComputerCraft's items.
-     *
-     * @param builder The builder to configure.
-     * @return The same building, for calling {@link CreativeModeTab.Builder#build()} on.
-     */
-    public static CreativeModeTab.Builder registerCreativeTab(CreativeModeTab.Builder builder) {
-        return builder
+        @SuppressWarnings("unused")
+        private static final RegistryEntry<CreativeModeTab> TAB = REGISTRY.register("tab", () -> PlatformHelper.get().newCreativeModeTab()
             .icon(() -> new ItemStack(Items.COMPUTER_NORMAL.get()))
             .title(Component.translatable("itemGroup.computercraft"))
             .displayItems((context, out) -> {
@@ -441,18 +401,56 @@ public final class ModRegistry {
                 for (var colour = 0; colour < 16; colour++) {
                     out.accept(DiskItem.createFromIDAndColour(-1, null, Colour.VALUES[colour].getHex()));
                 }
-            });
+            })
+            .build());
+    }
+
+    /**
+     * Register any objects which don't have to be done on the main thread.
+     */
+    public static void register() {
+        Blocks.REGISTRY.register();
+        BlockEntities.REGISTRY.register();
+        Items.REGISTRY.register();
+        TurtleSerialisers.REGISTRY.register();
+        PocketUpgradeSerialisers.REGISTRY.register();
+        Menus.REGISTRY.register();
+        ArgumentTypes.REGISTRY.register();
+        LootItemConditionTypes.REGISTRY.register();
+        RecipeSerializers.REGISTRY.register();
+        CreativeTabs.REGISTRY.register();
+
+        // Register bundled power providers
+        ComputerCraftAPI.registerBundledRedstoneProvider(new DefaultBundledRedstoneProvider());
+        ComputerCraftAPI.registerRefuelHandler(new FurnaceRefuelHandler());
+        ComputerCraftAPI.registerMediaProvider(stack -> {
+            var item = stack.getItem();
+            if (item instanceof IMedia media) return media;
+            if (item instanceof RecordItem) return RecordMedia.INSTANCE;
+            return null;
+        });
+
+        VanillaDetailRegistries.ITEM_STACK.addProvider(ItemDetails::fill);
+        VanillaDetailRegistries.BLOCK_IN_WORLD.addProvider(BlockDetails::fill);
+    }
+
+    /**
+     * Register any objects which must be done on the main thread.
+     */
+    public static void registerMainThread() {
+        CauldronInteraction.WATER.put(ModRegistry.Items.TURTLE_NORMAL.get(), TurtleItem.CAULDRON_INTERACTION);
+        CauldronInteraction.WATER.put(ModRegistry.Items.TURTLE_ADVANCED.get(), TurtleItem.CAULDRON_INTERACTION);
     }
 
     private static void addTurtle(CreativeModeTab.Output out, TurtleItem turtle) {
         out.accept(turtle.create(-1, null, -1, null, null, 0, null));
         TurtleUpgrades.getVanillaUpgrades()
-            .map(x -> turtle.create(-1, null, -1, null, UpgradeData.ofDefault(x), 0, null))
+            .map(x -> turtle.create(-1, null, -1, null, x, 0, null))
             .forEach(out::accept);
     }
 
     private static void addPocket(CreativeModeTab.Output out, PocketComputerItem pocket) {
         out.accept(pocket.create(-1, null, -1, null));
-        PocketUpgrades.getVanillaUpgrades().map(x -> pocket.create(-1, null, -1, UpgradeData.ofDefault(x))).forEach(out::accept);
+        PocketUpgrades.getVanillaUpgrades().map(x -> pocket.create(-1, null, -1, x)).forEach(out::accept);
     }
 }

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

@@ -124,7 +124,9 @@ public final class CommandComputerCraft {
                         if (computer.isOn()) shutdown++;
                         computer.shutdown();
                     }
-                    context.getSource().sendSuccess(Component.translatable("commands.computercraft.shutdown.done", shutdown, computers.size()), false);
+
+                    var didShutdown = shutdown;
+                    context.getSource().sendSuccess(() -> Component.translatable("commands.computercraft.shutdown.done", didShutdown, computers.size()), false);
                     return shutdown;
                 }))
 
@@ -138,7 +140,9 @@ public final class CommandComputerCraft {
                         if (!computer.isOn()) on++;
                         computer.turnOn();
                     }
-                    context.getSource().sendSuccess(Component.translatable("commands.computercraft.turn_on.done", on, computers.size()), false);
+
+                    var didOn = on;
+                    context.getSource().sendSuccess(() -> Component.translatable("commands.computercraft.turn_on.done", didOn, computers.size()), false);
                     return on;
                 }))
 
@@ -213,7 +217,7 @@ public final class CommandComputerCraft {
                         getMetricsInstance(context.getSource()).start();
 
                         var stopCommand = "/computercraft track stop";
-                        context.getSource().sendSuccess(Component.translatable(
+                        context.getSource().sendSuccess(() -> Component.translatable(
                             "commands.computercraft.track.start.stop",
                             link(text(stopCommand), stopCommand, Component.translatable("commands.computercraft.track.stop.action"))
                         ), false);

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

@@ -18,6 +18,7 @@ import net.minecraft.commands.CommandBuildContext;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.synchronization.ArgumentTypeInfo;
 import net.minecraft.network.FriendlyByteBuf;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
@@ -158,14 +159,14 @@ public final class ComputersArgumentType implements ArgumentType<ComputersArgume
         }
 
         @Override
-        public ComputersArgumentType.Template unpack(ComputersArgumentType argumentType) {
+        public ComputersArgumentType.Template unpack(@NotNull ComputersArgumentType argumentType) {
             return new ComputersArgumentType.Template(this, argumentType.requireSome);
         }
     }
 
     public record Template(Info info, boolean requireSome) implements ArgumentTypeInfo.Template<ComputersArgumentType> {
         @Override
-        public ComputersArgumentType instantiate(CommandBuildContext context) {
+        public ComputersArgumentType instantiate(@NotNull CommandBuildContext context) {
             return requireSome ? SOME : MANY;
         }
 

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

@@ -17,6 +17,7 @@ import net.minecraft.commands.synchronization.ArgumentTypeInfo;
 import net.minecraft.commands.synchronization.ArgumentTypeInfos;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.chat.Component;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -143,7 +144,7 @@ public final class RepeatArgumentType<T, U> implements ArgumentType<List<T>> {
     ) implements ArgumentTypeInfo.Template<RepeatArgumentType<?, ?>> {
         @Override
         @SuppressWarnings({ "unchecked", "rawtypes" })
-        public RepeatArgumentType<?, ?> instantiate(CommandBuildContext commandBuildContext) {
+        public RepeatArgumentType<?, ?> instantiate(@NotNull CommandBuildContext commandBuildContext) {
             var child = child().instantiate(commandBuildContext);
             return flatten ? RepeatArgumentType.someFlat((ArgumentType) child, some()) : RepeatArgumentType.some(child, some());
         }

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

@@ -129,14 +129,14 @@ public final class HelpingArgumentBuilder extends LiteralArgumentBuilder<Command
 
         @Override
         public int run(CommandContext<CommandSourceStack> context) {
-            context.getSource().sendSuccess(getHelp(context, assertNonNull(node), id, command), false);
+            context.getSource().sendSuccess(() -> getHelp(context, assertNonNull(node), id, command), false);
             return 0;
         }
     }
 
     private static Command<CommandSourceStack> helpForChild(CommandNode<CommandSourceStack> node, String id, String command) {
         return context -> {
-            context.getSource().sendSuccess(getHelp(context, node, id + "." + node.getName().replace('-', '_'), command + " " + node.getName()), false);
+            context.getSource().sendSuccess(() -> getHelp(context, node, id + "." + node.getName().replace('-', '_'), command + " " + node.getName()), false);
             return 0;
         };
     }

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

@@ -37,6 +37,6 @@ public class ServerTableFormatter implements TableFormatter {
 
     @Override
     public void writeLine(String label, Component component) {
-        source.sendSuccess(component, false);
+        source.sendSuccess(() -> component, false);
     }
 }

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

@@ -32,7 +32,7 @@ import net.minecraft.world.level.block.entity.BlockEntity;
 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.level.storage.loot.LootContext;
+import net.minecraft.world.level.storage.loot.LootParams;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.Vec3;
@@ -138,13 +138,12 @@ public abstract class AbstractComputerBlock<T extends AbstractComputerBlockEntit
 
         var tile = world.getBlockEntity(pos);
         if (tile instanceof AbstractComputerBlockEntity computer) {
-            var context = new LootContext.Builder(serverWorld)
-                .withRandom(world.random)
+            var context = new LootParams.Builder(serverWorld)
                 .withParameter(LootContextParams.ORIGIN, Vec3.atCenterOf(pos))
                 .withParameter(LootContextParams.TOOL, player.getMainHandItem())
                 .withParameter(LootContextParams.THIS_ENTITY, player)
                 .withParameter(LootContextParams.BLOCK_ENTITY, tile)
-                .withDynamicDrop(DROP, (ctx, out) -> out.accept(getItem(computer)));
+                .withDynamicDrop(DROP, out -> out.accept(getItem(computer)));
             for (var item : state.getDrops(context)) {
                 popResource(world, pos, item);
             }

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

@@ -9,16 +9,13 @@ import dan200.computercraft.api.ComputerCraftAPI;
 import dan200.computercraft.api.filesystem.Mount;
 import dan200.computercraft.api.network.PacketNetwork;
 import dan200.computercraft.core.ComputerContext;
+import dan200.computercraft.core.computer.ComputerThread;
 import dan200.computercraft.core.computer.GlobalEnvironment;
 import dan200.computercraft.core.computer.mainthread.MainThread;
 import dan200.computercraft.core.computer.mainthread.MainThreadConfig;
 import dan200.computercraft.core.lua.CobaltLuaMachine;
 import dan200.computercraft.core.lua.ILuaMachine;
-import dan200.computercraft.core.methods.MethodSupplier;
-import dan200.computercraft.core.methods.PeripheralMethod;
 import dan200.computercraft.impl.AbstractComputerCraftAPI;
-import dan200.computercraft.impl.ApiFactories;
-import dan200.computercraft.impl.GenericSources;
 import dan200.computercraft.shared.CommonHooks;
 import dan200.computercraft.shared.computer.metrics.GlobalMetrics;
 import dan200.computercraft.shared.config.ConfigSpec;
@@ -70,13 +67,11 @@ public final class ServerContext {
         this.server = server;
         storageDir = server.getWorldPath(FOLDER);
         mainThread = new MainThread(mainThreadConfig);
-        context = ComputerContext.builder(new Environment(server))
-            .computerThreads(ConfigSpec.computerThreads.get())
-            .mainThreadScheduler(mainThread)
-            .luaFactory(luaMachine)
-            .apiFactories(ApiFactories.getAll())
-            .genericMethods(GenericSources.getAllMethods())
-            .build();
+        context = new ComputerContext(
+            new Environment(server),
+            new ComputerThread(ConfigSpec.computerThreads.get()),
+            mainThread, luaMachine
+        );
         idAssigner = new IDAssigner(storageDir.resolve("ids.json"));
     }
 
@@ -138,16 +133,6 @@ public final class ServerContext {
         return context;
     }
 
-    /**
-     * Get the {@link MethodSupplier} used to find methods on peripherals.
-     *
-     * @return The {@link PeripheralMethod} method supplier.
-     * @see ComputerContext#peripheralMethods()
-     */
-    public MethodSupplier<PeripheralMethod> peripheralMethods() {
-        return context.peripheralMethods();
-    }
-
     /**
      * Tick all components of this server context. This should <em>NOT</em> be called outside of {@link CommonHooks}.
      */

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

@@ -7,7 +7,7 @@ package dan200.computercraft.shared.computer.upload;
 import dan200.computercraft.api.lua.LuaFunction;
 import dan200.computercraft.core.apis.handles.BinaryReadableHandle;
 import dan200.computercraft.core.apis.handles.ByteBufferChannel;
-import dan200.computercraft.core.methods.ObjectSource;
+import dan200.computercraft.core.asm.ObjectSource;
 
 import java.nio.ByteBuffer;
 import java.util.Collections;

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

@@ -4,19 +4,21 @@
 
 package dan200.computercraft.shared.config;
 
-import com.electronwill.nightconfig.core.CommentedConfig;
 import com.electronwill.nightconfig.core.Config;
 import com.electronwill.nightconfig.core.InMemoryCommentedFormat;
 import com.electronwill.nightconfig.core.UnmodifiableConfig;
 import dan200.computercraft.core.apis.http.options.Action;
 import dan200.computercraft.core.apis.http.options.AddressRule;
-import dan200.computercraft.core.apis.http.options.InvalidRuleException;
 import dan200.computercraft.core.apis.http.options.PartialOptions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.*;
-import java.util.function.Consumer;
+import javax.annotation.Nullable;
+import java.util.Locale;
+import java.util.Optional;
+import java.util.OptionalInt;
+import java.util.OptionalLong;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * Parses, checks and generates {@link Config}s for {@link AddressRule}.
@@ -24,65 +26,49 @@ import java.util.function.Consumer;
 class AddressRuleConfig {
     private static final Logger LOG = LoggerFactory.getLogger(AddressRuleConfig.class);
 
-    private static final AddressRule REJECT_ALL = AddressRule.parse("*", OptionalInt.empty(), Action.DENY.toPartial());
+    public static UnmodifiableConfig makeRule(String host, Action action) {
+        var config = InMemoryCommentedFormat.defaultInstance().createConfig(ConcurrentHashMap::new);
+        config.add("host", host);
+        config.add("action", action.name().toLowerCase(Locale.ROOT));
 
-    public static List<UnmodifiableConfig> defaultRules() {
-        return List.of(
-            makeRule(config -> {
-                config.setComment("host", """
-                    The magic "$private" host matches all private address ranges, such as localhost and 192.168.0.0/16.
-                    This rule prevents computers accessing internal services, and is strongly recommended.""");
-                config.add("host", "$private");
+        if (host.equals("*") && action == Action.ALLOW) {
+            config.setComment("max_download", """
+                The maximum size (in bytes) that a computer can download in a single request.
+                Note that responses may receive more data than allowed, but this data will not
+                be returned to the client.""");
+            config.set("max_download", AddressRule.MAX_DOWNLOAD);
 
-                config.setComment("action", "Deny all requests to private IP addresses.");
-                config.add("action", Action.DENY.name().toLowerCase(Locale.ROOT));
-            }),
-            makeRule(config -> {
-                config.setComment("host", """
-                    The wildcard "*" rule matches all remaining hosts.""");
-                config.add("host", "*");
+            config.setComment("max_upload", """
+                The maximum size (in bytes) that a computer can upload in a single request. This
+                includes headers and POST text.""");
+            config.set("max_upload", AddressRule.MAX_UPLOAD);
 
-                config.setComment("action", "Allow all non-denied hosts.");
-                config.add("action", Action.ALLOW.name().toLowerCase(Locale.ROOT));
+            config.setComment("max_websocket_message", "The maximum size (in bytes) that a computer can send or receive in one websocket packet.");
+            config.set("max_websocket_message", AddressRule.WEBSOCKET_MESSAGE);
 
-                config.setComment("max_download", """
-                    The maximum size (in bytes) that a computer can download in a single request.
-                    Note that responses may receive more data than allowed, but this data will not
-                    be returned to the client.""");
-                config.set("max_download", AddressRule.MAX_DOWNLOAD);
+            config.setComment("use_proxy", "Enable use of the HTTP/SOCKS proxy if it is configured.");
+            config.set("use_proxy", false);
+        }
 
-                config.setComment("max_upload", """
-                    The maximum size (in bytes) that a computer can upload in a single request. This
-                    includes headers and POST text.""");
-                config.set("max_upload", AddressRule.MAX_UPLOAD);
-
-                config.setComment("max_websocket_message", "The maximum size (in bytes) that a computer can send or receive in one websocket packet.");
-                config.set("max_websocket_message", AddressRule.WEBSOCKET_MESSAGE);
-
-                config.setComment("use_proxy", "Enable use of the HTTP/SOCKS proxy if it is configured.");
-                config.set("use_proxy", false);
-            })
-        );
-    }
-
-    private static UnmodifiableConfig makeRule(Consumer<CommentedConfig> setup) {
-        var config = InMemoryCommentedFormat.defaultInstance().createConfig(LinkedHashMap::new);
-        setup.accept(config);
         return config;
     }
 
-    public static AddressRule parseRule(UnmodifiableConfig builder) {
-        try {
-            return doParseRule(builder);
-        } catch (InvalidRuleException e) {
-            LOG.error("Malformed HTTP rule: {} HTTP will NOT work until this is fixed.", e.getMessage());
-            return REJECT_ALL;
-        }
+    public static boolean checkRule(UnmodifiableConfig builder) {
+        var hostObj = get(builder, "host", String.class).orElse(null);
+        var port = unboxOptInt(get(builder, "port", Number.class));
+        return hostObj != null && checkEnum(builder, "action", Action.class)
+            && check(builder, "port", Number.class)
+            && check(builder, "max_upload", Number.class)
+            && check(builder, "max_download", Number.class)
+            && check(builder, "websocket_message", Number.class)
+            && check(builder, "use_proxy", Boolean.class)
+            && AddressRule.parse(hostObj, port, PartialOptions.DEFAULT) != null;
     }
 
-    public static AddressRule doParseRule(UnmodifiableConfig builder) {
+    @Nullable
+    public static AddressRule parseRule(UnmodifiableConfig builder) {
         var hostObj = get(builder, "host", String.class).orElse(null);
-        if (hostObj == null) throw new InvalidRuleException("No 'host' specified");
+        if (hostObj == null) return null;
 
         var action = getEnum(builder, "action", Action.class).orElse(null);
         var port = unboxOptInt(get(builder, "port", Number.class));
@@ -102,19 +88,38 @@ class AddressRuleConfig {
         return AddressRule.parse(hostObj, port, options);
     }
 
+    private static <T> boolean check(UnmodifiableConfig config, String field, Class<T> klass) {
+        var value = config.get(field);
+        if (value == null || klass.isInstance(value)) return true;
+
+        LOG.warn("HTTP rule's {} is not a {}.", field, klass.getSimpleName());
+        return false;
+    }
+
+    private static <T extends Enum<T>> boolean checkEnum(UnmodifiableConfig config, String field, Class<T> klass) {
+        var value = config.get(field);
+        if (value == null) return true;
+
+        if (!(value instanceof String)) {
+            LOG.warn("HTTP rule's {} is not a string", field);
+            return false;
+        }
+
+        if (parseEnum(klass, (String) value) == null) {
+            LOG.warn("HTTP rule's {} is not a known option", field);
+            return false;
+        }
+
+        return true;
+    }
+
     private static <T> Optional<T> get(UnmodifiableConfig config, String field, Class<T> klass) {
         var value = config.get(field);
-        if (value == null) return Optional.empty();
-        if (klass.isInstance(value)) return Optional.of(klass.cast(value));
-
-        throw new InvalidRuleException(String.format(
-            "Field '%s' should be a '%s' but is a %s.",
-            field, klass.getSimpleName(), value.getClass().getSimpleName()
-        ));
+        return klass.isInstance(value) ? Optional.of(klass.cast(value)) : Optional.empty();
     }
 
     private static <T extends Enum<T>> Optional<T> getEnum(UnmodifiableConfig config, String field, Class<T> klass) {
-        return get(config, field, String.class).map(x -> parseEnum(field, klass, x));
+        return get(config, field, String.class).map(x -> parseEnum(klass, x));
     }
 
     private static OptionalLong unboxOptLong(Optional<? extends Number> value) {
@@ -125,14 +130,11 @@ class AddressRuleConfig {
         return value.map(Number::intValue).map(OptionalInt::of).orElse(OptionalInt.empty());
     }
 
-    private static <T extends Enum<T>> T parseEnum(String field, Class<T> klass, String x) {
+    @Nullable
+    private static <T extends Enum<T>> T parseEnum(Class<T> klass, String x) {
         for (var value : klass.getEnumConstants()) {
             if (value.name().equalsIgnoreCase(x)) return value;
         }
-
-        throw new InvalidRuleException(String.format(
-            "Field '%s' should be one of %s, but is '%s'.",
-            field, Arrays.stream(klass.getEnumConstants()).map(Enum::name).toList(), x
-        ));
+        return null;
     }
 }

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

@@ -9,6 +9,7 @@ import dan200.computercraft.api.ComputerCraftAPI;
 import dan200.computercraft.core.CoreConfig;
 import dan200.computercraft.core.Logging;
 import dan200.computercraft.core.apis.http.NetworkUtils;
+import dan200.computercraft.core.apis.http.options.Action;
 import dan200.computercraft.core.apis.http.options.ProxyType;
 import dan200.computercraft.core.computer.mainthread.MainThreadConfig;
 import dan200.computercraft.shared.peripheral.monitor.MonitorRenderer;
@@ -19,7 +20,9 @@ import org.apache.logging.log4j.core.filter.MarkerFilter;
 
 import javax.annotation.Nullable;
 import java.nio.file.Path;
+import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
 public final class ConfigSpec {
@@ -179,9 +182,9 @@ public final class ConfigSpec {
 
             httpEnabled = builder
                 .comment("""
-                    Enable the "http" API on Computers. Disabling this also disables the "pastebin" and
-                    "wget" programs, that many users rely on. It's recommended to leave this on and use
-                    the "rules" config option to impose more fine-grained control.""")
+                    Enable the "http" API on Computers. This also disables the "pastebin" and "wget"
+                    programs, that many users rely on. It's recommended to leave this on and use the
+                    "rules" config option to impose more fine-grained control.""")
                 .define("enabled", CoreConfig.httpEnabled);
 
             httpWebsocketEnabled = builder
@@ -191,23 +194,16 @@ public final class ConfigSpec {
             httpRules = builder
                 .comment("""
                     A list of rules which control behaviour of the "http" API for specific domains or
-                    IPs. Each rule matches against a hostname and an optional port, and then sets several
-                    properties for the request.  Rules are evaluated in order, meaning earlier rules override
-                    later ones.
-
-                    Valid properties:
-                     - "host" (required): The domain or IP address this rule matches. This may be a domain name
-                       ("pastebin.com"), wildcard ("*.pastebin.com") or CIDR notation ("127.0.0.0/8").
-                     - "port" (optional): Only match requests for a specific port, such as 80 or 443.
-
-                     - "action" (optional): Whether to allow or deny this request.
-                     - "max_download" (optional): The maximum size (in bytes) that a computer can download in this
-                       request.
-                     - "max_upload" (optional): The maximum size (in bytes) that a computer can upload in a this request.
-                     - "max_websocket_message" (optional): The maximum size (in bytes) that a computer can send or
-                       receive in one websocket packet.
-                     - "use_proxy" (optional): Enable use of the HTTP/SOCKS proxy if it is configured.""")
-                .defineList("rules", AddressRuleConfig.defaultRules(), x -> x instanceof UnmodifiableConfig);
+                    IPs. Each rule is an item with a 'host' to match against, and a series of
+                    properties. Rules are evaluated in order, meaning earlier rules override later
+                    ones.
+                    The host may be a domain name ("pastebin.com"), wildcard ("*.pastebin.com") or
+                    CIDR notation ("127.0.0.0/8").
+                    If no rules, the domain is blocked.""")
+                .defineList("rules", Arrays.asList(
+                    AddressRuleConfig.makeRule("$private", Action.DENY),
+                    AddressRuleConfig.makeRule("*", Action.ALLOW)
+                ), x -> x instanceof UnmodifiableConfig && AddressRuleConfig.checkRule((UnmodifiableConfig) x));
 
             httpMaxRequests = builder
                 .comment("""
@@ -399,8 +395,8 @@ public final class ConfigSpec {
         // HTTP
         CoreConfig.httpEnabled = httpEnabled.get();
         CoreConfig.httpWebsocketEnabled = httpWebsocketEnabled.get();
-
-        CoreConfig.httpRules = httpRules.get().stream().map(AddressRuleConfig::parseRule).toList();
+        CoreConfig.httpRules = httpRules.get().stream()
+            .map(AddressRuleConfig::parseRule).filter(Objects::nonNull).toList();
 
         CoreConfig.httpMaxRequests = httpMaxRequests.get();
         CoreConfig.httpMaxWebsockets = httpMaxWebsockets.get();

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

@@ -7,6 +7,7 @@ package dan200.computercraft.shared.container;
 import net.minecraft.core.NonNullList;
 import net.minecraft.world.Container;
 import net.minecraft.world.ContainerHelper;
+import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 
 /**
@@ -15,6 +16,24 @@ import net.minecraft.world.item.ItemStack;
 public interface BasicContainer extends Container {
     NonNullList<ItemStack> getContents();
 
+    @Override
+    default int getMaxStackSize() {
+        return 64;
+    }
+
+    @Override
+    default void startOpen(Player player) {
+    }
+
+    @Override
+    default void stopOpen(Player player) {
+    }
+
+    @Override
+    default boolean canPlaceItem(int slot, ItemStack stack) {
+        return true;
+    }
+
     @Override
     default int getContainerSize() {
         return getContents().size();

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

@@ -5,7 +5,6 @@
 package dan200.computercraft.shared.integration;
 
 import dan200.computercraft.api.ComputerCraftAPI;
-import dan200.computercraft.api.upgrades.UpgradeData;
 import dan200.computercraft.impl.PocketUpgrades;
 import dan200.computercraft.impl.TurtleUpgrades;
 import dan200.computercraft.shared.ModRegistry;
@@ -57,14 +56,14 @@ public final class RecipeModHelpers {
         for (var turtleSupplier : TURTLES) {
             var turtle = turtleSupplier.get();
             for (var upgrade : TurtleUpgrades.instance().getUpgrades()) {
-                upgradeItems.add(turtle.create(-1, null, -1, null, UpgradeData.ofDefault(upgrade), 0, null));
+                upgradeItems.add(turtle.create(-1, null, -1, null, upgrade, 0, null));
             }
         }
 
         for (var pocketSupplier : POCKET_COMPUTERS) {
             var pocket = pocketSupplier.get();
             for (var upgrade : PocketUpgrades.instance().getUpgrades()) {
-                upgradeItems.add(pocket.create(-1, null, -1, UpgradeData.ofDefault(upgrade)));
+                upgradeItems.add(pocket.create(-1, null, -1, upgrade));
             }
         }
 

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

@@ -9,7 +9,6 @@ import dan200.computercraft.api.pocket.IPocketUpgrade;
 import dan200.computercraft.api.turtle.ITurtleUpgrade;
 import dan200.computercraft.api.turtle.TurtleSide;
 import dan200.computercraft.api.upgrades.UpgradeBase;
-import dan200.computercraft.api.upgrades.UpgradeData;
 import dan200.computercraft.impl.PocketUpgrades;
 import dan200.computercraft.impl.TurtleUpgrades;
 import dan200.computercraft.shared.pocket.items.PocketComputerItem;
@@ -112,22 +111,20 @@ public class UpgradeRecipeGenerator<T> {
 
         if (stack.getItem() instanceof TurtleItem item) {
             // Suggest possible upgrades which can be applied to this turtle
-            var left = item.getUpgradeWithData(stack, TurtleSide.LEFT);
-            var right = item.getUpgradeWithData(stack, TurtleSide.RIGHT);
+            var left = item.getUpgrade(stack, TurtleSide.LEFT);
+            var right = item.getUpgrade(stack, TurtleSide.RIGHT);
             if (left != null && right != null) return Collections.emptyList();
 
             List<T> recipes = new ArrayList<>();
             var ingredient = Ingredient.of(stack);
             for (var upgrade : turtleUpgrades) {
-                if (upgrade.turtle == null) throw new NullPointerException();
-
                 // The turtle is facing towards us, so upgrades on the left are actually crafted on the right.
                 if (left == null) {
-                    recipes.add(turtle(ingredient, upgrade.ingredient, turtleWith(stack, UpgradeData.ofDefault(upgrade.turtle), right)));
+                    recipes.add(turtle(ingredient, upgrade.ingredient, turtleWith(stack, upgrade.turtle, right)));
                 }
 
                 if (right == null) {
-                    recipes.add(turtle(upgrade.ingredient, ingredient, turtleWith(stack, left, UpgradeData.ofDefault(upgrade.turtle))));
+                    recipes.add(turtle(upgrade.ingredient, ingredient, turtleWith(stack, left, upgrade.turtle)));
                 }
             }
 
@@ -140,8 +137,7 @@ public class UpgradeRecipeGenerator<T> {
             List<T> recipes = new ArrayList<>();
             var ingredient = Ingredient.of(stack);
             for (var upgrade : pocketUpgrades) {
-                if (upgrade.pocket == null) throw new NullPointerException();
-                recipes.add(pocket(upgrade.ingredient, ingredient, pocketWith(stack, UpgradeData.ofDefault(upgrade.pocket))));
+                recipes.add(pocket(upgrade.ingredient, ingredient, pocketWith(stack, upgrade.pocket)));
             }
 
             return Collections.unmodifiableList(recipes);
@@ -184,21 +180,21 @@ public class UpgradeRecipeGenerator<T> {
         if (stack.getItem() instanceof TurtleItem item) {
             List<T> recipes = new ArrayList<>(0);
 
-            var left = item.getUpgradeWithData(stack, TurtleSide.LEFT);
-            var right = item.getUpgradeWithData(stack, TurtleSide.RIGHT);
+            var left = item.getUpgrade(stack, TurtleSide.LEFT);
+            var right = item.getUpgrade(stack, TurtleSide.RIGHT);
 
             // The turtle is facing towards us, so upgrades on the left are actually crafted on the right.
             if (left != null) {
                 recipes.add(turtle(
                     Ingredient.of(turtleWith(stack, null, right)),
-                    Ingredient.of(left.getUpgradeItem()),
+                    Ingredient.of(left.getCraftingItem()),
                     stack
                 ));
             }
 
             if (right != null) {
                 recipes.add(turtle(
-                    Ingredient.of(right.getUpgradeItem()),
+                    Ingredient.of(right.getCraftingItem()),
                     Ingredient.of(turtleWith(stack, left, null)),
                     stack
                 ));
@@ -208,9 +204,9 @@ public class UpgradeRecipeGenerator<T> {
         } else if (stack.getItem() instanceof PocketComputerItem) {
             List<T> recipes = new ArrayList<>(0);
 
-            var back = PocketComputerItem.getUpgradeWithData(stack);
+            var back = PocketComputerItem.getUpgrade(stack);
             if (back != null) {
-                recipes.add(pocket(Ingredient.of(back.getUpgradeItem()), Ingredient.of(pocketWith(stack, null)), stack));
+                recipes.add(pocket(Ingredient.of(back.getCraftingItem()), Ingredient.of(pocketWith(stack, null)), stack));
             }
 
             return Collections.unmodifiableList(recipes);
@@ -219,7 +215,7 @@ public class UpgradeRecipeGenerator<T> {
         }
     }
 
-    private static ItemStack turtleWith(ItemStack stack, @Nullable UpgradeData<ITurtleUpgrade> left, @Nullable UpgradeData<ITurtleUpgrade> right) {
+    private static ItemStack turtleWith(ItemStack stack, @Nullable ITurtleUpgrade left, @Nullable ITurtleUpgrade right) {
         var item = (TurtleItem) stack.getItem();
         return item.create(
             item.getComputerID(stack), item.getLabel(stack), item.getColour(stack),
@@ -227,7 +223,7 @@ public class UpgradeRecipeGenerator<T> {
         );
     }
 
-    private static ItemStack pocketWith(ItemStack stack, @Nullable UpgradeData<IPocketUpgrade> back) {
+    private static ItemStack pocketWith(ItemStack stack, @Nullable IPocketUpgrade back) {
         var item = (PocketComputerItem) stack.getItem();
         return item.create(
             item.getComputerID(stack), item.getLabel(stack), item.getColour(stack), back
@@ -276,7 +272,7 @@ public class UpgradeRecipeGenerator<T> {
                     recipes.add(turtle(
                         ingredient, // Right upgrade, recipe on left
                         Ingredient.of(turtleItem.create(-1, null, -1, null, null, 0, null)),
-                        turtleItem.create(-1, null, -1, null, UpgradeData.ofDefault(turtle), 0, null)
+                        turtleItem.create(-1, null, -1, null, turtle, 0, null)
                     ));
                 }
             }
@@ -287,7 +283,7 @@ public class UpgradeRecipeGenerator<T> {
                     recipes.add(pocket(
                         ingredient,
                         Ingredient.of(pocketItem.create(-1, null, -1, null)),
-                        pocketItem.create(-1, null, -1, UpgradeData.ofDefault(pocket))
+                        pocketItem.create(-1, null, -1, pocket)
                     ));
                 }
             }

projects/common/src/main/java/dan200/computercraft/shared/peripheral/generic/GenericPeripheral.java

@@ -12,23 +12,19 @@ import dan200.computercraft.api.peripheral.IComputerAccess;
 import dan200.computercraft.api.peripheral.IDynamicPeripheral;
 import dan200.computercraft.api.peripheral.IPeripheral;
 import dan200.computercraft.shared.platform.RegistryWrappers;
-import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.entity.BlockEntity;
 
 import javax.annotation.Nullable;
 import java.util.List;
 import java.util.Set;
 
-public final class GenericPeripheral implements IDynamicPeripheral {
-    private final BlockEntity tile;
-    private final Direction side;
-
+class GenericPeripheral implements IDynamicPeripheral {
     private final String type;
     private final Set<String> additionalTypes;
+    private final BlockEntity tile;
     private final List<SaturatedMethod> methods;
 
-    GenericPeripheral(BlockEntity tile, Direction side, @Nullable String name, Set<String> additionalTypes, List<SaturatedMethod> methods) {
-        this.side = side;
+    GenericPeripheral(BlockEntity tile, @Nullable String name, Set<String> additionalTypes, List<SaturatedMethod> methods) {
         var type = RegistryWrappers.BLOCK_ENTITY_TYPES.getKey(tile.getType());
         this.tile = tile;
         this.type = name != null ? name : type.toString();
@@ -36,10 +32,6 @@ public final class GenericPeripheral implements IDynamicPeripheral {
         this.methods = methods;
     }
 
-    public Direction side() {
-        return side;
-    }
-
     @Override
     public String[] getMethodNames() {
         var names = new String[methods.size()];
@@ -62,6 +54,7 @@ public final class GenericPeripheral implements IDynamicPeripheral {
         return additionalTypes;
     }
 
+    @Nullable
     @Override
     public Object getTarget() {
         return tile;

projects/common/src/main/java/dan200/computercraft/shared/peripheral/generic/GenericPeripheralBuilder.java

@@ -1,63 +0,0 @@
-// SPDX-FileCopyrightText: 2020 The CC: Tweaked Developers
-//
-// SPDX-License-Identifier: MPL-2.0
-
-package dan200.computercraft.shared.peripheral.generic;
-
-import dan200.computercraft.api.peripheral.IPeripheral;
-import dan200.computercraft.api.peripheral.PeripheralType;
-import dan200.computercraft.core.methods.MethodSupplier;
-import dan200.computercraft.core.methods.NamedMethod;
-import dan200.computercraft.core.methods.PeripheralMethod;
-import dan200.computercraft.shared.computer.core.ServerContext;
-import net.minecraft.core.Direction;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.world.level.block.entity.BlockEntity;
-
-import javax.annotation.Nullable;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * A builder for a {@link GenericPeripheral}.
- * <p>
- * This handles building a list of {@linkplain SaturatedMethod methods} and computing the appropriate
- * {@link PeripheralType} from the {@linkplain NamedMethod#genericType() methods' peripheral types}.
- * <p>
- * See the platform-specific peripheral providers for the usage of this.
- */
-final class GenericPeripheralBuilder {
-    private final MethodSupplier<PeripheralMethod> peripheralMethods;
-
-    private @Nullable String name;
-    private final Set<String> additionalTypes = new HashSet<>(0);
-    private final ArrayList<SaturatedMethod> methods = new ArrayList<>();
-
-    GenericPeripheralBuilder(MinecraftServer server) {
-        peripheralMethods = ServerContext.get(server).peripheralMethods();
-    }
-
-    @Nullable
-    IPeripheral toPeripheral(BlockEntity blockEntity, Direction side) {
-        if (methods.isEmpty()) return null;
-
-        methods.trimToSize();
-        return new GenericPeripheral(blockEntity, side, name, additionalTypes, methods);
-    }
-
-    boolean addMethods(Object target) {
-        return peripheralMethods.forEachSelfMethod(target, (name, method, info) -> {
-            methods.add(new SaturatedMethod(target, name, method));
-
-            // If we have a peripheral type, use it. Always pick the smallest one, so it's consistent (assuming mods
-            // don't change).
-            var type = info == null ? null : info.genericType();
-            if (type != null && type.getPrimaryType() != null) {
-                var primaryType = type.getPrimaryType();
-                if (this.name == null || this.name.compareTo(primaryType) > 0) this.name = primaryType;
-            }
-            if (type != null) additionalTypes.addAll(type.getAdditionalTypes());
-        });
-    }
-}

projects/common/src/main/java/dan200/computercraft/shared/peripheral/generic/SaturatedMethod.java

@@ -9,20 +9,18 @@ import dan200.computercraft.api.lua.ILuaContext;
 import dan200.computercraft.api.lua.LuaException;
 import dan200.computercraft.api.lua.MethodResult;
 import dan200.computercraft.api.peripheral.IComputerAccess;
-import dan200.computercraft.core.methods.PeripheralMethod;
+import dan200.computercraft.core.asm.NamedMethod;
+import dan200.computercraft.core.asm.PeripheralMethod;
 
-/**
- * A {@link PeripheralMethod} along with the method's target.
- */
 final class SaturatedMethod {
     private final Object target;
     private final String name;
     private final PeripheralMethod method;
 
-    SaturatedMethod(Object target, String name, PeripheralMethod method) {
+    SaturatedMethod(Object target, NamedMethod<PeripheralMethod> method) {
         this.target = target;
-        this.name = name;
-        this.method = method;
+        name = method.getName();
+        this.method = method.getMethod();
     }
 
     MethodResult apply(ILuaContext context, IComputerAccess computer, IArguments args) throws LuaException {

projects/common/src/main/java/dan200/computercraft/shared/peripheral/modem/ModemState.java

@@ -11,7 +11,7 @@ import it.unimi.dsi.fastutil.ints.IntSet;
 import javax.annotation.Nullable;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-public final class ModemState {
+public class ModemState {
     private final @Nullable Runnable onChanged;
     private final AtomicBoolean changed = new AtomicBoolean(true);
 
@@ -69,30 +69,4 @@ public final class ModemState {
             setOpen(false);
         }
     }
-
-    /**
-     * Copy this modem state, returning a new instance. The new instance will have the same set of open channels but no
-     * on-change listener.
-     *
-     * @return The new modem state.
-     */
-    public ModemState copy() {
-        return copy(null);
-    }
-
-    /**
-     * Copy this modem state, returning a new instance. The new instance will have the same set of open channels and a
-     * different on-change listener.
-     *
-     * @param onChanged The on-change listener.
-     * @return The new modem state.
-     */
-    public ModemState copy(@Nullable Runnable onChanged) {
-        synchronized (channels) {
-            var clone = onChanged == null ? new ModemState() : new ModemState(onChanged);
-            clone.channels.addAll(channels);
-            clone.open = open;
-            return clone;
-        }
-    }
 }

projects/common/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/WiredModemPeripheral.java

@@ -16,12 +16,10 @@ import dan200.computercraft.api.peripheral.IPeripheral;
 import dan200.computercraft.api.peripheral.NotAttachedException;
 import dan200.computercraft.api.peripheral.WorkMonitor;
 import dan200.computercraft.core.apis.PeripheralAPI;
-import dan200.computercraft.core.methods.PeripheralMethod;
+import dan200.computercraft.core.asm.PeripheralMethod;
 import dan200.computercraft.core.util.LuaUtil;
-import dan200.computercraft.shared.computer.core.ServerContext;
 import dan200.computercraft.shared.peripheral.modem.ModemPeripheral;
 import dan200.computercraft.shared.peripheral.modem.ModemState;
-import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.Level;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -286,8 +284,7 @@ public abstract class WiredModemPeripheral extends ModemPeripheral implements Wi
 
     private void attachPeripheralImpl(IComputerAccess computer, ConcurrentMap<String, RemotePeripheralWrapper> peripherals, String periphName, IPeripheral peripheral) {
         if (!peripherals.containsKey(periphName) && !periphName.equals(getLocalPeripheral().getConnectedName())) {
-            var methods = ServerContext.get(((ServerLevel) getLevel()).getServer()).peripheralMethods().getSelfMethods(peripheral);
-            var wrapper = new RemotePeripheralWrapper(modem, peripheral, computer, periphName, methods);
+            var wrapper = new RemotePeripheralWrapper(modem, peripheral, computer, periphName);
             peripherals.put(periphName, wrapper);
             wrapper.attach();
         }
@@ -317,7 +314,7 @@ public abstract class WiredModemPeripheral extends ModemPeripheral implements Wi
         private volatile boolean attached;
         private final Set<String> mounts = new HashSet<>();
 
-        RemotePeripheralWrapper(WiredModemElement element, IPeripheral peripheral, IComputerAccess computer, String name, Map<String, PeripheralMethod> methods) {
+        RemotePeripheralWrapper(WiredModemElement element, IPeripheral peripheral, IComputerAccess computer, String name) {
             this.element = element;
             this.peripheral = peripheral;
             this.computer = computer;
@@ -325,7 +322,7 @@ public abstract class WiredModemPeripheral extends ModemPeripheral implements Wi
 
             type = Objects.requireNonNull(peripheral.getType(), "Peripheral type cannot be null");
             additionalTypes = peripheral.getAdditionalTypes();
-            methodMap = methods;
+            methodMap = PeripheralAPI.getMethods(peripheral);
         }
 
         public void attach() {

projects/common/src/main/java/dan200/computercraft/shared/peripheral/modem/wireless/WirelessModemBlockEntity.java

@@ -18,7 +18,7 @@ import net.minecraft.world.phys.Vec3;
 
 import javax.annotation.Nullable;
 
-public final class WirelessModemBlockEntity extends BlockEntity {
+public class WirelessModemBlockEntity extends BlockEntity {
     private static class Peripheral extends WirelessModemPeripheral {
         private final WirelessModemBlockEntity entity;
 
@@ -96,10 +96,6 @@ public final class WirelessModemBlockEntity extends BlockEntity {
         }
     }
 
-    public ModemState getModemState() {
-        return modem.getModemState();
-    }
-
     @Nullable
     public IPeripheral getPeripheral(@Nullable Direction direction) {
         return direction == null || getDirection() == direction ? modem : null;

projects/common/src/main/java/dan200/computercraft/shared/peripheral/speaker/SpeakerPeripheral.java

@@ -190,7 +190,7 @@ public abstract class SpeakerPeripheral implements IPeripheral {
      * The speaker supports [all of Minecraft's noteblock instruments](https://minecraft.fandom.com/wiki/Note_Block#Instruments).
      * These are:
      * <p>
-     * {@code "harp"}, {@code "basedrum"}, {@code "snare"}, {@code "hat"}, {@code "bass"}, {@code "flute"},
+     * {@code "harp"}, {@code "basedrum"}, {@code "snare"}, {@code "hat"}, {@code "bass"}, @code "flute"},
      * {@code "bell"}, {@code "guitar"}, {@code "chime"}, {@code "xylophone"}, {@code "iron_xylophone"},
      * {@code "cow_bell"}, {@code "didgeridoo"}, {@code "bit"}, {@code "banjo"} and {@code "pling"}.
      *

projects/common/src/main/java/dan200/computercraft/shared/peripheral/speaker/SpeakerPosition.java

@@ -19,7 +19,7 @@ public record SpeakerPosition(@Nullable Level level, Vec3 position, @Nullable En
     }
 
     public static SpeakerPosition of(Entity entity) {
-        return new SpeakerPosition(entity.level, entity.getEyePosition(1), entity);
+        return new SpeakerPosition(entity.level(), entity.getEyePosition(1), entity);
     }
 
     public boolean withinDistance(SpeakerPosition other, double distanceSq) {

projects/common/src/main/java/dan200/computercraft/shared/platform/FakePlayerConstants.java

@@ -1,31 +0,0 @@
-// SPDX-FileCopyrightText: 2023 The CC: Tweaked Developers
-//
-// SPDX-License-Identifier: MPL-2.0
-
-package dan200.computercraft.shared.platform;
-
-import com.mojang.authlib.GameProfile;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.item.ItemStack;
-
-/**
- * Shared constants for {@linkplain PlatformHelper#createFakePlayer(ServerLevel, GameProfile) fake player}
- * implementations.
- *
- * @see net.minecraft.server.level.ServerPlayer
- * @see net.minecraft.world.entity.player.Player
- */
-final class FakePlayerConstants {
-    private FakePlayerConstants() {
-    }
-
-    /**
-     * The maximum distance this player can reach.
-     * <p>
-     * This is used in the override of {@link net.minecraft.world.entity.player.Player#mayUseItemAt(BlockPos, Direction, ItemStack)},
-     * to prevent the fake player reaching more than 2 blocks away.
-     */
-    static final double MAX_REACH = 2;
-}

projects/common/src/main/java/dan200/computercraft/shared/platform/PlatformHelper.java

@@ -33,6 +33,7 @@ import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.inventory.CraftingContainer;
 import net.minecraft.world.inventory.MenuType;
+import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.item.DyeColor;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
@@ -68,13 +69,6 @@ public interface PlatformHelper extends dan200.computercraft.impl.PlatformHelper
         return (PlatformHelper) dan200.computercraft.impl.PlatformHelper.get();
     }
 
-    /**
-     * Check if we're running in a development environment.
-     *
-     * @return If we're running in a development environment.
-     */
-    boolean isDevelopmentEnvironment();
-
     /**
      * Create a new config builder.
      *
@@ -279,6 +273,13 @@ public interface PlatformHelper extends dan200.computercraft.impl.PlatformHelper
      */
     int getBurnTime(ItemStack stack);
 
+    /**
+     * Create a builder for a new creative tab.
+     *
+     * @return The creative tab builder.
+     */
+    CreativeModeTab.Builder newCreativeModeTab();
+
     /**
      * Get the "container" item to be returned after crafting. For instance, crafting with a lava bucket should return
      * an empty bucket.

projects/common/src/main/java/dan200/computercraft/shared/pocket/apis/PocketAPI.java

@@ -7,7 +7,6 @@ package dan200.computercraft.shared.pocket.apis;
 import dan200.computercraft.api.lua.ILuaAPI;
 import dan200.computercraft.api.lua.LuaFunction;
 import dan200.computercraft.api.pocket.IPocketUpgrade;
-import dan200.computercraft.api.upgrades.UpgradeData;
 import dan200.computercraft.impl.PocketUpgrades;
 import dan200.computercraft.shared.pocket.core.PocketServerComputer;
 import net.minecraft.core.NonNullList;
@@ -15,7 +14,6 @@ import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 
 import javax.annotation.Nullable;
-import java.util.Objects;
 
 /**
  * Control the current pocket computer, adding or removing upgrades.
@@ -70,7 +68,7 @@ public class PocketAPI implements ILuaAPI {
         if (newUpgrade == null) return new Object[]{ false, "Cannot find a valid upgrade" };
 
         // Remove the current upgrade
-        if (previousUpgrade != null) storeItem(player, previousUpgrade.getUpgradeItem());
+        if (previousUpgrade != null) storeItem(player, previousUpgrade.getCraftingItem().copy());
 
         // Set the new upgrade
         computer.setUpgrade(newUpgrade);
@@ -95,7 +93,7 @@ public class PocketAPI implements ILuaAPI {
 
         computer.setUpgrade(null);
 
-        storeItem(player, previousUpgrade.getUpgradeItem());
+        storeItem(player, previousUpgrade.getCraftingItem().copy());
 
         return new Object[]{ true };
     }
@@ -107,13 +105,13 @@ public class PocketAPI implements ILuaAPI {
         }
     }
 
-    private static @Nullable UpgradeData<IPocketUpgrade> findUpgrade(NonNullList<ItemStack> inv, int start, @Nullable UpgradeData<IPocketUpgrade> previous) {
+    private static @Nullable IPocketUpgrade findUpgrade(NonNullList<ItemStack> inv, int start, @Nullable IPocketUpgrade previous) {
         for (var i = 0; i < inv.size(); i++) {
             var invStack = inv.get((i + start) % inv.size());
             if (!invStack.isEmpty()) {
                 var newUpgrade = PocketUpgrades.instance().get(invStack);
 
-                if (newUpgrade != null && !Objects.equals(newUpgrade, previous)) {
+                if (newUpgrade != null && newUpgrade != previous) {
                     // Consume an item from this stack and exit the loop
                     invStack = invStack.copy();
                     invStack.shrink(1);

projects/common/src/main/java/dan200/computercraft/shared/pocket/core/PocketServerComputer.java

@@ -7,7 +7,6 @@ package dan200.computercraft.shared.pocket.core;
 import dan200.computercraft.api.peripheral.IPeripheral;
 import dan200.computercraft.api.pocket.IPocketAccess;
 import dan200.computercraft.api.pocket.IPocketUpgrade;
-import dan200.computercraft.api.upgrades.UpgradeData;
 import dan200.computercraft.core.computer.ComputerSide;
 import dan200.computercraft.shared.common.IColouredItem;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
@@ -105,13 +104,12 @@ public class PocketServerComputer extends ServerComputer implements IPocketAcces
     }
 
     @Override
-    @Deprecated(forRemoval = true)
     public Map<ResourceLocation, IPeripheral> getUpgrades() {
         return upgrade == null ? Collections.emptyMap() : Collections.singletonMap(upgrade.getUpgradeID(), getPeripheral(ComputerSide.BACK));
     }
 
-    public @Nullable UpgradeData<IPocketUpgrade> getUpgrade() {
-        return upgrade == null ? null : UpgradeData.of(upgrade, getUpgradeNBTData());
+    public @Nullable IPocketUpgrade getUpgrade() {
+        return upgrade;
     }
 
     /**
@@ -121,11 +119,13 @@ public class PocketServerComputer extends ServerComputer implements IPocketAcces
      *
      * @param upgrade The new upgrade to set it to, may be {@code null}.
      */
-    public void setUpgrade(@Nullable UpgradeData<IPocketUpgrade> upgrade) {
+    public void setUpgrade(@Nullable IPocketUpgrade upgrade) {
+        if (this.upgrade == upgrade) return;
+
         synchronized (this) {
             PocketComputerItem.setUpgrade(stack, upgrade);
             updateUpgradeNBTData();
-            this.upgrade = upgrade == null ? null : upgrade.upgrade();
+            this.upgrade = upgrade;
             invalidatePeripheral();
         }
     }
@@ -153,7 +153,7 @@ public class PocketServerComputer extends ServerComputer implements IPocketAcces
         super.tickServer();
 
         // Find any players which have gone missing and remove them from the tracking list.
-        tracking.removeIf(player -> !player.isAlive() || player.level != getLevel());
+        tracking.removeIf(player -> !player.isAlive() || player.level() != getLevel());
 
         // And now find any new players, add them to the tracking list, and broadcast state where appropriate.
         var sendState = hasOutputChanged() || lightChanged;

projects/common/src/main/java/dan200/computercraft/shared/pocket/inventory/PocketComputerMenuProvider.java

@@ -48,7 +48,7 @@ public class PocketComputerMenuProvider implements MenuProvider {
             isTypingOnly ? ModRegistry.Menus.POCKET_COMPUTER_NO_TERM.get() : ModRegistry.Menus.POCKET_COMPUTER.get(), id, inventory,
             p -> {
                 var stack = p.getItemInHand(hand);
-                return stack.getItem() == item && PocketComputerItem.getServerComputer(assertNonNull(entity.level.getServer()), stack) == computer;
+                return stack.getItem() == item && PocketComputerItem.getServerComputer(assertNonNull(entity.level().getServer()), stack) == computer;
             },
             computer, item.getFamily()
         );

projects/common/src/main/java/dan200/computercraft/shared/pocket/items/PocketComputerItem.java

@@ -10,7 +10,6 @@ import dan200.computercraft.api.ComputerCraftAPI;
 import dan200.computercraft.api.filesystem.Mount;
 import dan200.computercraft.api.media.IMedia;
 import dan200.computercraft.api.pocket.IPocketUpgrade;
-import dan200.computercraft.api.upgrades.UpgradeData;
 import dan200.computercraft.core.computer.ComputerSide;
 import dan200.computercraft.impl.PocketUpgrades;
 import dan200.computercraft.shared.ModRegistry;
@@ -24,7 +23,6 @@ import dan200.computercraft.shared.pocket.apis.PocketAPI;
 import dan200.computercraft.shared.pocket.core.PocketServerComputer;
 import dan200.computercraft.shared.pocket.inventory.PocketComputerMenuProvider;
 import dan200.computercraft.shared.util.IDAssigner;
-import dan200.computercraft.shared.util.NBTUtil;
 import net.minecraft.ChatFormatting;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.chat.Component;
@@ -60,7 +58,7 @@ public class PocketComputerItem extends Item implements IComputerItem, IMedia, I
         this.family = family;
     }
 
-    public static ItemStack create(int id, @Nullable String label, int colour, ComputerFamily family, @Nullable UpgradeData<IPocketUpgrade> upgrade) {
+    public static ItemStack create(int id, @Nullable String label, int colour, ComputerFamily family, @Nullable IPocketUpgrade upgrade) {
         return switch (family) {
             case NORMAL -> ModRegistry.Items.POCKET_COMPUTER_NORMAL.get().create(id, label, colour, upgrade);
             case ADVANCED -> ModRegistry.Items.POCKET_COMPUTER_ADVANCED.get().create(id, label, colour, upgrade);
@@ -68,14 +66,11 @@ public class PocketComputerItem extends Item implements IComputerItem, IMedia, I
         };
     }
 
-    public ItemStack create(int id, @Nullable String label, int colour, @Nullable UpgradeData<IPocketUpgrade> upgrade) {
+    public ItemStack create(int id, @Nullable String label, int colour, @Nullable IPocketUpgrade upgrade) {
         var result = new ItemStack(this);
         if (id >= 0) result.getOrCreateTag().putInt(NBT_ID, id);
         if (label != null) result.setHoverName(Component.literal(label));
-        if (upgrade != null) {
-            result.getOrCreateTag().putString(NBT_UPGRADE, upgrade.upgrade().getUpgradeID().toString());
-            if (!upgrade.data().isEmpty()) result.getOrCreateTag().put(NBT_UPGRADE_INFO, upgrade.data().copy());
-        }
+        if (upgrade != null) result.getOrCreateTag().putString(NBT_UPGRADE, upgrade.getUpgradeID().toString());
         if (colour != -1) result.getOrCreateTag().putInt(NBT_COLOUR, colour);
         return result;
     }
@@ -127,10 +122,11 @@ public class PocketComputerItem extends Item implements IComputerItem, IMedia, I
 
     @ForgeOverride
     public boolean onEntityItemUpdate(ItemStack stack, ItemEntity entity) {
-        if (entity.level.isClientSide || entity.level.getServer() == null) return false;
+        var level = entity.level();
+        if (level.isClientSide || level.getServer() == null) return false;
 
-        var computer = getServerComputer(entity.level.getServer(), stack);
-        if (computer != null && tick(stack, entity.level, entity, computer)) entity.setItem(stack.copy());
+        var computer = getServerComputer(level.getServer(), stack);
+        if (computer != null && tick(stack, entity.level(), entity, computer)) entity.setItem(stack.copy());
         return false;
     }
 
@@ -212,9 +208,7 @@ public class PocketComputerItem extends Item implements IComputerItem, IMedia, I
             setInstanceID(stack, computer.register());
             setSessionID(stack, registry.getSessionID());
 
-            var upgrade = getUpgrade(stack);
-
-            computer.updateValues(entity, stack, upgrade);
+            computer.updateValues(entity, stack, getUpgrade(stack));
             computer.addAPI(new PocketAPI(computer));
 
             // Only turn on when initially creating the computer, rather than each tick.
@@ -251,7 +245,7 @@ public class PocketComputerItem extends Item implements IComputerItem, IMedia, I
     public ItemStack withFamily(ItemStack stack, ComputerFamily family) {
         return create(
             getComputerID(stack), getLabel(stack), getColour(stack),
-            family, getUpgradeWithData(stack)
+            family, getUpgrade(stack)
         );
     }
 
@@ -301,27 +295,20 @@ public class PocketComputerItem extends Item implements IComputerItem, IMedia, I
 
     public static @Nullable IPocketUpgrade getUpgrade(ItemStack stack) {
         var compound = stack.getTag();
-        if (compound == null || !compound.contains(NBT_UPGRADE)) return null;
-        return PocketUpgrades.instance().get(compound.getString(NBT_UPGRADE));
+        return compound != null && compound.contains(NBT_UPGRADE)
+            ? PocketUpgrades.instance().get(compound.getString(NBT_UPGRADE)) : null;
     }
 
-    public static @Nullable UpgradeData<IPocketUpgrade> getUpgradeWithData(ItemStack stack) {
-        var compound = stack.getTag();
-        if (compound == null || !compound.contains(NBT_UPGRADE)) return null;
-        var upgrade = PocketUpgrades.instance().get(compound.getString(NBT_UPGRADE));
-        return upgrade == null ? null : UpgradeData.of(upgrade, NBTUtil.getCompoundOrEmpty(compound, NBT_UPGRADE_INFO));
-    }
-
-    public static void setUpgrade(ItemStack stack, @Nullable UpgradeData<IPocketUpgrade> upgrade) {
+    public static void setUpgrade(ItemStack stack, @Nullable IPocketUpgrade upgrade) {
         var compound = stack.getOrCreateTag();
 
         if (upgrade == null) {
             compound.remove(NBT_UPGRADE);
-            compound.remove(NBT_UPGRADE_INFO);
         } else {
-            compound.putString(NBT_UPGRADE, upgrade.upgrade().getUpgradeID().toString());
-            compound.put(NBT_UPGRADE_INFO, upgrade.data().copy());
+            compound.putString(NBT_UPGRADE, upgrade.getUpgradeID().toString());
         }
+
+        compound.remove(NBT_UPGRADE_INFO);
     }
 
     public static CompoundTag getUpgradeInfo(ItemStack stack) {

projects/common/src/main/java/dan200/computercraft/shared/pocket/peripherals/PocketSpeakerPeripheral.java

@@ -37,7 +37,7 @@ public class PocketSpeakerPeripheral extends UpgradeSpeakerPeripheral {
     public void update() {
         var entity = access.getEntity();
         if (entity != null) {
-            level = entity.level;
+            level = entity.level();
             position = entity.position();
         }
 

projects/common/src/main/java/dan200/computercraft/shared/pocket/recipes/PocketComputerUpgradeRecipe.java

@@ -5,7 +5,6 @@
 package dan200.computercraft.shared.pocket.recipes;
 
 import dan200.computercraft.api.pocket.IPocketUpgrade;
-import dan200.computercraft.api.upgrades.UpgradeData;
 import dan200.computercraft.impl.PocketUpgrades;
 import dan200.computercraft.shared.ModRegistry;
 import dan200.computercraft.shared.pocket.items.PocketComputerItem;
@@ -63,7 +62,7 @@ public final class PocketComputerUpgradeRecipe extends CustomRecipe {
         if (PocketComputerItem.getUpgrade(computer) != null) return ItemStack.EMPTY;
 
         // Check for upgrades around the item
-        UpgradeData<IPocketUpgrade> upgrade = null;
+        IPocketUpgrade upgrade = null;
         for (var y = 0; y < inventory.getHeight(); y++) {
             for (var x = 0; x < inventory.getWidth(); x++) {
                 var item = inventory.getItem(x + y * inventory.getWidth());

projects/common/src/main/java/dan200/computercraft/shared/turtle/blocks/TurtleBlock.java

@@ -5,9 +5,7 @@
 package dan200.computercraft.shared.turtle.blocks;
 
 import dan200.computercraft.annotations.ForgeOverride;
-import dan200.computercraft.api.turtle.ITurtleUpgrade;
 import dan200.computercraft.api.turtle.TurtleSide;
-import dan200.computercraft.api.upgrades.UpgradeData;
 import dan200.computercraft.shared.computer.blocks.AbstractComputerBlock;
 import dan200.computercraft.shared.computer.blocks.AbstractComputerBlockEntity;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
@@ -130,7 +128,7 @@ public class TurtleBlock extends AbstractComputerBlock<TurtleBlockEntity> implem
             if (stack.getItem() instanceof TurtleItem item) {
                 // Set Upgrades
                 for (var side : TurtleSide.values()) {
-                    turtle.getAccess().setUpgradeWithData(side, item.getUpgradeWithData(stack, side));
+                    turtle.getAccess().setUpgrade(side, item.getUpgrade(stack, side));
                 }
 
                 turtle.getAccess().setFuelLevel(item.getFuelLevel(stack));
@@ -163,16 +161,11 @@ public class TurtleBlock extends AbstractComputerBlock<TurtleBlockEntity> implem
         var access = turtle.getAccess();
         return TurtleItem.create(
             turtle.getComputerID(), turtle.getLabel(), access.getColour(), turtle.getFamily(),
-            withPersistedData(access.getUpgradeWithData(TurtleSide.LEFT)),
-            withPersistedData(access.getUpgradeWithData(TurtleSide.RIGHT)),
+            access.getUpgrade(TurtleSide.LEFT), access.getUpgrade(TurtleSide.RIGHT),
             access.getFuelLevel(), turtle.getOverlay()
         );
     }
 
-    private static @Nullable UpgradeData<ITurtleUpgrade> withPersistedData(@Nullable UpgradeData<ITurtleUpgrade> upgrade) {
-        return upgrade == null ? null : UpgradeData.of(upgrade.upgrade(), upgrade.upgrade().getPersistedData(upgrade.data()));
-    }
-
     @Override
     @Nullable
     public <U extends BlockEntity> BlockEntityTicker<U> getTicker(Level level, BlockState state, BlockEntityType<U> type) {

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

@@ -13,7 +13,6 @@ import dan200.computercraft.api.turtle.ITurtleUpgrade;
 import dan200.computercraft.api.turtle.TurtleAnimation;
 import dan200.computercraft.api.turtle.TurtleCommand;
 import dan200.computercraft.api.turtle.TurtleSide;
-import dan200.computercraft.api.upgrades.UpgradeData;
 import dan200.computercraft.core.computer.ComputerSide;
 import dan200.computercraft.core.util.Colour;
 import dan200.computercraft.impl.TurtleUpgrades;
@@ -142,16 +141,17 @@ public class TurtleBrain implements TurtleAccessInternal {
         overlay = nbt.contains(NBT_OVERLAY) ? new ResourceLocation(nbt.getString(NBT_OVERLAY)) : null;
 
         // Read upgrades
-        setUpgradeDirect(TurtleSide.LEFT, readUpgrade(nbt, NBT_LEFT_UPGRADE, NBT_LEFT_UPGRADE_DATA));
-        setUpgradeDirect(TurtleSide.RIGHT, readUpgrade(nbt, NBT_RIGHT_UPGRADE, NBT_RIGHT_UPGRADE_DATA));
-    }
+        setUpgradeDirect(TurtleSide.LEFT, nbt.contains(NBT_LEFT_UPGRADE) ? TurtleUpgrades.instance().get(nbt.getString(NBT_LEFT_UPGRADE)) : null);
+        setUpgradeDirect(TurtleSide.RIGHT, nbt.contains(NBT_RIGHT_UPGRADE) ? TurtleUpgrades.instance().get(nbt.getString(NBT_RIGHT_UPGRADE)) : null);
 
-    private @Nullable UpgradeData<ITurtleUpgrade> readUpgrade(CompoundTag tag, String upgradeKey, String dataKey) {
-        if (!tag.contains(upgradeKey)) return null;
-        var upgrade = TurtleUpgrades.instance().get(tag.getString(upgradeKey));
-        if (upgrade == null) return null;
-
-        return UpgradeData.of(upgrade, tag.getCompound(dataKey));
+        // NBT
+        upgradeNBTData.clear();
+        if (nbt.contains(NBT_LEFT_UPGRADE_DATA)) {
+            upgradeNBTData.put(TurtleSide.LEFT, nbt.getCompound(NBT_LEFT_UPGRADE_DATA).copy());
+        }
+        if (nbt.contains(NBT_RIGHT_UPGRADE_DATA)) {
+            upgradeNBTData.put(TurtleSide.RIGHT, nbt.getCompound(NBT_RIGHT_UPGRADE_DATA).copy());
+        }
     }
 
     private void writeCommon(CompoundTag nbt) {
@@ -319,7 +319,6 @@ public class TurtleBrain implements TurtleAccessInternal {
         return false;
     }
 
-    @Override
     public Vec3 getVisualPosition(float f) {
         var offset = getRenderOffset(f);
         var pos = owner.getBlockPos();
@@ -330,7 +329,6 @@ public class TurtleBrain implements TurtleAccessInternal {
         );
     }
 
-    @Override
     public float getVisualYaw(float f) {
         var yaw = getDirection().toYRot();
         switch (animation) {
@@ -516,7 +514,7 @@ public class TurtleBrain implements TurtleAccessInternal {
     }
 
     @Override
-    public void setUpgradeWithData(TurtleSide side, @Nullable UpgradeData<ITurtleUpgrade> upgrade) {
+    public void setUpgrade(TurtleSide side, @Nullable ITurtleUpgrade upgrade) {
         if (!setUpgradeDirect(side, upgrade) || owner.getLevel() == null) return;
 
         // This is a separate function to avoid updating the block when reading the NBT. We don't need to do this as
@@ -529,18 +527,19 @@ public class TurtleBrain implements TurtleAccessInternal {
         owner.updateInputsImmediately();
     }
 
-    private boolean setUpgradeDirect(TurtleSide side, @Nullable UpgradeData<ITurtleUpgrade> upgrade) {
+    private boolean setUpgradeDirect(TurtleSide side, @Nullable ITurtleUpgrade upgrade) {
         // Remove old upgrade
-        var oldUpgrade = upgrades.remove(side);
-        if (oldUpgrade == null && upgrade == null) return false;
+        if (upgrades.containsKey(side)) {
+            if (upgrades.get(side) == upgrade) return false;
+            upgrades.remove(side);
+        } else {
+            if (upgrade == null) return false;
+        }
+
+        upgradeNBTData.remove(side);
 
         // Set new upgrade
-        if (upgrade == null) {
-            upgradeNBTData.remove(side);
-        } else {
-            upgrades.put(side, upgrade.upgrade());
-            upgradeNBTData.put(side, upgrade.data().copy());
-        }
+        if (upgrade != null) upgrades.put(side, upgrade);
 
         // Notify clients and create peripherals
         if (owner.getLevel() != null && !owner.getLevel().isClientSide) {
@@ -594,7 +593,7 @@ public class TurtleBrain implements TurtleAccessInternal {
 
     public float getToolRenderAngle(TurtleSide side, float f) {
         return (side == TurtleSide.LEFT && animation == TurtleAnimation.SWING_LEFT_TOOL) ||
-               (side == TurtleSide.RIGHT && animation == TurtleAnimation.SWING_RIGHT_TOOL)
+            (side == TurtleSide.RIGHT && animation == TurtleAnimation.SWING_RIGHT_TOOL)
             ? 45.0f * (float) Math.sin(getAnimationFraction(f) * Math.PI)
             : 0.0f;
     }

projects/common/src/main/java/dan200/computercraft/shared/turtle/core/TurtleEquipCommand.java

@@ -5,7 +5,6 @@
 package dan200.computercraft.shared.turtle.core;
 
 import dan200.computercraft.api.turtle.*;
-import dan200.computercraft.api.upgrades.UpgradeData;
 import dan200.computercraft.impl.TurtleUpgrades;
 import dan200.computercraft.shared.turtle.TurtleUtil;
 
@@ -19,10 +18,10 @@ public class TurtleEquipCommand implements TurtleCommand {
     @Override
     public TurtleCommandResult execute(ITurtleAccess turtle) {
         // Determine the upgrade to replace
-        var oldUpgrade = turtle.getUpgradeWithData(side);
+        var oldUpgrade = turtle.getUpgrade(side);
 
         // Determine the upgrade to equipLeft
-        UpgradeData<ITurtleUpgrade> newUpgrade;
+        ITurtleUpgrade newUpgrade;
         var selectedStack = turtle.getInventory().getItem(turtle.getSelectedSlot());
         if (!selectedStack.isEmpty()) {
             newUpgrade = TurtleUpgrades.instance().get(selectedStack);
@@ -33,8 +32,8 @@ public class TurtleEquipCommand implements TurtleCommand {
 
         // Do the swapping:
         if (newUpgrade != null) turtle.getInventory().removeItem(turtle.getSelectedSlot(), 1);
-        if (oldUpgrade != null) TurtleUtil.storeItemOrDrop(turtle, oldUpgrade.getUpgradeItem());
-        turtle.setUpgradeWithData(side, newUpgrade);
+        if (oldUpgrade != null) TurtleUtil.storeItemOrDrop(turtle, oldUpgrade.getCraftingItem().copy());
+        turtle.setUpgrade(side, newUpgrade);
 
         // Animate
         if (newUpgrade != null || oldUpgrade != null) {

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

@@ -44,7 +44,7 @@ public class TurtleMoveCommand implements TurtleCommand {
         var state = oldWorld.getBlockState(newPosition);
         if (!oldWorld.isEmptyBlock(newPosition) &&
             !WorldUtil.isLiquidBlock(oldWorld, newPosition) &&
-            !state.getMaterial().isReplaceable()) {
+            !state.canBeReplaced()) {
             return TurtleCommandResult.failure("Movement obstructed");
         }
 

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

@@ -29,6 +29,7 @@ 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.entity.SignText;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.EntityHitResult;
@@ -210,7 +211,7 @@ public class TurtlePlaceCommand implements TurtleCommand {
         );
         if (result != InteractionResult.PASS) return result;
 
-        var level = turtlePlayer.player().level;
+        var level = turtlePlayer.player().level();
 
         // We special case some items which we allow to place "normally". Yes, this is very ugly.
         var item = stack.getItem();
@@ -225,18 +226,18 @@ public class TurtlePlaceCommand implements TurtleCommand {
         var signTile = (SignBlockEntity) tile;
         var split = Splitter.on('\n').splitToList(message);
         var firstLine = split.size() <= 2 ? 1 : 0;
+
+        var signText = new SignText();
         for (var i = 0; i < 4; i++) {
             if (i >= firstLine && i < firstLine + split.size()) {
                 var line = split.get(i - firstLine);
-                signTile.setMessage(i, line.length() > 15
+                signText.setMessage(i, line.length() > 15
                     ? Component.literal(line.substring(0, 15))
                     : Component.literal(line)
                 );
-            } else {
-                signTile.setMessage(i, Component.literal(""));
             }
         }
-        signTile.setChanged();
+        signTile.setText(signText, true);
         world.sendBlockUpdated(tile.getBlockPos(), tile.getBlockState(), tile.getBlockState(), Block.UPDATE_ALL);
     }
 

projects/common/src/main/java/dan200/computercraft/shared/turtle/inventory/TurtleMenu.java

@@ -4,7 +4,6 @@
 
 package dan200.computercraft.shared.turtle.inventory;
 
-import dan200.computercraft.api.turtle.TurtleSide;
 import dan200.computercraft.shared.ModRegistry;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
 import dan200.computercraft.shared.computer.core.ServerComputer;
@@ -30,13 +29,12 @@ public final class TurtleMenu extends AbstractComputerMenu {
     public static final int PLAYER_START_Y = 134;
     public static final int TURTLE_START_X = SIDEBAR_WIDTH + 175;
     public static final int PLAYER_START_X = SIDEBAR_WIDTH + BORDER;
-    public static final int UPGRADE_START_X = SIDEBAR_WIDTH + 254;
 
     private final ContainerData data;
 
     private TurtleMenu(
         int id, Predicate<Player> canUse, ComputerFamily family, @Nullable ServerComputer computer, @Nullable ComputerContainerData menuData,
-        Inventory playerInventory, Container inventory, Container turtleUpgrades, ContainerData data
+        Inventory playerInventory, Container inventory, ContainerData data
     ) {
         super(ModRegistry.Menus.TURTLE.get(), id, canUse, family, computer, menuData);
         this.data = data;
@@ -60,24 +58,19 @@ public final class TurtleMenu extends AbstractComputerMenu {
         for (var x = 0; x < 9; x++) {
             addSlot(new Slot(playerInventory, x, PLAYER_START_X + x * 18, PLAYER_START_Y + 3 * 18 + 5));
         }
-
-        // Turtle upgrades
-        addSlot(new UpgradeSlot(turtleUpgrades, TurtleSide.LEFT, 0, UPGRADE_START_X, PLAYER_START_Y + 1));
-        addSlot(new UpgradeSlot(turtleUpgrades, TurtleSide.RIGHT, 1, UPGRADE_START_X, PLAYER_START_Y + 1 + 18));
     }
 
     public static TurtleMenu ofBrain(int id, Inventory player, TurtleBrain turtle) {
         return new TurtleMenu(
             // Laziness in turtle.getOwner() is important here!
             id, p -> turtle.getOwner().stillValid(p), turtle.getFamily(), turtle.getOwner().createServerComputer(), null,
-            player, turtle.getInventory(), new UpgradeContainer(turtle), (SingleContainerData) turtle::getSelectedSlot
+            player, turtle.getInventory(), (SingleContainerData) turtle::getSelectedSlot
         );
     }
 
     public static TurtleMenu ofMenuData(int id, Inventory player, ComputerContainerData data) {
         return new TurtleMenu(
-            id, x -> true, data.family(), null, data,
-            player, new SimpleContainer(TurtleBlockEntity.INVENTORY_SIZE), new SimpleContainer(2), new SimpleContainerData(1)
+            id, x -> true, data.family(), null, data, player, new SimpleContainer(TurtleBlockEntity.INVENTORY_SIZE), new SimpleContainerData(1)
         );
     }
 

projects/common/src/main/java/dan200/computercraft/shared/turtle/inventory/UpgradeContainer.java

@@ -1,117 +0,0 @@
-// SPDX-FileCopyrightText: 2023 The CC: Tweaked Developers
-//
-// SPDX-License-Identifier: MPL-2.0
-
-package dan200.computercraft.shared.turtle.inventory;
-
-import dan200.computercraft.api.turtle.ITurtleAccess;
-import dan200.computercraft.api.turtle.ITurtleUpgrade;
-import dan200.computercraft.api.turtle.TurtleSide;
-import dan200.computercraft.api.upgrades.UpgradeData;
-import dan200.computercraft.impl.TurtleUpgrades;
-import net.minecraft.core.NonNullList;
-import net.minecraft.world.Container;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.ItemStack;
-
-import javax.annotation.Nullable;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * A fake {@link Container} which exposes the {@linkplain ITurtleAccess#getUpgrade(TurtleSide) upgrades} a turtle has.
- *
- * @see TurtleMenu
- * @see UpgradeSlot
- */
-class UpgradeContainer implements Container {
-    private static final int SIZE = 2;
-
-    private final ITurtleAccess turtle;
-
-    private final List<UpgradeData<ITurtleUpgrade>> lastUpgrade = Arrays.asList(null, null);
-    private final NonNullList<ItemStack> lastStack = NonNullList.withSize(2, ItemStack.EMPTY);
-
-    UpgradeContainer(ITurtleAccess turtle) {
-        this.turtle = turtle;
-    }
-
-    private TurtleSide getSide(int slot) {
-        return switch (slot) {
-            case 0 -> TurtleSide.LEFT;
-            case 1 -> TurtleSide.RIGHT;
-            default -> throw new IllegalArgumentException("Invalid slot " + slot);
-        };
-    }
-
-    @Override
-    public ItemStack getItem(int slot) {
-        var side = getSide(slot);
-        var upgrade = turtle.getUpgradeWithData(side);
-        if (upgrade == null) return ItemStack.EMPTY;
-
-        // We don't want to return getUpgradeItem directly here, as we'd end up recreating the stack each tick. To
-        // avoid that, we maintain a simple cache.
-        if (upgrade.equals(lastUpgrade.get(slot))) return lastStack.get(slot);
-
-        return setUpgradeStack(slot, upgrade);
-    }
-
-    private ItemStack setUpgradeStack(int slot, @Nullable UpgradeData<ITurtleUpgrade> upgrade) {
-        var stack = upgrade == null ? ItemStack.EMPTY : upgrade.getUpgradeItem();
-        lastUpgrade.set(slot, upgrade);
-        lastStack.set(slot, stack);
-        return stack;
-    }
-
-    @Override
-    public void setItem(int slot, ItemStack itemStack) {
-        var upgrade = TurtleUpgrades.instance().get(itemStack);
-        turtle.setUpgradeWithData(getSide(slot), upgrade);
-        setUpgradeStack(slot, upgrade);
-    }
-
-    @Override
-    public int getContainerSize() {
-        return SIZE;
-    }
-
-    @Override
-    public int getMaxStackSize() {
-        return 1;
-    }
-
-    @Override
-    public boolean isEmpty() {
-        for (var i = 0; i < SIZE; i++) {
-            if (!getItem(i).isEmpty()) return false;
-        }
-        return true;
-    }
-
-    @Override
-    public ItemStack removeItem(int slot, int count) {
-        return count <= 0 ? ItemStack.EMPTY : removeItemNoUpdate(slot);
-    }
-
-    @Override
-    public ItemStack removeItemNoUpdate(int slot) {
-        var current = getItem(slot);
-        setItem(slot, ItemStack.EMPTY);
-        return current;
-    }
-
-    @Override
-    public void setChanged() {
-    }
-
-    @Override
-    public boolean stillValid(Player player) {
-        return true;
-    }
-
-    @Override
-    public void clearContent() {
-        for (var i = 0; i < SIZE; i++) setItem(i, ItemStack.EMPTY);
-    }
-}

projects/common/src/main/java/dan200/computercraft/shared/turtle/inventory/UpgradeSlot.java

@@ -1,50 +0,0 @@
-// SPDX-FileCopyrightText: 2023 The CC: Tweaked Developers
-//
-// SPDX-License-Identifier: MPL-2.0
-
-package dan200.computercraft.shared.turtle.inventory;
-
-import com.mojang.datafixers.util.Pair;
-import dan200.computercraft.api.ComputerCraftAPI;
-import dan200.computercraft.api.turtle.TurtleSide;
-import dan200.computercraft.impl.TurtleUpgrades;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.Container;
-import net.minecraft.world.inventory.InventoryMenu;
-import net.minecraft.world.inventory.Slot;
-import net.minecraft.world.item.ItemStack;
-
-import javax.annotation.Nullable;
-
-/**
- * A slot in the turtle UI which holds the turtle's current upgrade.
- *
- * @see TurtleMenu
- */
-public class UpgradeSlot extends Slot {
-    public static final ResourceLocation LEFT_UPGRADE = new ResourceLocation(ComputerCraftAPI.MOD_ID, "gui/turtle_upgrade_left");
-    public static final ResourceLocation RIGHT_UPGRADE = new ResourceLocation(ComputerCraftAPI.MOD_ID, "gui/turtle_upgrade_right");
-
-    private final TurtleSide side;
-
-    public UpgradeSlot(Container container, TurtleSide side, int slot, int xPos, int yPos) {
-        super(container, slot, xPos, yPos);
-        this.side = side;
-    }
-
-    @Override
-    public boolean mayPlace(ItemStack stack) {
-        return TurtleUpgrades.instance().get(stack) != null;
-    }
-
-    @Override
-    public int getMaxStackSize() {
-        return 1;
-    }
-
-    @Nullable
-    @Override
-    public Pair<ResourceLocation, ResourceLocation> getNoItemIcon() {
-        return Pair.of(InventoryMenu.BLOCK_ATLAS, side == TurtleSide.LEFT ? LEFT_UPGRADE : RIGHT_UPGRADE);
-    }
-}

projects/common/src/main/java/dan200/computercraft/shared/turtle/items/TurtleItem.java

@@ -8,14 +8,12 @@ import dan200.computercraft.annotations.ForgeOverride;
 import dan200.computercraft.api.ComputerCraftAPI;
 import dan200.computercraft.api.turtle.ITurtleUpgrade;
 import dan200.computercraft.api.turtle.TurtleSide;
-import dan200.computercraft.api.upgrades.UpgradeData;
 import dan200.computercraft.impl.TurtleUpgrades;
 import dan200.computercraft.shared.ModRegistry;
 import dan200.computercraft.shared.common.IColouredItem;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
 import dan200.computercraft.shared.computer.items.AbstractComputerItem;
 import dan200.computercraft.shared.turtle.blocks.TurtleBlock;
-import dan200.computercraft.shared.util.NBTUtil;
 import net.minecraft.core.cauldron.CauldronInteraction;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
@@ -34,7 +32,7 @@ public class TurtleItem extends AbstractComputerItem implements IColouredItem {
 
     public static ItemStack create(
         int id, @Nullable String label, int colour, ComputerFamily family,
-        @Nullable UpgradeData<ITurtleUpgrade> leftUpgrade, @Nullable UpgradeData<ITurtleUpgrade> rightUpgrade,
+        @Nullable ITurtleUpgrade leftUpgrade, @Nullable ITurtleUpgrade rightUpgrade,
         int fuelLevel, @Nullable ResourceLocation overlay
     ) {
         return switch (family) {
@@ -48,7 +46,7 @@ public class TurtleItem extends AbstractComputerItem implements IColouredItem {
 
     public ItemStack create(
         int id, @Nullable String label, int colour,
-        @Nullable UpgradeData<ITurtleUpgrade> leftUpgrade, @Nullable UpgradeData<ITurtleUpgrade> rightUpgrade,
+        @Nullable ITurtleUpgrade leftUpgrade, @Nullable ITurtleUpgrade rightUpgrade,
         int fuelLevel, @Nullable ResourceLocation overlay
     ) {
         // Build the stack
@@ -60,15 +58,11 @@ public class TurtleItem extends AbstractComputerItem implements IColouredItem {
         if (overlay != null) stack.getOrCreateTag().putString(NBT_OVERLAY, overlay.toString());
 
         if (leftUpgrade != null) {
-            var tag = stack.getOrCreateTag();
-            tag.putString(NBT_LEFT_UPGRADE, leftUpgrade.upgrade().getUpgradeID().toString());
-            if (!leftUpgrade.data().isEmpty()) tag.put(NBT_LEFT_UPGRADE_DATA, leftUpgrade.data().copy());
+            stack.getOrCreateTag().putString(NBT_LEFT_UPGRADE, leftUpgrade.getUpgradeID().toString());
         }
 
         if (rightUpgrade != null) {
-            var tag = stack.getOrCreateTag();
-            tag.putString(NBT_RIGHT_UPGRADE, rightUpgrade.upgrade().getUpgradeID().toString());
-            if (!rightUpgrade.data().isEmpty()) tag.put(NBT_RIGHT_UPGRADE_DATA, rightUpgrade.data().copy());
+            stack.getOrCreateTag().putString(NBT_RIGHT_UPGRADE, rightUpgrade.getUpgradeID().toString());
         }
 
         return stack;
@@ -123,7 +117,7 @@ public class TurtleItem extends AbstractComputerItem implements IColouredItem {
         return create(
             getComputerID(stack), getLabel(stack),
             getColour(stack), family,
-            getUpgradeWithData(stack, TurtleSide.LEFT), getUpgradeWithData(stack, TurtleSide.RIGHT),
+            getUpgrade(stack, TurtleSide.LEFT), getUpgrade(stack, TurtleSide.RIGHT),
             getFuelLevel(stack), getOverlay(stack)
         );
     }
@@ -133,20 +127,7 @@ public class TurtleItem extends AbstractComputerItem implements IColouredItem {
         if (tag == null) return null;
 
         var key = side == TurtleSide.LEFT ? NBT_LEFT_UPGRADE : NBT_RIGHT_UPGRADE;
-        if (!tag.contains(key)) return null;
-        return TurtleUpgrades.instance().get(tag.getString(key));
-    }
-
-    public @Nullable UpgradeData<ITurtleUpgrade> getUpgradeWithData(ItemStack stack, TurtleSide side) {
-        var tag = stack.getTag();
-        if (tag == null) return null;
-
-        var key = side == TurtleSide.LEFT ? NBT_LEFT_UPGRADE : NBT_RIGHT_UPGRADE;
-        if (!tag.contains(key)) return null;
-        var upgrade = TurtleUpgrades.instance().get(tag.getString(key));
-        if (upgrade == null) return null;
-        var dataKey = side == TurtleSide.LEFT ? NBT_LEFT_UPGRADE_DATA : NBT_RIGHT_UPGRADE_DATA;
-        return UpgradeData.of(upgrade, NBTUtil.getCompoundOrEmpty(tag, dataKey));
+        return tag.contains(key) ? TurtleUpgrades.instance().get(tag.getString(key)) : null;
     }
 
     public @Nullable ResourceLocation getOverlay(ItemStack stack) {

projects/common/src/main/java/dan200/computercraft/shared/turtle/recipes/TurtleOverlayRecipe.java

@@ -38,8 +38,8 @@ public class TurtleOverlayRecipe extends ShapelessRecipe {
             turtle.getComputerID(stack),
             turtle.getLabel(stack),
             turtle.getColour(stack),
-            turtle.getUpgradeWithData(stack, TurtleSide.LEFT),
-            turtle.getUpgradeWithData(stack, TurtleSide.RIGHT),
+            turtle.getUpgrade(stack, TurtleSide.LEFT),
+            turtle.getUpgrade(stack, TurtleSide.RIGHT),
             turtle.getFuelLevel(stack),
             overlay
         );

projects/common/src/main/java/dan200/computercraft/shared/turtle/recipes/TurtleUpgradeRecipe.java

@@ -6,7 +6,6 @@ package dan200.computercraft.shared.turtle.recipes;
 
 import dan200.computercraft.api.turtle.ITurtleUpgrade;
 import dan200.computercraft.api.turtle.TurtleSide;
-import dan200.computercraft.api.upgrades.UpgradeData;
 import dan200.computercraft.impl.TurtleUpgrades;
 import dan200.computercraft.shared.ModRegistry;
 import dan200.computercraft.shared.turtle.items.TurtleItem;
@@ -105,10 +104,9 @@ public final class TurtleUpgradeRecipe extends CustomRecipe {
         // At this point we have a turtle + 1 or 2 items
         // Get the turtle we already have
         var itemTurtle = (TurtleItem) turtle.getItem();
-        @SuppressWarnings({ "unchecked", "rawtypes" })
-        UpgradeData<ITurtleUpgrade>[] upgrades = new UpgradeData[]{
-            itemTurtle.getUpgradeWithData(turtle, TurtleSide.LEFT),
-            itemTurtle.getUpgradeWithData(turtle, TurtleSide.RIGHT),
+        var upgrades = new ITurtleUpgrade[]{
+            itemTurtle.getUpgrade(turtle, TurtleSide.LEFT),
+            itemTurtle.getUpgrade(turtle, TurtleSide.RIGHT),
         };
 
         // Get the upgrades for the new items

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

@@ -10,6 +10,7 @@ import dan200.computercraft.shared.turtle.blocks.TurtleBlockEntity;
 import dan200.computercraft.shared.turtle.core.TurtlePlayer;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.entity.player.StackedContents;
 import net.minecraft.world.inventory.CraftingContainer;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.Recipe;
@@ -17,20 +18,22 @@ import net.minecraft.world.item.crafting.RecipeType;
 import net.minecraft.world.level.Level;
 
 import javax.annotation.Nullable;
+import java.util.AbstractList;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-public class TurtleInventoryCrafting extends CraftingContainer {
+public class TurtleInventoryCrafting implements CraftingContainer {
+    public static final int WIDTH = 3;
+    public static final int HEIGHT = 3;
+    public static final int SIZE = WIDTH * HEIGHT;
+
     private final ITurtleAccess turtle;
     private int xStart = 0;
     private int yStart = 0;
 
     @SuppressWarnings("ConstantConditions")
     public TurtleInventoryCrafting(ITurtleAccess turtle) {
-        // Passing null in here is evil, but we don't have a container present. We override most methods in order to
-        // avoid throwing any NPEs.
-        super(null, 0, 0);
         this.turtle = turtle;
     }
 
@@ -96,7 +99,7 @@ public class TurtleInventoryCrafting extends CraftingContainer {
                 // afterwards).
                 if (existing.isEmpty()) {
                     setItem(slot, remainder);
-                } else if (ItemStack.isSame(existing, remainder) && ItemStack.tagMatches(existing, remainder)) {
+                } else if (ItemStack.isSameItemSameTags(existing, remainder)) {
                     remainder.grow(existing.getCount());
                     setItem(slot, remainder);
                 } else {
@@ -110,12 +113,12 @@ public class TurtleInventoryCrafting extends CraftingContainer {
 
     @Override
     public int getWidth() {
-        return 3;
+        return WIDTH;
     }
 
     @Override
     public int getHeight() {
-        return 3;
+        return HEIGHT;
     }
 
     private int modifyIndex(int index) {
@@ -126,35 +129,37 @@ public class TurtleInventoryCrafting extends CraftingContainer {
             : -1;
     }
 
-    // IInventory implementation
+    @Override
+    public boolean isEmpty() {
+        for (int i = 0; i < SIZE; i++) {
+            if (!getItem(i).isEmpty()) return false;
+        }
+        return true;
+    }
 
     @Override
     public int getContainerSize() {
-        return getWidth() * getHeight();
+        return SIZE;
     }
 
     @Override
     public ItemStack getItem(int i) {
-        i = modifyIndex(i);
-        return turtle.getInventory().getItem(i);
+        return turtle.getInventory().getItem(modifyIndex(i));
     }
 
     @Override
     public ItemStack removeItemNoUpdate(int i) {
-        i = modifyIndex(i);
-        return turtle.getInventory().removeItemNoUpdate(i);
+        return turtle.getInventory().removeItemNoUpdate(modifyIndex(i));
     }
 
     @Override
     public ItemStack removeItem(int i, int size) {
-        i = modifyIndex(i);
-        return turtle.getInventory().removeItem(i, size);
+        return turtle.getInventory().removeItem(modifyIndex(i), size);
     }
 
     @Override
     public void setItem(int i, ItemStack stack) {
-        i = modifyIndex(i);
-        turtle.getInventory().setItem(i, stack);
+        turtle.getInventory().setItem(modifyIndex(i), stack);
     }
 
     @Override
@@ -174,15 +179,34 @@ public class TurtleInventoryCrafting extends CraftingContainer {
 
     @Override
     public boolean canPlaceItem(int i, ItemStack stack) {
-        i = modifyIndex(i);
-        return turtle.getInventory().canPlaceItem(i, stack);
+        return turtle.getInventory().canPlaceItem(modifyIndex(i), stack);
     }
 
     @Override
     public void clearContent() {
-        for (var i = 0; i < getContainerSize(); i++) {
+        for (var i = 0; i < SIZE; i++) {
             var j = modifyIndex(i);
             turtle.getInventory().setItem(j, ItemStack.EMPTY);
         }
     }
+
+    @Override
+    public void fillStackedContents(StackedContents contents) {
+        for (int i = 0; i < SIZE; i++) contents.accountSimpleStack(getItem(i));
+    }
+
+    @Override
+    public List<ItemStack> getItems() {
+        return new AbstractList<>() {
+            @Override
+            public ItemStack get(int index) {
+                return getItem(index);
+            }
+
+            @Override
+            public int size() {
+                return SIZE;
+            }
+        };
+    }
 }

projects/common/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleModem.java

@@ -9,7 +9,6 @@ import dan200.computercraft.api.turtle.*;
 import dan200.computercraft.shared.peripheral.modem.ModemState;
 import dan200.computercraft.shared.peripheral.modem.wireless.WirelessModemPeripheral;
 import net.minecraft.core.Direction;
-import net.minecraft.nbt.CompoundTag;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
@@ -78,9 +77,4 @@ public class TurtleModem extends AbstractTurtleUpgrade {
             }
         }
     }
-
-    @Override
-    public CompoundTag getPersistedData(CompoundTag upgradeData) {
-        return new CompoundTag();
-    }
 }

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

@@ -14,7 +14,6 @@ import dan200.computercraft.shared.util.DropConsumer;
 import dan200.computercraft.shared.util.WorldUtil;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
-import net.minecraft.nbt.CompoundTag;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.tags.TagKey;
@@ -60,7 +59,7 @@ public class TurtleTool extends AbstractTurtleUpgrade {
 
         // Check we've not got anything vaguely interesting on the item. We allow other mods to add their
         // own NBT, with the understanding such details will be lost to the mist of time.
-        if (stack.isDamaged() || stack.isEnchanted()) return false;
+        if (stack.isDamaged() || stack.isEnchanted() || stack.hasCustomHoverName()) return false;
         if (tag.contains("AttributeModifiers", TAG_LIST) && !tag.getList("AttributeModifiers", TAG_COMPOUND).isEmpty()) {
             return false;
         }
@@ -68,21 +67,6 @@ public class TurtleTool extends AbstractTurtleUpgrade {
         return true;
     }
 
-    @Override
-    public CompoundTag getUpgradeData(ItemStack stack) {
-        // Just use the current item's tag.
-        var itemTag = stack.getTag();
-        return itemTag == null ? new CompoundTag() : itemTag;
-    }
-
-    @Override
-    public ItemStack getUpgradeItem(CompoundTag upgradeData) {
-        // Copy upgrade data back to the item.
-        var item = super.getUpgradeItem(upgradeData);
-        if (!upgradeData.isEmpty()) item.setTag(upgradeData);
-        return item;
-    }
-
     @Override
     public TurtleCommandResult useTool(ITurtleAccess turtle, TurtleSide side, TurtleVerb verb, Direction direction) {
         return switch (verb) {
@@ -193,8 +177,7 @@ public class TurtleTool extends AbstractTurtleUpgrade {
     }
 
     private static boolean isTriviallyBreakable(BlockGetter reader, BlockPos pos, BlockState state) {
-        return
-            state.is(ComputerCraftTags.Blocks.TURTLE_ALWAYS_BREAKABLE)
+        return state.is(ComputerCraftTags.Blocks.TURTLE_ALWAYS_BREAKABLE)
             // Allow breaking any "instabreak" block.
             || state.getDestroySpeed(reader, pos) == 0;
     }

projects/common/src/main/java/dan200/computercraft/shared/util/DropConsumer.java

@@ -33,7 +33,7 @@ public final class DropConsumer {
         dropConsumer = consumer;
         remainingDrops = new ArrayList<>();
         dropEntity = entity;
-        dropWorld = entity.level;
+        dropWorld = entity.level();
         dropBounds = new AABB(entity.blockPosition()).inflate(2, 2, 2);
     }
 
@@ -70,7 +70,7 @@ public final class DropConsumer {
 
     public static boolean onEntitySpawn(Entity entity) {
         // Capture any nearby item spawns
-        if (dropWorld == entity.getLevel() && entity instanceof ItemEntity
+        if (dropWorld == entity.level() && entity instanceof ItemEntity
             && assertNonNull(dropBounds).contains(entity.position())) {
             handleDrops(((ItemEntity) entity).getItem());
             return true;

projects/common/src/main/java/dan200/computercraft/shared/util/InventoryUtil.java

@@ -90,6 +90,6 @@ public final class InventoryUtil {
         if (stack1.getItem() != stack2.getItem()) return false;
         if (stack1.getDamageValue() != stack2.getDamageValue()) return false;
         if (stack1.getCount() > stack1.getMaxStackSize()) return false;
-        return ItemStack.tagMatches(stack1, stack2);
+        return ItemStack.isSameItemSameTags(stack1, stack2);
     }
 }