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

2025-10-22 17:37:38 +00:00 · 2023-06-20 08:59:06 +01:00
parent c45fc94752 c8523bf479
commit ebaf49508f
65 changed files with 1040 additions and 267 deletions
--- a/projects/common/src/client/java/dan200/computercraft/client/gui/TurtleScreen.java
+++ b/projects/common/src/client/java/dan200/computercraft/client/gui/TurtleScreen.java
@@ -25,9 +25,11 @@ 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 = 254;
+    private static final int TEX_WIDTH = 278;
    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,15 +46,16 @@ public class TurtleScreen extends AbstractComputerScreen<TurtleMenu> {
    protected void renderBg(GuiGraphics graphics, float partialTicks, int mouseX, int mouseY) {
        var advanced = family == ComputerFamily.ADVANCED;
        var texture = advanced ? BACKGROUND_ADVANCED : BACKGROUND_NORMAL;
-        graphics.blit(texture, leftPos + AbstractComputerMenu.SIDEBAR_WIDTH, topPos, 0, 0, TEX_WIDTH, TEX_HEIGHT);
+        graphics.blit(texture, leftPos + AbstractComputerMenu.SIDEBAR_WIDTH, topPos, 0, 0, 0, TEX_WIDTH, TEX_HEIGHT, FULL_TEX_SIZE, FULL_TEX_SIZE);

+        // Render selected slot
        var slot = getMenu().getSelectedSlot();
        if (slot >= 0) {
            var slotX = slot % 4;
            var slotY = slot / 4;
            graphics.blit(texture,
-                leftPos + TURTLE_START_X - 2 + slotX * 18, topPos + PLAYER_START_Y - 2 + slotY * 18,
-                0, 217, 24, 24
+                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
            );
        }

--- a/projects/common/src/client/java/dan200/computercraft/client/model/turtle/ModelTransformer.java
+++ b/projects/common/src/client/java/dan200/computercraft/client/model/turtle/ModelTransformer.java
@@ -0,0 +1,98 @@
+// 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);
+    }
+}
--- a/projects/common/src/client/java/dan200/computercraft/client/render/TurtleBlockEntityRenderer.java
+++ b/projects/common/src/client/java/dan200/computercraft/client/render/TurtleBlockEntityRenderer.java
@@ -10,6 +10,7 @@ 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;
@@ -30,6 +31,7 @@ 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;
@@ -146,16 +148,30 @@ 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;
@@ -167,7 +183,50 @@ 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;
-            buffer.putBulkData(matrix, bakedquad, r, g, b, lightmapCoord, overlayLight);
+            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()
+            );
        }
    }

--- a/projects/common/src/client/java/dan200/computercraft/data/client/ClientDataProviders.java
+++ b/projects/common/src/client/java/dan200/computercraft/data/client/ClientDataProviders.java
@@ -0,0 +1,34 @@
+// 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())
+            ));
+        });
+    }
+}
--- a/projects/common/src/main/java/dan200/computercraft/data/BlockModelProvider.java
+++ b/projects/common/src/main/java/dan200/computercraft/data/BlockModelProvider.java
@@ -37,6 +37,14 @@ 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(),
@@ -142,11 +150,18 @@ class BlockModelProvider {
    private static void registerComputer(BlockModelGenerators generators, ComputerBlock<?> block) {
        generators.blockStateOutput.accept(MultiVariantGenerator.multiVariant(block)
            .with(createHorizontalFacingDispatch())
-            .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
-            )))
+            .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
+                );
+            }))
        );
        generators.delegateItemModel(block, getModelLocation(block, "_blinking"));
    }
