Merge remote-tracking branch 'origin/master'

# Conflicts:
#	build.gradle
#	gradle.properties
#	gradle/wrapper/gradle-wrapper.jar
#	gradle/wrapper/gradle-wrapper.properties
#	src/main/java/us/potatoboy/invview/ViewCommand.java

Author: PotatoPresident

.github/workflows/gradle.yml

@@ -15,17 +15,18 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 17
-        uses: actions/setup-java@v1
+      - uses: actions/checkout@v4
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
+          distribution: 'temurin'
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build with Gradle
         run: ./gradlew build --stacktrace --info
       - name: Upload a Build Artifact
-        uses: actions/upload-artifact@v2.1.4
+        uses: actions/upload-artifact@v4
         with:
           name: InvView-Artifact
           path: build/libs/

.github/workflows/release.yml

@@ -11,11 +11,11 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
 
       - name: Make gradlew executable
         run: chmod +x ./gradlew
@@ -24,7 +24,7 @@ jobs:
         run: ./gradlew clean build
 
       - name: Upload assets to GitHub, Modrinth and CurseForge
-        uses: Kir-Antipov/mc-publish@v3.2
+        uses: Kir-Antipov/mc-publish@v3.3
         with:
           modrinth-id: jrDKjZP7
           modrinth-featured: false
@@ -37,4 +37,4 @@ jobs:
 
           loaders: |
             fabric
-            quilt
+            quilt

gradle.properties

@@ -6,7 +6,7 @@ minecraft_version=1.21.5
 yarn_mappings=1.21.5+build.1
 loader_version=0.16.11
 # Mod Properties
-mod_version=1.4.15
+mod_version=1.4.16
 maven_group=us.potatoboy
 archives_base_name=InvView
 # Dependencies

gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

src/main/java/us/potatoboy/invview/ViewCommand.java

@@ -163,14 +163,17 @@ private static ServerPlayerEntity getRequestedPlayer(CommandContext<ServerComman
 
         if (requestedPlayer == null) {
             requestedPlayer = minecraftServer.getPlayerManager().createPlayer(requestedProfile, SyncedClientOptions.createDefault());
-            Optional<NbtCompound> compound = minecraftServer.getPlayerManager().loadPlayerData(requestedPlayer);
-            if (compound.isPresent()) {
-                ServerWorld world = minecraftServer.getWorld(
-                        DimensionType.worldFromDimensionNbt(new Dynamic<>(NbtOps.INSTANCE, compound.get().get("Dimension")))
-                                .result().get());
-
-                if (world != null) {
-                    ((EntityAccessor) requestedPlayer).callSetWorld(world);
+            Optional<NbtCompound> compoundOpt = minecraftServer.getPlayerManager().loadPlayerData(requestedPlayer);
+            if (compoundOpt.isPresent()) {
+                NbtCompound compound = compoundOpt.get();
+                if (compound.contains("Dimension")) {
+                    ServerWorld world = minecraftServer.getWorld(
+                            DimensionType.worldFromDimensionNbt(new Dynamic<>(NbtOps.INSTANCE, compound.get("Dimension")))
+                                    .result().get());
+
+                    if (world != null) {
+                        ((EntityAccessor) requestedPlayer).callSetWorld(world);
+                    }
                 }
             }
         }

src/main/resources/fabric.mod.json

@@ -32,8 +32,8 @@
     "invview.mixins.json"
   ],
   "depends": {
-    "fabricloader": ">=0.7.2",
+    "fabricloader": ">=0.15.10",
     "fabric": "*",
-    "minecraft": ">=1.20.4"
+    "minecraft": ">=1.20.5"
   }
 }