mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-11-02 14:43:00 +00:00
Code Issues Releases Wiki Activity

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

Browse Source 
As part of this, we also rewrite some of the turtle placing code, and
how it uses the turtle_can_use tag:

Minecraft 1.21 cleaned up the item/block clicking code a little bit,
splitting Block.use into Block.useItemOn and Block.useWithoutItem. The
first of these is pretty much exactly what we wanted in the first place,
so the tag was kinda redundant and we commented it out in the 1.21
update.

This was never meant to be a long-term fix, but time has gone by anyway.
We now check that tag, and call useWithoutItem() if present —
effectively restoring the previous behaviour.

Fixes #2011
This commit is contained in:
Jonathan Coates
2025-01-14 21:25:39 +00:00
parent 4a532952d4 62c9e5b08f
commit 4710ee5bcc
40 changed files with 650 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
projects/core/build.gradle.kts
View File

@@ -40,9 +40,8 @@ dependencies {
}
tasks.processResources {
filesMatching("data/computercraft/lua/rom/help/credits.md") {
expand(mapOf("gitContributors" to cct.gitContributors.map { it.joinToString("\n") }.get()))
}
var props = mapOf("gitContributors" to cct.gitContributors.get().joinToString("\n"))
filesMatching("data/computercraft/lua/rom/help/credits.md") { expand(props) }
}
tasks.test {

4
projects/core/src/main/java/dan200/computercraft/core/apis/http/request/HttpRequestHandler.java
View File

@@ -14,8 +14,6 @@ import io.netty.buffer.CompositeByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.SimpleChannelInboundHandler;
import io.netty.handler.codec.http.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.annotation.Nullable;
import java.io.Closeable;
@@ -30,8 +28,6 @@ import java.util.Objects;
import static dan200.computercraft.core.apis.http.request.HttpRequest.getHeaderSize;
public final class HttpRequestHandler extends SimpleChannelInboundHandler<HttpObject> implements Closeable {
private static final Logger LOG = LoggerFactory.getLogger(HttpRequestHandler.class);
/**
* Same as {@link io.netty.handler.codec.MessageAggregator}.
*/

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

@@ -1,3 +1,12 @@
# New features in CC: Tweaked 1.114.3
* `wget` now prints the error that occurred, rather than a generic "Failed" (tizu69).
* Update several translations.
Several bug fixes:
* Fix `fs.isDriveRoot` returning true for non-existent files.
* Fix possible memory leak when sending terminal contents.
# New features in CC: Tweaked 1.114.2
One bug fix:

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

@@ -1,6 +1,10 @@
New features in CC: Tweaked 1.114.2
New features in CC: Tweaked 1.114.3
One bug fix:
* Fix OpenGL errors when rendering empty monitors.
* `wget` now prints the error that occurred, rather than a generic "Failed" (tizu69).
* Update several translations.
Several bug fixes:
* Fix `fs.isDriveRoot` returning true for non-existent files.
* Fix possible memory leak when sending terminal contents.
Type "help changelog" to see the full version history.