コマンドから弓のダメージを変更できるように

Author: Elic0de

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

@@ -14,6 +14,7 @@
 import com.github.elic0de.thejpspit.spigot.hook.Hook;
 import com.github.elic0de.thejpspit.spigot.hook.VaultEconomyHook;
 import com.github.elic0de.thejpspit.spigot.item.ItemManager;
+import com.github.elic0de.thejpspit.spigot.leveler.Levels;
 import com.github.elic0de.thejpspit.spigot.listener.BlockPlaceListener;
 import com.github.elic0de.thejpspit.spigot.listener.CombatTagger;
 import com.github.elic0de.thejpspit.spigot.listener.EventListener;
@@ -81,6 +82,7 @@ private void loadConfig() throws RuntimeException {
 
     public void reload() {
         loadConfig();
+        Levels.initialize();
     }
 
     @Override

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

@@ -63,6 +63,14 @@ public void onKillCoin(Player player, int amount) {
         player.sendMessage("変更しました");
     }
 
+    @Subcommand("set arrowDamage")
+    @CommandPermission("tjp.arrow")
+    public void onArrowDamage(Player player, double amount) {
+        pit.getPitPreferences().ifPresent(pitPreferences -> pitPreferences.setDamageAmount(amount));
+        pit.getPitPreferences().ifPresent(preferences -> pit.getDatabase().updatePitPreferences(preferences));
+        player.sendMessage("変更しました");
+    }
+
     @Subcommand("shop")
     @CommandPermission("tjp.shop")
     public void onCreateShop(Player player) {

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

@@ -21,6 +21,10 @@ public class PitPreferences {
     @SerializedName("amount_reward")
     private int amountReward;
 
+    @Expose
+    @SerializedName("damage_amount")
+    private double damageAmount;
+
     public static PitPreferences getDefaults() {
         final Location location = Bukkit.getWorlds().stream().findAny().get().getSpawnLocation();
         return new PitPreferences(LocationData.at(location.getX(), location.getY(), location.getZ(), location.getWorld()));
@@ -30,6 +34,7 @@ private PitPreferences(LocationData spawn) {
         this.spawn = spawn;
         this.amountRegenHealth = 1;
         this.amountReward = 10;
+        this.damageAmount = .5;
     }
 
     public Optional<LocationData> getSpawn() {
@@ -55,4 +60,12 @@ public int getAmountReward() {
     public void setAmountReward(int amountReward) {
         this.amountReward = amountReward;
     }
+
+    public double getDamageAmount() {
+        return damageAmount;
+    }
+
+    public void setDamageAmount(double damageAmount) {
+        this.damageAmount = damageAmount;
+    }
 }

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

@@ -35,15 +35,15 @@ public class Settings {
     @YamlKey("level")
     private List<String> level = Arrays.asList(
         "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()
+        "10,30,10," + ChatColor.BLUE.name(),
+        "20,50,20," + ChatColor.DARK_AQUA.name(),
+        "30,75,30," + ChatColor.DARK_GREEN.name(),
+        "40,125,40," + ChatColor.GREEN.name(),
+        "50,250,50," + ChatColor.YELLOW.name(),
+        "60,600,60," + ChatColor.GOLD.name(),
+        "70,800,36000," + ChatColor.RED.name(),
+        "80,900,56000," + ChatColor.DARK_RED.name(),
+        "90,1000,72000," + ChatColor.AQUA.name()
     );
 
     public String getGithubToken() {

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

@@ -15,7 +15,7 @@ public class Levels {
         initialize();
     }
 
-    private static void initialize() {
+    public static void initialize() {
         Arrays.stream(TheJpsPit.getInstance().getSettings().getLevel().toArray(new String[0]))
             .map(text -> text.split(","))
             .map(data -> new Level(Integer.parseInt(data[0]), Integer.parseInt(data[1]),Integer.parseInt(data[2]), ChatColor.valueOf(data[3])))
@@ -30,7 +30,7 @@ private static void initialize() {
             int totalXp = level.getNeededXP();
             for (int i = 1; i < 10; i++){
                 final int nextLevel = l + i;
-                if (LEVELS.containsKey(nextLevel)) continue;
+                //if (LEVELS.containsKey(nextLevel)) continue;
                 totalXp += neededXp;
                 addedLevels.put(nextLevel, new Level(nextLevel, neededXp, neededXp * nextLevel, color));
             }

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

@@ -160,7 +160,7 @@ public void onDamage(EntityDamageByEntityEvent event) {
                         event.setCancelled(true);
                         return;
                     }
-                    case PROJECTILE -> event.setDamage(event.getDamage() - (event.getDamage() * .8));
+                    case PROJECTILE -> plugin.getPitPreferences().ifPresent(pitPreferences -> event.setDamage(pitPreferences.getDamageAmount()));
                 }
 
                 pitPlayer.showHealth(victimPitPlayer);