Update to Minecraft 1.21.11

Author: MrMicky-FR

.github/workflows/build.yml

@@ -3,6 +3,7 @@ name: Java CI
 on:
   push:
   pull_request:
+  workflow_dispatch:
 
 jobs:
   build:

common/build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id 'net.kyori.blossom' version '2.2.0'
-    id 'org.jetbrains.gradle.plugin.idea-ext' version '1.3'
+    // id 'org.jetbrains.gradle.plugin.idea-ext' version '1.3'
 }
 
 repositories {

fabric/build.gradle

@@ -1,6 +1,6 @@
 plugins {
-    id 'fabric-loom' version '1.11-SNAPSHOT'
-    id 'com.gradleup.shadow' version '8.3.5'
+    id 'fabric-loom' version '1.14-SNAPSHOT'
+    id 'com.gradleup.shadow' version '9.3.1'
 }
 
 java {
@@ -9,10 +9,10 @@ java {
 }
 
 ext {
-    minecraft_version = '1.21.8'
-    yarn_mappings = '1.21.8+build.1'
-    loader_version = '0.17.2'
-    fabric_version = '0.132.0+1.21.8'
+    minecraft_version = '1.21.11'
+    yarn_mappings = '1.21.11+build.4'
+    loader_version = '0.18.4'
+    fabric_version = '0.141.1+1.21.11'
 }
 
 dependencies {
@@ -54,6 +54,6 @@ remapJar {
     archiveFileName = "AzLink-Fabric-${project.version}-${project.ext.minecraft_version}.jar"
 }
 
-artifacts {
-    archives remapJar
+build {
+    dependsOn remapJar
 }

fabric/src/main/java/com/azuriom/azlink/fabric/AzLinkFabricMod.java

@@ -133,7 +133,7 @@ public Stream<CommandSender> getOnlinePlayers() {
     @Override
     public void dispatchConsoleCommand(String command) {
         ServerCommandSource source = getServer().getCommandSource();
-        getServer().getCommandManager().executeWithPrefix(source, command);
+        getServer().getCommandManager().parseAndExecute(source, command);
     }
 
     @Override

fabric/src/main/java/com/azuriom/azlink/fabric/command/FabricCommandSource.java

@@ -1,13 +1,17 @@
 package com.azuriom.azlink.fabric.command;
 
 import com.azuriom.azlink.common.command.CommandSender;
+import net.minecraft.command.permission.Permission;
+import net.minecraft.command.permission.PermissionLevel;
 import net.minecraft.entity.Entity;
 import net.minecraft.server.command.ServerCommandSource;
 
 import java.util.UUID;
 
 public class FabricCommandSource implements CommandSender {
 
+    private static final Permission PERMISSION_LEVEL_OWNERS = new Permission.Level(PermissionLevel.OWNERS);
+
     private final ServerCommandSource source;
 
     public FabricCommandSource(ServerCommandSource source) {
@@ -35,6 +39,6 @@ public void sendMessage(String message) {
 
     @Override
     public boolean hasPermission(String permission) {
-        return this.source.hasPermissionLevel(3);
+        return this.source.getPermissions().hasPermission(PERMISSION_LEVEL_OWNERS);
     }
 }

fabric/src/main/java/com/azuriom/azlink/fabric/command/FabricPlayer.java

@@ -1,12 +1,16 @@
 package com.azuriom.azlink.fabric.command;
 
 import com.azuriom.azlink.common.command.CommandSender;
+import net.minecraft.command.permission.Permission;
+import net.minecraft.command.permission.PermissionLevel;
 import net.minecraft.server.network.ServerPlayerEntity;
 
 import java.util.UUID;
 
 public class FabricPlayer implements CommandSender {
 
+    private static final Permission PERMISSION_LEVEL_OWNERS = new Permission.Level(PermissionLevel.OWNERS);
+
     private final ServerPlayerEntity player;
 
     public FabricPlayer(ServerPlayerEntity player) {
@@ -30,6 +34,6 @@ public void sendMessage(String message) {
 
     @Override
     public boolean hasPermission(String permission) {
-        return this.player.hasPermissionLevel(3);
+        return this.player.getPermissions().hasPermission(PERMISSION_LEVEL_OWNERS);
     }
 }

neoforge/build.gradle

@@ -1,6 +1,6 @@
 plugins {
-    id 'net.neoforged.moddev' version '2.0.82'
-    id 'com.gradleup.shadow' version '8.3.5'
+    id 'net.neoforged.moddev' version '2.0.139'
+    id 'com.gradleup.shadow' version '9.3.1'
 }
 
 java {
@@ -9,8 +9,8 @@ java {
 }
 
 ext {
-    minecraft_version = '1.21.8'
-    neo_version = '21.8.4-beta'
+    minecraft_version = '1.21.11'
+    neo_version = '21.11.35-beta'
 }
 
 neoForge {
@@ -60,6 +60,6 @@ shadowJar {
     relocate 'net.kyori', 'com.azuriom.azlink.libs'
 }
 
-artifacts {
-    archives shadowJar
+build {
+    dependsOn shadowJar
 }

neoforge/src/main/java/com/azuriom/azlink/neoforge/AzLinkNeoForgeMod.java

@@ -116,7 +116,7 @@ public PlatformInfo getPlatformInfo() {
                 .map(IModInfo::getDisplayName)
                 .orElse("unknown");
 
-        return new PlatformInfo(name, FMLLoader.versionInfo().neoForgeVersion());
+        return new PlatformInfo(name, FMLLoader.getCurrent().getVersionInfo().neoForgeVersion());
     }
 
     @Override

neoforge/src/main/java/com/azuriom/azlink/neoforge/command/NeoForgeCommandSource.java

@@ -2,12 +2,16 @@
 
 import com.azuriom.azlink.common.command.CommandSender;
 import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.server.permissions.Permission;
+import net.minecraft.server.permissions.PermissionLevel;
 import net.minecraft.world.entity.Entity;
 
 import java.util.UUID;
 
 public class NeoForgeCommandSource implements CommandSender {
 
+    private static final Permission PERMISSION_LEVEL_OWNERS = new Permission.HasCommandLevel(PermissionLevel.OWNERS);
+
     private final CommandSourceStack source;
 
     public NeoForgeCommandSource(CommandSourceStack source) {
@@ -35,6 +39,6 @@ public void sendMessage(String message) {
 
     @Override
     public boolean hasPermission(String permission) {
-        return this.source.hasPermission(3);
+        return this.source.permissions().hasPermission(PERMISSION_LEVEL_OWNERS);
     }
 }

neoforge/src/main/java/com/azuriom/azlink/neoforge/command/NeoForgePlayer.java

@@ -2,11 +2,15 @@
 
 import com.azuriom.azlink.common.command.CommandSender;
 import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.server.permissions.Permission;
+import net.minecraft.server.permissions.PermissionLevel;
 
 import java.util.UUID;
 
 public class NeoForgePlayer implements CommandSender {
 
+    private static final Permission PERMISSION_LEVEL_OWNERS = new Permission.HasCommandLevel(PermissionLevel.OWNERS);
+
     private final ServerPlayer player;
 
     public NeoForgePlayer(ServerPlayer player) {
@@ -30,6 +34,6 @@ public void sendMessage(String message) {
 
     @Override
     public boolean hasPermission(String permission) {
-        return this.player.hasPermissions(3);
+        return this.player.permissions().hasPermission(PERMISSION_LEVEL_OWNERS);
     }
 }