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

SquidDev · SquidDev · commit fbf994e803b3 · 2025-06-28T11:21:22.000+01:00
diff --git a/gradle.properties b/gradle.properties
@@ -12,7 +12,7 @@ neogradle.subsystems.conventions.runs.enabled=false
 
 # Mod properties
 isUnstable=true
-modVersion=1.115.1
+modVersion=1.116.0
 
 # Minecraft properties: We want to configure this here so we can read it in settings.gradle
 mcVersion=1.21.1
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -69,7 +69,7 @@ ideaExt = "1.1.7"
 illuaminate = "0.1.0-83-g1131f68"
 lwjgl = "3.3.3"
 minotaur = "2.8.7"
-modDevGradle = "2.0.78"
+modDevGradle = "2.0.95"
 nullAway = "0.12.7"
 shadow = "8.3.1"
 spotless = "7.0.2"
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -13,10 +13,10 @@
   },
   "devDependencies": {
     "@rollup/plugin-node-resolve": "^16.0.0",
-    "@rollup/plugin-typescript": "^12.0.0",
+    "@rollup/plugin-typescript": "^12.0.0 && <12.1.3",
     "@rollup/plugin-url": "^8.0.1",
     "@swc/core": "^1.3.92",
-    "@types/node": "^22.0.0",
+    "@types/node": "^24.0.0",
     "lightningcss": "^1.22.0",
     "preact-render-to-string": "^6.2.1",
     "rehype": "^13.0.0",
diff --git a/projects/common/src/main/resources/assets/computercraft/lang/cs_cz.json b/projects/common/src/main/resources/assets/computercraft/lang/cs_cz.json
@@ -205,8 +205,10 @@
     "item.computercraft.treasure_disk": "Disketa",
     "itemGroup.computercraft": "ComputerCraft",
     "tag.item.computercraft.computer": "Počítače",
+    "tag.item.computercraft.disks": "Disky",
     "tag.item.computercraft.dyeable": "Obarvitelné předměty",
     "tag.item.computercraft.monitor": "Monitory",
+    "tag.item.computercraft.pocket_computers": "Kapesní počítače",
     "tag.item.computercraft.turtle": "Roboti",
     "tag.item.computercraft.turtle_can_place": "Roboty-umístitelné předměty",
     "tag.item.computercraft.wired_modem": "Drátové modemy",
diff --git a/projects/common/src/main/resources/assets/computercraft/lang/de_de.json b/projects/common/src/main/resources/assets/computercraft/lang/de_de.json
@@ -177,6 +177,7 @@
     "item.computercraft.treasure_disk": "Diskette",
     "itemGroup.computercraft": "ComputerCraft",
     "tag.item.computercraft.computer": "Computer",
+    "tag.item.computercraft.dyeable": "Färbbare Elemente",
     "tag.item.computercraft.monitor": "Monitore",
     "tag.item.computercraft.turtle": "Turtles",
     "tag.item.computercraft.wired_modem": "Verkabelte Modems",
diff --git a/projects/common/src/main/resources/assets/computercraft/lang/it_it.json b/projects/common/src/main/resources/assets/computercraft/lang/it_it.json
@@ -205,8 +205,10 @@
     "item.computercraft.treasure_disk": "Disco Floppy",
     "itemGroup.computercraft": "ComputerCraft",
     "tag.item.computercraft.computer": "Computer",
+    "tag.item.computercraft.dyeable": "Oggetti colorabili",
     "tag.item.computercraft.monitor": "Monitor",
     "tag.item.computercraft.turtle": "Tartarughe",
+    "tag.item.computercraft.turtle_can_place": "Oggetti piazzabili da tartarughe",
     "tag.item.computercraft.wired_modem": "Modem cablati",
     "tracking_field.computercraft.avg": "%s (media)",
     "tracking_field.computercraft.computer_tasks.name": "Attività",
diff --git a/projects/common/src/main/resources/assets/computercraft/lang/ja_jp.json b/projects/common/src/main/resources/assets/computercraft/lang/ja_jp.json
@@ -205,8 +205,10 @@
     "item.computercraft.treasure_disk": "フロッピーディスク",
     "itemGroup.computercraft": "ComputerCraft",
     "tag.item.computercraft.computer": "コンピューター",
+    "tag.item.computercraft.disks": "ディスク",
     "tag.item.computercraft.dyeable": "染色可能なアイテム",
     "tag.item.computercraft.monitor": "モニター",
+    "tag.item.computercraft.pocket_computers": "ポケットコンピューター",
     "tag.item.computercraft.turtle": "タートル",
     "tag.item.computercraft.turtle_can_place": "タートルが設置可能なアイテム",
     "tag.item.computercraft.wired_modem": "有線モデム",
diff --git a/projects/common/src/main/resources/assets/computercraft/lang/pl_pl.json b/projects/common/src/main/resources/assets/computercraft/lang/pl_pl.json
@@ -92,6 +92,7 @@
     "item.computercraft.printed_pages": "Wydrukowane Strony",
     "item.computercraft.treasure_disk": "Dyskietka",
     "itemGroup.computercraft": "ComputerCraft",
+    "tag.item.computercraft.turtle_can_place": "Przedmioty stawialne przez Żółwia",
     "upgrade.computercraft.speaker.adjective": "Hałaśliwy",
     "upgrade.computercraft.wireless_modem_advanced.adjective": "Enderowy",
     "upgrade.computercraft.wireless_modem_normal.adjective": "Bezprzewodowy",
diff --git a/projects/common/src/main/resources/assets/computercraft/lang/tr_tr.json b/projects/common/src/main/resources/assets/computercraft/lang/tr_tr.json
@@ -205,8 +205,10 @@
     "item.computercraft.treasure_disk": "Disket",
     "itemGroup.computercraft": "ComputerCraft",
     "tag.item.computercraft.computer": "Bilgisayarlar",
+    "tag.item.computercraft.disks": "Diskler",
     "tag.item.computercraft.dyeable": "Boyanabilir eşyalar",
     "tag.item.computercraft.monitor": "Monitörler",
+    "tag.item.computercraft.pocket_computers": "Cep Bilgisayarları",
     "tag.item.computercraft.turtle": "Turtlelar",
     "tag.item.computercraft.turtle_can_place": "Kaplumbağa-yerleştirilebilir eşyalar",
     "tag.item.computercraft.wired_modem": "Kablolu modemler",
diff --git a/projects/common/src/main/resources/assets/computercraft/lang/zh_cn.json b/projects/common/src/main/resources/assets/computercraft/lang/zh_cn.json
@@ -205,8 +205,10 @@
     "item.computercraft.treasure_disk": "软盘",
     "itemGroup.computercraft": "ComputerCraft",
     "tag.item.computercraft.computer": "计算机",
+    "tag.item.computercraft.disks": "磁盘",
     "tag.item.computercraft.dyeable": "可染色物品",
     "tag.item.computercraft.monitor": "监视器",
+    "tag.item.computercraft.pocket_computers": "便携式计算机",
     "tag.item.computercraft.turtle": "海龟",
     "tag.item.computercraft.turtle_can_place": "可放置海龟物品",
     "tag.item.computercraft.wired_modem": "有线调制解调器",
diff --git a/projects/common/src/testMod/kotlin/dan200/computercraft/gametest/Disk_Test.kt b/projects/common/src/testMod/kotlin/dan200/computercraft/gametest/Disk_Test.kt
@@ -0,0 +1,51 @@
+// SPDX-FileCopyrightText: 2025 The CC: Tweaked Developers
+//
+// SPDX-License-Identifier: MPL-2.0
+
+package dan200.computercraft.gametest
+
+import dan200.computercraft.core.util.Colour
+import dan200.computercraft.gametest.api.craftItem
+import dan200.computercraft.gametest.api.immediate
+import dan200.computercraft.shared.ModRegistry
+import dan200.computercraft.shared.util.DataComponentUtil
+import dan200.computercraft.test.shared.ItemStackMatcher.isStack
+import net.minecraft.core.component.DataComponents
+import net.minecraft.gametest.framework.GameTest
+import net.minecraft.gametest.framework.GameTestHelper
+import net.minecraft.world.item.ItemStack
+import net.minecraft.world.item.Items
+import net.minecraft.world.item.component.DyedItemColor
+import org.hamcrest.MatcherAssert.assertThat
+
+class Disk_Test {
+    /**
+     * Ensure disks
+     */
+    @GameTest(template = "default")
+    fun Can_craft_disk(helper: GameTestHelper) = helper.immediate {
+        assertThat(
+            "Disk without dye",
+            helper.craftItem(ItemStack(Items.REDSTONE), ItemStack(Items.PAPER)),
+            isStack(
+                DataComponentUtil.createStack(
+                    ModRegistry.Items.DISK.get(),
+                    DataComponents.DYED_COLOR,
+                    DyedItemColor(Colour.BLUE.hex, false),
+                ),
+            ),
+        )
+
+        assertThat(
+            "Disk with dye",
+            helper.craftItem(ItemStack(Items.REDSTONE), ItemStack(Items.PAPER), ItemStack(Items.GREEN_DYE)),
+            isStack(
+                DataComponentUtil.createStack(
+                    ModRegistry.Items.DISK.get(),
+                    DataComponents.DYED_COLOR,
+                    DyedItemColor(Colour.GREEN.hex, false),
+                ),
+            ),
+        )
+    }
+}
diff --git a/projects/common/src/testMod/kotlin/dan200/computercraft/gametest/core/TestHooks.kt b/projects/common/src/testMod/kotlin/dan200/computercraft/gametest/core/TestHooks.kt
@@ -111,6 +111,7 @@ object TestHooks {
         Computer_Test::class.java,
         CraftOs_Test::class.java,
         Details_Test::class.java,
+        Disk_Test::class.java,
         Disk_Drive_Test::class.java,
         Inventory_Test::class.java,
         Loot_Test::class.java,
diff --git a/projects/core/src/main/resources/data/computercraft/lua/rom/help/changelog.md b/projects/core/src/main/resources/data/computercraft/lua/rom/help/changelog.md
@@ -1,3 +1,23 @@
+# New features in CC: Tweaked 1.116.0
+
+* Add `turtle.getEquippedLeft()` and `turtle.getEquippedRight()`.
+* Add item tags for floppy disks and pocket computers.
+* Support multi-line strings and comments in `edit`.
+* Computer and pocket computer terminal sizes can be set with the `computercraft:terminal_size` component.
+* Border and sidebar textures now use vanilla's nine-sliced format.
+
+Several bug fixes:
+* Ignore shader compilation errors when running with Pojav.
+* Fix several issues with character input.
+* Fix pocket computer dyes being lost when equipping/unequipping upgrades.
+* Fix superflous warnings from allocation tracking.
+* Fix `__lt`/`__le` not working on heterogeneous types.
+* Many documentation fixes (Lemmmy, matematikaadit, McJack12).
+* Fix `0` being treated as a valid colour in `window` and `colour.toBlit`.
+* Fix out-of-bounds when pasting too lon text.
+* Fix syntax highlighting of string escapes (LorneHyde).
+* Fix sidebar texture of advanced computers being offset.
+
 # New features in CC: Tweaked 1.115.1
 
 * Update various translations (cyb3r, kevk2156, teamer337, yakku).
diff --git a/projects/core/src/main/resources/data/computercraft/lua/rom/help/whatsnew.md b/projects/core/src/main/resources/data/computercraft/lua/rom/help/whatsnew.md
@@ -1,11 +1,21 @@
-New features in CC: Tweaked 1.115.1
+New features in CC: Tweaked 1.116.0
 
-* Update various translations (cyb3r, kevk2156, teamer337, yakku).
-* Support Fabric's item lookup API for registering media providers.
+* Add `turtle.getEquippedLeft()` and `turtle.getEquippedRight()`.
+* Add item tags for floppy disks and pocket computers.
+* Support multi-line strings and comments in `edit`.
+* Computer and pocket computer terminal sizes can be set with the `computercraft:terminal_size` component.
+* Border and sidebar textures now use vanilla's nine-sliced format.
 
 Several bug fixes:
-* Fix crashes on Create 6.0 (ellellie).
-* Fix `speaker.playAudio` not updating speaker volume.
-* Resize pocket lectern textures to fix issues with generating mipmaps.
+* Ignore shader compilation errors when running with Pojav.
+* Fix several issues with character input.
+* Fix pocket computer dyes being lost when equipping/unequipping upgrades.
+* Fix superflous warnings from allocation tracking.
+* Fix `__lt`/`__le` not working on heterogeneous types.
+* Many documentation fixes (Lemmmy, matematikaadit, McJack12).
+* Fix `0` being treated as a valid colour in `window` and `colour.toBlit`.
+* Fix out-of-bounds when pasting too lon text.
+* Fix syntax highlighting of string escapes (LorneHyde).
+* Fix sidebar texture of advanced computers being offset.
 
 Type "help changelog" to see the full version history.
diff --git a/projects/core/src/main/resources/data/computercraft/lua/rom/modules/main/cc/internal/edit_runner.lua b/projects/core/src/main/resources/data/computercraft/lua/rom/modules/main/cc/internal/edit_runner.lua
@@ -0,0 +1,58 @@
+-- SPDX-FileCopyrightText: 2025 The CC: Tweaked Developers
+--
+-- SPDX-License-Identifier: MPL-2.0
+
+--[[- Launches a program, reports any errors, and prompts the user to close the
+tab.
+
+> [!DANGER]
+> This is an internal module and SHOULD NOT be used in your own code. It may
+> be removed or changed at any time.
+
+This is used by the `edit` program to launch the running code.
+
+@tparam string title The title of the multishell tab.
+@tparam string path The path to the file.
+@tparam string contents The contents of the file.
+
+@local
+]]
+return function(title, path, contents)
+    multishell.setTitle(multishell.getCurrent(), title)
+    local current = term.current()
+    local fn, err = load(contents, path, nil, _ENV)
+    if fn then
+        local exception = require "cc.internal.exception"
+        local ok, err, co = exception.try(fn)
+
+        term.redirect(current)
+        term.setTextColor(term.isColour() and colours.yellow or colours.white)
+        term.setBackgroundColor(colours.black)
+        term.setCursorBlink(false)
+
+        if not ok then
+            printError(err)
+            exception.report(err, co, { [path] = contents })
+        end
+    else
+        local parser = require "cc.internal.syntax"
+        if parser.parse_program(contents) then printError(err) end
+    end
+
+    local message = "Press any key to continue."
+    local _, y = term.getCursorPos()
+    local w, h = term.getSize()
+    local wrapped = require("cc.strings").wrap(message, w)
+
+    term.setTextColor(colours.white)
+    term.setBackgroundColor(colours.black)
+
+    local start_y = h - #wrapped + 1
+    if y >= start_y then term.scroll(y - start_y + 1) end
+    for i = 1, #wrapped do
+        term.setCursorPos(1, start_y + i - 1)
+        term.write(wrapped[i])
+    end
+    os.pullEvent('key')
+    require "cc.internal.event".discard_char()
+end
diff --git a/projects/core/src/main/resources/data/computercraft/lua/rom/modules/main/cc/internal/menu.lua b/projects/core/src/main/resources/data/computercraft/lua/rom/modules/main/cc/internal/menu.lua
@@ -0,0 +1,125 @@
+-- SPDX-FileCopyrightText: 2017 Daniel Ratcliffe
+--
+-- SPDX-License-Identifier: LicenseRef-CCPL
+
+--[[- A simple menu bar.
+
+> [!DANGER]
+> This is an internal module and SHOULD NOT be used in your own code. It may
+> be removed or changed at any time.
+
+This provides a shared implementation of the menu bar used by the `edit` and
+`paint` programs. This draws a menu bar at the bottom of the string, with a list
+of options.
+
+@local
+]]
+
+local expect = require "cc.expect".expect
+
+--[[- Create a new menu bar.
+
+This should be called every time the menu is displayed.
+
+@tparam { string... } items The menu items to display.
+@return The menu.
+]]
+local function create(items)
+    expect(1, items, "table")
+    return {
+        items = items,
+        selected = 1,
+    }
+end
+
+--[[- Draw the menu bar at the bottom of the screen.
+
+This should be called when first displaying the menu, and if the whole screen is
+redrawn (e.g. after a [`term_resize`]).
+
+@param menu The menu bar to draw.
+]]
+local function draw(menu)
+    expect(1, menu, "table")
+
+    local _, height = term.getSize()
+    term.setCursorPos(1, height)
+
+    term.clearLine()
+
+    local active_colour = term.isColour() and colours.yellow or colours.white
+    term.setTextColour(colours.white)
+    for k, v in pairs(menu.items) do
+        if menu.selected == k then
+            term.setTextColour(active_colour)
+            term.write("[")
+            term.setTextColour(colours.white)
+            term.write(v)
+            term.setTextColour(active_colour)
+            term.write("]")
+            term.setTextColour(colours.white)
+        else
+            term.write(" " .. v .. " ")
+        end
+    end
+end
+
+--[[- Process an event.
+
+@param menu The menu bar to update.
+@tparam string The event name.
+@param ... Additional arguments to the event.
+@treturn nil|boolean|string Either:
+
+  - If no action was taken, return `nil`.
+  - If the menu was closed, return `false`.
+  - If an item was selected, return the item as a string.
+]]
+local function handle_event(menu, event, ...)
+    expect(1, menu, "table")
+
+    if event == "key" then
+        local key = ...
+
+        if key == keys.right then
+            -- Move right
+            menu.selected = menu.selected + 1
+            if menu.selected > #menu.items then menu.selected = 1 end
+            draw(menu)
+        elseif key == keys.left and menu.selected > 1 then
+            -- Move left
+            menu.selected = menu.selected - 1
+            if menu.selected < 1 then menu.selected = #menu.items end
+            draw(menu)
+        elseif key == keys.enter or key == keys.numPadEnter then
+            -- Select an option
+            return menu.items[menu.selected]
+        elseif key == keys.leftCtrl or keys == keys.rightCtrl or keys == keys.rightAlt then
+            -- Cancel the menu
+            return false
+        end
+    elseif event == "char" then
+        -- Select menu items
+        local char = (...):lower()
+        for _, item in pairs(menu.items) do
+            if item:sub(1, 1):lower() == char then return item end
+        end
+    elseif event == "mouse_click" then
+        local _, x, y = ...
+
+        local _, height = term.getSize()
+        if y ~= height then return false end -- Exit the menu
+
+        local item_start = 1
+        for _, item in ipairs(menu.items) do
+            local item_end = item_start + #item + 2
+            if x >= item_start and x < item_end then return item end
+            item_start = item_end
+        end
+    end
+
+    return nil
+end
+
+
+return { create = create, draw = draw, handle_event = handle_event }
diff --git a/projects/core/src/main/resources/data/computercraft/lua/rom/modules/main/cc/internal/syntax/lexer.lua b/projects/core/src/main/resources/data/computercraft/lua/rom/modules/main/cc/internal/syntax/lexer.lua
diff --git a/projects/core/src/main/resources/data/computercraft/lua/rom/programs/edit.lua b/projects/core/src/main/resources/data/computercraft/lua/rom/programs/edit.lua
diff --git a/projects/core/src/main/resources/data/computercraft/lua/rom/programs/fun/advanced/paint.lua b/projects/core/src/main/resources/data/computercraft/lua/rom/programs/fun/advanced/paint.lua
diff --git a/projects/core/src/main/resources/data/computercraft/lua/rom/programs/shell.lua b/projects/core/src/main/resources/data/computercraft/lua/rom/programs/shell.lua
diff --git a/projects/core/src/test/resources/test-rom/spec/modules/cc/internal/syntax/lexer_spec.md b/projects/core/src/test/resources/test-rom/spec/modules/cc/internal/syntax/lexer_spec.md
diff --git a/projects/web/src/frontend/typings.d.ts b/projects/web/src/frontend/typings.d.ts
diff --git a/projects/web/src/htmlTransform/index.tsx b/projects/web/src/htmlTransform/index.tsx
