Skip to content

Commit

Permalink
add ninja collection
Browse files Browse the repository at this point in the history
  • Loading branch information
Robert Brunson committed Jan 20, 2023
1 parent 19cd983 commit c0fd27f
Show file tree
Hide file tree
Showing 10 changed files with 270 additions and 166 deletions.
29 changes: 0 additions & 29 deletions src/main/java/com/minehut/cosmetics/commands/debug/Debug.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,34 +34,5 @@ public void execute(@NotNull CommandSender sender, @NotNull String command, @Not
return;
}

Bukkit.getScheduler().runTaskAsynchronously(cosmetics, () -> {
if (!Permission.staff().hasAccess(player).join()) return;

sender.sendMessage(Message.info("Retrieving Profile..."));
final Optional<CosmeticProfileResponse> profile = cosmetics.manager().getProfile(player.getUniqueId()).join();

if (profile.isEmpty()) {
player.sendMessage(Message.error("No profile found."));
return;
}

player.sendMessage(Message.info(Component.text()
.append(Component.text("Found profile!").color(NamedTextColor.GREEN))
.append(Component.newline())
.append(Component.text(profile.get().toString()).color(NamedTextColor.YELLOW))
.build())
);

final ItemStack item = player.getInventory().getItemInMainHand();
if (Material.AIR == item.getType()) return;

Component keylist = Component.empty();

for (final NamespacedKey key : item.getItemMeta().getPersistentDataContainer().getKeys()) {
keylist = keylist.append(Component.newline().append(Component.text(key.toString())));
}

player.sendMessage(Message.info(keylist));
});
}
}
4 changes: 2 additions & 2 deletions src/main/java/com/minehut/cosmetics/cosmetics/Collection.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ public enum Collection {
WENDELL_AND_WILD(Component.text("From the Netflix Original Film Wendell & Wild").color(NamedTextColor.AQUA).decoration(TextDecoration.ITALIC, false)),
ICE(Component.text("Ice Collection").color(NamedTextColor.AQUA).decoration(TextDecoration.ITALIC, false)),
WINTER_2023(Component.text("Winter 2023").color(NamedTextColor.AQUA).decoration(TextDecoration.ITALIC, false)),

ARCADE(Component.text("Arcade Collection").color(NamedTextColor.LIGHT_PURPLE).decoration(TextDecoration.ITALIC, false));;
NINJA(Component.text("Ninja Collection").color(NamedTextColor.RED).decoration(TextDecoration.ITALIC, false)),
ARCADE(Component.text("Arcade Collection").color(NamedTextColor.LIGHT_PURPLE).decoration(TextDecoration.ITALIC, false));


private final Component tag;
Expand Down
266 changes: 134 additions & 132 deletions src/main/java/com/minehut/cosmetics/cosmetics/bindings/Bindings.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,162 +12,164 @@
public class Bindings {
// bindings for sword items
public static MaterialBinding SWORD = new MaterialBinding()
.registerMaterials(List.of(
Material.WOODEN_SWORD,
Material.STONE_SWORD,
Material.IRON_SWORD,
Material.GOLDEN_SWORD,
Material.DIAMOND_SWORD,
Material.NETHERITE_SWORD
))
.registerCosmetics(List.of(
Item.EXPLORER_SWORD,
Item.FALL_22_SWORD,
Item.FALL_22_LEAF_SWORD,
Item.KATANA,
Item.HALLO_22_SCYTHE,
Item.MAID_DUSTER,
Item.CRUSADER_SWORD,
Item.DRAGON_SWORD,
Item.FANCY_SHORT_SWORD,
Item.FISH_SWORD,
Item.BAN_HAMMER,
Item.ICE_SWORD
));
.registerMaterials(List.of(
Material.WOODEN_SWORD,
Material.STONE_SWORD,
Material.IRON_SWORD,
Material.GOLDEN_SWORD,
Material.DIAMOND_SWORD,
Material.NETHERITE_SWORD
))
.registerCosmetics(List.of(
Item.EXPLORER_SWORD,
Item.FALL_22_SWORD,
Item.FALL_22_LEAF_SWORD,
Item.KATANA,
Item.HALLO_22_SCYTHE,
Item.MAID_DUSTER,
Item.CRUSADER_SWORD,
Item.DRAGON_SWORD,
Item.FANCY_SHORT_SWORD,
Item.FISH_SWORD,
Item.BAN_HAMMER,
Item.ICE_SWORD,
Item.EIGHT_BIT_SWORD
));

// bindings for pickaxe items
public static MaterialBinding PICKAXE = new MaterialBinding()
.registerMaterials(List.of(
Material.WOODEN_PICKAXE,
Material.STONE_PICKAXE,
Material.IRON_PICKAXE,
Material.GOLDEN_PICKAXE,
Material.DIAMOND_PICKAXE,
Material.NETHERITE_PICKAXE
))
.registerCosmetics(List.of(
Item.EXPLORER_PICKAXE,
Item.FALL_22_PICKAXE,
Item.MOLTEN_PICKAXE,
Item.ICE_PICKAXE
));
.registerMaterials(List.of(
Material.WOODEN_PICKAXE,
Material.STONE_PICKAXE,
Material.IRON_PICKAXE,
Material.GOLDEN_PICKAXE,
Material.DIAMOND_PICKAXE,
Material.NETHERITE_PICKAXE
))
.registerCosmetics(List.of(
Item.EXPLORER_PICKAXE,
Item.FALL_22_PICKAXE,
Item.MOLTEN_PICKAXE,
Item.ICE_PICKAXE
));

// bindings for shovel items
public static MaterialBinding SHOVEL = new MaterialBinding()
.registerMaterials(List.of(
Material.WOODEN_SHOVEL,
Material.STONE_SHOVEL,
Material.IRON_SHOVEL,
Material.GOLDEN_SHOVEL,
Material.DIAMOND_SHOVEL,
Material.NETHERITE_SHOVEL
))
.registerCosmetics(List.of(
Item.FALL_22_SHOVEL,
Item.GRAVE_SHOVEL,
Item.ICE_SHOVEL
));
.registerMaterials(List.of(
Material.WOODEN_SHOVEL,
Material.STONE_SHOVEL,
Material.IRON_SHOVEL,
Material.GOLDEN_SHOVEL,
Material.DIAMOND_SHOVEL,
Material.NETHERITE_SHOVEL
))
.registerCosmetics(List.of(
Item.FALL_22_SHOVEL,
Item.GRAVE_SHOVEL,
Item.ICE_SHOVEL
));

// bindings for axe items
public static MaterialBinding AXE = new MaterialBinding()
.registerMaterials(List.of(
Material.WOODEN_AXE,
Material.STONE_AXE,
Material.IRON_AXE,
Material.GOLDEN_AXE,
Material.DIAMOND_AXE,
Material.NETHERITE_AXE
))
.registerCosmetics(List.of(
Item.FALL_22_AXE,
Item.ARCADE_AXE,
Item.ICE_AXE
));
.registerMaterials(List.of(
Material.WOODEN_AXE,
Material.STONE_AXE,
Material.IRON_AXE,
Material.GOLDEN_AXE,
Material.DIAMOND_AXE,
Material.NETHERITE_AXE
))
.registerCosmetics(List.of(
Item.FALL_22_AXE,
Item.ARCADE_AXE,
Item.ICE_AXE
));

// bindings for spyglass items
public static MaterialBinding SPYGLASS = new MaterialBinding()
.registerMaterials(List.of(
Material.SPYGLASS
))
.registerCosmetics(List.of(
Item.EXPLORER_SPYGLASS
));
.registerMaterials(List.of(
Material.SPYGLASS
))
.registerCosmetics(List.of(
Item.EXPLORER_SPYGLASS
));

public static MaterialBinding HAT = new MaterialBinding()
.registerMaterials(List.of(
Material.LEATHER_HELMET,
Material.GOLDEN_HELMET,
Material.CHAINMAIL_HELMET,
Material.IRON_HELMET,
Material.DIAMOND_HELMET,
Material.NETHERITE_HELMET,
Material.TURTLE_HELMET
))
.registerCosmetics(List.of(
// Explorer
Hat.EXPLORER,
// Spooktacular 2022
Hat.WITCH,
Hat.CAT_EARS,
Hat.DEVIL_HORNS,
Hat.FOX_EARS,
Hat.FOX_EARS,
// Maid
Hat.MAID,
// Fall 2022
Hat.FALL_22,
// Crates
Hat.GAMER_HEADSET,
Hat.DRAGON,
Hat.STEAMPUNK,
Hat.TURTLE,
Hat.TECHNICAL_VISOR
));
.registerMaterials(List.of(
Material.LEATHER_HELMET,
Material.GOLDEN_HELMET,
Material.CHAINMAIL_HELMET,
Material.IRON_HELMET,
Material.DIAMOND_HELMET,
Material.NETHERITE_HELMET,
Material.TURTLE_HELMET
))
.registerCosmetics(List.of(
// Explorer
Hat.EXPLORER,
// Spooktacular 2022
Hat.WITCH,
Hat.CAT_EARS,
Hat.DEVIL_HORNS,
Hat.FOX_EARS,
Hat.FOX_EARS,
// Maid
Hat.MAID,
// Fall 2022
Hat.FALL_22,
// Crates
Hat.GAMER_HEADSET,
Hat.DRAGON,
Hat.STEAMPUNK,
Hat.TURTLE,
Hat.TECHNICAL_VISOR,
Hat.NINJA_MASK
));

public static MaterialBinding SHIELD = new MaterialBinding()
.registerMaterials(List.of(
Material.SHIELD
))
.registerCosmetics(List.of(
Item.FALL_22_SHIELD,
Item.ICE_SHIELD
));
.registerMaterials(List.of(
Material.SHIELD
))
.registerCosmetics(List.of(
Item.FALL_22_SHIELD,
Item.ICE_SHIELD
));

public static MaterialBinding FISHING_ROD = new MaterialBinding()
.registerMaterials(List.of(
Material.FISHING_ROD
))
.registerCosmetics(List.of(
Item.FANCY_FISHING_ROD
));
.registerMaterials(List.of(
Material.FISHING_ROD
))
.registerCosmetics(List.of(
Item.FANCY_FISHING_ROD
));

public static MaterialBinding ARROW = new MaterialBinding()
.registerMaterials(List.of(
Material.ARROW
))
.registerCosmetics(List.of(
Item.FALL_22_ARROW
));
.registerMaterials(List.of(
Material.ARROW
))
.registerCosmetics(List.of(
Item.FALL_22_ARROW
));

public static MaterialBinding BOW = new MaterialBinding()
.registerMaterials(List.of(
Material.BOW
))
.registerCosmetics(List.of(
Item.FALL_22_BOW
));
.registerMaterials(List.of(
Material.BOW
))
.registerCosmetics(List.of(
Item.FALL_22_BOW
));


public static List<MaterialBinding> ALL = List.of(
SWORD,
PICKAXE,
SHOVEL,
AXE,
SPYGLASS,
HAT,
SHIELD,
ARROW,
BOW,
FISHING_ROD
SWORD,
PICKAXE,
SHOVEL,
AXE,
SPYGLASS,
HAT,
SHIELD,
ARROW,
BOW,
FISHING_ROD
);
}
38 changes: 38 additions & 0 deletions src/main/java/com/minehut/cosmetics/cosmetics/collections/jan2023/ArcadeFighterBalloon.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
package com.minehut.cosmetics.cosmetics.collections.jan2023;

import com.minehut.cosmetics.cosmetics.Collection;
import com.minehut.cosmetics.cosmetics.types.balloon.Balloon;
import com.minehut.cosmetics.cosmetics.types.balloon.BalloonCosmetic;
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.ItemStack;
import org.jetbrains.annotations.NotNull;

public class ArcadeFighterBalloon extends BalloonCosmetic {
public ArcadeFighterBalloon() {
super(Balloon.ARCADE_FIGHTER.name());
}

@Override
public Component name() {
return Component.text("Arcade Fighter")
.color(rarity().display().color())
.decoration(TextDecoration.ITALIC, false);
}

@Override
public @NotNull ItemStack menuIcon() {
return ItemBuilder.of(Material.SCUTE)
.display(name())
.modelData(Model.Balloon.ARCADE_FIGHTER)
.build();
}

@Override
public @NotNull Collection collection() {
return Collection.ARCADE;
}
}
Loading

0 comments on commit c0fd27f

Please sign in to comment.