Merge remote-tracking branch 'origin/master'

howard12721 · howard12721 · commit f697999b42d6 · 2023-01-25T00:02:45.000+09:00
diff --git a/src/main/java/com/github/elic0de/thejpspit/cosmetics/CosmeticManager.java b/src/main/java/com/github/elic0de/thejpspit/cosmetics/CosmeticManager.java
@@ -5,16 +5,25 @@
 import com.github.elic0de.thejpspit.cosmetics.impl.death.LightingDeathCosmetic;
 import com.github.elic0de.thejpspit.cosmetics.impl.kill.BloodKillCosmetic;
 import com.github.elic0de.thejpspit.cosmetics.impl.kill.FireCosmetic;
+import com.github.elic0de.thejpspit.cosmetics.impl.trail.GreenStar;
+import com.github.elic0de.thejpspit.cosmetics.type.AuraCosmetic;
 import com.github.elic0de.thejpspit.cosmetics.type.DeathCosmetic;
 import com.github.elic0de.thejpspit.cosmetics.type.KillCosmetic;
+import com.github.elic0de.thejpspit.cosmetics.type.StreakCosmetic;
+import com.github.elic0de.thejpspit.cosmetics.type.TrailCosmetic;
 import com.github.elic0de.thejpspit.player.PitPlayer;
 import com.google.common.collect.ClassToInstanceMap;
 import com.google.common.collect.ImmutableClassToInstanceMap;
+import org.bukkit.entity.Entity;
 
 public class CosmeticManager {
 
     ClassToInstanceMap<KillCosmetic> killCosmetics;
     ClassToInstanceMap<DeathCosmetic> deathCosmetics;
+    ClassToInstanceMap<StreakCosmetic> streakCosmetics;
+    ClassToInstanceMap<TrailCosmetic> trailCosmetics;
+    ClassToInstanceMap<AuraCosmetic> auraCosmetics;
+
 
     public ClassToInstanceMap<AbstractCosmetic> allCosmetics;
 
@@ -30,9 +39,22 @@ public CosmeticManager() {
             .put(LightingDeathCosmetic.class, new LightingDeathCosmetic())
             .build();
 
+        streakCosmetics = new ImmutableClassToInstanceMap.Builder<StreakCosmetic>()
+            .build();
+
+        trailCosmetics = new ImmutableClassToInstanceMap.Builder<TrailCosmetic>()
+            .put(GreenStar.class, new GreenStar())
+            .build();
+
+        auraCosmetics = new ImmutableClassToInstanceMap.Builder<AuraCosmetic>()
+            .build();
+
         allCosmetics = new ImmutableClassToInstanceMap.Builder<AbstractCosmetic>()
             .putAll(killCosmetics)
             .putAll(deathCosmetics)
+            .putAll(streakCosmetics)
+            .putAll(trailCosmetics)
+            .putAll(auraCosmetics)
             .build();
     }
 
@@ -48,6 +70,24 @@ public void onDeath(PitPlayer player) {
         }
     }
 
+    public void onStreak(PitPlayer player) {
+        for (StreakCosmetic cosmetic : streakCosmetics.values()) {
+            cosmetic.onStreak(player);
+        }
+    }
+
+    public void onTrail(PitPlayer player, Entity target) {
+        for (TrailCosmetic cosmetic : trailCosmetics.values()) {
+            cosmetic.onTrail(player, target);
+        }
+    }
+
+    public void onAura(PitPlayer player) {
+        for (AuraCosmetic cosmetic : auraCosmetics.values()) {
+            cosmetic.onAura(player);
+        }
+    }
+
     public ClassToInstanceMap<KillCosmetic> getKillCosmetics() {
         return killCosmetics;
     }
@@ -56,6 +96,18 @@ public ClassToInstanceMap<DeathCosmetic> getDeathCosmetics() {
         return deathCosmetics;
     }
 
+    public ClassToInstanceMap<StreakCosmetic> getStreakCosmetics() {
+        return streakCosmetics;
+    }
+
+    public ClassToInstanceMap<TrailCosmetic> getTrailCosmetics() {
+        return trailCosmetics;
+    }
+
+    public ClassToInstanceMap<AuraCosmetic> getAuraCosmetics() {
+        return auraCosmetics;
+    }
+
     public ClassToInstanceMap<AbstractCosmetic> getAllCosmetics() {
         return allCosmetics;
     }
