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

README.md

@@ -11,14 +11,13 @@ SPDX-License-Identifier: MPL-2.0
 </picture>
 
 [![Current build status](https://github.com/cc-tweaked/CC-Tweaked/workflows/Build/badge.svg)](https://github.com/cc-tweaked/CC-Tweaked/actions "Current build status")
-[![Download CC: Tweaked on CurseForge](https://img.shields.io/static/v1?label=Download&message=CC:%20Tweaked&color=E04E14&logoColor=E04E14&logo=CurseForge)][CurseForge]
 [![Download CC: Tweaked on Modrinth](https://img.shields.io/static/v1?label=Download&color=00AF5C&logoColor=00AF5C&logo=Modrinth&message=CC:%20Tweaked)][Modrinth]
 
 CC: Tweaked is a mod for Minecraft which adds programmable computers, turtles and more to the game. A fork of the
 much-beloved [ComputerCraft], it continues its legacy with improved performance and stability, along with a wealth of
 new features.
 
-CC: Tweaked can be installed from [CurseForge] or [Modrinth]. It runs on both [Minecraft Forge] and [Fabric].
+CC: Tweaked can be installed from [Modrinth]. It runs on both [Minecraft Forge] and [Fabric].
 
 ## Contributing
 Any contribution is welcome, be that using the mod, reporting bugs or contributing code. If you want to get started
@@ -82,7 +81,6 @@ We bundle the API sources with the jar, so documentation should be easily viewab
 the generated documentation [can be browsed online](https://tweaked.cc/javadoc/).
 
 [computercraft]: https://github.com/dan200/ComputerCraft "ComputerCraft on GitHub"
-[curseforge]: https://minecraft.curseforge.com/projects/cc-tweaked "Download CC: Tweaked from CurseForge"
 [modrinth]: https://modrinth.com/mod/gu7yAYhd "Download CC: Tweaked from Modrinth"
 [Minecraft Forge]: https://files.minecraftforge.net/ "Download Minecraft Forge."
 [Fabric]: https://fabricmc.net/use/installer/ "Download Fabric."

buildSrc/build.gradle.kts

@@ -45,7 +45,6 @@ dependencies {
     implementation(libs.kotlin.plugin)
     implementation(libs.spotless)
 
-    implementation(libs.curseForgeGradle)
     implementation(libs.fabric.loom)
     implementation(libs.ideaExt)
     implementation(libs.minotaur)

buildSrc/src/main/kotlin/cc-tweaked.mod-publishing.gradle.kts

@@ -2,11 +2,9 @@
 //
 // SPDX-License-Identifier: MPL-2.0
 
-import net.darkhax.curseforgegradle.TaskPublishCurseForge
 import cc.tweaked.gradle.setProvider
 
 plugins {
-    id("net.darkhax.curseforgegradle")
     id("com.modrinth.minotaur")
     id("cc-tweaked.publishing")
 }
@@ -25,23 +23,6 @@ val isUnstable = project.properties["isUnstable"] == "true"
 val modVersion: String by extra
 val mcVersion: String by extra
 
-val publishCurseForge by tasks.registering(TaskPublishCurseForge::class) {
-    group = PublishingPlugin.PUBLISH_TASK_GROUP
-    description = "Upload artifacts to CurseForge"
-
-    apiToken = findProperty("curseForgeApiKey") ?: ""
-    enabled = apiToken != ""
-
-    val mainFile = upload("282001", modPublishing.output)
-    mainFile.changelog =
-        "Release notes can be found on the [GitHub repository](https://github.com/cc-tweaked/CC-Tweaked/releases/tag/v$mcVersion-$modVersion)."
-    mainFile.changelogType = "markdown"
-    mainFile.releaseType = if (isUnstable) "alpha" else "release"
-    mainFile.gameVersions.add(mcVersion)
-}
-
-tasks.publish { dependsOn(publishCurseForge) }
-
 modrinth {
     token.set(findProperty("modrinthApiKey") as String? ?: "")
     projectId.set("gu7yAYhd")

doc/index.md

@@ -16,7 +16,7 @@ CC: Tweaked is a mod for Minecraft which adds programmable computers, turtles an
 much-beloved [ComputerCraft], it continues its legacy with improved performance and stability, along with a wealth of
 new features.
 
-CC: Tweaked can be installed from [CurseForge] or [Modrinth]. It runs on both [Minecraft Forge] and [Fabric].
+CC: Tweaked can be installed from [Modrinth]. It runs on both [Minecraft Forge] and [Fabric].
 
 ## Features
 Controlled using the [Lua programming language][lua], CC: Tweaked's computers provides all the tools you need to start
@@ -62,7 +62,6 @@ CC: Tweaked lives on [GitHub]. If you've got any ideas, feedback or bugs please
 [github]: https://github.com/cc-tweaked/CC-Tweaked/ "CC: Tweaked on GitHub"
 [bug]: https://github.com/cc-tweaked/CC-Tweaked/issues/new/choose
 [computercraft]: https://github.com/dan200/ComputerCraft "ComputerCraft on GitHub"
-[curseforge]: https://minecraft.curseforge.com/projects/cc-tweaked "Download CC: Tweaked from CurseForge"
 [modrinth]: https://modrinth.com/mod/gu7yAYhd "Download CC: Tweaked from Modrinth"
 [forge]: https://files.minecraftforge.net/ "Download Minecraft Forge."
 [Minecraft Forge]: https://files.minecraftforge.net/ "Download Minecraft Forge."

gradle.properties

@@ -12,7 +12,7 @@ neogradle.subsystems.conventions.runs.enabled=false
 
 # Mod properties
 isUnstable=true
-modVersion=1.114.0
+modVersion=1.114.1
 
 # Minecraft properties: We want to configure this here so we can read it in settings.gradle
 mcVersion=1.21.1

gradle/libs.versions.toml

@@ -59,7 +59,6 @@ jmh = "1.37"
 # Build tools
 cctJavadoc = "1.8.3"
 checkstyle = "10.20.1"
-curseForgeGradle = "1.1.18"
 errorProne-core = "2.27.0"
 errorProne-plugin = "3.1.0"
 fabric-loom = "1.7.1"
@@ -146,7 +145,6 @@ lwjgl-glfw = { module = "org.lwjgl:lwjgl-glfw" }
 # Build tools
 cctJavadoc = { module = "cc.tweaked:cct-javadoc", version.ref = "cctJavadoc" }
 checkstyle = { module = "com.puppycrawl.tools:checkstyle", version.ref = "checkstyle" }
-curseForgeGradle = { module = "net.darkhax.curseforgegradle:CurseForgeGradle", version.ref = "curseForgeGradle" }
 errorProne-annotations = { module = "com.google.errorprone:error_prone_annotations", version.ref = "errorProne-core" }
 errorProne-api = { module = "com.google.errorprone:error_prone_check_api", version.ref = "errorProne-core" }
 errorProne-core = { module = "com.google.errorprone:error_prone_core", version.ref = "errorProne-core" }

projects/common/src/client/java/dan200/computercraft/client/render/monitor/MonitorBlockEntityRenderer.java

@@ -178,7 +178,7 @@ private static void renderTerminal(
                     var size = DirectFixedWidthFontRenderer.getVertexCount(terminal);
 
                     // In an ideal world we could upload these both into one buffer. However, we can't render VBOs with
-                    // and starting and ending offset, and so need to use two buffers instead.
+                    // a starting and ending offset, and so need to use two buffers instead.
 
                     renderToBuffer(backgroundBuffer, size, sink ->
                         DirectFixedWidthFontRenderer.drawTerminalBackground(sink, 0, 0, terminal, yMargin, yMargin, xMargin, xMargin));
@@ -216,10 +216,10 @@ private static void renderTerminal(
                 foregroundBuffer.bind();
                 foregroundBuffer.drawWithShader(
                     modelView, RenderSystem.getProjectionMatrix(), RenderTypes.getTerminalShader(),
-                    // As mentioned in the above comment, render the extra cursor quad if it is visible this frame. Each
-                    // // quad has an index count of 6.
+                    // Skip the cursor quad if it is not visible this frame.
                     FixedWidthFontRenderer.isCursorVisible(terminal) && FrameInfo.getGlobalCursorBlink()
-                        ? foregroundBuffer.getIndexCount() + 6 : foregroundBuffer.getIndexCount()
+                        ? foregroundBuffer.getIndexCount()
+                        : foregroundBuffer.getIndexCount() - RenderTypes.TERMINAL.mode().indexCount(4)
                 );
 
                 // Clear state

projects/common/src/main/java/dan200/computercraft/shared/lectern/CustomLecternBlockEntity.java

@@ -121,7 +121,7 @@ public Packet<ClientGamePacketListener> getUpdatePacket() {
     @Override
     public CompoundTag getUpdateTag(HolderLookup.Provider registries) {
         var tag = super.getUpdateTag(registries);
-        tag.put(NBT_ITEM, item.save(registries));
+        if (!item.isEmpty()) tag.put(NBT_ITEM, item.save(registries));
         return tag;
     }
 

projects/common/src/main/java/dan200/computercraft/shared/peripheral/monitor/MonitorBlockEntity.java

@@ -485,7 +485,7 @@ private void eachComputer(Consumer<IComputerAccess> fun) {
                 var monitor = getLoadedMonitor(x, y).getMonitor();
                 if (monitor == null) continue;
 
-                computers.forEach(fun);
+                monitor.computers.forEach(fun);
             }
         }
     }

projects/common/src/main/resources/assets/computercraft/lang/de_de.json

@@ -16,6 +16,7 @@
     "block.computercraft.monitor_advanced": "Erweiterter Monitor",
     "block.computercraft.monitor_normal": "Monitor",
     "block.computercraft.printer": "Drucker",
+    "block.computercraft.redstone_relay": "Redstone Relais",
     "block.computercraft.speaker": "Lautsprecher",
     "block.computercraft.turtle_advanced": "Erweiterte Turtle",
     "block.computercraft.turtle_advanced.upgraded": "Erweiterte Turtle (%s)",

projects/core/src/main/resources/data/computercraft/lua/rom/help/changelog.md

@@ -1,7 +1,14 @@
+# New features in CC: Tweaked 1.114.1
+
+Several bug fixes:
+* Fix monitor touch events only firing from one monitor.
+* Fix crash when lectern has no item.
+* Fix cursor not blinking on monitors.
+
 # New features in CC: Tweaked 1.114.0
 
 * Add redstone relay peripheral.
-* Add support for `math.atan(x, y)`.
+* Add support for `math.atan(y, x)`.
 * Update several translations.
 
 Several bug fixes:

projects/core/src/main/resources/data/computercraft/lua/rom/help/whatsnew.md

@@ -1,13 +1,8 @@
-New features in CC: Tweaked 1.114.0
-
-* Add redstone relay peripheral.
-* Add support for `math.atan(x, y)`.
-* Update several translations.
+New features in CC: Tweaked 1.114.1
 
 Several bug fixes:
-* Fix pocket upgrades not appearing after crafting.
-* Cancel `rednet.receive` and `Websocket.receive` timers after a message is received.
-* Fix several issues with parsing and printing large doubles.
-* Fix in-hand pocket computer being blank after changing dimension.
+* Fix monitor touch events only firing from one monitor.
+* Fix crash when lectern has no item.
+* Fix cursor not blinking on monitors.
 
 Type "help changelog" to see the full version history.