Backport to Minecraft 1.21.1

MrMicky-FR · MrMicky-FR · commit 0efe28f025d5 · 2026-03-30T21:26:10.000-04:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        java-version: [ 25 ]
+        java-version: [ 21 ]
 
     steps:
       - name: Checkout repository
@@ -55,8 +55,8 @@ jobs:
       - name: Upload AzLink-Forge.jar
         uses: actions/upload-artifact@v4
         with:
-          name: AzLink-NeoForge
-          path: neoforge/build/libs/AzLink-Forge-*.jar
+          name: AzLink-Forge
+          path: forge/build/libs/AzLink-Forge-*.jar
           overwrite: true
 
       - name: Upload AzLink-NeoForge.jar
diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -1,6 +1,6 @@
 plugins {
-    id 'fabric-loom' version '1.14-SNAPSHOT'
-    id 'com.gradleup.shadow' version '9.3.1'
+    id 'fabric-loom' version '1.12-SNAPSHOT'
+    id 'com.gradleup.shadow' version '9.2.2'
 }
 
 java {
@@ -9,10 +9,10 @@ java {
 }
 
 ext {
-    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'
+    minecraft_version = '1.21.1'
+    yarn_mappings = '1.21.1+build.3'
+    loader_version = '0.18.5'
+    fabric_version = '0.116.9+1.21.1'
 }
 
 dependencies {
@@ -29,7 +29,7 @@ loom {
 
 processResources {
     filesMatching('**/*.json') {
-        expand 'version': project.version
+        expand 'version': version
     }
 }
 
diff --git a/fabric/src/main/java/com/azuriom/azlink/fabric/AzLinkFabricMod.java b/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().parseAndExecute(source, command);
+        getServer().getCommandManager().executeWithPrefix(source, command);
     }
 
     @Override
diff --git a/fabric/src/main/java/com/azuriom/azlink/fabric/MinecraftTextAdapter.java b/fabric/src/main/java/com/azuriom/azlink/fabric/MinecraftTextAdapter.java
@@ -10,7 +10,6 @@
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
 
-import java.net.URI;
 import java.util.EnumMap;
 import java.util.Map;
 
@@ -48,8 +47,8 @@ public static Text toText(TextComponent component) {
         }
 
         if (component.url() != null) {
-            URI uri = URI.create(component.url());
-            result.fillStyle(Style.EMPTY.withClickEvent(new ClickEvent.OpenUrl(uri)));
+            ClickEvent clickEvent = new ClickEvent(ClickEvent.Action.OPEN_URL, component.url());
+            result.fillStyle(Style.EMPTY.withClickEvent(clickEvent));
         }
 
         for (TextComponent child : component.children()) {
diff --git a/fabric/src/main/java/com/azuriom/azlink/fabric/command/FabricCommandSource.java b/fabric/src/main/java/com/azuriom/azlink/fabric/command/FabricCommandSource.java
@@ -3,17 +3,13 @@
 import com.azuriom.azlink.common.chat.TextComponent;
 import com.azuriom.azlink.common.command.CommandSender;
 import com.azuriom.azlink.fabric.MinecraftTextAdapter;
-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) {
@@ -46,6 +42,6 @@ public void sendMessage(TextComponent message) {
 
     @Override
     public boolean hasPermission(String permission) {
-        return this.source.getPermissions().hasPermission(PERMISSION_LEVEL_OWNERS);
+        return this.source.hasPermissionLevel(3);
     }
 }
diff --git a/fabric/src/main/java/com/azuriom/azlink/fabric/command/FabricPlayer.java b/fabric/src/main/java/com/azuriom/azlink/fabric/command/FabricPlayer.java
@@ -3,16 +3,12 @@
 import com.azuriom.azlink.common.chat.TextComponent;
 import com.azuriom.azlink.common.command.CommandSender;
 import com.azuriom.azlink.fabric.MinecraftTextAdapter;
-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) {
@@ -41,6 +37,6 @@ public void sendMessage(TextComponent message) {
 
     @Override
     public boolean hasPermission(String permission) {
-        return this.player.getPermissions().hasPermission(PERMISSION_LEVEL_OWNERS);
+        return this.player.hasPermissionLevel(3);
     }
 }
diff --git a/forge/build.gradle b/forge/build.gradle
@@ -1,6 +1,6 @@
 plugins {
-    id 'net.minecraftforge.gradle' version '[7.0.3,8)'
-    id 'com.gradleup.shadow' version '9.3.1'
+    id 'net.minecraftforge.gradle' version '[6.0.24,6.2)'
+    id 'com.gradleup.shadow' version '9.2.2'
 }
 
 java {
@@ -9,22 +9,25 @@ java {
 }
 
 ext {
-    minecraft_version = '1.21.11'
-    forge_version = '61.1.0'
-}
-
-repositories {
-    minecraft.mavenizer(it)
-    maven fg.forgeMaven
-    maven fg.minecraftLibsMaven
+    minecraft_version = '1.21.1'
+    forge_version = '52.1.0'
 }
 
 dependencies {
     def forgeVersion = "${project.ext.minecraft_version}-${project.ext.forge_version}"
 
     implementation project(':azlink-common')
-    implementation minecraft.dependency("net.minecraftforge:forge:${forgeVersion}")
-    annotationProcessor 'net.minecraftforge:eventbus-validator:7.0.1'
+    minecraft "net.minecraftforge:forge:${forgeVersion}"
+}
+
+minecraft {
+    mappings channel: 'official', version: project.ext.minecraft_version
+}
+
+processResources {
+    filesMatching('**/*.toml') {
+        expand 'version': version
+    }
 }
 
 shadowJar {
diff --git a/forge/src/main/java/com/azuriom/azlink/forge/AzLinkForgeMod.java b/forge/src/main/java/com/azuriom/azlink/forge/AzLinkForgeMod.java
@@ -23,7 +23,7 @@
 import net.minecraftforge.event.TickEvent;
 import net.minecraftforge.event.server.ServerAboutToStartEvent;
 import net.minecraftforge.event.server.ServerStoppingEvent;
-import net.minecraftforge.eventbus.api.listener.SubscribeEvent;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.ModList;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.loading.FMLLoader;
@@ -68,7 +68,6 @@ public AzLinkForgeMod() {
         }
 
         MinecraftForge.EVENT_BUS.register(this);
-        TickEvent.ServerTickEvent.Pre.BUS.addListener(e -> this.tpsTask.run());
     }
 
     @SubscribeEvent
@@ -92,6 +91,11 @@ public void onRegisterCommands(RegisterCommandsEvent event) {
         command.register(event.getDispatcher());
     }
 
+    @SubscribeEvent
+    public void onTickStart(TickEvent.ServerTickEvent.Pre event) {
+        this.tpsTask.run();
+    }
+
     @Override
     public AzLinkPlugin getPlugin() {
         return this.plugin;
diff --git a/forge/src/main/java/com/azuriom/azlink/forge/MinecraftComponentAdapter.java b/forge/src/main/java/com/azuriom/azlink/forge/MinecraftComponentAdapter.java
@@ -9,7 +9,6 @@
 import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.network.chat.Style;
 
-import java.net.URI;
 import java.util.EnumMap;
 import java.util.Map;
 
@@ -47,8 +46,8 @@ public static Component toComponent(TextComponent component) {
         }
 
         if (component.url() != null) {
-            URI uri = URI.create(component.url());
-            result.withStyle(Style.EMPTY.withClickEvent(new ClickEvent.OpenUrl(uri)));
+            ClickEvent clickEvent = new ClickEvent(ClickEvent.Action.OPEN_URL, component.url());
+            result.withStyle(Style.EMPTY.withClickEvent(clickEvent));
         }
 
         for (TextComponent child : component.children()) {
diff --git a/forge/src/main/java/com/azuriom/azlink/forge/command/ForgeCommandSource.java b/forge/src/main/java/com/azuriom/azlink/forge/command/ForgeCommandSource.java
@@ -4,16 +4,12 @@
 import com.azuriom.azlink.common.command.CommandSender;
 import com.azuriom.azlink.forge.MinecraftComponentAdapter;
 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 ForgeCommandSource implements CommandSender {
 
-    private static final Permission PERMISSION_LEVEL_OWNERS = new Permission.HasCommandLevel(PermissionLevel.OWNERS);
-
     private final CommandSourceStack source;
 
     public ForgeCommandSource(CommandSourceStack source) {
@@ -46,6 +42,6 @@ public void sendMessage(TextComponent message) {
 
     @Override
     public boolean hasPermission(String permission) {
-        return this.source.permissions().hasPermission(PERMISSION_LEVEL_OWNERS);
+        return this.source.hasPermission(3);
     }
 }
diff --git a/forge/src/main/java/com/azuriom/azlink/forge/command/ForgePlayer.java b/forge/src/main/java/com/azuriom/azlink/forge/command/ForgePlayer.java
@@ -4,15 +4,11 @@
 import com.azuriom.azlink.common.command.CommandSender;
 import com.azuriom.azlink.forge.MinecraftComponentAdapter;
 import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.server.permissions.Permission;
-import net.minecraft.server.permissions.PermissionLevel;
 
 import java.util.UUID;
 
 public class ForgePlayer implements CommandSender {
 
-    private static final Permission PERMISSION_LEVEL_OWNERS = new Permission.HasCommandLevel(PermissionLevel.OWNERS);
-
     private final ServerPlayer player;
 
     public ForgePlayer(ServerPlayer player) {
@@ -41,6 +37,6 @@ public void sendMessage(TextComponent message) {
 
     @Override
     public boolean hasPermission(String permission) {
-        return this.player.permissions().hasPermission(PERMISSION_LEVEL_OWNERS);
+        return this.player.hasPermissions(3);
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/neoforge/build.gradle b/neoforge/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'net.neoforged.moddev' version '2.0.139'
-    id 'com.gradleup.shadow' version '9.3.1'
+    id 'com.gradleup.shadow' version '9.2.2'
 }
 
 java {
@@ -9,8 +9,8 @@ java {
 }
 
 ext {
-    minecraft_version = '1.21.11'
-    neo_version = '21.11.35-beta'
+    minecraft_version = '1.21.1'
+    neo_version = '21.1.222'
 }
 
 neoForge {
@@ -41,7 +41,7 @@ dependencies {
 
 processResources {
     filesMatching('**/*.toml') {
-        expand 'version': project.version
+        expand 'version': version
     }
 }
 
diff --git a/neoforge/src/main/java/com/azuriom/azlink/neoforge/AzLinkNeoForgeMod.java b/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.getCurrent().getVersionInfo().neoForgeVersion());
+        return new PlatformInfo(name, FMLLoader.versionInfo().neoForgeVersion());
     }
 
     @Override
diff --git a/neoforge/src/main/java/com/azuriom/azlink/neoforge/MinecraftComponentAdapter.java b/neoforge/src/main/java/com/azuriom/azlink/neoforge/MinecraftComponentAdapter.java
@@ -9,7 +9,6 @@
 import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.network.chat.Style;
 
-import java.net.URI;
 import java.util.EnumMap;
 import java.util.Map;
 
@@ -47,8 +46,8 @@ public static Component toComponent(TextComponent component) {
         }
 
         if (component.url() != null) {
-            URI uri = URI.create(component.url());
-            result.withStyle(Style.EMPTY.withClickEvent(new ClickEvent.OpenUrl(uri)));
+            ClickEvent clickEvent = new ClickEvent(ClickEvent.Action.OPEN_URL, component.url());
+            result.withStyle(Style.EMPTY.withClickEvent(clickEvent));
         }
 
         for (TextComponent child : component.children()) {
diff --git a/neoforge/src/main/java/com/azuriom/azlink/neoforge/command/NeoForgeCommandSource.java b/neoforge/src/main/java/com/azuriom/azlink/neoforge/command/NeoForgeCommandSource.java
@@ -4,16 +4,12 @@
 import com.azuriom.azlink.common.command.CommandSender;
 import com.azuriom.azlink.neoforge.MinecraftComponentAdapter;
 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) {
@@ -46,6 +42,6 @@ public void sendMessage(TextComponent message) {
 
     @Override
     public boolean hasPermission(String permission) {
-        return this.source.permissions().hasPermission(PERMISSION_LEVEL_OWNERS);
+        return this.source.hasPermission(3);
     }
 }
diff --git a/neoforge/src/main/java/com/azuriom/azlink/neoforge/command/NeoForgePlayer.java b/neoforge/src/main/java/com/azuriom/azlink/neoforge/command/NeoForgePlayer.java
diff --git a/settings.gradle b/settings.gradle
diff --git a/universal-legacy/build.gradle b/universal-legacy/build.gradle
diff --git a/universal/build.gradle b/universal/build.gradle

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`plugins {`
`2`		`- id 'fabric-loom' version '1.14-SNAPSHOT'`
`3`		`- id 'com.gradleup.shadow' version '9.3.1'`
	`2`	`+ id 'fabric-loom' version '1.12-SNAPSHOT'`
	`3`	`+ id 'com.gradleup.shadow' version '9.2.2'`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`java {`
`@@ -9,10 +9,10 @@ java {`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`ext {`
`12`		`- minecraft_version = '1.21.11'`
`13`		`- yarn_mappings = '1.21.11+build.4'`
`14`		`- loader_version = '0.18.4'`
`15`		`- fabric_version = '0.141.1+1.21.11'`
	`12`	`+ minecraft_version = '1.21.1'`
	`13`	`+ yarn_mappings = '1.21.1+build.3'`
	`14`	`+ loader_version = '0.18.5'`
	`15`	`+ fabric_version = '0.116.9+1.21.1'`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`dependencies {`
`@@ -29,7 +29,7 @@ loom {`
`29`	`29`
`30`	`30`	`processResources {`
`31`	`31`	`filesMatching('*/.json') {`
`32`		`- expand 'version': project.version`
	`32`	`+ expand 'version': version`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ public Stream<CommandSender> getOnlinePlayers() {`
`133`	`133`	`@Override`
`134`	`134`	`public void dispatchConsoleCommand(String command) {`
`135`	`135`	`ServerCommandSource source = getServer().getCommandSource();`
`136`		`- getServer().getCommandManager().parseAndExecute(source, command);`
	`136`	`+ getServer().getCommandManager().executeWithPrefix(source, command);`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@`
`10`	`10`	`import net.minecraft.text.Text;`
`11`	`11`	`import net.minecraft.util.Formatting;`
`12`	`12`
`13`		`-import java.net.URI;`
`14`	`13`	`import java.util.EnumMap;`
`15`	`14`	`import java.util.Map;`
`16`	`15`
`@@ -48,8 +47,8 @@ public static Text toText(TextComponent component) {`
`48`	`47`	`}`
`49`	`48`
`50`	`49`	`if (component.url() != null) {`
`51`		`- URI uri = URI.create(component.url());`
`52`		`- result.fillStyle(Style.EMPTY.withClickEvent(new ClickEvent.OpenUrl(uri)));`
	`50`	`+ ClickEvent clickEvent = new ClickEvent(ClickEvent.Action.OPEN_URL, component.url());`
	`51`	`+ result.fillStyle(Style.EMPTY.withClickEvent(clickEvent));`
`53`	`52`	`}`
`54`	`53`
`55`	`54`	`for (TextComponent child : component.children()) {`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@`
`9`	`9`	`import net.minecraft.network.chat.MutableComponent;`
`10`	`10`	`import net.minecraft.network.chat.Style;`
`11`	`11`
`12`		`-import java.net.URI;`
`13`	`12`	`import java.util.EnumMap;`
`14`	`13`	`import java.util.Map;`
`15`	`14`
`@@ -47,8 +46,8 @@ public static Component toComponent(TextComponent component) {`
`47`	`46`	`}`
`48`	`47`
`49`	`48`	`if (component.url() != null) {`
`50`		`- URI uri = URI.create(component.url());`
`51`		`- result.withStyle(Style.EMPTY.withClickEvent(new ClickEvent.OpenUrl(uri)));`
	`49`	`+ ClickEvent clickEvent = new ClickEvent(ClickEvent.Action.OPEN_URL, component.url());`
	`50`	`+ result.withStyle(Style.EMPTY.withClickEvent(clickEvent));`
`52`	`51`	`}`
`53`	`52`
`54`	`53`	`for (TextComponent child : component.children()) {`