diff --git a/src/main/java/com/github/elic0de/thejpspit/cosmetics/impl/death/BloodDeathCosmetic.java b/src/main/java/com/github/elic0de/thejpspit/cosmetics/impl/death/BloodDeathCosmetic.java
@@ -4,6 +4,7 @@
 import com.github.elic0de.thejpspit.cosmetics.CosmeticData;
 import com.github.elic0de.thejpspit.cosmetics.type.DeathCosmetic;
 import com.github.elic0de.thejpspit.player.PitPlayer;
+import org.bukkit.Effect;
 import org.bukkit.Material;
 import xyz.xenondevs.particle.ParticleBuilder;
 import xyz.xenondevs.particle.ParticleEffect;
@@ -14,10 +15,8 @@ public class BloodDeathCosmetic extends Cosmetic implements DeathCosmetic {
     @Override
     public void onDeath(PitPlayer player) {
         if (canExecute(player)) {
-            new ParticleBuilder(ParticleEffect.REDSTONE, player.getPlayer().getLocation())
-                .setAmount(15)
-                .setOffsetY(1f)
-                .setSpeed(0.1f)
-                .display();        }
+            player.getPlayer().playEffect(player.getPlayer().getLocation().clone().add(0, 0.5, 0), Effect.STEP_SOUND, 152);
+            player.getPlayer().playEffect(player.getPlayer().getLocation().clone().add(0, 1, 0), Effect.STEP_SOUND, 152);
+        }
     }
 }
diff --git a/src/main/java/com/github/elic0de/thejpspit/cosmetics/impl/kill/BloodKillCosmetic.java b/src/main/java/com/github/elic0de/thejpspit/cosmetics/impl/kill/BloodKillCosmetic.java
@@ -4,22 +4,17 @@
 import com.github.elic0de.thejpspit.cosmetics.CosmeticData;
 import com.github.elic0de.thejpspit.cosmetics.type.KillCosmetic;
 import com.github.elic0de.thejpspit.player.PitPlayer;
+import org.bukkit.Effect;
 import org.bukkit.Material;
-import xyz.xenondevs.particle.ParticleBuilder;
-import xyz.xenondevs.particle.ParticleEffect;
 
 @CosmeticData(id = "bloodkill", name = "あか", description = "あかかかかｋ", icon = Material.RED_DYE, coin = 50)
 public class BloodKillCosmetic extends Cosmetic implements KillCosmetic {
 
     @Override
     public void onKill(PitPlayer player, PitPlayer target) {
         if (canExecute(player)) {
-            new ParticleBuilder(ParticleEffect.REDSTONE, target.getPlayer().getLocation())
-                .setAmount(15)
-                .setOffsetY(1f)
-                .setSpeed(0.1f)
-                .display();
+            player.getPlayer().playEffect(player.getPlayer().getLocation().clone().add(0, 0.5, 0), Effect.STEP_SOUND, 152);
+            player.getPlayer().playEffect(player.getPlayer().getLocation().clone().add(0, 1, 0), Effect.STEP_SOUND, 152);
         }
     }
-}
-
+}
diff --git a/src/main/java/com/github/elic0de/thejpspit/cosmetics/impl/trail/GreenStar.java b/src/main/java/com/github/elic0de/thejpspit/cosmetics/impl/trail/GreenStar.java
@@ -0,0 +1,31 @@
+package com.github.elic0de.thejpspit.cosmetics.impl.trail;
+
+import com.github.elic0de.thejpspit.TheJpsPit;
+import com.github.elic0de.thejpspit.cosmetics.Cosmetic;
+import com.github.elic0de.thejpspit.cosmetics.CosmeticData;
+import com.github.elic0de.thejpspit.cosmetics.type.TrailCosmetic;
+import com.github.elic0de.thejpspit.player.PitPlayer;
+import org.bukkit.Material;
+import org.bukkit.entity.Entity;
+import org.bukkit.scheduler.BukkitRunnable;
+import xyz.xenondevs.particle.ParticleEffect;
+
+@CosmeticData(id = "greenstar", name = "なんか緑", description = "みどり", icon = Material.EMERALD, coin = 50)
+public class GreenStar extends Cosmetic implements TrailCosmetic {
+
+    @Override
+    public void onTrail(PitPlayer player, Entity target) {
+        if (canExecute(player)) {
+            BukkitRunnable runnable = new BukkitRunnable() {
+                @Override
+                public void run() {
+                    if (target == null || target.isOnGround() || target.isDead()) {
+                        cancel();
+                    }
+                    ParticleEffect.VILLAGER_HAPPY.display(target.getLocation());
+                }
+            };
+            runnable.runTaskTimer(TheJpsPit.getInstance(), 2, 2);
+        }
+    }
+}
diff --git a/src/main/java/com/github/elic0de/thejpspit/cosmetics/type/TrailCosmetic.java b/src/main/java/com/github/elic0de/thejpspit/cosmetics/type/TrailCosmetic.java
@@ -2,9 +2,10 @@
 
 import com.github.elic0de.thejpspit.cosmetics.AbstractCosmetic;
 import com.github.elic0de.thejpspit.player.PitPlayer;
