Update to 1.21.3

This is a very preliminary port. I can get in game and use computers,
but I've not tested much beyond that (there's at least one failing game
test).

== Rendering ==

 - Remove TBO monitor renderer: There was a big overhaul to how shaders
   are defined and loaded in 1.21.2. It might have been possible to
   update the monitor shader code to this version, it doesn't see much
   use nowadays, so let's just delete it.

   This is a real shame — the TBO renderer was one of my favourite
   projects I've worked on. Unfortunately, it just doesn't seem worth
   the ongoing maintenance burden. It lives on in the standalone
   emulator :D.

 - Similarly, the VBO rendering code got a bit of an overhaul. We no
   longer use a custom VBO subclass, and instead just hack vanilla's to
   support changing the number of vertices rendered.

   This does mean we need to construct a MeshData, rather than a raw
   ByteBuffer. This isn't too hard, but not sure how it'll play with
   Iris. Given recent vanilla performance improvements, maybe we can
   remove our Unsafe code and use a normal BufferBuilder now.

 - Move some textures to vanilla's GUI sprite sheet (from our own). We
   also move the turtle "selected slot" texture to a sprite sheet -
   would be good to do the other ones (printer progress, maybe
   printouts) in the future.

 - Remove our custom emissive model code, now that vanilla supports
   it. We should add emissive textures to some other models at some
   point.

== Recipes ==

