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

SquidDev · SquidDev · commit 9cf0f85fcb1b · 2025-07-12T19:00:00.000+01:00
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -11,7 +11,8 @@ body:
         What version of Minecraft are you using? If your version is not listed, please try to reproduce on one of the supported versions.
     options:
       - 1.20.1
-      - 1.21.x
+      - 1.21.1
+      - 1.21.7
   validations:
     required: true
 - type: input
diff --git a/crowdin.yml b/crowdin.yml
@@ -12,6 +12,7 @@ files:
         de: de_de    # German
         es-ES: es_es # Spanish
         fr: fr_fr    # French
+        hu: hu_hu    # Hungarian
         it: it_it    # Italian
         ja: ja_jp    # Japanese
         ko: ko_kr    # Korean
diff --git a/gradle.properties b/gradle.properties
@@ -12,7 +12,7 @@ neogradle.subsystems.conventions.runs.enabled=false
 
 # Mod properties
 isUnstable=true
-modVersion=1.116.0
+modVersion=1.116.1
 
 # 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
@@ -74,7 +74,7 @@ nullAway = "0.12.7"
 shadow = "8.3.1"
 spotless = "7.0.2"
 taskTree = "2.1.1"
-teavm = "0.11.0-SQUID.1"
+teavm = "0.13.0-SQUID.1"
 vanillaExtract = "0.2.1"
 versionCatalogUpdate = "0.8.1"
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -13,7 +13,7 @@
   },
   "devDependencies": {
     "@rollup/plugin-node-resolve": "^16.0.0",
-    "@rollup/plugin-typescript": "^12.0.0 && <12.1.3",
+    "@rollup/plugin-typescript": "^12.0.0",
     "@rollup/plugin-url": "^8.0.1",
     "@swc/core": "^1.3.92",
     "@types/node": "^24.0.0",
diff --git a/projects/common/src/main/java/dan200/computercraft/shared/command/UserLevel.java b/projects/common/src/main/java/dan200/computercraft/shared/command/UserLevel.java
@@ -50,6 +50,12 @@ public boolean test(ServerPlayer source) {
 
     public static boolean isOwner(CommandSourceStack source) {
         var server = source.getServer();
+
+        // While CommandSourceStack.getServer is non-nullable, that's a lie for permission checks. When loading
+        // .mcfunction files, ServerFunctionLibrary constructs an instance with an empty server. In that case, return
+        // false — we don't want to treat functions as an owner!
+        if (server == null) return false;
+
         var player = source.getPlayer();
         return server.isDedicatedServer()
             ? source.getEntity() == null && source.hasPermission(4) && source.getTextName().equals("Server")
diff --git a/projects/common/src/main/resources/assets/computercraft/lang/hu_hu.json b/projects/common/src/main/resources/assets/computercraft/lang/hu_hu.json
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
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,10 @@
+# New features in CC: Tweaked 1.116.1
+
+* Update translations.
+
+One bug fix:
+* Fix NPE when mcfunction files contain CC commands.
+
 # New features in CC: Tweaked 1.116.0
 
 * Add `turtle.getEquippedLeft()` and `turtle.getEquippedRight()`.
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,21 +1,8 @@
-New features in CC: Tweaked 1.116.0
+New features in CC: Tweaked 1.116.1
 
-* 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.
+* Update translations.
 
-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.
+One bug fix:
+* Fix NPE when mcfunction files contain CC commands.
 
 Type "help changelog" to see the full version history.
diff --git a/projects/web/src/builder/java/cc/tweaked/web/builder/TransformingClassLoader.java b/projects/web/src/builder/java/cc/tweaked/web/builder/TransformingClassLoader.java
@@ -17,6 +17,8 @@
 import java.io.UncheckedIOException;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.net.URLConnection;
+import java.net.URLStreamHandler;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.*;
@@ -112,11 +114,17 @@ protected Class<?> findClass(String name) throws ClassNotFoundException {
             return super.getResourceAsStream(name);
         }
 
+        var bytes = getTransformed(path);
+        this.lastFile = new TransformedClass(name, bytes);
+        return new ByteArrayInputStream(bytes);
+    }
+
+    private byte[] getTransformed(Path path) {
         ClassReader reader;
         try (var stream = Files.newInputStream(path)) {
             reader = new ClassReader(stream);
         } catch (IOException e) {
-            throw new UncheckedIOException("Failed reading " + name, e);
+            throw new UncheckedIOException("Failed reading " + path, e);
         }
 
         var writer = new ClassWriter(reader, 0);
@@ -125,9 +133,7 @@ protected Class<?> findClass(String name) throws ClassNotFoundException {
         for (var transformer : transformers) sink = transformer.apply(className, sink);
         reader.accept(sink, 0);
 
-        var bytes = writer.toByteArray();
-        this.lastFile = new TransformedClass(name, bytes);
-        return new ByteArrayInputStream(bytes);
+        return writer.toByteArray();
     }
 
     @Override
@@ -142,7 +148,7 @@ protected Enumeration<URL> findResources(String name) {
         return new IteratorEnumeration<>(
             (path == null ? classpath.stream().map(x -> x.resolve(name)) : Stream.of(path))
                 .filter(Files::exists)
-                .map(TransformingClassLoader::toURL)
+                .map(this::toURL)
                 .iterator()
         );
     }
@@ -160,9 +166,12 @@ public T nextElement() {
         }
     }
 
-    private static URL toURL(Path path) {
+    private URL toURL(Path path) {
         try {
-            return path.toUri().toURL();
+            var url = path.toUri().toURL();
+
+            if (!path.toString().endsWith(".class")) return url;
+            return new URL(url.getProtocol(), url.getHost(), url.getPort(), url.getFile(), new TransformingHandler(path));
         } catch (MalformedURLException e) {
             throw new IllegalStateException("Cannot convert " + path + " to a URL", e);
         }
@@ -171,4 +180,31 @@ private static URL toURL(Path path) {
     @SuppressWarnings("ArrayRecordComponent")
     private record TransformedClass(String name, byte[] contents) {
     }
+
+    private final class TransformingHandler extends URLStreamHandler {
+        private final Path path;
+
+        private TransformingHandler(Path path) {
+            this.path = path;
+        }
+
+        @Override
+        protected URLConnection openConnection(URL u) {
+            return new URLConnection(u) {
+                private @Nullable InputStream stream;
+
+                @Override
+                public void connect() {
+                    if (stream == null) stream = new ByteArrayInputStream(getTransformed(path));
+                }
+
+                @Override
+                public InputStream getInputStream() {
+                    connect();
+                    if (stream == null) throw new NullPointerException("Stream cannot be null");
+                    return stream;
+                }
+            };
+        }
+    }
 }
