レベリングシステム修正

Author: Elic0de

src/main/java/com/github/elic0de/thejpspit/spigot/leveler/Level.java

@@ -7,11 +7,14 @@ public class Level {
     private final int lev;
     private final int neededXP;
 
+    private final int totalXp;
+
     private final ChatColor levelColor;
 
-    public Level(int lev, int neededXP, ChatColor color) {
+    public Level(int lev, int neededXP, int totalXp , ChatColor color) {
         this.lev = lev;
         this.neededXP = neededXP;
+        this.totalXp = totalXp;
         this.levelColor = color;
     }
 
@@ -27,6 +30,10 @@ public int getLevel() {
         return lev;
     }
 
+    public int getTotalXp() {
+        return totalXp;
+    }
+
     public int getNeededXP() {
         return neededXP;
     }

src/main/java/com/github/elic0de/thejpspit/spigot/leveler/Levels.java

@@ -3,91 +3,100 @@
 import com.github.elic0de.thejpspit.spigot.player.PitPlayer;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import org.bukkit.ChatColor;
 
 public class Levels {
 
-    private final static List<Level> LEVELS = new ArrayList<>(10);
+    private final static HashMap<Integer,Level> LEVELS = new HashMap();
 
     static {
         initialize(
-            "1,15," + ChatColor.GRAY.name(),
-            "10,30," + ChatColor.BLUE.name(),
-            "20,50," + ChatColor.DARK_AQUA.name(),
-            "30,75," + ChatColor.DARK_GREEN.name(),
-            "40,125," + ChatColor.GREEN.name(),
-            "50,250," + ChatColor.YELLOW.name(),
-            "60,600," + ChatColor.GOLD.name(),
-            "70,800," + ChatColor.RED.name(),
-            "80,900," + ChatColor.DARK_RED.name(),
-            "90,1000," + ChatColor.AQUA.name()
+            "1,15,15," + ChatColor.GRAY.name(),
+            "10,30,300," + ChatColor.BLUE.name(),
+            "20,50,1000," + ChatColor.DARK_AQUA.name(),
+            "30,75,2250," + ChatColor.DARK_GREEN.name(),
+            "40,125,5000," + ChatColor.GREEN.name(),
+            "50,250,12500," + ChatColor.YELLOW.name(),
+            "60,600,36000," + ChatColor.GOLD.name(),
+            "70,800,56000," + ChatColor.RED.name(),
+            "80,900,72000," + ChatColor.DARK_RED.name(),
+            "90,1000,90000," + ChatColor.AQUA.name()
         );
     }
 
     private static void initialize(String... texts) {
         Arrays.stream(texts)
             .map(text -> text.split(","))
-            .map(data -> new Level(Integer.parseInt(data[0]), Integer.parseInt(data[1]), ChatColor.valueOf(data[2])))
-            .forEach(LEVELS::add);
+            .map(data -> new Level(Integer.parseInt(data[0]), Integer.parseInt(data[1]),Integer.parseInt(data[2]), ChatColor.valueOf(data[3])))
+            .forEach(level -> LEVELS.put(level.getLevel(), level));
 
-        // TODO
-        Level level = LEVELS.get(0);
-        for (int i = 1; i < LEVELS.get(LEVELS.size() - 1).getLevel() + 10; i++) {
+        final HashMap<Integer,Level> addedLevels = new HashMap<>();
+        for (Level level : LEVELS.values()) {
+            final int l = level.getLevel();
             final int neededXp = level.getNeededXP();
             final ChatColor color = level.getLevelColor();
 
-            if (LEVELS.get(i) != null) {
-                level = LEVELS.get(i);
-            } else LEVELS.add(new Level(i, neededXp, color));
+            int totalXp = level.getTotalXp();
+            for (int i = 1; i < 10; i++){
+                final int nextLevel = l + i;
+                if (LEVELS.containsKey(nextLevel)) continue;
+                totalXp += neededXp;
+                addedLevels.put(nextLevel, new Level(nextLevel, neededXp, totalXp, color));
+            }
         }
+        LEVELS.putAll(addedLevels);
     }
 
+/*    public static int getPlayerLevel(int playerLevel) {
+        if (LEVELS.containsKey(playerLevel)) {
+            final Level level = LEVELS.get(playerLevel);
+            return level.getLevel();
+        }
+        if (LEVELS.containsKey(LEVELS.size() - 1)) {
+            final int maxLevel = LEVELS.get(LEVELS.size() - 1).getLevel();
+            return maxLevel;
+        }
+        return 0;
+    }*/
+
     public static int getPlayerLevel(PitPlayer player) {
-        final List<Integer> requirements = LEVELS.stream().map(Level::getNeededXP)
+        final List<Integer> requirements = LEVELS.values().stream().map(Level::getTotalXp)
             .toList();
         int maxLevel = requirements.size();
         for (int i = 0; i < maxLevel; i++) {
             if (player.getXp() < requirements.get(i)) {
-                return i;
+                return i + 1;
             }
         }
         return maxLevel;
     }
 
-    public static int getPlayerNeededXP(PitPlayer player) {
-        final List<Integer> requirements = LEVELS.stream().map(Level::getNeededXP)
-            .toList();
-        for (int requirement : requirements) {
-            int amountToNextLevel = (int) (requirement - player.getXp());
-            if (amountToNextLevel > 0) {
-                return amountToNextLevel;
+    public static int getPlayerNeededXP(int playerLevel, int currentXp) {
+        if (LEVELS.containsKey(playerLevel)) {
+            final Level level = LEVELS.get(playerLevel);
+            final int requirementXp = level.getTotalXp() - currentXp;
+            if (requirementXp > 0) {
+                return requirementXp;
             }
         }
         return 0;
     }
 
-    public static int getLevelNeededXP(PitPlayer player) {
-        final List<Integer> requirements = LEVELS.stream().map(Level::getNeededXP)
-            .toList();
-        for (int requirement : requirements) {
-            int amountToNextLevel = (int) (requirement - player.getXp());
-            if (amountToNextLevel > 0) {
-                return requirement;
-            }
+    public static int getLevelTotalXP(int playerLevel) {
+        if (LEVELS.containsKey(playerLevel)) {
+            final Level level = LEVELS.get(playerLevel);
+            return level.getTotalXp();
         }
         return 0;
     }
 
-    public static ChatColor getPlayerLevelColor(PitPlayer player) {
-        final List<Integer> requirements = LEVELS.stream().map(Level::getNeededXP)
-            .toList();
-        int maxLevel = requirements.size();
-        for (int i = 0; i < maxLevel; i++) {
-            if (player.getXp() < requirements.get(i)) {
-                return LEVELS.get(i).getLevelColor();
-            }
+    public static ChatColor getPlayerLevelColor(int playerLevel) {
+        if (LEVELS.containsKey(playerLevel)) {
+            final Level level = LEVELS.get(playerLevel);
+            return level.getLevelColor();
         }
-        return LEVELS.get(maxLevel).getLevelColor();
+        return ChatColor.GRAY;
     }
 }

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

@@ -132,16 +132,21 @@ public void onDrop(PlayerDropItemEvent event) {
     @EventHandler
     public void onDamage(EntityDamageByEntityEvent event) {
         if (event.getEntity() instanceof Player vitim) {
+            if (event.getCause() == DamageCause.VOID) {
+                plugin.getGame().death(PitPlayerManager.getPitPlayer(vitim));
+                return;
+            }
             if (event.getDamager() instanceof Player damager) {
                 final PitPlayer victimPitPlayer = PitPlayerManager.getPitPlayer(vitim);
                 final PitPlayer pitPlayer = PitPlayerManager.getPitPlayer(damager);
-                if (event.getCause() == EntityDamageEvent.DamageCause.FALL) {
-                    event.setCancelled(true);
-                    return;
-                }
-                if (event.getCause() == DamageCause.PROJECTILE) {
-                    event.setDamage(event.getDamage() - (event.getDamage() / 0.8));
+                switch (event.getCause()) {
+                    case FALL -> {
+                        event.setCancelled(true);
+                        return;
+                    }
+                    case PROJECTILE -> event.setDamage(event.getDamage() - (event.getDamage() / 0.8));
                 }
+
                 pitPlayer.showHealth(victimPitPlayer);
                 victimPitPlayer.setLastDamager(pitPlayer);
             }
@@ -166,8 +171,8 @@ public void onXpGain(PlayerExpChangeEvent event) {
 
     @EventHandler
     public void on(PlayerInteractEvent event) {
-        /*final PitPlayer pitPlayer = PitPlayerManager.getPitPlayer(event.getPlayer());
-        pitPlayer.increaseStreaks();*/
+        final PitPlayer pitPlayer = PitPlayerManager.getPitPlayer(event.getPlayer());
+        pitPlayer.increaseXP();
         if (event.getHand() != EquipmentSlot.HAND) {
             return;
         }

src/main/java/com/github/elic0de/thejpspit/spigot/nms/PacketManager1_19_R1.java

@@ -70,8 +70,7 @@ public static PacketManager1_19_R1 make() {
                 getCBClass("entity.CraftEntity").getMethod("getHandle"),
                 getMojangClass("world.entity.Entity").getMethod("getBukkitEntity"),
                 getCBClass("CraftWorld").getMethod("getHandle"),
-                getMojangClass("server.network.PlayerConnection")
-                    .getMethod("a", getMojangClass("network.protocol.Packet")),
+                getMojangClass("server.network.PlayerConnection").getMethod("a", getMojangClass("network.protocol.Packet")),
                 getMojangClass("server.level.EntityPlayer").getField("b")
             );
         } catch (ReflectiveOperationException e) {

src/main/java/com/github/elic0de/thejpspit/spigot/player/PitPlayer.java

@@ -11,6 +11,7 @@
 import java.util.stream.Stream;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
+import org.bukkit.Sound;
 import org.bukkit.attribute.Attribute;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
@@ -35,16 +36,15 @@ public class PitPlayer {
         new ItemStack(Material.IRON_LEGGINGS),
         new ItemStack(Material.IRON_CHESTPLATE)
     };
+    private int level;
     private long kills;
-
     private long streaks;
     private long bestStreaks;
     private long deaths;
     private double rating;
     private double bestRating;
     private double xp;
     private final FastBoard board;
-
     private PitPlayer lastDamager;
 
     public PitPlayer(Player player) {
@@ -60,6 +60,7 @@ public PitPlayer(Player player) {
         this.xp = 0;
         this.board = new FastBoard(player);
         this.board.updateTitle(ChatColor.translateAlternateColorCodes('&', "&eTHE JPS PIT"));
+        this.level = Levels.getPlayerLevel(this);
     }
 
     public PitPlayer(Player player, long kills, long streaks, long bestStreaks, long deaths, double rating, double bestRating, double xp) {
@@ -75,6 +76,7 @@ public PitPlayer(Player player, long kills, long streaks, long bestStreaks, long
         this.xp = xp;
         this.board = new FastBoard(player);
         this.board.updateTitle(ChatColor.translateAlternateColorCodes('&', "&eTHE JPS PIT"));
+        this.level = Levels.getPlayerLevel(this);
     }
 
     public void addItem() {
@@ -153,18 +155,18 @@ public void sendStatus(PitPlayer player) {
     }
 
     private void updateXpBar() {
-        final float xp = Levels.getPlayerNeededXP(this);
-        final float neededXp = Levels.getLevelNeededXP(this);
-        final int level = Levels.getPlayerLevel(this);
+        // TODO 一時保存しておく
+        final float xp = Levels.getPlayerNeededXP(level, (int) this.xp);
+        final float totalXp = Levels.getLevelTotalXP(level);
+
         player.setLevel(level);
-        player.setExp((neededXp - xp)/neededXp);
+        player.setExp((totalXp - xp)/totalXp);
     }
 
     public void updateDisplayName() {
-        final int level = Levels.getPlayerLevel(this);
-        final ChatColor color = Levels.getPlayerLevelColor(this);
+        final ChatColor color = Levels.getPlayerLevelColor(level);
         player.setDisplayName("[" + color + level + ChatColor.RESET + "]" + " " + getName());
-        player.setPlayerListName("[" + color + Levels.getPlayerLevel(this) + ChatColor.RESET + "]" + " " + getName());
+        player.setPlayerListName("[" + color + level + ChatColor.RESET + "]" + " " + getName());
     }
 
     public Player getPlayer() {
@@ -184,6 +186,10 @@ public PitPlayer getKiller() {
         return PitPlayerManager.getPitPlayer(player.getKiller());
     }
 
+    public int getLevel() {
+        return level;
+    }
+
     public long getKills() {
         return kills;
     }
@@ -242,8 +248,17 @@ public void increaseDeaths() {
 
     public void increaseXP() {
         this.xp++;
+
+        // レベルアップ
+        if (Levels.getPlayerNeededXP(level, (int) xp) == 0) {
+            final int nextLevel = level + 1;
+            final int previousLevel = this.level;
+            this.level = nextLevel;
+            player.sendTitle("§b§lLEVEL UP!", previousLevel + " → " + nextLevel, 20,40, 20);
+            player.playSound(player.getLocation(), Sound.ENTITY_PLAYER_LEVELUP, 1f, 1f);
+            updateDisplayName();
+        }
         updateXpBar();
-        updateDisplayName();
     }
 
     public void increaseHealth() {

src/main/java/com/github/elic0de/thejpspit/spigot/scoreboard/GameScoreboard.java

@@ -48,8 +48,9 @@ public List<String> boardLines(PitPlayer player) {
             "",
             "&ejapanpvpserver.net"
         ).map(s ->
-            s.replaceAll("%level%", Levels.getPlayerLevel(player) + "")
-                .replaceAll("%neededXp%", Levels.getPlayerNeededXP(player) + "")
+            s.replaceAll("%level%",   Levels.getPlayerLevelColor(player.getLevel()) + "" + player.getLevel() + ChatColor.RESET)
+                .replaceAll("%neededXp%", Levels.getPlayerNeededXP(player.getLevel(),
+                    (int) player.getXp()) + "")
                 .replaceAll("%rating%", player.getRating() + "%")
                 .replaceAll("%bestRating%", player.getBestRating() + "%")
                 .replaceAll("%streaks%", player.getStreaks() + "")

src/main/resources/plugin.yml

@@ -5,3 +5,4 @@ api-version: 1.19
 author: 'Elic0de#0342'
 softdepend:
   - Vault
+  - TheNewEconomy