Folia 26.1.2 Support

.github/workflows/build.yml

@@ -12,10 +12,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 11
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '21'
           distribution: 'adopt'
           cache: 'gradle'
       - name: Build with Gradle

.github/workflows/gradle.yml

@@ -14,10 +14,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 11
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '21'
           distribution: 'adopt'
           cache: 'gradle'
       - name: Bump version and push tag

common/build.gradle.kts

@@ -4,22 +4,30 @@ plugins {
 
 repositories {
     mavenCentral()
+    maven {
+        url = uri("https://repo.papermc.io/repository/maven-public/")
+    }
 }
 
-val javaTarget = 8 // Sponge targets a minimum of Java 17
+val javaTarget = 25
 java {
-    sourceCompatibility = JavaVersion.toVersion(javaTarget)
-    targetCompatibility = JavaVersion.toVersion(javaTarget)
-    if (JavaVersion.current() < JavaVersion.toVersion(javaTarget)) {
-        toolchain.languageVersion.set(JavaLanguageVersion.of(javaTarget))
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(javaTarget))
+        vendor.set(JvmVendorSpec.matching(""))
+    }
+}
+
+tasks {
+    withType<JavaCompile>().configureEach {
+        options.release.set(javaTarget)
     }
 }
 
 dependencies {
-    compileOnly("com.google.guava:guava:21.0")
-    compileOnly("com.google.code.gson:gson:2.8.0")
-    compileOnly("org.spongepowered:configurate-core:4.1.2")
-    compileOnly("net.kyori:adventure-api:4.10.0")
-    compileOnly("net.kyori:adventure-text-minimessage:4.10.0")
-    compileOnly("net.kyori:adventure-nbt:4.15.0")
+    compileOnly("com.google.guava:guava:33.4.8-jre")
+    compileOnly("com.google.code.gson:gson:2.13.1")
+    implementation("org.spongepowered:configurate-core:4.2.0")
+    implementation("net.kyori:adventure-api:4.22.0")
+    implementation("net.kyori:adventure-text-minimessage:4.22.0")
+    implementation("net.kyori:adventure-nbt:4.22.0")
 }

common/src/main/java/com/funniray/minimap/common/JavaMinimapPlugin.java

@@ -25,7 +25,13 @@ public abstract class JavaMinimapPlugin implements MinimapPlugin {
             "journeymap:admin_save",
             "journeymap:teleport_req",
             "journeymap:common",
+            "journeymap:mp_options_req",
+            "journeymap:chunk_overlay",
+            "journeymap:remove_player",
+            "journeymap:player_loc",
+            "journeymap:waypoint",
             "worldinfo:world_id",
+            "xaerolib:main",
             "xaerominimap:main",
             "xaeroworldmap:main",
             "voxelmap:settings"
@@ -69,20 +75,26 @@ public void loadConfig() {
 
     @Override
     public void handleSwitchWorld(MinimapWorld world, MinimapPlayer player) {
-        xaerosHandler.sendXaerosConfig(player);
+        xaerosHandler.sendXaerosWorldChangePackets(player);
+        jmHandler.sendPermissions(player);
         voxelHandler.sendSettings(player);
     }
 
     @Override
     public void handlePlayerJoined(MinimapPlayer player) {
-        xaerosHandler.sendXaerosHandshake(player);
-        xaerosHandler.sendXaerosConfig(player);
+        jmHandler.sendInitialState(player);
+        handlePlayerJoinedRepeat(player);
+    }
+
+    public void handlePlayerJoinedRepeat(MinimapPlayer player) {
+        xaerosHandler.sendXaerosJoinPackets(player);
         voxelHandler.sendSettings(player);
     }
 
     @Override
     public void handlePlayerLeft(MinimapPlayer player) {
         jmHandler.playerLeft(player);
+        xaerosHandler.playerLeft(player);
     }
 
     public void saveConfig() {
@@ -106,6 +118,7 @@ public void onPluginMessage(String channel, MinimapPlayer player, byte[] message
                 break;
             case "xaerominimap":
             case "xaeroworldmap":
+            case "xaerolib":
                 xaerosHandler.onPluginMessage(channel, player, message);
                 break;
             case "worldinfo":

common/src/main/java/com/funniray/minimap/common/api/MinimapPlayer.java

@@ -3,10 +3,21 @@
 import com.funniray.minimap.common.version.Version;
 import net.kyori.adventure.text.Component;
 
+import java.util.List;
 import java.util.UUID;
 
 public interface MinimapPlayer {
+    record PluginMessage(String channel, byte[] payload) {
+    }
+
     void sendPluginMessage(byte[] message, String channel);
+
+    default void sendPluginMessages(List<PluginMessage> messages) {
+        for (PluginMessage message : messages) {
+            sendPluginMessage(message.payload(), message.channel());
+        }
+    }
+
     void sendMessage(Component message);
     void teleport(MinimapLocation location);
     MinimapLocation getLocation();
@@ -15,5 +26,10 @@ public interface MinimapPlayer {
     UUID getUniqueId();
     String getUsername();
     boolean hasPermission(String string);
+
+    default boolean hasExplicitPermission(String string) {
+        return hasPermission(string);
+    }
+
     Version getVersion();
 }

common/src/main/java/com/funniray/minimap/common/api/MinimapServer.java

@@ -3,12 +3,13 @@
 import com.funniray.minimap.common.version.Version;
 
 import java.util.List;
+import java.util.function.Consumer;
 
 public interface MinimapServer {
     Version getMinecraftVersion();
     String getLoaderVersion();
     String getLoaderName();
 
-    List<MinimapPlayer> getPlayers();
+    void forEachPlayer(Consumer<MinimapPlayer> action);
     List<MinimapWorld> getWorlds();
 }