Merge pull request #186 from TheNextLvl-net/fix/spawn-location

Fixed spawn location de/serialization

Author: NonSwag

src/main/java/net/thenextlvl/tweaks/TweaksPlugin.java

@@ -6,8 +6,6 @@
 import core.i18n.file.ComponentBundle;
 import core.io.IO;
 import core.paper.adapters.inventory.MaterialAdapter;
-import core.paper.adapters.world.LocationAdapter;
-import core.paper.adapters.world.WorldAdapter;
 import core.paper.messenger.PluginMessenger;
 import io.papermc.paper.command.brigadier.Commands;
 import io.papermc.paper.plugin.lifecycle.event.types.LifecycleEvents;
@@ -16,6 +14,7 @@
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
+import net.thenextlvl.tweaks.adapter.LazyLocationAdapter;
 import net.thenextlvl.tweaks.command.environment.time.DayCommand;
 import net.thenextlvl.tweaks.command.environment.time.MidnightCommand;
 import net.thenextlvl.tweaks.command.environment.time.NightCommand;
@@ -101,14 +100,13 @@
 import net.thenextlvl.tweaks.listener.SpawnListener;
 import net.thenextlvl.tweaks.listener.WorldListener;
 import net.thenextlvl.tweaks.model.CommandConfig;
+import net.thenextlvl.tweaks.model.LazyLocation;
 import net.thenextlvl.tweaks.model.MessageMigrator;
 import net.thenextlvl.tweaks.model.PluginConfig;
 import net.thenextlvl.tweaks.version.PluginVersionChecker;
 import org.bstats.bukkit.Metrics;
-import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.ServerLinks;
-import org.bukkit.World;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.jspecify.annotations.NullMarked;
@@ -364,9 +362,8 @@ private void initConfig() {
         this.config = new GsonFile<>(
                 IO.of(getDataFolder(), "config.json"),
                 new PluginConfig(), new GsonBuilder()
-                .registerTypeHierarchyAdapter(Location.class, new LocationAdapter.Simple())
+                .registerTypeHierarchyAdapter(LazyLocation.class, new LazyLocationAdapter())
                 .registerTypeHierarchyAdapter(Material.class, new MaterialAdapter())
-                .registerTypeHierarchyAdapter(World.class, new WorldAdapter.Key())
                 .disableHtmlEscaping()
                 .setPrettyPrinting()
                 .serializeNulls()

src/main/java/net/thenextlvl/tweaks/adapter/LazyLocationAdapter.java

@@ -0,0 +1,45 @@
+package net.thenextlvl.tweaks.adapter;
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonNull;
+import com.google.gson.JsonParseException;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
+import net.kyori.adventure.key.Key;
+import net.thenextlvl.tweaks.model.LazyLocation;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
+
+import java.lang.reflect.Type;
+
+@NullMarked
+public class LazyLocationAdapter implements JsonSerializer<LazyLocation>, JsonDeserializer<LazyLocation> {
+    @Override
+    @SuppressWarnings("PatternValidation")
+    public @Nullable LazyLocation deserialize(JsonElement element, Type type, JsonDeserializationContext context) throws JsonParseException {
+        if (!element.isJsonPrimitive()) return null;
+        var split = element.getAsString().split(", ");
+        var world = Key.key(split[0]);
+        var x = Double.parseDouble(split[1]);
+        var y = Double.parseDouble(split[2]);
+        var z = Double.parseDouble(split[3]);
+        var yaw = split.length == 6 ? Float.parseFloat(split[4]) : 0;
+        var pitch = split.length == 6 ? Float.parseFloat(split[5]) : 0;
+        return new LazyLocation(world, x, y, z, yaw, pitch);
+    }
+
+    @Override
+    public JsonElement serialize(@Nullable LazyLocation source, Type type, JsonSerializationContext context) {
+        if (source == null) return JsonNull.INSTANCE;
+        var builder = new StringBuilder(source.key().asString()).append(", ")
+                .append(source.getX()).append(", ")
+                .append(source.getY()).append(", ")
+                .append(source.getZ());
+        if (source.getYaw() != 0 || source.getPitch() != 0)
+            builder.append(", ").append(source.getYaw()).append(", ").append(source.getPitch());
+        return new JsonPrimitive(builder.toString());
+    }
+}

src/main/java/net/thenextlvl/tweaks/command/spawn/SetSpawnCommand.java

@@ -13,6 +13,7 @@
 import net.kyori.adventure.text.minimessage.tag.resolver.Formatter;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import net.thenextlvl.tweaks.TweaksPlugin;
+import net.thenextlvl.tweaks.model.LazyLocation;
 import org.bukkit.GameRule;
 import org.bukkit.World;
 import org.bukkit.entity.Player;
@@ -71,7 +72,7 @@ private RequiredArgumentBuilder<CommandSourceStack, World> world() {
 
     private int setSpawn(CommandContext<CommandSourceStack> context, World world, FinePosition position, Rotation rotation) {
         var spawn = position.toLocation(world).setRotation(rotation);
-        plugin.config().spawn.location = spawn;
+        plugin.config().spawn.location = new LazyLocation(spawn);
         plugin.saveConfig();
 
         if (Boolean.TRUE.equals(world.getGameRuleValue(GameRule.SEND_COMMAND_FEEDBACK)))

src/main/java/net/thenextlvl/tweaks/model/LazyLocation.java

@@ -0,0 +1,50 @@
+package net.thenextlvl.tweaks.model;
+
+import net.kyori.adventure.key.Key;
+import net.kyori.adventure.key.Keyed;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.World;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
+
+@NullMarked
+public final class LazyLocation extends Location implements Keyed {
+    private Key key;
+
+    public LazyLocation(Location location) {
+        super(location.getWorld(), location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
+        this.key = location.getWorld().key();
+    }
+
+    public LazyLocation(Key key, double x, double y, double z, float yaw, float pitch) {
+        super(Bukkit.getWorld(key), x, y, z, yaw, pitch);
+        this.key = key;
+    }
+
+    @Override
+    public void setWorld(@Nullable World world) {
+        super.setWorld(world);
+        if (world != null) this.key = world.key();
+    }
+
+    @Override
+    public @Nullable World getWorld() {
+        var world = super.getWorld();
+        if (world != null) return world;
+
+        world = Bukkit.getWorld(key);
+        if (world != null) setWorld(world);
+        return world;
+    }
+
+    @Override
+    public boolean isWorldLoaded() {
+        return getWorld() != null;
+    }
+
+    @Override
+    public Key key() {
+        return key;
+    }
+}

src/main/java/net/thenextlvl/tweaks/model/PluginConfig.java

@@ -1,7 +1,6 @@
 package net.thenextlvl.tweaks.model;
 
 import com.google.gson.annotations.SerializedName;
-import org.bukkit.Location;
 import org.bukkit.Material;
 import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
@@ -62,7 +61,7 @@ public static class SpawnConfig {
         public @SerializedName("ignore-respawn-position") boolean ignoreRespawnPosition = false;
 
         @Nullable
-        public @SerializedName("location") Location location = null;
+        public @SerializedName("location") LazyLocation location = null;
     }
 
     public static class GUIConfig {