From 4868c4aa32c67073ac6c3d82d76e95b18cbb0211 Mon Sep 17 00:00:00 2001 From: Jonathan Coates Date: Thu, 10 Jul 2025 00:26:42 +0100 Subject: [PATCH] Small bits of cleanup - Remove unused MonitorRenderer. I'm sure this had been deleted already, but apparently not! - Add missing items to the changelog. - Fix crash when clearing tests in a world. - Bump Iris deps, to help with debugging #2229. --- gradle/libs.versions.toml | 8 ++--- .../peripheral/monitor/MonitorRenderer.java | 32 ------------------- .../computercraft/gametest/core/TestHooks.kt | 2 +- .../computercraft/lua/rom/help/changelog.md | 1 + .../computercraft/lua/rom/help/whatsnew.md | 1 + 5 files changed, 7 insertions(+), 37 deletions(-) delete mode 100644 projects/common/src/main/java/dan200/computercraft/shared/peripheral/monitor/MonitorRenderer.java diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ab43ed39e..124e7b3b8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -38,14 +38,14 @@ nightConfig = "3.8.1" # Minecraft mods emi = "1.1.7+1.21" fabricPermissions = "0.3.3" -iris-fabric = "1.8.11+1.21.5-fabric" -iris-forge = "1.8.11+1.21.5-neoforge" +iris-fabric = "1.9.1+1.21.7-fabric" +iris-forge = "1.9.1+1.21.7-neoforge" jei = "19.8.2.99" modmenu = "13.0.2" moreRed = "6.0.0.3" rei = "18.0.800" -sodium-fabric = "mc1.21.5-0.6.12-fabric" -sodium-forge = "mc1.21.5-0.6.12-neoforge" +sodium-fabric = "mc1.21.6-0.6.13-fabric" +sodium-forge = "mc1.21.6-0.6.13-neoforge" mixinExtra = "0.3.5" create-forge = "6.0.0-6" create-fabric = "0.5.1-f-build.1467+mc1.20.1" diff --git a/projects/common/src/main/java/dan200/computercraft/shared/peripheral/monitor/MonitorRenderer.java b/projects/common/src/main/java/dan200/computercraft/shared/peripheral/monitor/MonitorRenderer.java deleted file mode 100644 index 9dd52f115..000000000 --- a/projects/common/src/main/java/dan200/computercraft/shared/peripheral/monitor/MonitorRenderer.java +++ /dev/null @@ -1,32 +0,0 @@ -// SPDX-FileCopyrightText: 2020 The CC: Tweaked Developers -// -// SPDX-License-Identifier: MPL-2.0 - -package dan200.computercraft.shared.peripheral.monitor; - -/** - * The render type to use for monitors. - * - * @see dan200.computercraft.client.render.TileEntityMonitorRenderer - * @see ClientMonitor - */ -public enum MonitorRenderer { - /** - * Determine the best monitor backend. - */ - BEST, - - /** - * Render using texture buffer objects. - * - * @see org.lwjgl.opengl.GL31#glTexBuffer(int, int, int) - */ - TBO, - - /** - * Render using VBOs. - * - * @see com.mojang.blaze3d.vertex.VertexBuffer - */ - VBO, -} 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 index c09aec026..4065ad438 100644 --- a/projects/common/src/testMod/kotlin/dan200/computercraft/gametest/core/TestHooks.kt +++ b/projects/common/src/testMod/kotlin/dan200/computercraft/gametest/core/TestHooks.kt @@ -88,7 +88,7 @@ object TestHooks { LOG.info("Cleaning up after last run") val level = server.overworld() - StructureUtils.findTestBlocks(getTestOrigin(server), 200, level).forEach { pos -> + StructureUtils.findTestBlocks(getTestOrigin(server), 200, level).toList().forEach { pos -> val test = level.getBlockEntity(pos, BlockEntityType.TEST_INSTANCE_BLOCK).getOrNull() ?: return@forEach StructureUtils.clearSpaceForStructure(test.structureBoundingBox, level) } 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 index 03e30cd77..494106020 100644 --- 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 @@ -5,6 +5,7 @@ * 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. +* Allow equipping upgrades on the bottom of a pocket computer. Several bug fixes: * Ignore shader compilation errors when running with Pojav. 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 index b2ba52612..22988c236 100644 --- 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 @@ -5,6 +5,7 @@ New features in CC: Tweaked 1.116.0 * 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. +* Allow equipping upgrades on the bottom of a pocket computer. Several bug fixes: * Ignore shader compilation errors when running with Pojav.