Initial update to 1.21.10

buildSrc/build.gradle.kts

@@ -25,6 +25,7 @@ repositories {
         name = "Fabric"
         content {
             includeGroup("net.fabricmc")
+            includeGroup("net.fabricmc.unpick")
         }
     }
 

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

@@ -68,5 +68,5 @@ tasks.ideaSyncTask {
 tasks.named("checkDependencyConsistency", DependencyCheck::class.java) {
     val libs = project.extensions.getByType<VersionCatalogsExtension>().named("libs")
     // Minecraft depends on asm, but Fabric forces it to a more recent version
-    override(libs.findLibrary("asm").get(), "9.8")
+    override(libs.findLibrary("asm").get(), "9.9")
 }

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

@@ -50,7 +50,6 @@ repositories {
             includeGroup("com.simibubi.create")
             includeGroup("net.commoble.morered")
             includeGroup("dev.architectury")
-            includeGroup("dev.emi")
             includeGroup("maven.modrinth")
             includeGroup("me.shedaniel.cloth")
             includeGroup("me.shedaniel")

gradle.properties

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

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.129.0+1.21.8"
-fabric-loader = "0.16.14"
-neoForge = "21.8.0-beta"
+fabric-api = "0.135.0+1.21.10"
+fabric-loader = "0.17.3"
+neoForge = "21.10.6-beta"
 neoMergeTool = "2.0.0"
 mixin = "0.8.5"
-parchment = "2025.06.29"
-parchmentMc = "1.21.6"
-yarn = "1.21.7+build.1"
+parchment = "2025.10.12"
+parchmentMc = "1.21.10"
+yarn = "1.21.10+build.2"
 
 # Core dependencies (these versions are tied to the version Minecraft uses)
 fastutil = "8.5.15"
@@ -36,12 +36,11 @@ kotlin-coroutines = "1.10.1"
 nightConfig = "3.8.1"
 
 # Minecraft mods
-emi = "1.1.7+1.21"
 fabricPermissions = "0.3.3"
 iris-fabric = "1.9.1+1.21.7-fabric"
 iris-forge = "1.9.1+1.21.7-neoforge"
-jei = "23.1.0.4"
-modmenu = "13.0.2"
+jei = "26.0.0.1"
+modmenu = "16.0.0-rc.1"
 moreRed = "6.0.0.3"
 rei = "18.0.800"
 sodium-fabric = "mc1.21.6-0.6.13-fabric"
@@ -62,20 +61,20 @@ cctJavadoc = "1.8.5"
 checkstyle = "10.23.1"
 errorProne-core = "2.38.0"
 errorProne-plugin = "4.1.0"
-fabric-loom = "1.10.4"
+fabric-loom = "1.11.8"
 githubRelease = "2.5.2"
 gradleVersions = "0.50.0"
 ideaExt = "1.1.7"
 illuaminate = "0.1.0-83-g1131f68"
 lwjgl = "3.3.3"
 minotaur = "2.8.7"
-modDevGradle = "2.0.99"
+modDevGradle = "2.0.113"
 nullAway = "0.12.7"
 shadow = "8.3.1"
 spotless = "7.0.2"
 taskTree = "2.1.1"
 teavm = "0.13.0-SQUID.1"
-vanillaExtract = "0.2.1"
+vanillaExtract = "0.3.0"
 versionCatalogUpdate = "0.8.1"
 
 [libraries]
@@ -106,16 +105,15 @@ slf4j = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
 # Minecraft mods
 create-fabric = { module = "com.simibubi.create:create-fabric-1.20.1", version.ref = "create-fabric" }
 create-forge = { module = "com.simibubi.create:create-1.21.1", version.ref = "create-forge" }
-emi = { module = "dev.emi:emi-xplat-mojmap", version.ref = "emi" }
 fabric-api = { module = "net.fabricmc.fabric-api:fabric-api", version.ref = "fabric-api" }
 fabric-junit = { module = "net.fabricmc:fabric-loader-junit", version.ref = "fabric-loader" }
 fabric-loader = { module = "net.fabricmc:fabric-loader", version.ref = "fabric-loader" }
 fabricPermissions = { module = "me.lucko:fabric-permissions-api", version.ref = "fabricPermissions" }
 iris-fabric = { module = "maven.modrinth:iris", version.ref = "iris-fabric" }
 iris-forge = { module = "maven.modrinth:iris", version.ref = "iris-forge" }
-jei-api = { module = "mezz.jei:jei-1.21.7-common-api", version.ref = "jei" }
-jei-fabric = { module = "mezz.jei:jei-1.21.7-fabric", version.ref = "jei" }
-jei-forge = { module = "mezz.jei:jei-1.21.7-neoforge", version.ref = "jei" }
+jei-api = { module = "mezz.jei:jei-1.21.10-common-api", version.ref = "jei" }
+jei-fabric = { module = "mezz.jei:jei-1.21.10-fabric", version.ref = "jei" }
+jei-forge = { module = "mezz.jei:jei-1.21.10-neoforge", version.ref = "jei" }
 mixin = { module = "org.spongepowered:mixin", version.ref = "mixin" }
 mixinExtra = { module = "io.github.llamalad7:mixinextras-common", version.ref = "mixinExtra" }
 modmenu = { module = "com.terraformersmc:modmenu", version.ref = "modmenu" }

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -205,15 +205,15 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew.bat

@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

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

@@ -6,23 +6,27 @@
 
 import com.google.common.base.Suppliers;
 import com.mojang.blaze3d.vertex.PoseStack;
+import com.mojang.blaze3d.vertex.SheetedDecalTextureGenerator;
+import com.mojang.blaze3d.vertex.VertexConsumer;
 import dan200.computercraft.api.client.turtle.TurtleUpgradeModel;
 import net.minecraft.client.multiplayer.ClientLevel;
-import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.Sheets;
+import net.minecraft.client.renderer.SubmitNodeCollector;
 import net.minecraft.client.renderer.block.model.BakedQuad;
+import net.minecraft.client.renderer.feature.ModelFeatureRenderer;
 import net.minecraft.client.renderer.item.BlockModelWrapper;
 import net.minecraft.client.renderer.item.ItemModel;
 import net.minecraft.client.renderer.item.ItemModelResolver;
 import net.minecraft.client.renderer.item.ItemStackRenderState;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.client.resources.model.BlockModelRotation;
 import net.minecraft.client.resources.model.ModelBaker;
+import net.minecraft.client.resources.model.ModelBakery;
 import net.minecraft.client.resources.model.ResolvedModel;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.ARGB;
-import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.ItemOwner;
 import net.minecraft.world.item.ItemDisplayContext;
 import net.minecraft.world.item.ItemStack;
 import org.joml.Vector3f;
@@ -113,7 +117,7 @@ private static StandaloneModel ofUncached(ResolvedModel model, ModelBaker baker)
      * Set up an {@link ItemStackRenderState.LayerRenderState} to render this model.
      *
      * @param layer The layer to set up.
-     * @see ItemModel#update(ItemStackRenderState, ItemStack, ItemModelResolver, ItemDisplayContext, ClientLevel, LivingEntity, int)
+     * @see ItemModel#update(ItemStackRenderState, ItemStack, ItemModelResolver, ItemDisplayContext, ClientLevel, ItemOwner, int)
      */
     public void setupItemLayer(ItemStackRenderState.LayerRenderState layer) {
         layer.setExtents(extents);
@@ -127,26 +131,37 @@ public void setupItemLayer(ItemStackRenderState.LayerRenderState layer) {
      * Render the model directly.
      *
      * @param transform The current pose stack transformations.
-     * @param buffers   The buffer source to use for rendering.
+     * @param collector The node collector to render to.
      * @param light     The current light texture coordinate.
      * @param overlay   The current overlay texture coordinate.
      */
-    public void render(PoseStack transform, MultiBufferSource buffers, int light, int overlay) {
-        render(transform, buffers, light, overlay, null);
+    public void submit(PoseStack transform, SubmitNodeCollector collector, int light, int overlay) {
+        submit(transform, collector, light, overlay, null, null);
     }
 
     /**
      * Render the model directly.
      *
-     * @param transform The current pose stack transformations.
-     * @param buffers   The buffer source to use for rendering.
-     * @param light     The current light texture coordinate.
-     * @param overlay   The current overlay texture coordinate.
-     * @param tints     The tints for this model.
+     * @param transform        The current pose stack transformations.
+     * @param collector        The node collector to render to.
+     * @param light            The current light texture coordinate.
+     * @param overlay          The current overlay texture coordinate.
+     * @param tints            The tints for this model.
+     * @param crumblingOverlay The current breaking progress.
      */
-    public void render(PoseStack transform, MultiBufferSource buffers, int light, int overlay, int @Nullable [] tints) {
-        var pose = transform.last();
-        var buffer = buffers.getBuffer(renderType);
+    public void submit(PoseStack transform, SubmitNodeCollector collector, int light, int overlay, int @Nullable [] tints, ModelFeatureRenderer.@Nullable CrumblingOverlay crumblingOverlay) {
+        collector.submitCustomGeometry(transform, renderType, (pose, buffer) -> render(pose, buffer, tints, light, overlay));
+
+        if (crumblingOverlay != null && renderType.affectsCrumbling()) {
+            // FIXME: We need a custom hook here, which renders to crumblingBufferSource. Currently the DESTROY_TYPES
+            //  buffer gets flushed before the main model gets rendered.
+            collector.submitCustomGeometry(transform, ModelBakery.DESTROY_TYPES.get(crumblingOverlay.progress()), (pose, buffer) ->
+                render(pose, new SheetedDecalTextureGenerator(buffer, crumblingOverlay.cameraPose(), 1.0f), null, light, overlay)
+            );
+        }
+    }
+
+    private void render(PoseStack.Pose pose, VertexConsumer buffer, int @Nullable [] tints, int light, int overlay) {
         for (var quad : quads) {
             float r, g, b, a;
             var idx = quad.tintIndex();

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

@@ -4,16 +4,13 @@
 
 package dan200.computercraft.api.client.turtle;
 
-import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import dan200.computercraft.api.ComputerCraftAPI;
 import dan200.computercraft.api.client.StandaloneModel;
-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 net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.block.model.ItemTransform;
 import net.minecraft.client.renderer.item.BlockModelWrapper;
 import net.minecraft.client.renderer.item.ItemModelResolver;
@@ -70,11 +67,6 @@ public void renderForItem(UpgradeData<ITurtleUpgrade> upgrade, TurtleSide side,
         getModel(side).setupItemLayer(layer);
     }
 
-    @Override
-    public void renderForLevel(UpgradeData<ITurtleUpgrade> upgrade, TurtleSide side, ITurtleAccess turtle, PoseStack transform, MultiBufferSource buffers, int light, int overlay) {
-        getModel(side).render(transform, buffers, light, overlay);
-    }
-
     private record Unbaked(ResourceLocation left, ResourceLocation right) implements TurtleUpgradeModel.Unbaked {
         @Override
         public MapCodec<? extends TurtleUpgradeModel.Unbaked> type() {

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

@@ -9,12 +9,10 @@
 import com.mojang.math.Transformation;
 import com.mojang.serialization.MapCodec;
 import dan200.computercraft.api.ComputerCraftAPI;
-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 net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.MultiBufferSource;
+import net.minecraft.client.renderer.SubmitNodeCollector;
 import net.minecraft.client.renderer.block.model.ItemTransform;
 import net.minecraft.client.renderer.item.ItemModelResolver;
 import net.minecraft.client.renderer.item.ItemStackRenderState;
@@ -23,7 +21,6 @@
 import net.minecraft.client.resources.model.ModelBaker;
 import net.minecraft.core.component.DataComponentPatch;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.util.Mth;
 import net.minecraft.world.item.ItemDisplayContext;
 import net.minecraft.world.item.ItemStack;
 import org.joml.Matrix4f;
@@ -77,15 +74,6 @@ public void renderForItem(UpgradeData<ITurtleUpgrade> upgrade, TurtleSide side,
         }
     }
 
-    @Override
-    public void renderForLevel(UpgradeData<ITurtleUpgrade> upgrade, TurtleSide side, ITurtleAccess turtle, PoseStack transform, MultiBufferSource buffers, int light, int overlay) {
-        transform.mulPose(getRenderer(side).transform().getMatrix());
-        transform.mulPose(Axis.YP.rotation(Mth.PI));
-        Minecraft.getInstance().getItemRenderer().renderStatic(
-            upgrade.getUpgradeItem(), ItemDisplayContext.FIXED, light, overlay, transform, buffers, turtle.getLevel(), 0
-        );
-    }
-
     private static final class Unbaked implements TurtleUpgradeModel.Unbaked {
         @Override
         public MapCodec<? extends TurtleUpgradeModel.Unbaked> type() {
@@ -120,14 +108,14 @@ private static TransformedRenderer getRenderer(TurtleSide side) {
 
     private record TransformedRenderer(Transformation transform) implements SpecialModelRenderer<ItemStackRenderState> {
         @Override
-        public void render(
-            @Nullable ItemStackRenderState state, ItemDisplayContext itemDisplayContext, PoseStack poseStack,
-            MultiBufferSource multiBufferSource, int overlay, int light, boolean bl
+        public void submit(
+            @Nullable ItemStackRenderState state, ItemDisplayContext context, PoseStack poseStack, SubmitNodeCollector sink,
+            int light, int overlay, boolean foil, int outlineColour
         ) {
             if (state == null) return;
             poseStack.pushPose();
             poseStack.mulPose(transform.getMatrix());
-            state.render(poseStack, multiBufferSource, overlay, light);
+            state.submit(poseStack, sink, light, overlay, outlineColour);
             poseStack.popPose();
         }
 

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

@@ -6,20 +6,17 @@
 
 import com.google.common.collect.HashMultiset;
 import com.google.common.collect.Multiset;
-import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.datafixers.util.Pair;
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.DataResult;
 import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import dan200.computercraft.api.ComputerCraftAPI;
-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 it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import net.minecraft.Util;
-import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.block.model.ItemTransform;
 import net.minecraft.client.renderer.item.ItemModelResolver;
 import net.minecraft.client.renderer.item.ItemStackRenderState;
@@ -71,11 +68,6 @@ public void renderForItem(UpgradeData<ITurtleUpgrade> upgrade, TurtleSide side,
         getModel(upgrade).renderForItem(upgrade, side, renderer, resolver, transform, seed);
     }
 
-    @Override
-    public void renderForLevel(UpgradeData<ITurtleUpgrade> upgrade, TurtleSide side, ITurtleAccess turtle, PoseStack transform, MultiBufferSource buffers, int light, int overlay) {
-        getModel(upgrade).renderForLevel(upgrade, side, turtle, transform, buffers, light, overlay);
-    }
-
     private record Unbaked<T>(
         Cases<T> cases,
         Optional<TurtleUpgradeModel.Unbaked> fallback