--- a/projects/common/src/main/java/dan200/computercraft/data/DataProviders.java
+++ b/projects/common/src/main/java/dan200/computercraft/data/DataProviders.java
@@ -4,16 +4,20 @@

 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;

 /**
@@ -37,11 +41,22 @@ 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);
+        }
    }

-    interface GeneratorSink {
+    public 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);
--- a/projects/common/src/main/java/dan200/computercraft/shared/container/BasicContainer.java
+++ b/projects/common/src/main/java/dan200/computercraft/shared/container/BasicContainer.java
@@ -7,7 +7,6 @@ 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;

 /**
@@ -16,24 +15,6 @@ 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();
--- a/projects/common/src/main/java/dan200/computercraft/shared/peripheral/speaker/SpeakerPeripheral.java
+++ b/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"}.
     *
--- a/projects/common/src/main/java/dan200/computercraft/shared/turtle/inventory/TurtleMenu.java
+++ b/projects/common/src/main/java/dan200/computercraft/shared/turtle/inventory/TurtleMenu.java
@@ -4,6 +4,7 @@

 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;
@@ -29,12 +30,13 @@ 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, ContainerData data
+        Inventory playerInventory, Container inventory, Container turtleUpgrades, ContainerData data
    ) {
        super(ModRegistry.Menus.TURTLE.get(), id, canUse, family, computer, menuData);
        this.data = data;
@@ -58,19 +60,24 @@ 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(), (SingleContainerData) turtle::getSelectedSlot
+            player, turtle.getInventory(), new UpgradeContainer(turtle), (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 SimpleContainerData(1)
+            id, x -> true, data.family(), null, data,
+            player, new SimpleContainer(TurtleBlockEntity.INVENTORY_SIZE), new SimpleContainer(2), new SimpleContainerData(1)
        );
    }

--- a/projects/common/src/main/java/dan200/computercraft/shared/turtle/inventory/UpgradeContainer.java
+++ b/projects/common/src/main/java/dan200/computercraft/shared/turtle/inventory/UpgradeContainer.java
@@ -0,0 +1,108 @@
+// 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.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 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<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 upgrade = turtle.getUpgrade(getSide(slot));
+
+        // We don't want to return getCraftingItem directly here, as consumers may mutate the stack (they shouldn't!,
+        // but if they do it's a pain to track down). To avoid recreating the stack each tick, we maintain a simple
+        // cache.
+        if (upgrade == lastUpgrade.get(slot)) return lastStack.get(slot);
+
+        var stack = upgrade == null ? ItemStack.EMPTY : upgrade.getCraftingItem().copy();
+        lastUpgrade.set(slot, upgrade);
+        lastStack.set(slot, stack);
+        return stack;
+    }
+
+    @Override
+    public void setItem(int slot, ItemStack itemStack) {
+        turtle.setUpgrade(getSide(slot), TurtleUpgrades.instance().get(itemStack));
+    }
+
+    @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);
+    }
+}
--- a/projects/common/src/main/java/dan200/computercraft/shared/turtle/inventory/UpgradeSlot.java
+++ b/projects/common/src/main/java/dan200/computercraft/shared/turtle/inventory/UpgradeSlot.java
@@ -0,0 +1,50 @@
+// 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);
+    }
+}
--- a/projects/common/src/main/resources/assets/computercraft/lang/ru_ru.json
+++ b/projects/common/src/main/resources/assets/computercraft/lang/ru_ru.json
@@ -115,5 +115,67 @@
    "upgrade.minecraft.diamond_pickaxe.adjective": "Добывающая",
    "upgrade.minecraft.diamond_shovel.adjective": "Копающая",
    "upgrade.minecraft.diamond_sword.adjective": "Боевая",
-    "gui.computercraft.pocket_computer_overlay": "Карманный компьютер открыт. Чтобы закрыть, нажми ESC."
+    "gui.computercraft.pocket_computer_overlay": "Карманный компьютер открыт. Чтобы закрыть, нажми ESC.",
+    "gui.computercraft.config.command_require_creative.tooltip": "Требовать творческий режим и права оператора для взаимодействия с\nкомандными компьютерами. Это поведение по умолчанию для Командных блоков ванильной игры.",
+    "gui.computercraft.config.default_computer_settings.tooltip": "Разделенный запятыми список системных настроек по умолчанию на новых компьютерах.\nНапример: \"shell.autocomplete=false,lua.autocomplete=false,edit.autocomplete=false\"\nотключит всё автодополнение.",
+    "gui.computercraft.config.execution.computer_threads.tooltip": "Устанавливает количество потоков, на которых работают компьютеры. Большее число\nозначает, что больше компьютеров сможет работать одновременно, но может привести к лагу.\nОбратите внимание, что некоторые моды могут не работать с более чем одним потоком. Используйте с осторожностью.\nОграничение: > 1",
+    "gui.computercraft.config.execution.max_main_computer_time.tooltip": "Идеальный максимум времени, которое отведено компьютеру на выполнение задач, в миллисекундах.\nМы вполне возможно выйдем за этот лимит, так как невозможно предсказать сколько\nвремени будет затрачено на выполнение задач, это лишь верхний лимит среднего значения времени.\nОграничение: > 1",
+    "gui.computercraft.config.execution.max_main_global_time.tooltip": "Максимум времени, которое может быть потрачено на выполнение задач за один тик, в \nмиллисекундах. \nМы вполне возможно выйдем за этот лимит, так как невозможно предсказать сколько\nвремени будет затрачено на выполнение задач, это лишь верхний лимит среднего значения времени.\nОграничение: > 1",
+    "gui.computercraft.config.http.bandwidth.global_download": "Глобальный лимит на скачивание",
+    "gui.computercraft.config.http.bandwidth.global_download.tooltip": "Количество байтов, которое можно скачать за секунду. Все компьютеры делят эту пропускную способность. (байты в секунду)\nОграничение: > 1",
+    "gui.computercraft.config.http.bandwidth.global_upload.tooltip": "Количество байтов, которое можно загрузить за секунду. Все компьютеры делят эту пропускную способность. (байты в секунду)\nОграничение: > 1",
+    "tracking_field.computercraft.http_requests.name": "HTTP запросы",
+    "tracking_field.computercraft.turtle_ops.name": "Операции Черепашек",
+    "gui.computercraft.config.http.enabled.tooltip": "Включить API \"http\" на Компьютерах. Это также отключает программы \"pastebin\" и \"wget\", \nкоторые нужны многим пользователям. Рекомендуется оставить это включенным и использовать \nконфиг \"rules\" для более тонкой настройки.",
+    "gui.computercraft.config.http.max_websockets.tooltip": "Количество одновременно открытых веб-сокетов, которые может иметь компьютер. Установите на 0 для неограниченных веб-сокетов.\nОграничение: > 1",
+    "gui.computercraft.config.term_sizes": "Размер терминала",
+    "gui.computercraft.config.term_sizes.computer.height": "Высота терминала",
+    "gui.computercraft.config.term_sizes.monitor.height": "Максимальная высота монитора",
+    "gui.computercraft.config.term_sizes.monitor.width.tooltip": "Ограничение: 1 ~ 32",
+    "gui.computercraft.config.turtle.advanced_fuel_limit": "Лимит топлива Продвинутых Черепашек",
+    "gui.computercraft.config.turtle.need_fuel.tooltip": "Устанавливает, нуждаются ли Черепашки в топливе для передвижения.",
+    "gui.computercraft.terminal": "Компьютерный терминал",
+    "tracking_field.computercraft.computer_tasks.name": "Задачи",
+    "tracking_field.computercraft.server_tasks.name": "Серверные задачи",
+    "gui.computercraft.upload.no_response": "Перенос файлов",
+    "tracking_field.computercraft.avg": "%s (среднее)",
+    "gui.computercraft.config.command_require_creative": "Для использования командных компьютеров нужен творческий режим",
+    "gui.computercraft.config.computer_space_limit": "Лимит места на компьютерах (в байтах)",
+    "gui.computercraft.config.computer_space_limit.tooltip": "Лимит места на дисках компьютеров и черепашек, в байтах.",
+    "gui.computercraft.config.default_computer_settings": "Настройки Компьютера по умолчанию",
+    "gui.computercraft.config.disable_lua51_features": "Отключить функции Lua 5.1",
+    "gui.computercraft.config.disable_lua51_features.tooltip": "Поставьте, чтобы отключить функции из Lua 5.1, которые будут убраны в будущих\nобновлениях. Полезно для того, чтобы улучшить совместимость вперед ваших программ.",
+    "gui.computercraft.config.execution": "Выполнение",
+    "gui.computercraft.config.execution.computer_threads": "Потоки компьютера",
+    "gui.computercraft.config.execution.max_main_global_time": "Глобальный лимит времени на тик сервера",
+    "gui.computercraft.config.execution.tooltip": "Контролирует поведение выполнения задач компьютеров. Эта настройка преднезначается для \nтонкой настройки серверов, и в основном не должна быть изменена.",
+    "gui.computercraft.config.floppy_space_limit": "Лимит места на дискетах (байты)",
+    "gui.computercraft.config.floppy_space_limit.tooltip": "Лимит места для хранения информации на дискетах, в байтах.",
+    "gui.computercraft.config.http": "HTTP",
+    "gui.computercraft.config.http.bandwidth": "Пропускная способность",
+    "gui.computercraft.config.http.bandwidth.global_upload": "Глобальный лимит загрузки",
+    "gui.computercraft.config.http.bandwidth.tooltip": "Ограничивает пропускную способность, используемую компьютерами.",
+    "gui.computercraft.config.http.enabled": "Включить HTTP API",
+    "gui.computercraft.config.http.max_requests": "Максимум одновременных запросов",
+    "gui.computercraft.config.http.max_requests.tooltip": "Количество http-запросов, которые компьютер может сделать одновременно. Дополнительные запросы \nбудут поставлены в очередь, и отправлены когда существующие запросы будут выполнены. Установите на 0 для \nнеограниченных запросов.\nОграничение: > 0",
+    "gui.computercraft.config.http.max_websockets": "Максимум одновременных веб-сокетов",
+    "gui.computercraft.config.term_sizes.computer": "Компьютер",
+    "gui.computercraft.config.term_sizes.computer.height.tooltip": "Ограничение: 1 ~ 255",
+    "gui.computercraft.config.term_sizes.computer.tooltip": "Размер терминала на компьютерах.",
+    "gui.computercraft.config.term_sizes.computer.width": "Ширина терминала",
+    "gui.computercraft.config.term_sizes.computer.width.tooltip": "Ограничение: 1 ~ 255",
+    "gui.computercraft.config.term_sizes.monitor": "Монитор",
+    "gui.computercraft.config.term_sizes.monitor.height.tooltip": "Ограничение: 1 ~ 32",
+    "gui.computercraft.config.term_sizes.monitor.tooltip": "Максимальный размер мониторов (в блоках).",
+    "gui.computercraft.config.term_sizes.monitor.width": "Максимальная ширина мониторов",
+    "gui.computercraft.config.term_sizes.pocket_computer.height": "Высота терминала",
+    "gui.computercraft.config.term_sizes.pocket_computer.height.tooltip": "Ограничение: 1 ~ 255",
+    "gui.computercraft.config.term_sizes.pocket_computer.width": "Ширина терминала",
+    "gui.computercraft.config.term_sizes.pocket_computer.width.tooltip": "Ограничение: 1 ~ 255",
+    "gui.computercraft.config.turtle": "Черепашки",
+    "gui.computercraft.config.turtle.advanced_fuel_limit.tooltip": "Лимит топлива для Продвинутых Черепашек.\nОграничение: > 0",
+    "gui.computercraft.config.turtle.need_fuel": "Включить механику топлива",
+    "gui.computercraft.config.turtle.normal_fuel_limit": "Лимит топлива Черепашек",
+    "gui.computercraft.config.turtle.normal_fuel_limit.tooltip": "Лимит топлива для Черепашек.\nОграничение: > 0",
+    "gui.computercraft.config.turtle.tooltip": "Разные настройки, связанные с черепашками."
 }
--- a/projects/common/src/main/resources/assets/computercraft/models/block/computer_on.json
+++ b/projects/common/src/main/resources/assets/computercraft/models/block/computer_on.json
@@ -0,0 +1,39 @@
+{
+    "parent": "minecraft:block/block",
+    "render_type": "cutout",
+    "textures": {
+        "particle": "#front"
+    },
+    "display": {
+        "firstperson_righthand": {
+            "rotation": [ 0, 135, 0 ],
+            "translation": [ 0, 0, 0 ],
+            "scale": [ 0.40, 0.40, 0.40 ]
+        }
+    },
+    "elements": [
+        {
+            "from": [ 0, 0, 0 ],
+            "to": [ 16, 16, 16 ],
+            "faces": {
+                "down":  { "texture": "#top",   "cullface": "down" },
+                "up":    { "texture": "#top",   "cullface": "up" },
+                "north": { "texture": "#front", "cullface": "north" },
+                "south": { "texture": "#side",  "cullface": "south" },
+                "west":  { "texture": "#side",  "cullface": "west" },
+                "east":  { "texture": "#side",  "cullface": "east" }
+            }
+        },
+        {
+            "from": [ 0, 0, 0 ],
+            "to": [ 16, 16, 16 ],
+            "faces": {
+                "north": {
+                    "texture": "#cursor",
+                    "cullface": "north",
+                    "forge_data": {"block_light": 15, "sky_light": 15}
+                }
+            }
+        }
+    ]
+}
--- a/projects/common/src/main/resources/assets/computercraft/models/block/computer_on.json.license
+++ b/projects/common/src/main/resources/assets/computercraft/models/block/computer_on.json.license
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2023 The CC: Tweaked Developers
+
+SPDX-License-Identifier: MPL-2.0
--- a/projects/common/src/main/resources/assets/computercraft/textures/block/computer_advanced_front_blink.png
+++ b/projects/common/src/main/resources/assets/computercraft/textures/block/computer_advanced_front_blink.png
--- a/projects/common/src/main/resources/assets/computercraft/textures/block/computer_advanced_front_on.png
+++ b/projects/common/src/main/resources/assets/computercraft/textures/block/computer_advanced_front_on.png
--- a/projects/common/src/main/resources/assets/computercraft/textures/block/computer_blink.png
+++ b/projects/common/src/main/resources/assets/computercraft/textures/block/computer_blink.png
--- a/projects/common/src/main/resources/assets/computercraft/textures/block/computer_advanced_front_blink.png.mcmeta
+++ b/projects/common/src/main/resources/assets/computercraft/textures/block/computer_advanced_front_blink.png.mcmeta
--- a/projects/common/src/main/resources/assets/computercraft/textures/block/computer_command_front_blink.png
+++ b/projects/common/src/main/resources/assets/computercraft/textures/block/computer_command_front_blink.png
--- a/projects/common/src/main/resources/assets/computercraft/textures/block/computer_command_front_blink.png.mcmeta
+++ b/projects/common/src/main/resources/assets/computercraft/textures/block/computer_command_front_blink.png.mcmeta
@@ -1,6 +0,0 @@
-{
-  "animation": {
-    "frametime": 8,
-    "frames": [ 0, 1 ]
-  }
-}
--- a/projects/common/src/main/resources/assets/computercraft/textures/block/computer_command_front_on.png
+++ b/projects/common/src/main/resources/assets/computercraft/textures/block/computer_command_front_on.png
--- a/projects/common/src/main/resources/assets/computercraft/textures/block/computer_normal_front_blink.png
+++ b/projects/common/src/main/resources/assets/computercraft/textures/block/computer_normal_front_blink.png
--- a/projects/common/src/main/resources/assets/computercraft/textures/block/computer_normal_front_blink.png.mcmeta
+++ b/projects/common/src/main/resources/assets/computercraft/textures/block/computer_normal_front_blink.png.mcmeta
@@ -1,6 +0,0 @@
-{
-  "animation": {
-    "frametime": 8,
-    "frames": [ 0, 1 ]
-  }
-}
--- a/projects/common/src/main/resources/assets/computercraft/textures/block/computer_normal_front_on.png
+++ b/projects/common/src/main/resources/assets/computercraft/textures/block/computer_normal_front_on.png
--- a/projects/common/src/main/resources/assets/computercraft/textures/block/computer_on.png
+++ b/projects/common/src/main/resources/assets/computercraft/textures/block/computer_on.png
--- a/projects/common/src/main/resources/assets/computercraft/textures/gui/turtle_advanced.png
+++ b/projects/common/src/main/resources/assets/computercraft/textures/gui/turtle_advanced.png
--- a/projects/common/src/main/resources/assets/computercraft/textures/gui/turtle_normal.png
+++ b/projects/common/src/main/resources/assets/computercraft/textures/gui/turtle_normal.png
--- a/projects/common/src/main/resources/assets/computercraft/textures/gui/turtle_upgrade_left.png
+++ b/projects/common/src/main/resources/assets/computercraft/textures/gui/turtle_upgrade_left.png
--- a/projects/common/src/main/resources/assets/computercraft/textures/gui/turtle_upgrade_left.png.license
+++ b/projects/common/src/main/resources/assets/computercraft/textures/gui/turtle_upgrade_left.png.license
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2023 The CC: Tweaked Developers
+
+SPDX-License-Identifier: MPL-2.0
--- a/projects/common/src/main/resources/assets/computercraft/textures/gui/turtle_upgrade_right.png
+++ b/projects/common/src/main/resources/assets/computercraft/textures/gui/turtle_upgrade_right.png
--- a/projects/common/src/main/resources/assets/computercraft/textures/gui/turtle_upgrade_right.png.license
+++ b/projects/common/src/main/resources/assets/computercraft/textures/gui/turtle_upgrade_right.png.license
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2023 The CC: Tweaked Developers
+
+SPDX-License-Identifier: MPL-2.0