JM 6 nbt waypoint data container support

Author: rfresh2

.github/workflows/build.yml

@@ -13,9 +13,6 @@ jobs:
       - name: Check out repository
         uses: actions/checkout@v4
 
-      - name: Gradle Wrapper Verification
-        uses: gradle/wrapper-validation-action@v3
-
       - name: Set up JDK 8
         uses: actions/setup-java@v4
         with:
@@ -25,13 +22,16 @@ jobs:
       - name: Elevate wrapper permissions
         run: chmod +x ./gradlew
 
-      - name: Build
-        uses: gradle/gradle-build-action@v3
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
         with:
-          arguments: build
+          dependency-graph: generate-and-submit
+
+      - name: Build
+        run: ./gradlew build
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
           name: JMWaypointsToXaero
-          path: JMWaypointsToXaero-*.jar
+          path: build/libs/JMWaypointsToXaero-*.jar

README.md

@@ -16,7 +16,7 @@ This will overwrite any Xaero Waypoints you have defined already for your select
 
 Download the latest jar from releases
 
-`java -jar JMWaypointstoXaero-1.1.jar <input folder> <output folder>`
+`java -jar JMWaypointstoXaero-1.2.jar <input folder> <output folder>`
 
 Input folder is your JourneyMap directory for your selected world.
 
@@ -26,11 +26,11 @@ Example:
 Output folder is your destination Xaero Waypoints directory
 
 Example:
-`C:\Users\rfresh2\AppData\Roaming\.minecraft\XaeroWaypoints\Multiplayer_2b2t.org`
+`C:\Users\rfresh2\AppData\Roaming\.minecraft\xaero\minimap\Multiplayer_2b2t.org`
 
 # Full command example
 
-`java -jar JMWaypointsToXaero-1.1.jar "C:\Users\rfresh2\AppData\Roaming\.minecraft\journeymap\data\mp\2b2t" "C:\Users\rfresh2\AppData\Roaming\.minecraft\XaeroWaypoints\Multiplayer_2b2t.org"`
+`java -jar JMWaypointsToXaero-1.1.jar "C:\Users\rfresh2\AppData\Roaming\.minecraft\journeymap\data\mp\2b2t" "C:\Users\rfresh2\AppData\Roaming\.minecraft\xaero\minimap\Multiplayer_2b2t.org"`
 
 # Additional References
 

build.gradle.kts

@@ -1,10 +1,10 @@
 plugins {
     java
-    id("io.github.goooler.shadow") version "8.1.7"
+    id("com.gradleup.shadow") version "8.3.7"
 }
 
 group = "com.github.rfresh2"
-version = "1.1"
+version = "1.2"
 
 val shade: Configuration by configurations.creating
 configurations.implementation.get().extendsFrom(shade)
@@ -15,13 +15,15 @@ java {
 
 repositories {
     mavenCentral()
+    maven("https://repo.viaversion.com")
 }
 
 dependencies {
-    shade("com.fasterxml.jackson.core:jackson-core:2.17.1")
-    shade("com.fasterxml.jackson.core:jackson-databind:2.17.1")
-    shade("org.slf4j:slf4j-api:2.0.13")
-    shade("org.slf4j:slf4j-simple:2.0.13")
+    shade("com.fasterxml.jackson.core:jackson-core:2.18.4")
+    shade("com.fasterxml.jackson.core:jackson-databind:2.18.4")
+    shade("org.slf4j:slf4j-api:2.0.17")
+    shade("org.slf4j:slf4j-simple:2.0.17")
+    shade("com.viaversion:nbt:5.1.1")
 }
 
 tasks {

gradle/wrapper/gradle-wrapper.jar

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

gradle/wrapper/gradle-wrapper.properties

@@ -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/HEAD/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/.
@@ -84,7 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # 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
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -112,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -203,15 +205,15 @@ fi
 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,
+#   * DEFAULT_JVM_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 \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -68,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

gradlew.bat

@@ -9,6 +9,9 @@
 import com.github.rfresh2.model.JMWaypointLegacy;
 import com.github.rfresh2.model.JMWaypointModern;
 import com.github.rfresh2.model.XaeroWaypoint;
+import com.viaversion.nbt.io.NBTIO;
+import com.viaversion.nbt.tag.CompoundTag;
+import com.viaversion.nbt.tag.Tag;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -20,6 +23,7 @@
 import java.nio.file.OpenOption;
 import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
@@ -60,7 +64,31 @@ public static void main(final String[] args) {
     }
 
     private static List<XaeroWaypoint> convertWaypoints(Path inputFolder) {
-        return Arrays.stream(Objects.requireNonNull(inputFolder.toFile().listFiles()))
+        File inputFolderFile = inputFolder.toFile();
+        List<File> files = Arrays.asList(Objects.requireNonNull(inputFolderFile.listFiles()));
+
+        for (File file : files) {
+            if (file.getName().equals("WaypointData.dat")) {
+                LOG.info("Found JourneyMap NBT waypoint data file: {}", file.getAbsolutePath());
+                try {
+                    List<JMWaypointModern> jmWaypoints = readNbtWaypoints(file.toPath());
+                    return jmWaypoints.stream()
+                        .peek(wp -> LOG.info("Found {} JM waypoint: {} [{}, {}, {}]",
+                            "nbt",
+                            wp.getName(),
+                            wp.getX(),
+                            wp.getY(),
+                            wp.getZ()))
+                        .map(JourneyMapWaypointsToXaero::convertWaypoint)
+                        .collect(Collectors.toList());
+                } catch (Exception e) {
+                    LOG.error("Error reading WaypointData.dat file: {}", file.getAbsolutePath(), e);
+                    throw new RuntimeException(e);
+                }
+            }
+        }
+
+        return files.stream()
             .map(JourneyMapWaypointsToXaero::parseJourneyMapWaypointFile)
             .filter(Objects::nonNull)
             .peek(wp -> LOG.info("Found {} JM waypoint: {} [{}, {}, {}]",
@@ -140,4 +168,26 @@ public static XaeroWaypoint convertWaypoint(final IJMWaypoint jmWaypoint) {
                 dimension
         );
     }
+
+    public static List<JMWaypointModern> readNbtWaypoints(Path nbtSrc) throws Exception {
+        List<JMWaypointModern> waypoints = new ArrayList<>();
+        CompoundTag tag = (CompoundTag) NBTIO.reader().named().read(nbtSrc, false);
+        CompoundTag waypointsTag = tag.getCompoundTag("waypoints");
+        for (Tag waypointTagEntry : waypointsTag.values()) {
+            CompoundTag e = (CompoundTag) waypointTagEntry;
+            String waypointName = e.getString("name");
+            CompoundTag posTag = e.getCompoundTag("pos");
+            int x = posTag.getInt("x");
+            int y = posTag.getInt("y");
+            int z = posTag.getInt("z");
+            String dimension = posTag.getString("dimension");
+            int color = e.getInt("color");
+            int r = color >> 16 & 0xFF;
+            int g = color >> 8 & 0xFF;
+            int b = color & 0xFF;
+            JMWaypointModern jmWaypointJsonModern = new JMWaypointModern(waypointName, x, y, z, r, g, b, true, new String[]{dimension});
+            waypoints.add(jmWaypointJsonModern);
+        }
+        return waypoints;
+    }
 }