+import org.bukkit.entity.Entity;
 
 public interface TrailCosmetic extends AbstractCosmetic {
 
-    default void onTrail(PitPlayer player) {
+    default void onTrail(PitPlayer player, Entity target) {
     }
 }
diff --git a/src/main/java/com/github/elic0de/thejpspit/gui/CosmeticsMenu.java b/src/main/java/com/github/elic0de/thejpspit/gui/CosmeticsMenu.java
@@ -81,7 +81,7 @@ private DynamicGuiElement getItemElement(AbstractCosmetic cosmetic) {
                     final PurchasedCosmeticsCollection cosmeticsCollection = preferences.getCosmeticsCollection();
                     if (hasCosmetic.get()) {
                         if (isSelected.get()) {
-                            cosmeticsCollection.unSelectCosmetic();
+                            cosmeticsCollection.unSelectCosmetic(cosmetic);
                             return;
                         }
                         cosmeticsCollection.selectCosmetic(cosmetic);
diff --git a/src/main/java/com/github/elic0de/thejpspit/listener/EventListener.java b/src/main/java/com/github/elic0de/thejpspit/listener/EventListener.java
@@ -19,6 +19,7 @@
 import org.bukkit.entity.Arrow;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
+import org.bukkit.entity.Projectile;
 import org.bukkit.entity.Villager;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -29,6 +30,7 @@
 import org.bukkit.event.entity.EntityRegainHealthEvent;
 import org.bukkit.event.entity.FoodLevelChangeEvent;
 import org.bukkit.event.entity.PlayerDeathEvent;
+import org.bukkit.event.entity.ProjectileLaunchEvent;
 import org.bukkit.event.player.PlayerDropItemEvent;
 import org.bukkit.event.player.PlayerExpChangeEvent;
 import org.bukkit.event.player.PlayerInteractEntityEvent;
@@ -176,6 +178,15 @@ private void onEntityRegainHealth(EntityRegainHealthEvent event) {
         }
     }
 
+    @EventHandler
+    public void onProjectileShoot(ProjectileLaunchEvent event) {
+        Projectile target = event.getEntity();
+        if (target.getShooter() instanceof Player player) {
+            final PitPlayer pitPlayer = PitPlayerManager.getPitPlayer(player);
+            TheJpsPit.getInstance().getCosmeticManager().onTrail(pitPlayer, target);
+        }
+    }
+
     @EventHandler
     public void onXpGain(PlayerExpChangeEvent event) {
         event.setAmount(0);
diff --git a/src/main/java/com/github/elic0de/thejpspit/player/PitPlayer.java b/src/main/java/com/github/elic0de/thejpspit/player/PitPlayer.java
@@ -244,7 +244,10 @@ public void increaseKills() {
     public void increaseStreaks() {
         this.streaks ++;
 
-        if (streaks % 5 == 0) TheJpsPit.getInstance().getGame().streakBroadcast(player.getName() + "&aが連続で&c" + streaks + "&aキルしています！" );
+        if (streaks % 5 == 0) {
+            TheJpsPit.getInstance().getCosmeticManager().onStreak(this);
+            TheJpsPit.getInstance().getGame().streakBroadcast(player.getName() + "&aが連続で&c" + streaks + "&aキルしています！" );
+        }
 
         if (bestStreaks < streaks) {
             this.bestStreaks = streaks;
diff --git a/src/main/java/com/github/elic0de/thejpspit/player/PurchasedCosmeticsCollection.java b/src/main/java/com/github/elic0de/thejpspit/player/PurchasedCosmeticsCollection.java
@@ -3,11 +3,18 @@
 import com.github.elic0de.thejpspit.TheJpsPit;
 import com.github.elic0de.thejpspit.cosmetics.AbstractCosmetic;
 import com.github.elic0de.thejpspit.cosmetics.Cosmetic;
+import com.github.elic0de.thejpspit.cosmetics.type.AuraCosmetic;
+import com.github.elic0de.thejpspit.cosmetics.type.DeathCosmetic;
+import com.github.elic0de.thejpspit.cosmetics.type.KillCosmetic;
+import com.github.elic0de.thejpspit.cosmetics.type.StreakCosmetic;
+import com.github.elic0de.thejpspit.cosmetics.type.TrailCosmetic;
 import com.github.elic0de.thejpspit.hook.EconomyHook;
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 import java.math.BigDecimal;
+import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -23,18 +30,29 @@ public class PurchasedCosmeticsCollection {
 
     @Expose
     @SerializedName("selected_id")
-    private String selectedCosmeticId = "";
+    private Map<String, String> selectedCosmeticId = new HashMap<>();
 
+
+
+    // todo:もっといいやりかたがあるはずなので教えてください
     public void selectCosmetic(AbstractCosmetic cosmetic) {
-        this.selectedCosmeticId = cosmetic.getId();
+        final String key = getKey(cosmetic);
+        if (key == null) return;
+        this.selectedCosmeticId.put(key, cosmetic.getId());
     }
 
-    public void unSelectCosmetic() {
-        this.selectedCosmeticId = "";
+    public void unSelectCosmetic(AbstractCosmetic cosmetic) {
+        final String key = getKey(cosmetic);
+        selectedCosmeticId.put(key, "");
+        //this.selectedCosmeticId.containsValue()
     }
 
     public boolean isSelectedCosmetic(AbstractCosmetic cosmetic) {
-        return this.selectedCosmeticId.equals(cosmetic.getId());
+        final String key = getKey(cosmetic);
+        if (key == null) return false;
+        if (selectedCosmeticId.containsKey(key))
+            return this.selectedCosmeticId.get(key) == cosmetic.getId();
+        return false;
     }
 
     public boolean canBuy(PitPlayer pitPlayer, AbstractCosmetic cosmetic){
@@ -52,4 +70,14 @@ public boolean has(AbstractCosmetic cosmetic){
         return cosmeticsId.contains(cosmetic.getId());
     }
 
+
+    private String getKey(AbstractCosmetic cosmetic) {
+        String key = null;
+        if (cosmetic instanceof KillCosmetic) key = "kill";
+        if (cosmetic instanceof DeathCosmetic) key = "death";
+        if (cosmetic instanceof StreakCosmetic) key = "streak";
+        if (cosmetic instanceof TrailCosmetic) key = "trail";
+        if (cosmetic instanceof AuraCosmetic) key = "aura";
+        return key;
+    }
 }
diff --git a/src/main/java/com/github/elic0de/thejpspit/task/GameTask.java b/src/main/java/com/github/elic0de/thejpspit/task/GameTask.java
@@ -26,13 +26,15 @@ public GameTask() {
             @Override
             public void run() {
                 pit.getGame().getScoreboard().update();
+
                 /*repeats.getAndIncrement();
                 if (repeats.get() >= 5) {
                     pit.getGame().getPitPlayers().forEach(PitPlayer::increaseHealth);
                     repeats.set(0);
                 }*/
                 // TODO クラス分ける
                 for (PitPlayer pitPlayer : pit.getGame().getPitPlayers()) {
+                    TheJpsPit.getInstance().getCosmeticManager().onAura(pitPlayer);
                     final long streaks = pitPlayer.getStreaks();
                     if (streaks < 5) continue;
                     final Player player = pitPlayer.getPlayer();

Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,10 @@`
`2`	`2`
`3`	`3`	`import com.github.elic0de.thejpspit.cosmetics.AbstractCosmetic;`
`4`	`4`	`import com.github.elic0de.thejpspit.player.PitPlayer;`
	`5`	`+import org.bukkit.entity.Entity;`
`5`	`6`
`6`	`7`	`public interface TrailCosmetic extends AbstractCosmetic {`
`7`	`8`
`8`		`- default void onTrail(PitPlayer player) {`
	`9`	`+ default void onTrail(PitPlayer player, Entity target) {`
`9`	`10`	`}`
`10`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ private DynamicGuiElement getItemElement(AbstractCosmetic cosmetic) {`
`81`	`81`	`final PurchasedCosmeticsCollection cosmeticsCollection = preferences.getCosmeticsCollection();`
`82`	`82`	`if (hasCosmetic.get()) {`
`83`	`83`	`if (isSelected.get()) {`
`84`		`- cosmeticsCollection.unSelectCosmetic();`
	`84`	`+ cosmeticsCollection.unSelectCosmetic(cosmetic);`
`85`	`85`	`return;`
`86`	`86`	`}`
`87`	`87`	`cosmeticsCollection.selectCosmetic(cosmetic);`