MERGE/winter-release

Minehut · Dec 20, 2022 · d6fc2de · d6fc2de
1 parent e05cc92
commit d6fc2de
Show file tree

Hide file tree

Showing 38 changed files with 604 additions and 265 deletions.
diff --git a/src/main/java/com/minehut/cosmetics/Cosmetics.java b/src/main/java/com/minehut/cosmetics/Cosmetics.java
@@ -12,6 +12,7 @@
 import com.minehut.cosmetics.config.Mode;
 import com.minehut.cosmetics.cosmetics.CosmeticsManager;
 import com.minehut.cosmetics.cosmetics.entities.EntityHandler;
+import com.minehut.cosmetics.cosmetics.listeners.trinkets.IceStaffListener;
 import com.minehut.cosmetics.cosmetics.types.trinket.listener.TrinketListener;
 import com.minehut.cosmetics.cosmetics.crates.CratesModule;
 import com.minehut.cosmetics.cosmetics.listeners.CosmeticsListener;
@@ -24,7 +25,7 @@
 import com.minehut.cosmetics.cosmetics.listeners.skins.SkinModifyListener;
 import com.minehut.cosmetics.cosmetics.listeners.skins.SkinTriggerListener;
 import com.minehut.cosmetics.cosmetics.listeners.CosmeticEntityListener;
-import com.minehut.cosmetics.cosmetics.listeners.EmojiHandler;
+import com.minehut.cosmetics.cosmetics.listeners.EmojiListener;
 import com.minehut.cosmetics.cosmetics.listeners.visibility.VisibilityHandler;
 import com.minehut.cosmetics.modules.LocalStorageManager;
 import com.minehut.cosmetics.modules.polling.RankPollingModule;
@@ -115,11 +116,14 @@ public void onEnable() {
         registerEvents(new CosmeticsTeleportListener(this));
         registerEvents(new CosmeticEntityListener());
         registerEvents(new TrinketListener());
-        registerEvents(new EmojiHandler());
+        registerEvents(new EmojiListener());
         registerEvents(resourcePackManager);
         registerEvents(visibilityHandler);
         registerEvents(entityHandler);
 
+        // trinket listeners
+        registerEvents(new IceStaffListener());
+
         // register commands
         new MenuCommand().register(this);
         new Debug(this).register(this);

diff --git a/src/main/java/com/minehut/cosmetics/cosmetics/bindings/Bindings.java b/src/main/java/com/minehut/cosmetics/cosmetics/bindings/Bindings.java
@@ -64,7 +64,8 @@ public class Bindings {
             ))
             .registerCosmetics(List.of(
                     Item.FALL_22_SHOVEL,
-                    Item.GRAVE_SHOVEL
+                    Item.GRAVE_SHOVEL,
+                    Item.ICE_SHOVEL
             ));
 
     // bindings for axe items
@@ -79,7 +80,8 @@ public class Bindings {
             ))
             .registerCosmetics(List.of(
                     Item.FALL_22_AXE,
-                    Item.ARCADE_AXE
+                    Item.ARCADE_AXE,
+                    Item.ICE_AXE
             ));
 
     // bindings for spyglass items
@@ -127,7 +129,8 @@ public class Bindings {
                     Material.SHIELD
             ))
             .registerCosmetics(List.of(
-                    Item.FALL_22_SHIELD
+                    Item.FALL_22_SHIELD,
+                    Item.ICE_SHIELD
             ));
 
     public static MaterialBinding FISHING_ROD = new MaterialBinding()

diff --git a/src/main/java/com/minehut/cosmetics/cosmetics/collections/expressive/ClownEmoji.java b/src/main/java/com/minehut/cosmetics/cosmetics/collections/expressive/ClownEmoji.java
@@ -19,15 +19,10 @@ public ClownEmoji() {
     }
 
     @Override
