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

Author: SquidDev

.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

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

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.7

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"
 

package-lock.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",

package.json

@@ -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")

projects/common/src/main/java/dan200/computercraft/shared/command/UserLevel.java

@@ -9,6 +9,7 @@
 import dan200.computercraft.shared.network.client.SpeakerStopClientMessage;
 import dan200.computercraft.shared.network.server.ServerNetworking;
 import net.minecraft.core.BlockPos;
+import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
@@ -47,7 +48,12 @@ private Peripheral(SpeakerBlockEntity speaker) {
         }
 
         @Override
-        public SpeakerPosition getPosition() {
+        protected ServerLevel getLevel() {
+            return (ServerLevel) speaker.getLevel();
+        }
+
+        @Override
+        protected SpeakerPosition getPosition() {
             return SpeakerPosition.of(speaker.getLevel(), Vec3.atCenterOf(speaker.getBlockPos()));
         }
 

projects/common/src/main/java/dan200/computercraft/shared/peripheral/speaker/SpeakerBlockEntity.java

@@ -32,7 +32,10 @@
 import net.minecraft.world.level.block.state.properties.NoteBlockInstrument;
 import org.jspecify.annotations.Nullable;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
 
 import static dan200.computercraft.api.lua.LuaValues.checkFinite;
 
@@ -155,7 +158,9 @@ public void update() {
         }
     }
 
-    public abstract SpeakerPosition getPosition();
+    protected abstract ServerLevel getLevel();
+
+    protected abstract SpeakerPosition getPosition();
 
     public UUID getSource() {
         return source;
@@ -255,7 +260,7 @@ public final boolean playSound(ILuaContext context, String name, Optional<Double
         // Prevent playing music discs.
         var soundEvent = BuiltInRegistries.SOUND_EVENT.getValue(identifier);
         // TODO: Build a set of sound events at server startup, and cache this.
-        var level = Objects.requireNonNull(getPosition().level());
+        var level = getLevel();
         if (soundEvent != null && level.registryAccess().lookupOrThrow(Registries.JUKEBOX_SONG).stream().anyMatch(x -> x.soundEvent().value() == soundEvent)) {
             return false;
         }

projects/common/src/main/java/dan200/computercraft/shared/peripheral/speaker/SpeakerPeripheral.java

@@ -7,7 +7,6 @@
 import dan200.computercraft.api.peripheral.IComputerAccess;
 import dan200.computercraft.shared.network.client.SpeakerStopClientMessage;
 import dan200.computercraft.shared.network.server.ServerNetworking;
-import net.minecraft.server.level.ServerLevel;
 
 
 /**
@@ -16,8 +15,6 @@
 public abstract class UpgradeSpeakerPeripheral extends SpeakerPeripheral {
     public static final String ADJECTIVE = "upgrade.computercraft.speaker.adjective";
 
-    protected abstract ServerLevel getLevel();
-
     @Override
     public void detach(IComputerAccess computer) {
         super.detach(computer);