Update to 1.21.6

Author: JulianVennen

CHANGELOG.md

@@ -1,2 +1,2 @@
-## v3.0.7
-- Update to 1.21.5
+## v3.0.8
+- Update to 1.21.6

bungeecord/build.gradle

@@ -8,7 +8,7 @@ sourceCompatibility = JavaVersion.VERSION_11
 targetCompatibility = JavaVersion.VERSION_11
 
 dependencies {
-    compileOnly "net.md-5:bungeecord-api:${minor_minecraft_version}-R0.1-SNAPSHOT"
+    compileOnly "net.md-5:bungeecord-api:${minor_minecraft_version}-R0.4-SNAPSHOT"
     implementation(libs.mclogs.api) {
         exclude group: 'com.google.code.gson', module: 'gson'
     }

fabric/src/main/java/gs/mclo/command/FabricClientCommandSourceAccessor.java

@@ -18,7 +18,7 @@ public FabricClientCommandSourceAccessor(FabricClientCommandSource source) {
 
     @Override
     public boolean hasPermission(Permission permission) {
-        return source.hasPermission(permission.level());
+        return source.getPlayer().hasPermissions(permission.level());
     }
 
     @Override

forge/build.gradle

@@ -29,9 +29,14 @@ minecraft {
     }
 
     runs {
+        configureEach {
+            ideaModule "${rootProject.name}.${project.name}.main"
+
+            property 'eventbus.api.strictRuntimeChecks', 'true'
+        }
+
         client {
             workingDirectory file('runs/client')
-            ideaModule "${rootProject.name}.${project.name}.main"
             taskName 'Client'
             mods {
                 modClientRun {
@@ -42,13 +47,13 @@ minecraft {
 
         server {
             workingDirectory file('runs/server')
-            ideaModule "${rootProject.name}.${project.name}.main"
             taskName 'Server'
             mods {
                 modServerRun {
                     source sourceSets.main
                 }
             }
+            args '--nogui'
         }
     }
 }
@@ -63,6 +68,7 @@ tasks.named('jarJar') {
 
 dependencies {
     minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
+    annotationProcessor 'net.minecraftforge:eventbus-validator:7.0-beta.7'
 
     // Forge's hack fix
     implementation('net.sf.jopt-simple:jopt-simple:5.0.4') { version { strictly '5.0.4' } }

forge/src/main/java/gs/mclo/MclogsForge.java

@@ -2,25 +2,22 @@
 
 import gs.mclo.commands.ClientCommandSourceStackBuildContext;
 import net.minecraftforge.client.event.RegisterClientCommandsEvent;
-import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.RegisterCommandsEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
 
 @Mod(Constants.MOD_ID)
 public class MclogsForge extends MclogsCommonMc {
 
     public MclogsForge() {
         this.init();
-        MinecraftForge.EVENT_BUS.register(this);
+        RegisterClientCommandsEvent.BUS.addListener(this::registerClientCommands);
+        RegisterCommandsEvent.BUS.addListener(this::registerCommands);
     }
 
-    @SubscribeEvent
     public void registerClientCommands(RegisterClientCommandsEvent event) {
         registerCommandsOnDedicatedServer(event.getDispatcher(), new ClientCommandSourceStackBuildContext());
     }
 
-    @SubscribeEvent
     public void registerCommands(RegisterCommandsEvent event) {
         registerCommandsOnDedicatedServer(event.getDispatcher());
     }

gradle.properties

@@ -17,34 +17,34 @@ homepage_url=https://mclo.gs
 sources_url=https://github.com/aternosorg/mclogs-integration
 issues_url=https://github.com/aternosorg/mclogs-integration/issues
 
-minecraft_version=1.21.5
-minecraft_versions=1.21.5
+minecraft_version=1.21.6
+minecraft_versions=1.21.6
 minor_minecraft_version=1.21
-min_minecraft_version=1.21
+min_minecraft_version=1.21.6
 max_minecraft_version=1.22
 
 ## This is the version of minecraft that the 'common' project uses, you can find a list of all versions here
 ## https://projects.neoforged.net/neoforged/neoform
-neo_form_version=1.21.5-20250325.162830
+neo_form_version=1.21.6-20250617.151856
 # The version of ParchmentMC that is used, see https://parchmentmc.org/docs/getting-started#choose-a-version for new versions
 enable_parchment=false
 parchment_minecraft=1.21.4
 parchment_version=2025.01.19
 
 # Fabric
 # https://fabricmc.net/develop/
-fabric_version=0.119.6+1.21.5
+fabric_version=0.127.0+1.21.6
 fabric_loader_version=0.16.9
 
 # Forge
 # https://files.minecraftforge.net/
-forge_version=55.0.3
-forge_loader_version_range=[55,)
+forge_version=56.0.0
+forge_loader_version_range=[56,)
 
 # NeoForge
 # https://projects.neoforged.net/neoforged/neoforge
-neoforge_version=21.5.16-beta
-neoforge_loader_version_range=[6,)
+neoforge_version=21.6.5-beta
+neoforge_loader_version_range=[4,)
 
 # Velocity
 velocity_versions=3.4

neoforge/src/main/java/gs/mclo/commands/NeoForgeClientCommandSourceStackBuildContext.java

@@ -6,59 +6,15 @@
 import java.util.regex.Pattern;
 
 public class NeoForgeClientCommandSourceStackBuildContext extends ClientCommandSourceStackBuildContext {
-    /**
-     * A regex pattern for parsing NeoForge version strings.
-     */
-    private static final Pattern NEOFORGE_VERSION_PATTERN = Pattern.compile("(\\d+)\\.(\\d+)\\.(\\d+)(?:-beta)?");
-    /**
-     * Are click events with client commands supported in this version?
-     */
-    private boolean supportsClickEvents = false;
 
     /**
      * Constructs a new build context for client commands on NeoForge.
      */
     public NeoForgeClientCommandSourceStackBuildContext() {
-        try {
-            if (isMinVersion(new int[]{21, 4, 5})) {
-                supportsClickEvents = true;
-            }
-        } catch (Exception e) {
-            Constants.LOG.error("Failed to parse NeoForge version", e);
-        }
     }
 
     @Override
     public boolean supportsClientCommandClickEvents() {
-        return supportsClickEvents;
-    }
-
-    /**
-     * Is a minimum version of NeoForge installed?
-     * @param minVersions The minimum version to check for. (Minecraft minor version, Minecraft patch version, NeoForge patch version)
-     * @return True if the minimum version is installed, false otherwise.
-     */
-    protected boolean isMinVersion(int[] minVersions) {
-        var version = FMLLoader.versionInfo().neoForgeVersion();
-        var matcher = NEOFORGE_VERSION_PATTERN.matcher(version);
-
-        if (!matcher.matches()) {
-            throw new IllegalStateException("Failed to parse NeoForge version: " + version);
-        }
-
-        if (matcher.groupCount() != minVersions.length) {
-            throw new IllegalStateException("Expected match group count : " + version);
-        }
-
-        for (int i = 0; i < minVersions.length; i++) {
-            var minVersion = minVersions[i];
-            var foundVersion = Integer.parseInt(matcher.group(i + 1));
-            if (foundVersion > minVersion) {
-                return true;
-            } else if (foundVersion < minVersion) {
-                return false;
-            }
-        }
         return true;
     }
 }