Too many fixes and update to 1.21.4

Author: RedCarlos26

.github/workflows/build.yml

@@ -0,0 +1,24 @@
+name: Build
+on: [push, pull_request]
+
+jobs:
+    build:
+        runs-on: ubuntu-latest
+        steps:
+            - name: Checkout repository
+              uses: actions/checkout@v4
+
+            - name: Set up Java
+              uses: actions/setup-java@v4
+              with:
+                  distribution: 'adopt'
+                  java-version: 21
+
+            - name: Build
+              run: ./gradlew build
+
+            - name: Upload artifacts
+              uses: actions/upload-artifact@v4
+              with:
+                  name: build-artifacts
+                  path: build/libs/

.github/workflows/dev_build.yml

@@ -10,10 +10,6 @@
   <img src="https://img.shields.io/badge/Minecraft%20Version-1.20.2-blueviolet" alt="Minecraft Version">
 </div>
 
-<div align="center">
-  <a href="https://discord.gg/u3XNcDZyrY"><img src="https://invidget.switchblade.xyz/u3XNcDZyrY"></a>
-</div>
-
 # How to use
 - Download the lastest Meteor Client DevBuild.
 - Put NF Addon in your `.minecraft/mods` folder where you have installed Meteor.

.github/workflows/pull_request.yml

@@ -0,0 +1,66 @@
+plugins {
+    id("fabric-loom") version "1.10-SNAPSHOT"
+}
+
+base {
+    archivesName = project.property("archives_base_name").toString()
+    version = project.property("mod_version").toString()
+    group = project.property("maven_group").toString()
+}
+
+repositories {
+    maven("https://maven.meteordev.org/releases") {
+        name = "meteor-maven"
+    }
+
+    maven("https://maven.meteordev.org/snapshots") {
+        name = "meteor-maven-snapshots"
+    }
+
+    maven("https://babbaj.github.io/maven/") {
+        name = "babbaj-maven"
+    }
+}
+
+dependencies {
+    // Fabric
+    minecraft("com.mojang:minecraft:${project.property("minecraft_version")}")
+    mappings("net.fabricmc:yarn:${project.property("yarn_mappings")}:v2")
+    modImplementation("net.fabricmc:fabric-loader:${project.property("loader_version")}")
+
+    // Meteor
+    modImplementation("meteordevelopment:meteor-client:${project.property("minecraft_version")}-SNAPSHOT")
+
+    // Baritone
+    modImplementation("dev.babbaj:nether-pathfinder:1.4.1")
+    modImplementation("meteordevelopment:baritone:${project.property("minecraft_version")}-SNAPSHOT")
+}
+
+tasks {
+    processResources {
+        val propertiesMap = mapOf(
+            "version" to project.version,
+            "minecraft_version" to project.property("minecraft_version"),
+            "loader_version" to project.property("loader_version")
+        )
+
+        inputs.properties(propertiesMap)
+        filesMatching("fabric.mod.json") {
+            expand(propertiesMap)
+        }
+    }
+
+    withType<JavaCompile> {
+        options.encoding = "UTF-8"
+        options.release = 21
+    }
+
+    java {
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
+    }
+}
+
+loom {
+    accessWidenerPath = file("src/main/resources/netherfreedom.accesswidener")
+}

README.md

@@ -1,16 +1,11 @@
 org.gradle.jvmargs=-Xmx2G
 
 # Fabric Properties (https://fabricmc.net/develop/)
-minecraft_version=1.20.2
-yarn_mappings=1.20.2+build.4
-loader_version=0.14.24
+minecraft_version=1.21.4
+yarn_mappings=1.21.4+build.8
+loader_version=0.16.10
 
 # Mod Properties
 mod_version=1.4
 maven_group=netherfreedom.package
 archives_base_name=NF-Addon
-
-# Dependencies
-
-# Meteor (https://maven.meteordev.org/)
-meteor_version=0.5.5

build.gradle

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

build.gradle.kts

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +82,11 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# 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"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +133,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 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=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=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,18 +200,28 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# 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.
+
+# 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, 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" \
         -classpath "$CLASSPATH" \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradle.properties

@@ -1,10 +1,10 @@
 package me.redcarlos.netherfreedom;
 
 import com.mojang.logging.LogUtils;
-import me.redcarlos.netherfreedom.modules.hud.NFBindsHud;
 import me.redcarlos.netherfreedom.modules.hud.NFWelcomeHud;
 import me.redcarlos.netherfreedom.modules.main.*;
 import meteordevelopment.meteorclient.addons.MeteorAddon;
+import meteordevelopment.meteorclient.pathing.BaritoneUtils;
 import meteordevelopment.meteorclient.systems.Systems;
 import meteordevelopment.meteorclient.systems.hud.Hud;
 import meteordevelopment.meteorclient.systems.hud.HudGroup;
@@ -30,24 +30,23 @@ public void onInitialize() {
         Modules modules = Modules.get();
 
         // Main
-        modules.add(new AfkLogout());
-        modules.add(new ArmorNotify());
-        modules.add(new AutoWalkPlus());
-        modules.add(new BaritoneMiner());
+        modules.add(new AutoWalkNF());
+
         modules.add(new DiggingTools());
-        modules.add(new DiscordRPC());
         modules.add(new HandManager());
         modules.add(new HotbarManager());
         //modules.add(new NetherrackTracker());
-        modules.add(new NFAnnouncer());
-        modules.add(new NFBorer());
+        modules.add(new NetherBorer());
         modules.add(new NFRotation());
         modules.add(new NFScaffold());
 
         // HUD
         Hud hud = Systems.get(Hud.class);
-        hud.register(NFBindsHud.INFO);
         hud.register(NFWelcomeHud.INFO);
+
+        if (BaritoneUtils.IS_AVAILABLE) {
+            modules.add(new BaritoneMiner());
+        }
 	}
 
     @Override