化粧品諸々

Author: Elic0de

src/main/java/com/github/elic0de/thejpspit/cosmetics/AbstractCosmetic.java

@@ -1,5 +1,7 @@
 package com.github.elic0de.thejpspit.cosmetics;
 
+import org.bukkit.Material;
+
 public interface AbstractCosmetic {
 
     // todo: slot charの追加, material
@@ -9,5 +11,9 @@ public interface AbstractCosmetic {
 
     String getDescription();
 
+    Character getSlot();
+
+    Material getMaterial();
+
     double getCoin();
 }

src/main/java/com/github/elic0de/thejpspit/cosmetics/Cosmetic.java

@@ -2,15 +2,15 @@
 
 import com.github.elic0de.thejpspit.player.PitPlayer;
 import java.util.concurrent.atomic.AtomicBoolean;
+import org.bukkit.Material;
 
 public class Cosmetic implements AbstractCosmetic {
 
-
     private String cosmeticId;
     private String cosmeticName;
-
     private String cosmeticDescription;
-
+    private Character slot;
+    private Material material;
     private double coin;
 
     public Cosmetic() {
@@ -21,6 +21,8 @@ public Cosmetic() {
             this.cosmeticId = cosmeticData.id();
             this.cosmeticName = cosmeticData.name();
             this.cosmeticDescription = cosmeticData.description();
+            this.slot = cosmeticData.slot();
+            this.material = cosmeticData.icon();
             this.coin = cosmeticData.coin();
         }
     }
@@ -44,6 +46,14 @@ public String getDescription() {
         return cosmeticDescription;
     }
 
+    public Character getSlot() {
+        return slot;
+    }
+
+    public Material getMaterial() {
+        return material;
+    }
+
     public double getCoin() {
         return coin;
     }

src/main/java/com/github/elic0de/thejpspit/cosmetics/CosmeticData.java

@@ -4,15 +4,19 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import org.bukkit.Material;
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
 public @interface CosmeticData {
     String id() default "";
-
     String name() default "UNKNOWN";
 
     String description() default "No description provided";
 
+    char slot() default 'z';
+
+    Material icon() default Material.BARRIER;
+
     double coin() default 0;
 }

src/main/java/com/github/elic0de/thejpspit/cosmetics/CosmeticManager.java

@@ -1,6 +1,8 @@
 package com.github.elic0de.thejpspit.cosmetics;
 
+import com.github.elic0de.thejpspit.cosmetics.impl.death.CatCosmetic;
 import com.github.elic0de.thejpspit.cosmetics.impl.kill.FireCosmetic;
+import com.github.elic0de.thejpspit.cosmetics.type.DeathCosmetic;
 import com.github.elic0de.thejpspit.cosmetics.type.KillCosmetic;
 import com.github.elic0de.thejpspit.player.PitPlayer;
 import com.google.common.collect.ClassToInstanceMap;
@@ -9,20 +11,46 @@
 public class CosmeticManager {
 
     ClassToInstanceMap<KillCosmetic> killCosmetics;
+    ClassToInstanceMap<DeathCosmetic> deathCosmetics;
+
+    public ClassToInstanceMap<AbstractCosmetic> allCosmetics;
 
     public CosmeticManager() {
         killCosmetics = new ImmutableClassToInstanceMap.Builder<KillCosmetic>()
             .put(FireCosmetic.class, new FireCosmetic())
             .build();
+
+        deathCosmetics = new ImmutableClassToInstanceMap.Builder<DeathCosmetic>()
+            .put(CatCosmetic.class, new CatCosmetic())
+            .build();
+
+        allCosmetics = new ImmutableClassToInstanceMap.Builder<AbstractCosmetic>()
+            .putAll(killCosmetics)
+            .putAll(deathCosmetics)
+            .build();
     }
 
-    public void onProcess(PitPlayer player) {
+    public void onKill(PitPlayer player) {
         for (KillCosmetic cosmetic : killCosmetics.values()) {
             cosmetic.onKill(player);
         }
     }
 
+    public void onDeath(PitPlayer player) {
+        for (DeathCosmetic cosmetic : deathCosmetics.values()) {
+            cosmetic.onDeath(player);
+        }
+    }
+
     public ClassToInstanceMap<KillCosmetic> getKillCosmetics() {
         return killCosmetics;
     }
+
+    public ClassToInstanceMap<DeathCosmetic> getDeathCosmetics() {
+        return deathCosmetics;
+    }
+
+    public ClassToInstanceMap<AbstractCosmetic> getAllCosmetics() {
+        return allCosmetics;
+    }
 }

src/main/java/com/github/elic0de/thejpspit/cosmetics/impl/death/CatCosmetic.java

@@ -0,0 +1,20 @@
+package com.github.elic0de.thejpspit.cosmetics.impl.death;
+
+import com.github.elic0de.thejpspit.cosmetics.Cosmetic;
+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.Material;
+import org.bukkit.Sound;
+
+@CosmeticData(id = "cat", name = "ねこねこ", description = "あいうえお", slot = 'x', icon = Material.CAT_SPAWN_EGG, coin = 50)
+public class CatCosmetic extends Cosmetic implements DeathCosmetic {
+
+    @Override
+    public void onDeath(PitPlayer player) {
+        if (canExecute(player)) {
+            player.getPlayer().playSound(player.getPlayer().getLocation(), Sound.ENTITY_CAT_DEATH, 1F,1F);
+        }
+    }
+}
+

src/main/java/com/github/elic0de/thejpspit/cosmetics/impl/kill/FireCosmetic.java

@@ -4,16 +4,18 @@
 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.Material;
 import xyz.xenondevs.particle.ParticleBuilder;
 import xyz.xenondevs.particle.ParticleEffect;
 
-@CosmeticData(id = "Fire", name = "ファイやー", description = "足元が焦げて..", coin = 50)
+@CosmeticData(id = "Fire", name = "ファイやー", description = "足元が焦げて..", slot = 'F', icon = Material.BLACK_BANNER, coin = 50)
 public class FireCosmetic extends Cosmetic implements KillCosmetic {
 
     @Override
     public void onKill(PitPlayer player) {
         if (canExecute(player)) {
             new ParticleBuilder(ParticleEffect.FLAME, player.getPlayer().getLocation())
+                .setAmount(5)
                 .setOffsetY(1f)
                 .setSpeed(0.1f)
                 .display();

src/main/java/com/github/elic0de/thejpspit/cosmetics/type/AuraCosmetic.java

@@ -0,0 +1,11 @@
+package com.github.elic0de.thejpspit.cosmetics.type;
+
+import com.github.elic0de.thejpspit.cosmetics.AbstractCosmetic;
+import com.github.elic0de.thejpspit.player.PitPlayer;
+
+public interface AuraCosmetic extends AbstractCosmetic {
+
+    default void onAura(PitPlayer player) {
+    }
+
+}

src/main/java/com/github/elic0de/thejpspit/cosmetics/type/DeathCosmetic.java

@@ -0,0 +1,10 @@
+package com.github.elic0de.thejpspit.cosmetics.type;
+
+import com.github.elic0de.thejpspit.cosmetics.AbstractCosmetic;
+import com.github.elic0de.thejpspit.player.PitPlayer;
+
+public interface DeathCosmetic extends AbstractCosmetic {
+
+    default void onDeath(PitPlayer player) {
+    }
+}

src/main/java/com/github/elic0de/thejpspit/cosmetics/type/StreakCosmetic.java

@@ -0,0 +1,10 @@
+package com.github.elic0de.thejpspit.cosmetics.type;
+
+import com.github.elic0de.thejpspit.cosmetics.AbstractCosmetic;
+import com.github.elic0de.thejpspit.player.PitPlayer;
+
+public interface StreakCosmetic extends AbstractCosmetic {
+
+    default void onStreak(PitPlayer player) {
+    }
+}

src/main/java/com/github/elic0de/thejpspit/cosmetics/type/TrailCosmetic.java

@@ -0,0 +1,10 @@
+package com.github.elic0de.thejpspit.cosmetics.type;
+
+import com.github.elic0de.thejpspit.cosmetics.AbstractCosmetic;
+import com.github.elic0de.thejpspit.player.PitPlayer;
+
+public interface TrailCosmetic extends AbstractCosmetic {
+
+    default void onTrail(PitPlayer player) {
+    }
+}