update to CraftedCore 4.2

build.gradle

@@ -1,6 +1,6 @@
 plugins {
-    id "dev.architectury.loom" version "1.3-SNAPSHOT"
-    id 'net.darkhax.curseforgegradle' version '1.1.18'
+    id "dev.architectury.loom" version "1.6-SNAPSHOT"
+    id 'net.darkhax.curseforgegradle' version '1.+'
     id "maven-publish"
 }
 

gradle.properties

@@ -8,6 +8,6 @@ maven_group=dev.tocraft
 parchmentmc_mappings=2022.11.06
 forge_version=40.2.10
 # Dependency Versions
-craftedcore_version=4.0
+craftedcore_version=4.2
 # Platform
 loom.platform=forge

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -144,15 +145,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -201,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

src/main/java/tocraft/eomtw/EoMTweaks.java

@@ -1,12 +1,12 @@
 package tocraft.eomtw;
 
-import dev.architectury.event.events.common.CommandRegistrationEvent;
 import net.minecraft.network.chat.TextComponent;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.eventbus.api.EventPriority;
 import net.minecraftforge.fml.ModList;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
+import tocraft.craftedcore.event.common.CommandEvents;
 import tocraft.craftedcore.platform.VersionChecker;
 import tocraft.eomtw.commands.FTBTeamsExtraCommands;
 import tocraft.eomtw.registry.EoMRegistry;
@@ -29,7 +29,7 @@ public EoMTweaks() {
         MinecraftForge.EVENT_BUS.addListener(EventPriority.LOWEST, OreRegistry::biomeLoadingEvent);
 
         if (ModList.get().isLoaded("ftbteams")) {
-            CommandRegistrationEvent.EVENT.register(new FTBTeamsExtraCommands());
+            CommandEvents.REGISTRATION.register(new FTBTeamsExtraCommands());
         }
     }
 

src/main/java/tocraft/eomtw/commands/FTBTeamsExtraCommands.java

@@ -5,15 +5,15 @@
 import com.mojang.brigadier.builder.RequiredArgumentBuilder;
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
-import dev.architectury.event.events.common.CommandRegistrationEvent;
 import dev.ftb.mods.ftbteams.data.Team;
 import dev.ftb.mods.ftbteams.data.TeamArgument;
 import dev.ftb.mods.ftbteams.data.TeamArgumentProvider;
 import dev.ftb.mods.ftbteams.property.TeamPropertyArgument;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.Commands;
+import tocraft.craftedcore.event.common.CommandEvents;
 
-public class FTBTeamsExtraCommands implements CommandRegistrationEvent {
+public class FTBTeamsExtraCommands implements CommandEvents.CommandRegistration {
     private RequiredArgumentBuilder<CommandSourceStack, TeamArgumentProvider> teamArg() {
         return Commands.argument("team", TeamArgument.create());
     }