-    public @NotNull Component component() {
+    public String characters() {
         return Fonts.Emoji.CLOWN;
     }
 
-    @Override
-    public Permission permission() {
-        return Permission.hasPurchased(this);
-    }
-
     @Override
     public Permission visibility() {
         return Permission.none();

diff --git a/src/main/java/com/minehut/cosmetics/cosmetics/collections/expressive/CryEmoji.java b/src/main/java/com/minehut/cosmetics/cosmetics/collections/expressive/CryEmoji.java
@@ -19,7 +19,7 @@ public CryEmoji() {
     }
 
     @Override
-    public @NotNull Component component() {
+    public String characters() {
         return Fonts.Emoji.CRY;
     }
 

diff --git a/src/main/java/com/minehut/cosmetics/cosmetics/collections/expressive/EyeEmoji.java b/src/main/java/com/minehut/cosmetics/cosmetics/collections/expressive/EyeEmoji.java
@@ -19,15 +19,10 @@ public EyeEmoji() {
     }
 
     @Override
-    public @NotNull Component component() {
+    public String characters() {
         return Fonts.Emoji.EYE;
     }
 
-    @Override
-    public Permission permission() {
-        return Permission.hasPurchased(this);
-    }
-
     @Override
     public Permission visibility() {
         return Permission.none();

diff --git a/src/main/java/com/minehut/cosmetics/cosmetics/collections/expressive/FireEmoji.java b/src/main/java/com/minehut/cosmetics/cosmetics/collections/expressive/FireEmoji.java
@@ -19,7 +19,7 @@ public FireEmoji() {
     }
 
     @Override
-    public @NotNull Component component() {
+    public String characters() {
         return Fonts.Emoji.FIRE;
     }
 

diff --git a/src/main/java/com/minehut/cosmetics/cosmetics/collections/expressive/LipsEmoji.java b/src/main/java/com/minehut/cosmetics/cosmetics/collections/expressive/LipsEmoji.java
@@ -19,7 +19,7 @@ public LipsEmoji() {
     }
 
     @Override
-    public @NotNull Component component() {
+    public String characters() {
         return Fonts.Emoji.LIPS;
     }
 

diff --git a/src/main/java/com/minehut/cosmetics/cosmetics/collections/expressive/ObviousEmoji.java b/src/main/java/com/minehut/cosmetics/cosmetics/collections/expressive/ObviousEmoji.java
@@ -19,7 +19,7 @@ public ObviousEmoji() {
     }
 
     @Override
-    public @NotNull Component component() {
+    public String characters() {
         return Fonts.Emoji.OBVIOUS;
     }
 

diff --git a/src/main/java/com/minehut/cosmetics/cosmetics/collections/expressive/OutrageEmoji.java b/src/main/java/com/minehut/cosmetics/cosmetics/collections/expressive/OutrageEmoji.java
@@ -19,7 +19,7 @@ public OutrageEmoji() {
     }
 
     @Override
-    public @NotNull Component component() {
+    public String characters() {
         return Fonts.Emoji.OUTRAGE;
     }
 

diff --git a/src/main/java/com/minehut/cosmetics/cosmetics/collections/expressive/PartyEmoji.java b/src/main/java/com/minehut/cosmetics/cosmetics/collections/expressive/PartyEmoji.java
@@ -19,7 +19,7 @@ public PartyEmoji() {
     }
 
     @Override
-    public @NotNull Component component() {
+    public String characters() {
         return Fonts.Emoji.PARTY;
     }
 

diff --git a/src/main/java/com/minehut/cosmetics/cosmetics/collections/expressive/SadEmoji.java b/src/main/java/com/minehut/cosmetics/cosmetics/collections/expressive/SadEmoji.java
@@ -19,7 +19,7 @@ public SadEmoji() {
     }
 
     @Override
-    public @NotNull Component component() {
+    public String characters() {
         return Fonts.Emoji.SAD;
     }
 

diff --git a/src/main/java/com/minehut/cosmetics/cosmetics/collections/expressive/SkullEmoji.java b/src/main/java/com/minehut/cosmetics/cosmetics/collections/expressive/SkullEmoji.java
@@ -19,15 +19,10 @@ public SkullEmoji() {
     }
 
     @Override
-    public @NotNull Component component() {
+    public String characters() {
         return Fonts.Emoji.SKULL;
     }
 
-    @Override
-    public Permission permission() {
-        return Permission.hasPurchased(this);
-    }
-
     @Override
     public Permission visibility() {
         return Permission.none();

diff --git a/src/main/java/com/minehut/cosmetics/cosmetics/collections/expressive/WeirdSmileEmoji.java b/src/main/java/com/minehut/cosmetics/cosmetics/collections/expressive/WeirdSmileEmoji.java
@@ -19,15 +19,10 @@ public WeirdSmileEmoji() {
     }
 
     @Override
-    public @NotNull Component component() {
+    public String characters() {
         return Fonts.Emoji.WEIRD_SMILE;
     }
 
-    @Override
-    public Permission permission() {
-        return Permission.hasPurchased(this);
-    }
-
     @Override
     public Permission visibility() {
         return Permission.none();

diff --git a/src/main/java/com/minehut/cosmetics/cosmetics/collections/general/HeartEmoji.java b/src/main/java/com/minehut/cosmetics/cosmetics/collections/general/HeartEmoji.java
@@ -19,7 +19,7 @@ public HeartEmoji() {
     }
 
     @Override
-    public @NotNull Component component() {
+    public String characters() {
         return Fonts.Emoji.HEART;
     }
 

diff --git a/src/main/java/com/minehut/cosmetics/cosmetics/collections/general/MinehutEmoji.java b/src/main/java/com/minehut/cosmetics/cosmetics/collections/general/MinehutEmoji.java
@@ -19,7 +19,7 @@ public MinehutEmoji() {
     }
 
     @Override
-    public @NotNull Component component() {
+    public String characters() {
         return Fonts.Emoji.MINEHUT_LOGO;
     }
 

diff --git a/src/main/java/com/minehut/cosmetics/cosmetics/collections/general/SmileEmoji.java b/src/main/java/com/minehut/cosmetics/cosmetics/collections/general/SmileEmoji.java
@@ -19,7 +19,7 @@ public SmileEmoji() {
     }
 
     @Override
-    public @NotNull Component component() {
+    public String characters() {
         return Fonts.Emoji.SMILE;
     }
 

diff --git a/src/main/java/com/minehut/cosmetics/cosmetics/collections/general/ThumbsUpEmoji.java b/src/main/java/com/minehut/cosmetics/cosmetics/collections/general/ThumbsUpEmoji.java
@@ -19,7 +19,7 @@ public ThumbsUpEmoji() {
     }
 
     @Override
-    public @NotNull Component component() {
+    public String characters() {
         return Fonts.Emoji.THUMBS_UP;
     }
 

diff --git a/...ain/java/com/minehut/cosmetics/cosmetics/collections/netflix2022/SpooktacularBoombox.java b/...ain/java/com/minehut/cosmetics/cosmetics/collections/netflix2022/SpooktacularBoombox.java
@@ -1,39 +1,23 @@
 package com.minehut.cosmetics.cosmetics.collections.netflix2022;
 
-import com.minehut.cosmetics.Cosmetics;
-import com.minehut.cosmetics.config.Mode;
 import com.minehut.cosmetics.cosmetics.Collection;
 import com.minehut.cosmetics.cosmetics.Permission;
-import com.minehut.cosmetics.cosmetics.properties.CosmeticSlot;
-import com.minehut.cosmetics.cosmetics.types.trinket.TrinketCosmetic;
-import com.minehut.cosmetics.cosmetics.properties.Equippable;
-import com.minehut.cosmetics.cosmetics.properties.SlotHandler;
+import com.minehut.cosmetics.cosmetics.types.trinket.ItemTrinket;
 import com.minehut.cosmetics.cosmetics.types.trinket.Trinket;
 import com.minehut.cosmetics.ui.model.Model;
 import com.minehut.cosmetics.util.ItemBuilder;
-import com.minehut.cosmetics.util.SkinUtil;
 import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.format.TextDecoration;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Optional;
-import java.util.function.Supplier;
-
-public class SpooktacularBoombox extends TrinketCosmetic implements Equippable, SlotHandler {
-    private CosmeticSlot slot = null;
+public class SpooktacularBoombox extends ItemTrinket {
 
     public SpooktacularBoombox() {
         super(Trinket.SPOOKTACULAR_BOOMBOX.name());
     }
 
-    @Override
-    public Permission permission() {
-        return Permission.hasPurchased(this);
-    }
-
     @Override
     public Permission visibility() {
         return Permission.deny();
@@ -58,51 +42,4 @@ public Component name() {
     public @NotNull Collection collection() {
         return Collection.WENDELL_AND_WILD;
     }
-
-    @Override
-    public void equip() {
-        player().ifPresent(player -> slot().ifPresent(slot -> {
-
-            final ItemStack item = menuIcon();
-            item.editMeta(meta -> SkinUtil.writeCosmeticKeys(meta, this));
-
-            switch (Cosmetics.mode()) {
-                // handle based on the slot being used
-                case LOBBY -> {
-                    switch (slot) {
-                        case MAIN_HAND -> {
-                            player.getInventory().setItem(6, item);
-                            player.getInventory().setHeldItemSlot(6);
-                        }
-                        case OFF_HAND -> player.getInventory().setItemInOffHand(item);
-                    }
-                }
-                case PLAYER_SERVER -> player.getInventory().addItem(item);
-            }
-        }));
-    }
-
-    @Override
-    public void unequip() {
-        player().ifPresent(player -> slot().ifPresent(slot -> {
-            // handle like items in lobby mode
-            if (Mode.LOBBY == Cosmetics.mode()) {
-                switch (slot) {
-                    case MAIN_HAND -> player.getInventory().setItem(6, null);
-                    case OFF_HAND -> player.getInventory().setItemInOffHand(null);
-                }
-            }
-        }));
-    }
-
-    @Override
-    public Optional<CosmeticSlot> slot() {
-        return Optional.ofNullable(slot);
-    }
-
-    @Override
-    public void setSlot(CosmeticSlot slot) {
-        this.slot = slot;
-    }
-
 }
diff --git a/src/main/java/com/minehut/cosmetics/cosmetics/collections/winter2022/IceAxe.java b/src/main/java/com/minehut/cosmetics/cosmetics/collections/winter2022/IceAxe.java
@@ -0,0 +1,41 @@
+package com.minehut.cosmetics.cosmetics.collections.winter2022;
+
+import com.minehut.cosmetics.cosmetics.Collection;
+import com.minehut.cosmetics.cosmetics.types.item.Item;
+import com.minehut.cosmetics.cosmetics.types.item.ItemCosmetic;
+import com.minehut.cosmetics.ui.model.Model;
+import com.minehut.cosmetics.util.ItemBuilder;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.TextDecoration;
+import org.bukkit.Material;
+import org.bukkit.inventory.ItemFlag;
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;
+
+public class IceAxe extends ItemCosmetic {
+    public IceAxe() {
+        super(Item.ICE_AXE.name());
+    }
+
+    @Override
+    public Component name() {
+        return Component.text("Ice Axe")
+                .color(rarity().display().color())
+                .decoration(TextDecoration.ITALIC, false);
+    }
+
+    @Override
+    public @NotNull ItemStack menuIcon() {
+        return ItemBuilder.of(Material.DIAMOND_AXE)
+                .display(name())
+                .flags(ItemFlag.HIDE_ATTRIBUTES)
+                .modelData(Model.Item.Axe.ICE)
+                .build();
+    }
+
+    @Override
+    public @NotNull Collection collection() {
+        return Collection.ICE;
+    }
+}
+