There were several major changes to ingredients this update. The code
here hasn't been very well tested right now — might be nice to add some
game tests for this.

 - Ingredients can no longer be constructed directly from a tag key (it
   needs to be fetched from the current registries), so the recipe
   generation code needs a bit of a reshuffle.

 - DiskRecipe now accepts a custom list of ingredients, rather than
   being hard-coded (fixes #1755). Recipes can now return custom
   `RecipeDisplay`s used to show a recipe in the crafting book. We use
   this to replace the impostor recipes.

   I'm not entirely sure how well this'll play with other recipe
   mods. Here's hoping.

 - Similarly, our recipe mod integration has been updated to use
   RecipeDisplay. We had to do this as ingredients no longer accept
   arbitrary ItemStacks (only a specific item), but the design is a
   little speculative - JEI/REI haven't updated yet.

== Misc ==

 - Blocks/items now need to know their ID ahead of time (so they can
   compute their description). This requires some reshuffling to the
   registration code, but it's pretty minor.

 - updateShape and neighborChanged have been tweaked slightly, I assume
   to work with the upcoming redstone changes. neighborChanged is
   currently commented out — we need to handle that properly.

 - All the positions were lowered by one in game tests. It's a good
   change (they now match the positions in structures), but annoying to
   update for!

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

@@ -4,10 +4,8 @@
 
 /** Default configuration for Fabric projects. */
 
-import cc.tweaked.gradle.CCTweakedExtension
-import cc.tweaked.gradle.CCTweakedPlugin
+import cc.tweaked.gradle.*
 import cc.tweaked.gradle.IdeaRunConfigurations
-import cc.tweaked.gradle.MinecraftConfigurations
 
 plugins {
     `java-library`
@@ -67,3 +65,9 @@ dependencies {
 tasks.ideaSyncTask {
     doLast { IdeaRunConfigurations(project).patch() }
 }
+
+tasks.named("checkDependencyConsistency", DependencyCheck::class.java) {
+    val libs = project.extensions.getByType<VersionCatalogsExtension>().named("libs")
+    // Fabric forces asm to a more recent version
+    override(libs.findLibrary("asm").get(), "9.7.1")
+}

gradle.properties

@@ -15,4 +15,4 @@ isUnstable=true
 modVersion=1.113.1
 
 # Minecraft properties: We want to configure this here so we can read it in settings.gradle
-mcVersion=1.21.1
+mcVersion=1.21.3

gradle/libs.versions.toml

@@ -7,14 +7,14 @@
 # Minecraft
 # MC version is specified in gradle.properties, as we need that in settings.gradle.
 # Remember to update corresponding versions in fabric.mod.json/neoforge.mods.toml
-fabric-api = "0.102.1+1.21.1"
-fabric-loader = "0.15.11"
-neoForge = "21.1.9"
+fabric-api = "0.106.1+1.21.3"
+fabric-loader = "0.16.7"
+neoForge = "21.3.0-beta"
 neoForgeSpi = "8.0.1"
 mixin = "0.8.5"
 parchment = "2024.07.28"
 parchmentMc = "1.21"
-yarn = "1.21.1+build.1"
+yarn = "1.21.3+build.1"
 
 # Core dependencies (these versions are tied to the version Minecraft uses)
 fastutil = "8.5.12"
@@ -62,14 +62,14 @@ checkstyle = "10.14.1"
 curseForgeGradle = "1.1.18"
 errorProne-core = "2.27.0"
 errorProne-plugin = "3.1.0"
-fabric-loom = "1.7.1"
+fabric-loom = "1.8.10"
 githubRelease = "2.5.2"
 gradleVersions = "0.50.0"
 ideaExt = "1.1.7"
 illuaminate = "0.1.0-73-g43ee16c"
 lwjgl = "3.3.3"
 minotaur = "2.8.7"
-neoGradle = "7.0.152"
+neoGradle = "7.0.165"
 nullAway = "0.10.25"
 shadow = "8.3.1"
 spotless = "6.23.3"
@@ -186,9 +186,9 @@ kotlin = ["kotlin-stdlib", "kotlin-coroutines"]
 # Minecraft
 externalMods-common = ["iris-forge", "jei-api", "nightConfig-core", "nightConfig-toml"]
 externalMods-forge-compile = ["moreRed", "iris-forge", "jei-api"]
-externalMods-forge-runtime = ["jei-forge"]
+externalMods-forge-runtime = []
 externalMods-fabric-compile = ["fabricPermissions", "iris-fabric", "jei-api", "rei-api", "rei-builtin"]
-externalMods-fabric-runtime = ["jei-fabric", "modmenu"]
+externalMods-fabric-runtime = []
 
 # Testing
 test = ["junit-jupiter-api", "junit-jupiter-params", "hamcrest", "jqwik-api"]

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

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

@@ -60,7 +60,7 @@ public static TransformedModel of(ResourceLocation location) {
     }
 
     public static TransformedModel of(ItemStack item, Transformation transform) {
-        var model = Minecraft.getInstance().getItemRenderer().getItemModelShaper().getItemModel(item);
+        var model = Minecraft.getInstance().getItemRenderer().getModel(item, null, null, 0);
         return new TransformedModel(model, transform);
     }
 }

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

@@ -48,7 +48,7 @@ public interface TurtleUpgradeModeller<T extends ITurtleUpgrade> {
      * by other means.
      *
      * @return A list of models that this modeller depends on.
-     * @see UnbakedModel#getDependencies()
+     * @see UnbakedModel#resolveDependencies(UnbakedModel.Resolver)
      */
     default Stream<ResourceLocation> getDependencies() {
         return Stream.of();

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

@@ -38,7 +38,7 @@ private static final class UpgradeItemModeller implements TurtleUpgradeModeller<
         @Override
         public TransformedModel getModel(ITurtleUpgrade upgrade, @Nullable ITurtleAccess turtle, TurtleSide side, DataComponentPatch data) {
             var stack = upgrade.getUpgradeItem(data);
-            var model = Minecraft.getInstance().getItemRenderer().getItemModelShaper().getItemModel(stack);
+            var model = Minecraft.getInstance().getItemRenderer().getModel(stack, null, null, 0);
             if (stack.hasFoil()) model = ClientPlatformHelper.get().createdFoiledModel(model);
             return new TransformedModel(model, side == TurtleSide.LEFT ? leftTransform : rightTransform);
         }

projects/common/build.gradle.kts

@@ -15,6 +15,12 @@ sourceSets {
     main {
         resources.srcDir("src/generated/resources")
     }
+    client {
+        java {
+            exclude("dan200/computercraft/client/integration/emi")
+            exclude("dan200/computercraft/client/integration/jei")
+        }
+    }
 }
 
 minecraft {

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

@@ -11,7 +11,6 @@
 import dan200.computercraft.client.render.CableHighlightRenderer;
 import dan200.computercraft.client.render.PocketItemRenderer;
 import dan200.computercraft.client.render.PrintoutItemRenderer;
-import dan200.computercraft.client.render.monitor.MonitorBlockEntityRenderer;
 import dan200.computercraft.client.render.monitor.MonitorHighlightRenderer;
 import dan200.computercraft.client.render.monitor.MonitorRenderState;
 import dan200.computercraft.client.sound.SpeakerManager;
@@ -29,11 +28,11 @@
 import net.minecraft.client.Camera;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.MultiBufferSource;
+import net.minecraft.client.renderer.entity.state.ItemFrameRenderState;
 import net.minecraft.client.sounds.AudioStream;
 import net.minecraft.client.sounds.SoundEngine;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.InteractionHand;
-import net.minecraft.world.entity.decoration.ItemFrame;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.BlockHitResult;
@@ -88,7 +87,7 @@ public static boolean onRenderHeldItem(
         return false;
     }
 
-    public static boolean onRenderItemFrame(PoseStack transform, MultiBufferSource render, ItemFrame frame, ItemStack stack, int light) {
+    public static boolean onRenderItemFrame(PoseStack transform, MultiBufferSource render, ItemFrameRenderState frame, ItemStack stack, int light) {
         if (stack.getItem() instanceof PrintoutItem) {
             PrintoutItemRenderer.onRenderInFrame(transform, render, frame, stack, light);
             return true;
@@ -132,17 +131,6 @@ private static void addTurtleUpgrade(Consumer<String> out, TurtleBlockEntity tur
         if (upgrade != null) out.accept(String.format("Upgrade[%s]: %s", side, upgrade.holder().key().location()));
     }
 
-    /**
-     * Add additional information about the game to the debug screen.
-     *
-     * @param addText A callback which adds a single line of text.
-     */
-    public static void addGameDebugInfo(Consumer<String> addText) {
-        if (MonitorBlockEntityRenderer.hasRenderedThisFrame() && Minecraft.getInstance().getDebugOverlay().showDebugScreen()) {
-            addText.accept("[CC:T] Monitor renderer: " + MonitorBlockEntityRenderer.currentRenderer());
-        }
-    }
-
     public static @Nullable BlockState getBlockBreakingState(BlockState state, BlockPos pos) {
         // Only apply to cables which have both a cable and modem
         if (state.getBlock() != ModRegistry.Blocks.CABLE.get()

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

@@ -14,7 +14,6 @@
 import dan200.computercraft.client.gui.*;
 import dan200.computercraft.client.pocket.ClientPocketComputers;
 import dan200.computercraft.client.render.CustomLecternRenderer;
-import dan200.computercraft.client.render.RenderTypes;
 import dan200.computercraft.client.render.TurtleBlockEntityRenderer;
 import dan200.computercraft.client.render.monitor.MonitorBlockEntityRenderer;
 import dan200.computercraft.client.turtle.TurtleModemModeller;
@@ -34,16 +33,14 @@
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.screens.inventory.MenuAccess;
 import net.minecraft.client.multiplayer.ClientLevel;
-import net.minecraft.client.renderer.ShaderInstance;
 import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
 import net.minecraft.client.renderer.blockentity.BlockEntityRenderers;
 import net.minecraft.client.renderer.item.ClampedItemPropertyFunction;
 import net.minecraft.client.renderer.item.ItemProperties;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.packs.resources.PreparableReloadListener;
-import net.minecraft.server.packs.resources.ResourceProvider;
-import net.minecraft.util.FastColor;
+import net.minecraft.util.ARGB;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.inventory.MenuType;
@@ -54,7 +51,6 @@
 
 import javax.annotation.Nullable;
 import java.io.File;
-import java.io.IOException;
 import java.util.Collection;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
@@ -182,7 +178,7 @@ private static int getPocketColour(ItemStack stack, int layer) {
             case 1 -> DyedItemColor.getOrDefault(stack, -1); // Frame colour
             case 2 -> { // Light colour
                 var computer = ClientPocketComputers.get(stack);
-                yield computer == null || computer.getLightState() == -1 ? Colour.BLACK.getARGB() : FastColor.ARGB32.opaque(computer.getLightState());
+                yield computer == null || computer.getLightState() == -1 ? Colour.BLACK.getARGB() : ARGB.opaque(computer.getLightState());
             }
         };
     }
@@ -191,10 +187,6 @@ private static int getTurtleColour(ItemStack stack, int layer) {
         return layer == 0 ? DyedItemColor.getOrDefault(stack, -1) : -1;
     }
 
-    public static void registerShaders(ResourceProvider resources, BiConsumer<ShaderInstance, Consumer<ShaderInstance>> load) throws IOException {
-        RenderTypes.registerShaders(resources, load);
-    }
-
     private record UnclampedPropertyFunction(
         ClampedItemPropertyFunction function
     ) implements ClampedItemPropertyFunction {

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

@@ -99,7 +99,7 @@ public void containerTick() {
 
         if (uploadNagDeadline != Long.MAX_VALUE && Util.getNanos() >= uploadNagDeadline) {
             new ItemToast(minecraft(), displayStack, NO_RESPONSE_TITLE, NO_RESPONSE_MSG, ItemToast.TRANSFER_NO_RESPONSE_TOKEN)
-                .showOrReplace(minecraft().getToasts());
+                .showOrReplace(minecraft().getToastManager());
             uploadNagDeadline = Long.MAX_VALUE;
         }
     }

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

@@ -7,7 +7,6 @@
 import dan200.computercraft.client.gui.widgets.ComputerSidebar;
 import dan200.computercraft.client.gui.widgets.TerminalWidget;
 import dan200.computercraft.client.render.ComputerBorderRenderer;
-import dan200.computercraft.client.render.RenderTypes;
 import dan200.computercraft.client.render.SpriteRenderer;
 import dan200.computercraft.shared.computer.inventory.AbstractComputerMenu;
 import net.minecraft.client.gui.GuiGraphics;
@@ -40,14 +39,14 @@ protected TerminalWidget createTerminal() {
     public void renderBg(GuiGraphics graphics, float partialTicks, int mouseX, int mouseY) {
         // Draw a border around the terminal
         var terminal = getTerminal();
-        var spriteRenderer = SpriteRenderer.createForGui(graphics, RenderTypes.GUI_SPRITES);
-        var computerTextures = GuiSprites.getComputerTextures(family);
-
-        ComputerBorderRenderer.render(
-            spriteRenderer, computerTextures,
-            terminal.getX(), terminal.getY(), terminal.getWidth(), terminal.getHeight(), false
-        );
-        ComputerSidebar.renderBackground(spriteRenderer, computerTextures, leftPos, topPos + sidebarYOffset);
-        graphics.flush(); // Flush to ensure background textures are drawn before foreground.
+
+        SpriteRenderer.inGui(graphics, spriteRenderer -> {
+            var computerTextures = GuiSprites.getComputerTextures(family);
+            ComputerBorderRenderer.render(
+                spriteRenderer, computerTextures,
+                terminal.getX(), terminal.getY(), terminal.getWidth(), terminal.getHeight(), false
+            );
+            ComputerSidebar.renderBackground(spriteRenderer, computerTextures, leftPos, topPos + sidebarYOffset);
+        });
     }
 }

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

@@ -7,6 +7,7 @@
 import dan200.computercraft.shared.peripheral.diskdrive.DiskDriveMenu;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
+import net.minecraft.client.renderer.RenderType;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.player.Inventory;
@@ -23,7 +24,7 @@ public DiskDriveScreen(DiskDriveMenu container, Inventory player, Component titl
 
     @Override
     protected void renderBg(GuiGraphics graphics, float partialTicks, int mouseX, int mouseY) {
-        graphics.blit(BACKGROUND, leftPos, topPos, 0, 0, imageWidth, imageHeight);
+        graphics.blit(RenderType::guiTextured, BACKGROUND, leftPos, topPos, 0, 0, imageWidth, imageHeight, 256, 256);
     }
 
     @Override

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

@@ -35,8 +35,8 @@ public final class GuiSprites extends TextureAtlasHolder {
 
     private static ButtonTextures button(String name) {
         return new ButtonTextures(
-            ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "gui/buttons/" + name),
-            ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "gui/buttons/" + name + "_hover")
+            ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "buttons/" + name),
+            ResourceLocation.fromNamespaceAndPath(ComputerCraftAPI.MOD_ID, "buttons/" + name + "_hover")
         );
     }
 
@@ -97,12 +97,8 @@ public static ComputerTextures getComputerTextures(ComputerFamily family) {
      * @param active The texture for the button when it is active (hovered or focused).
      */
     public record ButtonTextures(ResourceLocation normal, ResourceLocation active) {
-        public TextureAtlasSprite get(boolean active) {
-            return GuiSprites.get(active ? this.active : normal);
-        }
-
-        public Stream<ResourceLocation> textures() {
-            return Stream.of(normal, active);
+        public ResourceLocation get(boolean active) {
+            return active ? this.active : normal;
         }
     }