PitPreferences修正

Author: Elic0de

src/main/java/com/github/elic0de/thejpspit/spigot/TheJpsPit.java

@@ -196,7 +196,6 @@ private void createNPCs() {
 
     @Override
     public void onDisable() {
-        pitPreferences.ifPresent(preferences -> database.updatePitPreferences(preferences));
         // Plugin shutdown logic
         if (database != null) {
             database.terminate();

src/main/java/com/github/elic0de/thejpspit/spigot/command/PitCommand.java

@@ -11,6 +11,7 @@
 import com.github.elic0de.thejpspit.spigot.item.PitItemEntry;
 import com.github.elic0de.thejpspit.spigot.player.PitPlayer;
 import com.github.elic0de.thejpspit.spigot.player.PitPlayerManager;
+import com.github.elic0de.thejpspit.spigot.util.LocationData;
 import com.github.elic0de.thejpspit.spigot.villager.VillagerNPCManager;
 import org.bukkit.entity.Player;
 
@@ -41,7 +42,9 @@ public void onReset(Player player) {
     @Subcommand("set spawn")
     @CommandPermission("tjp.spawn")
     public void onSetSpawn(Player player) {
-        pit.getPitPreferences().ifPresent(pitPreferences -> pitPreferences.setSpawn(player.getLocation()));
+        pit.getPitPreferences().ifPresent(pitPreferences -> pitPreferences.setSpawn(LocationData.at(player.getLocation())));
+        PitPlayerManager.getPitPlayer(player).sendMessage("&cスポーン地点を設定しました");
+        pit.getPitPreferences().ifPresent(preferences -> pit.getDatabase().updatePitPreferences(preferences));
     }
 
     @Subcommand("shop")

src/main/java/com/github/elic0de/thejpspit/spigot/command/SpawnCommand.java

@@ -19,6 +19,6 @@ public void spawn(Player player) {
             pitPlayer.sendMessage("&cあなたは戦闘中です");
             return;
         }
-        pit.getPitPreferences().ifPresent(pitPreferences -> player.teleport(pitPreferences.getSpawn().orElse(player.getLocation())));
+        pit.getPitPreferences().ifPresent(pitPreferences -> pitPreferences.getSpawn().ifPresent(location -> player.teleport(location.getLocation())));
     }
 }

src/main/java/com/github/elic0de/thejpspit/spigot/config/PitPreferences.java

@@ -1,5 +1,6 @@
 package com.github.elic0de.thejpspit.spigot.config;
 
+import com.github.elic0de.thejpspit.spigot.util.LocationData;
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 import java.util.Optional;
@@ -10,21 +11,22 @@ public class PitPreferences {
 
     @Expose
     @SerializedName("spawn")
-    private Location spawn;
+    private LocationData spawn;
 
     public static PitPreferences getDefaults() {
-        return new PitPreferences(Bukkit.getWorlds().stream().findAny().get().getSpawnLocation());
+        final Location location = Bukkit.getWorlds().stream().findAny().get().getSpawnLocation();
+        return new PitPreferences(LocationData.at(location.getX(), location.getY(), location.getZ(), location.getWorld()));
     }
 
-    private PitPreferences(Location spawn) {
+    private PitPreferences(LocationData spawn) {
         this.spawn = spawn;
     }
 
-    public Optional<Location> getSpawn() {
+    public Optional<LocationData> getSpawn() {
         return Optional.ofNullable(spawn);
     }
 
-    public void setSpawn(Location location) {
+    public void setSpawn(LocationData location) {
         this.spawn = location;
     }
 }

src/main/java/com/github/elic0de/thejpspit/spigot/database/SqLiteDatabase.java

@@ -171,7 +171,7 @@ public Optional<PitPreferences> getPitPreferences() {
         try (PreparedStatement statement = getConnection().prepareStatement(formatStatementTables("""
                 SELECT `preferences`
                 FROM `%pit_preferences%`
-                LIMIT 1"""))) {
+                """))) {
             final ResultSet resultSet = statement.executeQuery();
             if (resultSet.next()) {
                 final String preferences = new String(resultSet.getBytes("preferences"), StandardCharsets.UTF_8);

src/main/java/com/github/elic0de/thejpspit/spigot/listener/EventListener.java

@@ -12,6 +12,7 @@
 import com.github.elic0de.thejpspit.spigot.villager.VillagerNPCManager;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
+import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
@@ -48,11 +49,11 @@ public void onJoin(PlayerJoinEvent event) {
         Object packet = packetManager.buildScoreboardTeam(player);
         packetManager.sendPacket(packet, player);
 
-        /*plugin.getPitPreferences().ifPresent(pitPreferences -> {
-            final Location location = pitPreferences.getSpawn().get();
+        plugin.getPitPreferences().ifPresent(pitPreferences -> {
+            final Location location = pitPreferences.getSpawn().get().getLocation();
 
             if (location != null) player.teleport(location);
-        });*/
+        });
         if (userData.isEmpty()) {
             plugin.getDatabase().createPitPlayer(player);
             PitPlayerManager.registerUser(new PitPlayer(player));

src/main/java/com/github/elic0de/thejpspit/spigot/util/LocationData.java

@@ -0,0 +1,129 @@
+package com.github.elic0de.thejpspit.spigot.util;
+
+import com.google.gson.annotations.Expose;
+import java.util.UUID;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.World;
+import org.jetbrains.annotations.NotNull;
+
+public class LocationData {
+
+    @Expose
+    private double x;
+    @Expose
+    private double y;
+    @Expose
+    private double z;
+    @Expose
+    private UUID uniqueId;
+    @Expose
+    private float yaw;
+    @Expose
+    private float pitch;
+
+    protected LocationData(double x, double y, double z, UUID uniqueId, float yaw, float pitch) {
+        this.x = x;
+        this.y = y;
+        this.z = z;
+        this.uniqueId = uniqueId;
+        this.yaw = yaw;
+        this.pitch = pitch;
+    }
+
+    private LocationData() {
+    }
+    @NotNull
+    public static LocationData at(Location location) {
+        return new LocationData(location.getX(), location.getY(), location.getZ(),
+            location.getWorld().getUID(), location.getYaw(), location.getPitch());
+    }
+
+    @NotNull
+    public static LocationData at(double x, double y, double z,  @NotNull World world, float yaw, float pitch) {
+        return new LocationData(x, y, z, world.getUID(), yaw, pitch);
+    }
+
+    @NotNull
+    public static LocationData at(double x, double y, double z,  @NotNull World world) {
+        return new LocationData(x, y, z, world.getUID(), 0, 0);
+    }
+
+    public double getX() {
+        return x;
+    }
+
+    public double getY() {
+        return y;
+    }
+
+    public double getZ() {
+        return z;
+    }
+
+    @NotNull
+    public UUID getUniqueId() {
+        return uniqueId;
+    }
+
+    public float getYaw() {
+        return yaw;
+    }
+
+    public float getPitch() {
+        return pitch;
+    }
+
+    public Location getLocation() {
+        final World world = Bukkit.getWorld(uniqueId);
+        if (world != null) return new Location(world, x, y, z, yaw, pitch);
+        return Bukkit.getWorlds().stream().findAny().get().getSpawnLocation();
+    }
+
+    public void setX(double x) {
+        this.x = x;
+    }
+
+    public void setY(double y) {
+        this.y = y;
+    }
+
+    public void setZ(double z) {
+        this.z = z;
+    }
+
+    public void setWorld(World world) {
+        this.uniqueId = world.getUID();
+    }
+
+    public void setYaw(float yaw) {
+        this.yaw = yaw;
+    }
+
+    public void setPitch(float pitch) {
+        this.pitch = pitch;
+    }
+
+
+    public double distanceBetween(@NotNull LocationData other) {
+        return Math.sqrt(Math.pow(x - other.x, 2) + Math.pow(y - other.y, 2) + Math.pow(z - other.z, 2));
+    }
+
+    @NotNull
+    public LocationData interpolate(LocationData next, double scalar) {
+        return LocationData.at(
+            x + (next.x - x) * scalar,
+            y + (next.y - y) * scalar,
+            z + (next.z - z) * scalar,
+            Bukkit.getWorld(uniqueId),
+            (float) (yaw + (next.yaw - yaw) * scalar),
+            (float) (pitch + (next.pitch - pitch) * scalar)
+        );
+    }
+
+    @NotNull
+    public String toString() {
+        return "(x: " + x + ", y: " + y + ", z: " + z + ", world: " + uniqueId +
+            ", yaw: " + yaw + ", pitch: " + pitch + ")";
+    }
+}