From c20714b3a7e894ec51bf492ef8b7ecdea8bc9df2 Mon Sep 17 00:00:00 2001 From: zxq5 Date: Thu, 6 Feb 2025 09:19:49 +0000 Subject: [PATCH 1/9] # changes - added shoot wither skull ability to witherite (may be changed later idk, depends how people feel about it) - refactored custom gear set code to be more concise with less boilerplate # additions - added dragon armour - right click with sword to dash - chestplate is actually an elytra, uses a clientside resourcepack to render a chestplate as well. - chestplate has the armour value of prot4 netherite - added blazing armour - full set provides complete immunity to fire - right click with sword shoots three fireballs just like a blaze. - sword has the equivalent of fire aspect 3 built in. - started working on a basic abstract class for custom food and drinks to make additions easier in the future. # improved clientside resourcepack with new additions - dragon armour / sword - blazing armour / sword --- .../java/dev/zxq5/fantasysmp/Fantasysmp.java | 13 +- .../java/dev/zxq5/fantasysmp/items/Food.java | 4 + .../zxq5/fantasysmp/items/GenericGearSet.java | 79 +++++----- .../dev/zxq5/fantasysmp/items/ItemStats.java | 36 +++++ .../java/dev/zxq5/fantasysmp/items/Items.java | 41 +++-- .../fantasysmp/items/food/GenericDrink.java | 40 +++++ .../fantasysmp/items/gear/BlazingGear.java | 130 ++++++++++++++++ .../fantasysmp/items/gear/DragonGear.java | 142 ++++++++++++++++++ .../LightningSword.java} | 40 ++--- .../items/{ => gear}/StevensWrath.java | 27 +--- .../items/gear/TrueNetheriteGear.java | 22 +++ .../WitheriteGear.java} | 80 +++++++--- src/main/resources/plugin.yml | 18 ++- 13 files changed, 538 insertions(+), 134 deletions(-) create mode 100644 src/main/java/dev/zxq5/fantasysmp/items/Food.java create mode 100644 src/main/java/dev/zxq5/fantasysmp/items/ItemStats.java create mode 100644 src/main/java/dev/zxq5/fantasysmp/items/food/GenericDrink.java create mode 100644 src/main/java/dev/zxq5/fantasysmp/items/gear/BlazingGear.java create mode 100644 src/main/java/dev/zxq5/fantasysmp/items/gear/DragonGear.java rename src/main/java/dev/zxq5/fantasysmp/items/{Lightning.java => gear/LightningSword.java} (74%) rename src/main/java/dev/zxq5/fantasysmp/items/{ => gear}/StevensWrath.java (76%) create mode 100644 src/main/java/dev/zxq5/fantasysmp/items/gear/TrueNetheriteGear.java rename src/main/java/dev/zxq5/fantasysmp/items/{Witherite.java => gear/WitheriteGear.java} (69%) diff --git a/src/main/java/dev/zxq5/fantasysmp/Fantasysmp.java b/src/main/java/dev/zxq5/fantasysmp/Fantasysmp.java index f8e060b..fdc2b73 100644 --- a/src/main/java/dev/zxq5/fantasysmp/Fantasysmp.java +++ b/src/main/java/dev/zxq5/fantasysmp/Fantasysmp.java @@ -3,9 +3,11 @@ package dev.zxq5.fantasysmp; import dev.zxq5.fantasysmp.events.HereticWarner; import dev.zxq5.fantasysmp.events.StevenKillCheck; import dev.zxq5.fantasysmp.items.*; +import dev.zxq5.fantasysmp.items.gear.LightningSword; +import dev.zxq5.fantasysmp.items.gear.StevensWrath; +import dev.zxq5.fantasysmp.items.gear.WitheriteGear; import dev.zxq5.fantasysmp.warps.Warp; import dev.zxq5.fantasysmp.warps.Warper; -import org.bukkit.entity.Panda; import org.bukkit.plugin.java.JavaPlugin; public final class Fantasysmp extends JavaPlugin { @@ -33,15 +35,6 @@ public final class Fantasysmp extends JavaPlugin { getServer().broadcastMessage("registered commands + \n /home \n /sethome \n /warp \n /setwarp"); - GenericGearSet witherite = new Witherite(); - witherite.registerRecipes(); - - Lightning lightning = new Lightning(); - lightning.registerRecipes(); - - StevensWrath stevensWrath = new StevensWrath(); - stevensWrath.registerRecipes(); - getServer().getPluginManager().registerEvents(new StevenKillCheck(), this); HereticWarner hereticWarner = new HereticWarner(); diff --git a/src/main/java/dev/zxq5/fantasysmp/items/Food.java b/src/main/java/dev/zxq5/fantasysmp/items/Food.java new file mode 100644 index 0000000..b88474e --- /dev/null +++ b/src/main/java/dev/zxq5/fantasysmp/items/Food.java @@ -0,0 +1,4 @@ +package dev.zxq5.fantasysmp.items; + +public class Food { +} diff --git a/src/main/java/dev/zxq5/fantasysmp/items/GenericGearSet.java b/src/main/java/dev/zxq5/fantasysmp/items/GenericGearSet.java index 144dcb7..32baa68 100644 --- a/src/main/java/dev/zxq5/fantasysmp/items/GenericGearSet.java +++ b/src/main/java/dev/zxq5/fantasysmp/items/GenericGearSet.java @@ -1,22 +1,22 @@ package dev.zxq5.fantasysmp.items; +import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.NamespacedKey; import org.bukkit.attribute.Attribute; import org.bukkit.attribute.AttributeModifier; -import org.bukkit.entity.Item; -import org.bukkit.inventory.EquipmentSlotGroup; -import org.bukkit.inventory.ItemFlag; -import org.bukkit.inventory.ItemStack; -import org.bukkit.inventory.RecipeChoice; +import org.bukkit.event.Listener; +import org.bukkit.inventory.*; import org.bukkit.inventory.meta.ItemMeta; +import org.bukkit.inventory.meta.components.EquippableComponent; +import org.bukkit.plugin.Plugin; import java.util.ArrayList; import java.util.List; import java.util.UUID; -public abstract class GenericGearSet implements HasRecipes { +public abstract class GenericGearSet implements HasRecipes, Listener { protected ItemStats sword = new ItemStats(); protected ItemStats helmet = new ItemStats(); @@ -27,6 +27,10 @@ public abstract class GenericGearSet implements HasRecipes { protected static RecipeChoice NETHERITE_UPGRADE = new RecipeChoice.MaterialChoice(Material.NETHERITE_UPGRADE_SMITHING_TEMPLATE); protected static RecipeChoice WITHER_SKULL = new RecipeChoice.MaterialChoice(Material.WITHER_SKELETON_SKULL); + public void registerEvents(Plugin plugin) { + Bukkit.getServer().getPluginManager().registerEvents(this, plugin); + } + public void setTier1() { sword.setMaterial(Material.WOODEN_SWORD); helmet.setMaterial(Material.LEATHER_HELMET); @@ -143,13 +147,13 @@ public abstract class GenericGearSet implements HasRecipes { meta.addItemFlags(ItemFlag.HIDE_ATTRIBUTES); meta.setDisplayName(sword.name); - if (!sword.customModel.isEmpty()) meta.setItemModel(NamespacedKey.fromString("fantasysmp:" + sword.customModel)); + if (!sword.customItemModel.isEmpty()) meta.setItemModel(NamespacedKey.fromString("fantasysmp:" + sword.customItemModel)); ArrayList lore = new ArrayList<>(List.of(sword.lore)); lore.add("\n"); lore.add(ChatColor.GRAY + "When in Main Hand:" + ChatColor.RESET); - if (sword.attackDamage > 0) lore.add(ChatColor.GREEN + " " + sword.attackDamage + " Attack Damage" + ChatColor.RESET); - if (sword.attackSpeed > 0) lore.add(ChatColor.GREEN + " " + sword.attackSpeed + " Attack Speed" + ChatColor.RESET); + if (sword.attackDamage > 0) lore.add(ChatColor.GREEN + String.format(" %.1f Attack Damage", sword.attackDamage) + ChatColor.RESET); + if (sword.attackSpeed > 0) lore.add(ChatColor.GREEN + String.format(" %.1f Attack Speed", sword.attackSpeed) + ChatColor.RESET); meta.setLore(lore); item.setItemMeta(meta); @@ -163,6 +167,7 @@ public abstract class GenericGearSet implements HasRecipes { meta.setDisplayName(helmet.name); meta.setLore(new ArrayList<>(List.of(helmet.lore))); + meta.addAttributeModifier(Attribute.ARMOR, new AttributeModifier( UUID.randomUUID(), "armour", @@ -188,7 +193,11 @@ public abstract class GenericGearSet implements HasRecipes { EquipmentSlotGroup.HEAD )); } - if (!helmet.customModel.isEmpty()) meta.setItemModel(NamespacedKey.fromString("fantasysmp:" + helmet.customModel)); + if (!helmet.customItemModel.isEmpty()) meta.setItemModel(NamespacedKey.fromString("fantasysmp:" + helmet.customItemModel)); + EquippableComponent equippable = meta.getEquippable(); + equippable.setModel(NamespacedKey.fromString("fantasysmp:" + helmet.customEquipmentModel)); + equippable.setSlot(EquipmentSlot.HEAD); + meta.setEquippable(equippable); item.setItemMeta(meta); return item; @@ -227,7 +236,11 @@ public abstract class GenericGearSet implements HasRecipes { )); } - if (!chestplate.customModel.isEmpty()) meta.setItemModel(NamespacedKey.fromString("fantasysmp:" + chestplate.customModel)); + if (!chestplate.customItemModel.isEmpty()) meta.setItemModel(NamespacedKey.fromString("fantasysmp:" + chestplate.customItemModel)); + EquippableComponent equippable = meta.getEquippable(); + equippable.setModel(NamespacedKey.fromString("fantasysmp:" + chestplate.customEquipmentModel)); + equippable.setSlot(EquipmentSlot.CHEST); + meta.setEquippable(equippable); item.setItemMeta(meta); return item; @@ -266,7 +279,12 @@ public abstract class GenericGearSet implements HasRecipes { )); } - if (!leggings.customModel.isEmpty()) meta.setItemModel(NamespacedKey.fromString("fantasysmp:" + leggings.customModel)); + if (!leggings.customItemModel.isEmpty()) meta.setItemModel(NamespacedKey.fromString("fantasysmp:" + leggings.customItemModel)); + EquippableComponent equippable = meta.getEquippable(); + equippable.setModel(NamespacedKey.fromString("fantasysmp:" + leggings.customEquipmentModel)); + equippable.setSlot(EquipmentSlot.LEGS); + meta.setEquippable(equippable); + item.setItemMeta(meta); return item; } @@ -304,42 +322,17 @@ public abstract class GenericGearSet implements HasRecipes { )); } - if (!boots.customModel.isEmpty()) meta.setItemModel(NamespacedKey.fromString("fantasysmp:" + boots.customModel)); + if (!boots.customItemModel.isEmpty()) meta.setItemModel(NamespacedKey.fromString("fantasysmp:" + boots.customItemModel)); + EquippableComponent equippable = meta.getEquippable(); + equippable.setModel(NamespacedKey.fromString("fantasysmp:" + boots.customEquipmentModel)); + equippable.setSlot(EquipmentSlot.FEET); + meta.setEquippable(equippable); + item.setItemMeta(meta); return item; } } -class ItemStats { - public double attackDamage; - public double attackSpeed; - public int durability; - public int armour; - public int armourToughness; - public double knockbackResistance ; - public String name; - public String lore; - public String customModel; - public ItemStack material; - - public ItemStats() { - this.attackDamage = 0; - this.attackSpeed = 0; - this.durability = 0; - this.armour = 0; - this.armourToughness = 0; - this.knockbackResistance = 0; - this.name = ""; - this.lore = ""; - this.customModel = ""; - this.material = new ItemStack(Material.AIR); - } - - public void setMaterial(Material material) { - this.material = new ItemStack(material); - } -} - diff --git a/src/main/java/dev/zxq5/fantasysmp/items/ItemStats.java b/src/main/java/dev/zxq5/fantasysmp/items/ItemStats.java new file mode 100644 index 0000000..5acb73a --- /dev/null +++ b/src/main/java/dev/zxq5/fantasysmp/items/ItemStats.java @@ -0,0 +1,36 @@ +package dev.zxq5.fantasysmp.items; + +import org.bukkit.Material; +import org.bukkit.inventory.ItemStack; + +public class ItemStats { + public double attackDamage; + public double attackSpeed; + public int durability; + public int armour; + public int armourToughness; + public double knockbackResistance ; + public String name; + public String lore; + public String customItemModel; + public String customEquipmentModel; + public ItemStack material; + + public ItemStats() { + this.attackDamage = 0; + this.attackSpeed = 0; + this.durability = 0; + this.armour = 0; + this.armourToughness = 0; + this.knockbackResistance = 0; + this.name = ""; + this.lore = ""; + this.customItemModel = ""; + this.customEquipmentModel = ""; + this.material = new ItemStack(Material.AIR); + } + + public void setMaterial(Material material) { + this.material = new ItemStack(material); + } +} diff --git a/src/main/java/dev/zxq5/fantasysmp/items/Items.java b/src/main/java/dev/zxq5/fantasysmp/items/Items.java index 0066e7d..9e7badd 100644 --- a/src/main/java/dev/zxq5/fantasysmp/items/Items.java +++ b/src/main/java/dev/zxq5/fantasysmp/items/Items.java @@ -1,11 +1,8 @@ package dev.zxq5.fantasysmp.items; -import org.bukkit.Bukkit; -import org.bukkit.block.data.type.Light; +import dev.zxq5.fantasysmp.items.gear.*; import org.bukkit.command.CommandExecutor; import org.bukkit.entity.Player; -import org.bukkit.entity.Wither; -import org.bukkit.event.EventHandler; import org.bukkit.plugin.java.JavaPlugin; import static org.bukkit.Bukkit.getServer; @@ -36,7 +33,12 @@ public class Items implements CommandExecutor { CommandExecutor handler; switch (args[0]) { - case "witherite" -> handler = new Witherite(); + case "witherite" -> handler = new WitheriteGear(); + case "lightning" -> handler = new LightningSword(); + case "steven" -> handler = new StevensWrath(); + case "blazing" -> handler = new BlazingGear(); + case "dragon" -> handler = new DragonGear(); + case "trueneth" -> handler = new TrueNetheriteGear(); default -> { return false; } } @@ -46,10 +48,29 @@ public class Items implements CommandExecutor { } public Items(JavaPlugin plugin) { - Witherite.init(); - Lightning.init(); - getServer().getPluginManager().registerEvents(new Witherite(), plugin); - getServer().getPluginManager().registerEvents(new Lightning(), plugin); - getServer().getPluginManager().registerEvents(new StevensWrath(), plugin); + + WitheriteGear witherite = new WitheriteGear(); + witherite.registerRecipes(); + witherite.registerEvents(plugin); + + LightningSword lightning = new LightningSword(); + lightning.registerRecipes(); + lightning.registerEvents(plugin); + + StevensWrath stevensWrath = new StevensWrath(); + stevensWrath.registerRecipes(); + stevensWrath.registerEvents(plugin); + + BlazingGear blazing = new BlazingGear(); + blazing.registerRecipes(); + blazing.registerEvents(plugin); + + DragonGear dragon = new DragonGear(); + dragon.registerRecipes(); + dragon.registerEvents(plugin); + + TrueNetheriteGear trueNetherite = new TrueNetheriteGear(); + trueNetherite.registerRecipes(); + trueNetherite.registerEvents(plugin); } } diff --git a/src/main/java/dev/zxq5/fantasysmp/items/food/GenericDrink.java b/src/main/java/dev/zxq5/fantasysmp/items/food/GenericDrink.java new file mode 100644 index 0000000..2ca88f1 --- /dev/null +++ b/src/main/java/dev/zxq5/fantasysmp/items/food/GenericDrink.java @@ -0,0 +1,40 @@ +package dev.zxq5.fantasysmp.items.food; + +import dev.zxq5.fantasysmp.items.HasRecipes; +import org.bukkit.Material; +import org.bukkit.command.CommandExecutor; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.inventory.ItemStack; +import org.bukkit.inventory.meta.PotionMeta; + +import java.util.ArrayList; +import java.util.List; + +public abstract class GenericDrink implements Listener, CommandExecutor, HasRecipes { + public String name; + public String lore; + + @EventHandler + public abstract void itemCraftingHandler(org.bukkit.event.inventory.PrepareItemCraftEvent event); + + @Override + public abstract boolean onCommand(org.bukkit.command.CommandSender sender, org.bukkit.command.Command command, String label, String[] args); + + public abstract void registerRecipes(); + + public ItemStack getDrink() { + ItemStack item = new ItemStack(Material.POTION, 1); + + PotionMeta pm = (PotionMeta) item.getItemMeta(); + pm.setBasePotionType(org.bukkit.potion.PotionType.WATER); + + List lore = new ArrayList<>(); + lore.add(this.lore); + pm.setLore(lore); + pm.setDisplayName(this.name); + item.setItemMeta(pm); + return item; + } + +} diff --git a/src/main/java/dev/zxq5/fantasysmp/items/gear/BlazingGear.java b/src/main/java/dev/zxq5/fantasysmp/items/gear/BlazingGear.java new file mode 100644 index 0000000..88283a8 --- /dev/null +++ b/src/main/java/dev/zxq5/fantasysmp/items/gear/BlazingGear.java @@ -0,0 +1,130 @@ +package dev.zxq5.fantasysmp.items.gear; + +import dev.zxq5.fantasysmp.items.GenericGearSet; +import dev.zxq5.fantasysmp.util.LoreChecker; +import org.bukkit.*; +import org.bukkit.command.CommandExecutor; +import org.bukkit.damage.DamageType; +import org.bukkit.entity.Fireball; +import org.bukkit.entity.LivingEntity; +import org.bukkit.entity.Player; +import org.bukkit.entity.SmallFireball; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.block.Action; +import org.bukkit.event.entity.EntityDamageByEntityEvent; +import org.bukkit.event.player.PlayerInteractEvent; +import org.bukkit.inventory.ItemStack; +import org.bukkit.inventory.RecipeChoice; +import org.bukkit.inventory.SmithingTransformRecipe; +import org.bukkit.plugin.Plugin; +import org.bukkit.potion.PotionEffect; +import org.bukkit.potion.PotionEffectType; +import org.bukkit.util.Vector; + +import java.util.ArrayList; +import java.util.Objects; + +import static org.bukkit.Bukkit.*; + +public class BlazingGear extends GenericGearSet implements Listener, CommandExecutor { + private ArrayList cooldown = new ArrayList<>(); + + @Override + public boolean onCommand(org.bukkit.command.CommandSender sender, org.bukkit.command.Command command, String label, String[] args) { + Player player = (Player) sender; + player.getInventory().addItem(this.getSword()); + player.getInventory().addItem(this.getHelmet()); + player.getInventory().addItem(this.getChestplate()); + player.getInventory().addItem(this.getLeggings()); + player.getInventory().addItem(this.getBoots()); + + return true; + } + + @Override + public void registerRecipes() {} + + @EventHandler + public void onPlayerSetOnFire(org.bukkit.event.entity.EntityDamageEvent event) { + if (!(event.getEntity() instanceof Player player)) return; + + if (!(LoreChecker.itemLoreContains(player.getInventory().getHelmet(), this.helmet.lore))) return; + if (!(LoreChecker.itemLoreContains(player.getInventory().getChestplate(), this.chestplate.lore))) return; + if (!(LoreChecker.itemLoreContains(player.getInventory().getLeggings(), this.leggings.lore))) return; + if (!(LoreChecker.itemLoreContains(player.getInventory().getBoots(), this.boots.lore))) return; + + if (event.getDamageSource().getDamageType() == DamageType.ON_FIRE) event.setCancelled(true); + if (event.getDamageSource().getDamageType() == DamageType.IN_FIRE) event.setCancelled(true); + if (event.getDamageSource().getDamageType() == DamageType.LAVA) event.setCancelled(true); + + player.setFireTicks(0); + } + + @EventHandler + public void onPlayerInteract(PlayerInteractEvent event) { + Player player = event.getPlayer(); + ItemStack item = event.getItem(); // Get the item the player interacted with + + if (!(event.getAction() == Action.RIGHT_CLICK_AIR || event.getAction() == Action.RIGHT_CLICK_BLOCK)) { + return; + } + + if (!(LoreChecker.itemLoreContains(item, this.sword.lore))) return; + if (cooldown.contains(player)) return; + + Plugin plugin = getPluginManager().getPlugin("fantasysmp"); + + cooldown.add(player); + Bukkit.getScheduler().runTaskLater(plugin, () -> cooldown.remove(player), 25); + + shootFireball(player); + Bukkit.getScheduler().runTaskLater(plugin, () -> shootFireball(player), 4); + Bukkit.getScheduler().runTaskLater(plugin, () -> shootFireball(player), 8); + } + + @EventHandler + public void onEntityDamageByEntity(EntityDamageByEntityEvent event) { + if (!(event.getDamager() instanceof Player player)) return; + if (!(LoreChecker.itemLoreContains(player.getInventory().getItemInMainHand(), this.sword.lore))) return; + if (event.getEntity().getFireTicks() < 240) event.getEntity().setFireTicks(240); + } + + public void shootFireball(Player player) { + Location location = player.getLocation(); + World world = player.getWorld(); + player.launchProjectile(SmallFireball.class); + player.playSound(location, Sound.ENTITY_BLAZE_SHOOT, 1.0f, 1.0f); + world.spawnParticle(Particle.FLAME, location, 1); + } + + public static void init() {} + + public BlazingGear() { + this.setTier4(); + this.sword.name = "Blazing Sword"; + this.sword.customItemModel = "blazing_sword"; + + this.helmet.name = "Blazing Helmet"; + this.helmet.customItemModel = "blazing_helmet"; + this.helmet.customEquipmentModel = "blazing"; + + this.chestplate.name = "Blazing Chestplate"; + this.chestplate.customItemModel = "blazing_chestplate"; + this.chestplate.customEquipmentModel = "blazing"; + + this.leggings.name = "Blazing Leggings"; + this.leggings.customItemModel = "blazing_leggings"; + this.leggings.customEquipmentModel = "blazing"; + + this.boots.name = "Blazing Boots"; + this.boots.customItemModel = "blazing_boots"; + this.boots.customEquipmentModel = "blazing"; + + this.sword.lore = "Forged from molten lava and the essence of blazes"; + this.helmet.lore = "Forged from molten lava and the essence of blazes"; + this.chestplate.lore = "Forged from molten lava and the essence of blazes"; + this.leggings.lore = "Forged from molten lava and the essence of blazes"; + this.boots.lore = "Forged from molten lava and the essence of blazes"; + } +} diff --git a/src/main/java/dev/zxq5/fantasysmp/items/gear/DragonGear.java b/src/main/java/dev/zxq5/fantasysmp/items/gear/DragonGear.java new file mode 100644 index 0000000..3bf4762 --- /dev/null +++ b/src/main/java/dev/zxq5/fantasysmp/items/gear/DragonGear.java @@ -0,0 +1,142 @@ +package dev.zxq5.fantasysmp.items.gear; + +import dev.zxq5.fantasysmp.items.GenericGearSet; +import dev.zxq5.fantasysmp.items.ItemStats; +import dev.zxq5.fantasysmp.util.LoreChecker; +import org.bukkit.*; +import org.bukkit.attribute.Attribute; +import org.bukkit.attribute.AttributeModifier; +import org.bukkit.command.CommandExecutor; +import org.bukkit.enchantments.Enchantment; +import org.bukkit.entity.LivingEntity; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.block.Action; +import org.bukkit.event.player.PlayerInteractEvent; +import org.bukkit.inventory.*; +import org.bukkit.inventory.meta.ItemMeta; +import org.bukkit.inventory.meta.components.EquippableComponent; +import org.bukkit.potion.PotionEffect; +import org.bukkit.potion.PotionEffectType; +import org.bukkit.util.Vector; + +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; +import java.util.UUID; + +import static org.bukkit.Bukkit.getServer; + +public class DragonGear extends GenericGearSet implements Listener, CommandExecutor { + private ArrayList cooldown = new ArrayList<>(); + + @Override + public boolean onCommand(org.bukkit.command.CommandSender sender, org.bukkit.command.Command command, String label, String[] args) { + Player player = (Player) sender; + player.getInventory().addItem(this.getSword()); + player.getInventory().addItem(this.getHelmet()); + player.getInventory().addItem(this.getChestplate()); + player.getInventory().addItem(this.getLeggings()); + player.getInventory().addItem(this.getBoots()); + + return true; + } + + @Override + public void registerRecipes() {} + + @EventHandler + public void onEntityPotionEffectEvent(org.bukkit.event.entity.EntityPotionEffectEvent event) { + if (event.getEntity() instanceof Player player) { + if (event.getNewEffect() == null) return; + + if (event.getNewEffect().getType() != PotionEffectType.LEVITATION) { + return; + } + + try { + if (LoreChecker.itemLoreContains(player.getInventory().getHelmet(), this.helmet.lore) + && LoreChecker.itemLoreContains(player.getInventory().getChestplate(), this.chestplate.lore) + && LoreChecker.itemLoreContains(player.getInventory().getLeggings(), this.leggings.lore) + && LoreChecker.itemLoreContains(player.getInventory().getBoots(), this.boots.lore) + ) { + event.setCancelled(true); + } + } catch (Exception e) { + e.printStackTrace(); + } + } + } + + @EventHandler + public void onPlayerInteract(PlayerInteractEvent event) { + Player player = event.getPlayer(); + ItemStack item = event.getItem(); // Get the item the player interacted with + + if (!(event.getAction() == Action.RIGHT_CLICK_AIR || event.getAction() == Action.RIGHT_CLICK_BLOCK)) { + return; + } + + if (!(LoreChecker.itemLoreContains(item, this.sword.lore))) return; + if (cooldown.contains(player)) return; + + Location location = player.getLocation(); + Vector direction = location.getDirection(); + player.setVelocity(direction.multiply(2.0)); + player.playSound(location, Sound.ENTITY_ENDERMAN_TELEPORT, 1.0f, 1.0f); + World world = player.getWorld(); + world.spawnParticle(Particle.PORTAL, location, 1); + + cooldown.add(player); + Bukkit.getScheduler().scheduleSyncDelayedTask( + Objects.requireNonNull(Bukkit.getPluginManager().getPlugin("fantasysmp")), + () -> cooldown.remove(player), + 25 + ); + } + + @Override + public ItemStack getHelmet() { +// helmet.setMaterial(Material.DRAGON_HEAD); + return super.getHelmet(); + } + + @Override + public ItemStack getChestplate() { + chestplate.setMaterial(Material.ELYTRA); + ItemStack item = super.getChestplate(); + item.addUnsafeEnchantment(Enchantment.PROTECTION, 4); + return item; + } + + public static void init() {} + + public DragonGear() { + this.setTier5(); + this.sword.name = "Dragon Sword"; + this.sword.customItemModel = "dragon_sword"; + + this.helmet.name = "Dragon Helmet"; + this.helmet.customItemModel = "dragon_helmet"; + this.helmet.customEquipmentModel = "dragon"; + + this.chestplate.name = "Dragon Chestplate"; + this.chestplate.customItemModel = "dragon_chestplate"; + this.chestplate.customEquipmentModel = "dragon"; + + this.leggings.name = "Dragon Leggings"; + this.leggings.customItemModel = "dragon_leggings"; + this.leggings.customEquipmentModel = "dragon"; + + this.boots.name = "Dragon Boots"; + this.boots.customItemModel = "dragon_boots"; + this.boots.customEquipmentModel = "dragon"; + + this.sword.lore = "A blade forged from dragon scales and chorus fruit"; + this.helmet.lore = "Forged from dragon scales and chorus fruit"; + this.chestplate.lore = "Forged from dragon scales and chorus fruit"; + this.leggings.lore = "Forged from dragon scales and chorus fruit"; + this.boots.lore = "Forged from dragon scales and chorus fruit"; + } +} diff --git a/src/main/java/dev/zxq5/fantasysmp/items/Lightning.java b/src/main/java/dev/zxq5/fantasysmp/items/gear/LightningSword.java similarity index 74% rename from src/main/java/dev/zxq5/fantasysmp/items/Lightning.java rename to src/main/java/dev/zxq5/fantasysmp/items/gear/LightningSword.java index d797980..194de83 100644 --- a/src/main/java/dev/zxq5/fantasysmp/items/Lightning.java +++ b/src/main/java/dev/zxq5/fantasysmp/items/gear/LightningSword.java @@ -1,38 +1,27 @@ -package dev.zxq5.fantasysmp.items; +package dev.zxq5.fantasysmp.items.gear; +import dev.zxq5.fantasysmp.items.GenericGearSet; import dev.zxq5.fantasysmp.util.LoreChecker; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.NamespacedKey; import org.bukkit.World; import org.bukkit.command.CommandExecutor; -import org.bukkit.entity.LightningStrike; -import org.bukkit.entity.LivingEntity; -import org.bukkit.entity.Player; +import org.bukkit.entity.*; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ShapedRecipe; -import org.bukkit.inventory.meta.ItemMeta; -import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; -import java.util.List; - -import static org.bukkit.Bukkit.broadcastMessage; import static org.bukkit.Bukkit.getServer; -public class Lightning extends GenericGearSet implements Listener, CommandExecutor { +public class LightningSword extends GenericGearSet implements Listener, CommandExecutor { @Override public boolean onCommand(org.bukkit.command.CommandSender sender, org.bukkit.command.Command command, String label, String[] args) { - if (!(args[0].equals("lightning"))) { - return false; - } - Player player = (Player) sender; - - player.getInventory().addItem(new Lightning().getSword()); + player.getInventory().addItem(this.getSword()); return true; } @@ -77,7 +66,6 @@ public class Lightning extends GenericGearSet implements Listener, CommandExecut @EventHandler public void onEntityDamage(org.bukkit.event.entity.EntityDamageEvent event) { if (event.getEntity() instanceof Player player) { - if (!(event .getDamageSource() .getDamageType() @@ -88,16 +76,30 @@ public class Lightning extends GenericGearSet implements Listener, CommandExecut if (LoreChecker.itemLoreContains(player.getInventory().getItemInMainHand(), this.sword.lore)) { event.setCancelled(true); + return; + } + } + } + + @EventHandler + public void onEntityDeath(org.bukkit.event.entity.EntityDeathEvent event) { + if (event.getEntity() instanceof Mob mob) { + if ( + event.getDamageSource().getDamageType().getKey().toString().equals("minecraft:lightning_bolt") + || event.getDamageSource().getDamageType().getKey().toString().equals("minecraft:on_fire") + ) { + Entity e = event.getEntity(); + ((ExperienceOrb) e.getLocation().getWorld().spawn(e.getLocation(), ExperienceOrb.class)).setExperience(10); } } } public static void init() {} - public Lightning() { + public LightningSword() { this.setTier5(); this.sword.name = "Lightning Sword"; - this.sword.customModel = "lightning_sword"; + this.sword.customItemModel = "lightning_sword"; this.sword.lore = "All who oppose shall be smitten."; } } diff --git a/src/main/java/dev/zxq5/fantasysmp/items/StevensWrath.java b/src/main/java/dev/zxq5/fantasysmp/items/gear/StevensWrath.java similarity index 76% rename from src/main/java/dev/zxq5/fantasysmp/items/StevensWrath.java rename to src/main/java/dev/zxq5/fantasysmp/items/gear/StevensWrath.java index b044eed..3369a31 100644 --- a/src/main/java/dev/zxq5/fantasysmp/items/StevensWrath.java +++ b/src/main/java/dev/zxq5/fantasysmp/items/gear/StevensWrath.java @@ -1,43 +1,26 @@ -package dev.zxq5.fantasysmp.items; +package dev.zxq5.fantasysmp.items.gear; +import dev.zxq5.fantasysmp.items.GenericGearSet; import dev.zxq5.fantasysmp.util.LoreChecker; import org.bukkit.*; import org.bukkit.command.CommandExecutor; -import org.bukkit.entity.LightningStrike; -import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; -import org.bukkit.inventory.ItemStack; -import org.bukkit.inventory.ShapedRecipe; -import org.bukkit.inventory.ShapelessRecipe; -import org.bukkit.inventory.SmithingTransformRecipe; -import org.bukkit.inventory.meta.ItemMeta; -import org.bukkit.potion.PotionEffect; - -import java.util.List; - -import static org.bukkit.Bukkit.broadcastMessage; -import static org.bukkit.Bukkit.getServer; public class StevensWrath extends GenericGearSet implements Listener, CommandExecutor { @Override public boolean onCommand(org.bukkit.command.CommandSender sender, org.bukkit.command.Command command, String label, String[] args) { - if (!(args[0].equals("wrath"))) { - return false; - } - Player player = (Player) sender; - - player.getInventory().addItem(new StevensWrath().getSword()); + player.getInventory().addItem(this.getSword()); return true; } @EventHandler public void onCraft(org.bukkit.event.inventory.PrepareItemCraftEvent event) { if (!event.getInventory().contains(Material.NETHERITE_BLOCK)) return; - if (!event.getInventory().contains(new Lightning().getSword())) return; + if (!event.getInventory().contains(new LightningSword().getSword())) return; event.getInventory().setResult(new StevensWrath().getSword()); } @@ -89,7 +72,7 @@ public class StevensWrath extends GenericGearSet implements Listener, CommandExe public StevensWrath() { this.setTier6(); this.sword.name = ChatColor.LIGHT_PURPLE + "Stevens Wrath" + ChatColor.RESET; - this.sword.customModel = "stevens_wrath"; + this.sword.customItemModel = "stevens_wrath"; this.sword.lore = ChatColor.LIGHT_PURPLE + "All who oppose the mighty Steven shall face his wrath of lightning."; } } diff --git a/src/main/java/dev/zxq5/fantasysmp/items/gear/TrueNetheriteGear.java b/src/main/java/dev/zxq5/fantasysmp/items/gear/TrueNetheriteGear.java new file mode 100644 index 0000000..b2f31ea --- /dev/null +++ b/src/main/java/dev/zxq5/fantasysmp/items/gear/TrueNetheriteGear.java @@ -0,0 +1,22 @@ +package dev.zxq5.fantasysmp.items.gear; + +import dev.zxq5.fantasysmp.items.GenericGearSet; +import org.bukkit.command.CommandExecutor; +import org.bukkit.event.Listener; + +public class TrueNetheriteGear extends GenericGearSet implements CommandExecutor, Listener { + @Override + public boolean onCommand(org.bukkit.command.CommandSender sender, org.bukkit.command.Command command, String label, String[] args) { + return false; + } + + @Override + public void registerRecipes() {} + + public TrueNetheriteGear() { + this.setTier6(); + this.sword.name = "True Netherite Sword"; + this.sword.customItemModel = "true_netherite_sword"; + this.sword.lore = "Destruction awaits."; + } +} diff --git a/src/main/java/dev/zxq5/fantasysmp/items/Witherite.java b/src/main/java/dev/zxq5/fantasysmp/items/gear/WitheriteGear.java similarity index 69% rename from src/main/java/dev/zxq5/fantasysmp/items/Witherite.java rename to src/main/java/dev/zxq5/fantasysmp/items/gear/WitheriteGear.java index 2aa5d67..0e03f95 100644 --- a/src/main/java/dev/zxq5/fantasysmp/items/Witherite.java +++ b/src/main/java/dev/zxq5/fantasysmp/items/gear/WitheriteGear.java @@ -1,38 +1,38 @@ -package dev.zxq5.fantasysmp.items; +package dev.zxq5.fantasysmp.items.gear; +import dev.zxq5.fantasysmp.items.GenericGearSet; import dev.zxq5.fantasysmp.util.LoreChecker; -import org.bukkit.Material; -import org.bukkit.NamespacedKey; +import org.bukkit.*; import org.bukkit.command.CommandExecutor; +import org.bukkit.entity.Fireball; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; +import org.bukkit.entity.WitherSkull; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; +import org.bukkit.event.block.Action; +import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.RecipeChoice; import org.bukkit.inventory.SmithingTransformRecipe; -import org.bukkit.inventory.meta.ItemMeta; -import org.bukkit.inventory.meta.components.CustomModelDataComponent; -import org.bukkit.inventory.meta.components.EquippableComponent; import org.bukkit.potion.PotionEffect; +import java.util.ArrayList; +import java.util.Objects; + import static org.bukkit.Bukkit.getServer; -public class Witherite extends GenericGearSet implements Listener, CommandExecutor { +public class WitheriteGear extends GenericGearSet implements Listener, CommandExecutor { + private ArrayList cooldown = new ArrayList<>(); @Override public boolean onCommand(org.bukkit.command.CommandSender sender, org.bukkit.command.Command command, String label, String[] args) { - if (!(args[0].equals("witherite"))) { - return false; - } - Player player = (Player) sender; - - player.getInventory().addItem(new Witherite().getSword()); - player.getInventory().addItem(new Witherite().getHelmet()); - player.getInventory().addItem(new Witherite().getChestplate()); - player.getInventory().addItem(new Witherite().getLeggings()); - player.getInventory().addItem(new Witherite().getBoots()); + player.getInventory().addItem(this.getSword()); + player.getInventory().addItem(this.getHelmet()); + player.getInventory().addItem(this.getChestplate()); + player.getInventory().addItem(this.getLeggings()); + player.getInventory().addItem(this.getBoots()); return true; } @@ -91,6 +91,32 @@ public class Witherite extends GenericGearSet implements Listener, CommandExecut } + @EventHandler + public void onPlayerInteract(PlayerInteractEvent event) { + Player player = event.getPlayer(); + ItemStack item = event.getItem(); // Get the item the player interacted with + + if (!(event.getAction() == Action.RIGHT_CLICK_AIR || event.getAction() == Action.RIGHT_CLICK_BLOCK)) { + return; + } + + if (!(LoreChecker.itemLoreContains(item, this.sword.lore))) return; + if (cooldown.contains(player)) return; + + Location location = player.getLocation(); + player.launchProjectile(WitherSkull.class); + player.playSound(location, Sound.ENTITY_WITHER_SHOOT, 1.0f, 1.0f); + World world = player.getWorld(); + world.spawnParticle(Particle.SOUL_FIRE_FLAME, location, 1); + + cooldown.add(player); + Bukkit.getScheduler().scheduleSyncDelayedTask( + Objects.requireNonNull(Bukkit.getPluginManager().getPlugin("fantasysmp")), + () -> cooldown.remove(player), + 25 + ); + } + @EventHandler public void onEntityPotionEffectEvent(org.bukkit.event.entity.EntityPotionEffectEvent event) { if (event.getEntity() instanceof Player player) { @@ -116,18 +142,26 @@ public class Witherite extends GenericGearSet implements Listener, CommandExecut public static void init() {} - public Witherite() { + public WitheriteGear() { this.setTier5(); this.sword.name = "Witherite Sword"; - this.sword.customModel = "witherite_sword"; + this.sword.customItemModel = "witherite_sword"; + this.helmet.name = "Witherite Helmet"; - this.helmet.customModel = "witherite_helmet"; + this.helmet.customItemModel = "witherite_helmet"; + this.helmet.customEquipmentModel = "witherite"; + this.chestplate.name = "Witherite Chestplate"; - this.chestplate.customModel = "witherite_chestplate"; + this.chestplate.customItemModel = "witherite_chestplate"; + this.chestplate.customEquipmentModel = "witherite"; + this.leggings.name = "Witherite Leggings"; - this.leggings.customModel = "witherite_leggings"; + this.leggings.customItemModel = "witherite_leggings"; + this.leggings.customEquipmentModel = "witherite"; + this.boots.name = "Witherite Boots"; - this.boots.customModel = "witherite_boots"; + this.boots.customItemModel = "witherite_boots"; + this.boots.customEquipmentModel = "witherite"; this.sword.lore = "A sword forged with the skulls of wither skeletons."; this.helmet.lore = "A helmet forged with the skulls of wither skeletons."; diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 2d73bfc..40b96b0 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -39,12 +39,6 @@ commands: permissions: - fantasysmp.admin: - description: Manage plugin - default: op - children: - fantasysmp.*: true - fantasysmp.items: description: create custom items from plugin default: false @@ -59,4 +53,14 @@ permissions: fantasysmp.home: description: commands for teleporting home - default: true \ No newline at end of file + default: true + + fantasysmp.admin: + description: Manage plugin + default: op + children: + fantasysmp.items: true + fantasysmp.manage_warps: true + fantasysmp.home: true + fantasysmp.warps: true + From c760ea20e5b6e0d1f21d2ccae6bb4a92ff502f4c Mon Sep 17 00:00:00 2001 From: zxq5 Date: Thu, 6 Feb 2025 09:21:56 +0000 Subject: [PATCH 2/9] # changes - added shoot wither skull ability to witherite (may be changed later idk, depends how people feel about it) - refactored custom gear set code to be more concise with less boilerplate # additions - added dragon armour - right click with sword to dash - chestplate is actually an elytra, uses a clientside resourcepack to render a chestplate as well. - chestplate has the armour value of prot4 netherite - added blazing armour - full set provides complete immunity to fire - right click with sword shoots three fireballs just like a blaze. - sword has the equivalent of fire aspect 3 built in. - started working on a basic abstract class for custom food and drinks to make additions easier in the future. # improved clientside resourcepack with new additions - dragon armour / sword - blazing armour / sword --- src/main/java/dev/zxq5/fantasysmp/Fantasysmp.java | 3 --- src/main/java/dev/zxq5/fantasysmp/items/Items.java | 6 ++---- .../items/gear/{WitheriteGear.java => Witherite.java} | 5 ++--- 3 files changed, 4 insertions(+), 10 deletions(-) rename src/main/java/dev/zxq5/fantasysmp/items/gear/{WitheriteGear.java => Witherite.java} (97%) diff --git a/src/main/java/dev/zxq5/fantasysmp/Fantasysmp.java b/src/main/java/dev/zxq5/fantasysmp/Fantasysmp.java index fdc2b73..ec5fdda 100644 --- a/src/main/java/dev/zxq5/fantasysmp/Fantasysmp.java +++ b/src/main/java/dev/zxq5/fantasysmp/Fantasysmp.java @@ -3,9 +3,6 @@ package dev.zxq5.fantasysmp; import dev.zxq5.fantasysmp.events.HereticWarner; import dev.zxq5.fantasysmp.events.StevenKillCheck; import dev.zxq5.fantasysmp.items.*; -import dev.zxq5.fantasysmp.items.gear.LightningSword; -import dev.zxq5.fantasysmp.items.gear.StevensWrath; -import dev.zxq5.fantasysmp.items.gear.WitheriteGear; import dev.zxq5.fantasysmp.warps.Warp; import dev.zxq5.fantasysmp.warps.Warper; import org.bukkit.plugin.java.JavaPlugin; diff --git a/src/main/java/dev/zxq5/fantasysmp/items/Items.java b/src/main/java/dev/zxq5/fantasysmp/items/Items.java index 9e7badd..67f007e 100644 --- a/src/main/java/dev/zxq5/fantasysmp/items/Items.java +++ b/src/main/java/dev/zxq5/fantasysmp/items/Items.java @@ -5,8 +5,6 @@ import org.bukkit.command.CommandExecutor; import org.bukkit.entity.Player; import org.bukkit.plugin.java.JavaPlugin; -import static org.bukkit.Bukkit.getServer; - public class Items implements CommandExecutor { @Override @@ -33,7 +31,7 @@ public class Items implements CommandExecutor { CommandExecutor handler; switch (args[0]) { - case "witherite" -> handler = new WitheriteGear(); + case "witherite" -> handler = new Witherite(); case "lightning" -> handler = new LightningSword(); case "steven" -> handler = new StevensWrath(); case "blazing" -> handler = new BlazingGear(); @@ -49,7 +47,7 @@ public class Items implements CommandExecutor { public Items(JavaPlugin plugin) { - WitheriteGear witherite = new WitheriteGear(); + Witherite witherite = new Witherite(); witherite.registerRecipes(); witherite.registerEvents(plugin); diff --git a/src/main/java/dev/zxq5/fantasysmp/items/gear/WitheriteGear.java b/src/main/java/dev/zxq5/fantasysmp/items/gear/Witherite.java similarity index 97% rename from src/main/java/dev/zxq5/fantasysmp/items/gear/WitheriteGear.java rename to src/main/java/dev/zxq5/fantasysmp/items/gear/Witherite.java index 0e03f95..a3394ce 100644 --- a/src/main/java/dev/zxq5/fantasysmp/items/gear/WitheriteGear.java +++ b/src/main/java/dev/zxq5/fantasysmp/items/gear/Witherite.java @@ -4,7 +4,6 @@ import dev.zxq5.fantasysmp.items.GenericGearSet; import dev.zxq5.fantasysmp.util.LoreChecker; import org.bukkit.*; import org.bukkit.command.CommandExecutor; -import org.bukkit.entity.Fireball; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.entity.WitherSkull; @@ -22,7 +21,7 @@ import java.util.Objects; import static org.bukkit.Bukkit.getServer; -public class WitheriteGear extends GenericGearSet implements Listener, CommandExecutor { +public class Witherite extends GenericGearSet implements Listener, CommandExecutor { private ArrayList cooldown = new ArrayList<>(); @Override @@ -142,7 +141,7 @@ public class WitheriteGear extends GenericGearSet implements Listener, CommandEx public static void init() {} - public WitheriteGear() { + public Witherite() { this.setTier5(); this.sword.name = "Witherite Sword"; this.sword.customItemModel = "witherite_sword"; From 3313ed197799c5957f3d53c31eeaad95a5adc951 Mon Sep 17 00:00:00 2001 From: zxq5 Date: Thu, 6 Feb 2025 09:25:34 +0000 Subject: [PATCH 3/9] renamed a file --- src/main/java/dev/zxq5/fantasysmp/items/Items.java | 4 ++-- .../items/gear/{Witherite.java => WitheriteGear.java} | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename src/main/java/dev/zxq5/fantasysmp/items/gear/{Witherite.java => WitheriteGear.java} (98%) diff --git a/src/main/java/dev/zxq5/fantasysmp/items/Items.java b/src/main/java/dev/zxq5/fantasysmp/items/Items.java index 67f007e..05dcf40 100644 --- a/src/main/java/dev/zxq5/fantasysmp/items/Items.java +++ b/src/main/java/dev/zxq5/fantasysmp/items/Items.java @@ -31,7 +31,7 @@ public class Items implements CommandExecutor { CommandExecutor handler; switch (args[0]) { - case "witherite" -> handler = new Witherite(); + case "witherite" -> handler = new WitheriteGear(); case "lightning" -> handler = new LightningSword(); case "steven" -> handler = new StevensWrath(); case "blazing" -> handler = new BlazingGear(); @@ -47,7 +47,7 @@ public class Items implements CommandExecutor { public Items(JavaPlugin plugin) { - Witherite witherite = new Witherite(); + WitheriteGear witherite = new WitheriteGear(); witherite.registerRecipes(); witherite.registerEvents(plugin); diff --git a/src/main/java/dev/zxq5/fantasysmp/items/gear/Witherite.java b/src/main/java/dev/zxq5/fantasysmp/items/gear/WitheriteGear.java similarity index 98% rename from src/main/java/dev/zxq5/fantasysmp/items/gear/Witherite.java rename to src/main/java/dev/zxq5/fantasysmp/items/gear/WitheriteGear.java index a3394ce..6a42389 100644 --- a/src/main/java/dev/zxq5/fantasysmp/items/gear/Witherite.java +++ b/src/main/java/dev/zxq5/fantasysmp/items/gear/WitheriteGear.java @@ -21,7 +21,7 @@ import java.util.Objects; import static org.bukkit.Bukkit.getServer; -public class Witherite extends GenericGearSet implements Listener, CommandExecutor { +public class WitheriteGear extends GenericGearSet implements Listener, CommandExecutor { private ArrayList cooldown = new ArrayList<>(); @Override @@ -141,7 +141,7 @@ public class Witherite extends GenericGearSet implements Listener, CommandExecut public static void init() {} - public Witherite() { + public WitheriteGear() { this.setTier5(); this.sword.name = "Witherite Sword"; this.sword.customItemModel = "witherite_sword"; From 2f3101a7f1043dbb064b22d55f7f38364878f951 Mon Sep 17 00:00:00 2001 From: zxq5 Date: Thu, 6 Feb 2025 13:23:55 +0000 Subject: [PATCH 4/9] started on xray detector --- .../zxq5/fantasysmp/events/XrayDetector.java | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 src/main/java/dev/zxq5/fantasysmp/events/XrayDetector.java diff --git a/src/main/java/dev/zxq5/fantasysmp/events/XrayDetector.java b/src/main/java/dev/zxq5/fantasysmp/events/XrayDetector.java new file mode 100644 index 0000000..2ac40aa --- /dev/null +++ b/src/main/java/dev/zxq5/fantasysmp/events/XrayDetector.java @@ -0,0 +1,57 @@ +package dev.zxq5.fantasysmp.events; + +import org.bukkit.Bukkit; +import org.bukkit.Material; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.block.BlockBreakEvent; +import org.bukkit.plugin.Plugin; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; + +import static org.bukkit.Bukkit.getConsoleSender; +import static org.bukkit.Bukkit.getPluginManager; + +public class XrayDetector implements Listener { + private HashMap> players = new HashMap<>(); + + private final ArrayList trackedBlocks = new ArrayList<>(Arrays.asList( + Material.ANCIENT_DEBRIS, + Material.DIAMOND_ORE, + Material.EMERALD_ORE, + Material.GOLD_ORE, + Material.IRON_ORE, + Material.LAPIS_ORE, + Material.REDSTONE_ORE + )); + + @EventHandler + public void onBlockBreak(BlockBreakEvent event) { + Player player = event.getPlayer(); + HashMap blocks = this.players.get(player); + Material block = event.getBlock().getType(); + Plugin plugin = getPluginManager().getPlugin("fantasysmp"); + + if (!this.players.containsKey(player)) { + this.players.put(player, new HashMap<>()); + } + + if (this.trackedBlocks.contains(block)) { + if (!(blocks.containsKey(block))) blocks.put(block, 0); + blocks.put(block, blocks.get(block) + 1); + + Bukkit.getScheduler().runTaskLater(plugin, () -> { + blocks.put(block, blocks.get(block) - 1); + }, 18000); + } + + for (HashMap.Entry nextBlock : blocks.entrySet()) { + if (nextBlock.getValue() > 30) { + getConsoleSender().sendMessage("Player " + player.getName() + " has broken 30 " + nextBlock.getKey().name() + " in the last 30 minutes!!! (possible xray)"); + } + } + } +} From db2a40e178d35b8c9747bdc9fe9faec90efd9922 Mon Sep 17 00:00:00 2001 From: zxq5 Date: Mon, 10 Feb 2025 16:49:57 +0000 Subject: [PATCH 5/9] worked on anticheat, added new item sets, refactored warps, working on teams and ranks - will be integrated with the warps system. working on general stability improvements / bugfixes --- .../java/dev/zxq5/fantasysmp/Fantasysmp.java | 11 +- .../dev/zxq5/fantasysmp/chatutils/Chat.java | 7 + .../zxq5/fantasysmp/events/XrayDetector.java | 95 ++++++++-- .../dev/zxq5/fantasysmp/groups/Commands.java | 49 +++++ .../dev/zxq5/fantasysmp/groups/Ranks.java | 4 + .../java/dev/zxq5/fantasysmp/groups/Team.java | 60 ++++++ .../zxq5/fantasysmp/items/GenericGearSet.java | 10 + .../java/dev/zxq5/fantasysmp/items/Items.java | 23 +++ .../fantasysmp/items/food/AppleCider.java | 85 +++++++++ .../fantasysmp/items/food/AppleJuice.java | 70 +++++++ .../fantasysmp/items/food/GenericDrink.java | 39 +++- .../fantasysmp/items/gear/BlazingGear.java | 22 ++- .../fantasysmp/items/gear/CrimsonGear.java | 69 +++++++ .../fantasysmp/items/gear/DragonGear.java | 47 ++++- .../zxq5/fantasysmp/items/gear/EnderGear.java | 109 +++++++++++ .../fantasysmp/items/gear/PoseidonGear.java | 94 ++++++++++ .../items/gear/TrueNetheriteGear.java | 34 +++- .../fantasysmp/items/gear/WitheriteGear.java | 22 +-- .../java/dev/zxq5/fantasysmp/warps/Warp.java | 13 ++ .../dev/zxq5/fantasysmp/warps/Warper.java | 177 ++++++++++++------ src/main/resources/plugin.yml | 18 +- 21 files changed, 944 insertions(+), 114 deletions(-) create mode 100644 src/main/java/dev/zxq5/fantasysmp/chatutils/Chat.java create mode 100644 src/main/java/dev/zxq5/fantasysmp/groups/Commands.java create mode 100644 src/main/java/dev/zxq5/fantasysmp/groups/Ranks.java create mode 100644 src/main/java/dev/zxq5/fantasysmp/groups/Team.java create mode 100644 src/main/java/dev/zxq5/fantasysmp/items/food/AppleCider.java create mode 100644 src/main/java/dev/zxq5/fantasysmp/items/food/AppleJuice.java create mode 100644 src/main/java/dev/zxq5/fantasysmp/items/gear/CrimsonGear.java create mode 100644 src/main/java/dev/zxq5/fantasysmp/items/gear/EnderGear.java create mode 100644 src/main/java/dev/zxq5/fantasysmp/items/gear/PoseidonGear.java diff --git a/src/main/java/dev/zxq5/fantasysmp/Fantasysmp.java b/src/main/java/dev/zxq5/fantasysmp/Fantasysmp.java index ec5fdda..2dd81f5 100644 --- a/src/main/java/dev/zxq5/fantasysmp/Fantasysmp.java +++ b/src/main/java/dev/zxq5/fantasysmp/Fantasysmp.java @@ -2,6 +2,7 @@ package dev.zxq5.fantasysmp; import dev.zxq5.fantasysmp.events.HereticWarner; import dev.zxq5.fantasysmp.events.StevenKillCheck; +import dev.zxq5.fantasysmp.events.XrayDetector; import dev.zxq5.fantasysmp.items.*; import dev.zxq5.fantasysmp.warps.Warp; import dev.zxq5.fantasysmp.warps.Warper; @@ -24,19 +25,19 @@ public final class Fantasysmp extends JavaPlugin { getCommand("home").setExecutor(new Warper()); getCommand("sethome").setExecutor(new Warper()); - getCommand("setwarp").setExecutor(new Warper()); + getCommand("delwarp").setExecutor(new Warper()); getCommand("warp").setExecutor(new Warper()); - - getCommand("reloadwarps").setExecutor(new Warper()); - - getServer().broadcastMessage("registered commands + \n /home \n /sethome \n /warp \n /setwarp"); + getCommand("rewarps").setExecutor(new Warper()); + getCommand("warps").setExecutor(new Warper()); getServer().getPluginManager().registerEvents(new StevenKillCheck(), this); HereticWarner hereticWarner = new HereticWarner(); hereticWarner.checkHereticInventory(); + XrayDetector xrayDetector = new XrayDetector(); + getServer().getPluginManager().registerEvents(xrayDetector, this); } @Override diff --git a/src/main/java/dev/zxq5/fantasysmp/chatutils/Chat.java b/src/main/java/dev/zxq5/fantasysmp/chatutils/Chat.java new file mode 100644 index 0000000..11abdd0 --- /dev/null +++ b/src/main/java/dev/zxq5/fantasysmp/chatutils/Chat.java @@ -0,0 +1,7 @@ +package dev.zxq5.fantasysmp.chatutils; + +import org.bukkit.ChatColor; + +public class Chat { + public static String EVENTPREFIX = ChatColor.WHITE + "<" + ChatColor.AQUA + "Server" + ChatColor.WHITE + "> " + ChatColor.RESET; +} diff --git a/src/main/java/dev/zxq5/fantasysmp/events/XrayDetector.java b/src/main/java/dev/zxq5/fantasysmp/events/XrayDetector.java index 2ac40aa..cf0f9fb 100644 --- a/src/main/java/dev/zxq5/fantasysmp/events/XrayDetector.java +++ b/src/main/java/dev/zxq5/fantasysmp/events/XrayDetector.java @@ -1,5 +1,6 @@ package dev.zxq5.fantasysmp.events; +import com.google.gson.Gson; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -8,15 +9,24 @@ import org.bukkit.event.Listener; import org.bukkit.event.block.BlockBreakEvent; import org.bukkit.plugin.Plugin; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +import java.net.URI; +import java.net.URL; +import java.net.http.HttpClient; +import java.net.http.HttpRequest; +import java.net.http.HttpResponse; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; +import java.util.Map; -import static org.bukkit.Bukkit.getConsoleSender; -import static org.bukkit.Bukkit.getPluginManager; +import static org.bukkit.Bukkit.*; public class XrayDetector implements Listener { - private HashMap> players = new HashMap<>(); + private final HashMap> players = new HashMap<>(); + private String token; private final ArrayList trackedBlocks = new ArrayList<>(Arrays.asList( Material.ANCIENT_DEBRIS, @@ -31,13 +41,12 @@ public class XrayDetector implements Listener { @EventHandler public void onBlockBreak(BlockBreakEvent event) { Player player = event.getPlayer(); - HashMap blocks = this.players.get(player); + HashMap blocks; Material block = event.getBlock().getType(); Plugin plugin = getPluginManager().getPlugin("fantasysmp"); - if (!this.players.containsKey(player)) { - this.players.put(player, new HashMap<>()); - } + if (!this.players.containsKey(player)) this.players.put(player, new HashMap<>()); + blocks = this.players.get(player); if (this.trackedBlocks.contains(block)) { if (!(blocks.containsKey(block))) blocks.put(block, 0); @@ -45,13 +54,71 @@ public class XrayDetector implements Listener { Bukkit.getScheduler().runTaskLater(plugin, () -> { blocks.put(block, blocks.get(block) - 1); - }, 18000); - } - - for (HashMap.Entry nextBlock : blocks.entrySet()) { - if (nextBlock.getValue() > 30) { - getConsoleSender().sendMessage("Player " + player.getName() + " has broken 30 " + nextBlock.getKey().name() + " in the last 30 minutes!!! (possible xray)"); - } + }, 1200); } } + + private void uploadData() { + HashMap> data = new HashMap<>(); + for (Map.Entry> entry : players.entrySet()) { + HashMap materials = new HashMap<>(); + + for (Map.Entry materialEntry : entry.getValue().entrySet()) { + materials.put(materialEntry.getKey().toString(), materialEntry.getValue()); + } + + data.put(entry.getKey().getName(), materials); + } + + Gson gson = new Gson(); + + HttpClient client = HttpClient.newHttpClient(); + HttpRequest request = HttpRequest.newBuilder(URI.create("https://mcapi.zxq5.dev/xray?token=" + token)) + .header("Content-Type", "application/json") + .POST(HttpRequest.BodyPublishers.ofString(gson.toJson(data))) + .build(); + + client.sendAsync(request, HttpResponse.BodyHandlers.ofString()) + .thenApply(HttpResponse::body) + .join(); + } + + public XrayDetector() { + File dataFolder = getServer().getPluginManager().getPlugin("Fantasysmp").getDataFolder(); + File file = new File(dataFolder, "token.txt"); + + BufferedReader reader; + try { + reader = new BufferedReader(new FileReader(file)); + this.token = reader.readLine(); + } catch (Exception e) { + e.printStackTrace(); + return; + } + + Bukkit.getScheduler().runTaskTimerAsynchronously(getPluginManager().getPlugin("fantasysmp"), this::uploadData, 0, 20 * 60); + } } + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/dev/zxq5/fantasysmp/groups/Commands.java b/src/main/java/dev/zxq5/fantasysmp/groups/Commands.java new file mode 100644 index 0000000..93bed17 --- /dev/null +++ b/src/main/java/dev/zxq5/fantasysmp/groups/Commands.java @@ -0,0 +1,49 @@ +package dev.zxq5.fantasysmp.groups; + +import org.bukkit.command.CommandExecutor; +import org.bukkit.entity.Player; + +/* + * Commands: + * + * ** PLAYER ** + * + * team list => TODO + * team create => TODO + * team rename => TODO + * team transfer => TODO + * team join => TODO + * team invite => TODO + * team leave => TODO + * team disband => TODO + * team setwarp => TODO + * team delwarp => TODO + * team kick => TODO + * team log => TODO + * + * ** ADMIN ONLY ** + * + * rank create => TODO + * rank rename => TODO + * rank delete => TODO + * rank add => TODO + * rank remove => TODO + * */ + +public class Commands implements CommandExecutor { + + @Override + public boolean onCommand(org.bukkit.command.CommandSender sender, org.bukkit.command.Command command, String label, String[] args) { + if (!(sender instanceof Player player)) return false; + + if (command.getName().equals("team")) handleTeamCommands(player, args); + if (command.getName().equals("rank")) handleRankCommands(player, args); + return true; + } + + public void handleTeamCommands(Player player, String[] args) {} + + public void handleRankCommands(Player player, String[] args) {} + + public Commands() {} +} diff --git a/src/main/java/dev/zxq5/fantasysmp/groups/Ranks.java b/src/main/java/dev/zxq5/fantasysmp/groups/Ranks.java new file mode 100644 index 0000000..4f7fc01 --- /dev/null +++ b/src/main/java/dev/zxq5/fantasysmp/groups/Ranks.java @@ -0,0 +1,4 @@ +package dev.zxq5.fantasysmp.groups; + +public class Ranks { +} diff --git a/src/main/java/dev/zxq5/fantasysmp/groups/Team.java b/src/main/java/dev/zxq5/fantasysmp/groups/Team.java new file mode 100644 index 0000000..3a2ae0d --- /dev/null +++ b/src/main/java/dev/zxq5/fantasysmp/groups/Team.java @@ -0,0 +1,60 @@ +package dev.zxq5.fantasysmp.groups; + +import com.google.gson.Gson; +import java.io.*; +import static org.bukkit.Bukkit.getServer; + +public class Team { + private static Team[] teams; + + private String name; + private String ownerUUID; + private String[] members; + private String[] tag; + + public static void loadTeams() throws Exception { + File dataFolder = getServer().getPluginManager().getPlugin("Fantasysmp").getDataFolder(); + File file = new File(dataFolder, "warps.json"); + + if (!file.exists()) { + createTeamsFile(); + } + + BufferedReader reader; + reader = new BufferedReader(new FileReader(file)); + + Gson gson = new Gson(); + teams = gson.fromJson(reader, Team[].class); + + reader.close(); + } + + public static void saveTeams() throws Exception { + File dataFolder = getServer().getPluginManager().getPlugin("Fantasysmp").getDataFolder(); + File file = new File(dataFolder, "teams.json"); + + Gson gson = new Gson(); + String json = gson.toJson(teams); + Writer writer = new FileWriter(file); + writer.write(json); + writer.close(); + } + + public static void createTeamsFile() { + File dataFolder = getServer().getPluginManager().getPlugin("Fantasysmp").getDataFolder(); + File file = new File(dataFolder, "teams.json"); + + if (!file.exists()) { + try { + Team[] t = new Team[0]; + Gson gson = new Gson(); + String json = gson.toJson(t); + Writer writer = new FileWriter(file); + writer.write(json); + writer.close(); + } catch (Exception e) { + e.printStackTrace(); + } + } + } +} diff --git a/src/main/java/dev/zxq5/fantasysmp/items/GenericGearSet.java b/src/main/java/dev/zxq5/fantasysmp/items/GenericGearSet.java index 32baa68..5195f91 100644 --- a/src/main/java/dev/zxq5/fantasysmp/items/GenericGearSet.java +++ b/src/main/java/dev/zxq5/fantasysmp/items/GenericGearSet.java @@ -1,11 +1,13 @@ package dev.zxq5.fantasysmp.items; +import dev.zxq5.fantasysmp.util.LoreChecker; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.NamespacedKey; import org.bukkit.attribute.Attribute; import org.bukkit.attribute.AttributeModifier; +import org.bukkit.entity.Player; import org.bukkit.event.Listener; import org.bukkit.inventory.*; import org.bukkit.inventory.meta.ItemMeta; @@ -123,6 +125,14 @@ public abstract class GenericGearSet implements HasRecipes, Listener { boots.knockbackResistance = 0.1; } + public boolean hasGear(Player player) { + return (LoreChecker.itemLoreContains(player.getInventory().getHelmet(), this.helmet.lore) + && LoreChecker.itemLoreContains(player.getInventory().getChestplate(), this.chestplate.lore) + && LoreChecker.itemLoreContains(player.getInventory().getLeggings(), this.leggings.lore) + && LoreChecker.itemLoreContains(player.getInventory().getBoots(), this.boots.lore) + ); + } + // this must be overridden by the child class. public static void init() {} diff --git a/src/main/java/dev/zxq5/fantasysmp/items/Items.java b/src/main/java/dev/zxq5/fantasysmp/items/Items.java index 05dcf40..96f0c03 100644 --- a/src/main/java/dev/zxq5/fantasysmp/items/Items.java +++ b/src/main/java/dev/zxq5/fantasysmp/items/Items.java @@ -1,5 +1,7 @@ package dev.zxq5.fantasysmp.items; +import dev.zxq5.fantasysmp.items.food.AppleCider; +import dev.zxq5.fantasysmp.items.food.AppleJuice; import dev.zxq5.fantasysmp.items.gear.*; import org.bukkit.command.CommandExecutor; import org.bukkit.entity.Player; @@ -37,6 +39,9 @@ public class Items implements CommandExecutor { case "blazing" -> handler = new BlazingGear(); case "dragon" -> handler = new DragonGear(); case "trueneth" -> handler = new TrueNetheriteGear(); + case "ender" -> handler = new EnderGear(); + case "poseidon" -> handler = new PoseidonGear(); + case "crimson" -> handler = new CrimsonGear(); default -> { return false; } } @@ -67,8 +72,26 @@ public class Items implements CommandExecutor { dragon.registerRecipes(); dragon.registerEvents(plugin); + EnderGear ender = new EnderGear(); + ender.registerRecipes(); + ender.registerEvents(plugin); + TrueNetheriteGear trueNetherite = new TrueNetheriteGear(); trueNetherite.registerRecipes(); trueNetherite.registerEvents(plugin); + + PoseidonGear poseidon = new PoseidonGear(); + poseidon.registerRecipes(); + poseidon.registerEvents(plugin); + + CrimsonGear crimson = new CrimsonGear(); + crimson.registerRecipes(); + crimson.registerEvents(plugin); + + AppleJuice appleJuice = new AppleJuice(); + appleJuice.registerEvents(plugin); + + AppleCider appleCider = new AppleCider(); + appleCider.registerEvents(plugin); } } diff --git a/src/main/java/dev/zxq5/fantasysmp/items/food/AppleCider.java b/src/main/java/dev/zxq5/fantasysmp/items/food/AppleCider.java new file mode 100644 index 0000000..67de93e --- /dev/null +++ b/src/main/java/dev/zxq5/fantasysmp/items/food/AppleCider.java @@ -0,0 +1,85 @@ +package dev.zxq5.fantasysmp.items.food; + +import org.bukkit.Bukkit; +import org.bukkit.Material; +import org.bukkit.entity.Player; +import org.bukkit.inventory.ItemStack; +import org.bukkit.inventory.meta.PotionMeta; +import org.bukkit.inventory.meta.components.FoodComponent; +import org.bukkit.potion.PotionEffectType; + +public class AppleCider extends GenericDrink { + + public boolean onCommand(org.bukkit.command.CommandSender sender, org.bukkit.command.Command command, String label, String[] args) { + Player player = (Player) sender; + player.getInventory().addItem(this.getDrink()); + return true; + } + + public AppleCider() { + this.name = "Apple Cider"; + this.lore = "A stronger drink"; + + this.ingredients.put(new ItemStack(Material.APPLE, 1), 1); + this.ingredients.put(new AppleJuice().getDrink(), 1); + this.ingredients.put(new ItemStack(Material.SUGAR, 1), 1); + } + + @Override + public ItemStack getDrink() { + ItemStack item = super.getDrink(); + PotionMeta meta = (PotionMeta) item.getItemMeta(); + + if (meta == null) { + Bukkit.getConsoleSender().sendMessage("Meta is null on a drink!!!!! this should not happen!!!!"); + return item; + } + + meta.addCustomEffect(new org.bukkit.potion.PotionEffect( + PotionEffectType.SATURATION, 20, 5 + ), true); + meta.addCustomEffect(new org.bukkit.potion.PotionEffect( + PotionEffectType.SPEED, 10 * 20, 1 + ), true); + + meta.setColor(org.bukkit.Color.fromRGB(255, 255, 0)); + meta.setMaxStackSize(16); + FoodComponent food = meta.getFood(); + food.setNutrition(8); + food.setSaturation(8); + food.setCanAlwaysEat(true); + meta.setFood(food); + + item.setItemMeta(meta); + return item; + } + + @Override + public void registerRecipes() {} +} + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/dev/zxq5/fantasysmp/items/food/AppleJuice.java b/src/main/java/dev/zxq5/fantasysmp/items/food/AppleJuice.java new file mode 100644 index 0000000..d0cdac9 --- /dev/null +++ b/src/main/java/dev/zxq5/fantasysmp/items/food/AppleJuice.java @@ -0,0 +1,70 @@ +package dev.zxq5.fantasysmp.items.food; + +import org.bukkit.Material; +import org.bukkit.entity.Player; +import org.bukkit.inventory.ItemStack; +import org.bukkit.inventory.meta.PotionMeta; +import org.bukkit.inventory.meta.components.FoodComponent; + +public class AppleJuice extends GenericDrink { + + public boolean onCommand(org.bukkit.command.CommandSender sender, org.bukkit.command.Command command, String label, String[] args) { + Player player = (Player) sender; + player.getInventory().addItem(this.getDrink()); + return true; + } + + public AppleJuice() { + this.name = "Apple Juice"; + this.lore = "A refreshing drink"; + + this.ingredients.put(new ItemStack(Material.APPLE, 1), 1); + this.ingredients.put(GenericDrink.WATER_BOTTLE, 1); + } + + @Override + public ItemStack getDrink() { + ItemStack item = super.getDrink(); + PotionMeta meta = (PotionMeta) item.getItemMeta(); + + meta.setColor(org.bukkit.Color.fromRGB(255, 255, 0)); + meta.setMaxStackSize(16); + FoodComponent food = meta.getFood(); + food.setNutrition(6); + food.setSaturation(6); + food.setCanAlwaysEat(true); + meta.setFood(food); + + item.setItemMeta(meta); + return item; + } + + @Override + public void registerRecipes() {} +} + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/dev/zxq5/fantasysmp/items/food/GenericDrink.java b/src/main/java/dev/zxq5/fantasysmp/items/food/GenericDrink.java index 2ca88f1..f1ea21a 100644 --- a/src/main/java/dev/zxq5/fantasysmp/items/food/GenericDrink.java +++ b/src/main/java/dev/zxq5/fantasysmp/items/food/GenericDrink.java @@ -1,25 +1,52 @@ package dev.zxq5.fantasysmp.items.food; import dev.zxq5.fantasysmp.items.HasRecipes; +import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.command.CommandExecutor; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.PotionMeta; +import org.bukkit.plugin.Plugin; -import java.util.ArrayList; -import java.util.List; +import java.util.*; public abstract class GenericDrink implements Listener, CommandExecutor, HasRecipes { - public String name; - public String lore; + protected static ItemStack WATER_BOTTLE = new ItemStack(Material.GLASS_BOTTLE, 1); + protected HashMap ingredients = new HashMap<>(); + + protected String name; + protected String lore; + + public void registerEvents(Plugin plugin) { + Bukkit.getServer().getPluginManager().registerEvents(this, plugin); + } @EventHandler - public abstract void itemCraftingHandler(org.bukkit.event.inventory.PrepareItemCraftEvent event); + public void itemCraftingHandler(org.bukkit.event.inventory.PrepareItemCraftEvent event) { + ItemStack item = getDrink(); + int sum = ingredients + .values() + .stream() + .mapToInt(Integer::intValue) + .sum(); + + long count = Arrays + .stream(event.getInventory().getMatrix()) + .filter(Objects::nonNull) + .mapToInt(ItemStack::getAmount) + .sum(); + + if (sum != count) return; + for (ItemStack ingredient : ingredients.keySet()) { + if (!event.getInventory().containsAtLeast(ingredient, ingredients.get(ingredient))) return; + } + event.getInventory().setResult(item); + } @Override - public abstract boolean onCommand(org.bukkit.command.CommandSender sender, org.bukkit.command.Command command, String label, String[] args); + public abstract boolean onCommand(org.bukkit.command.CommandSender csender, org.bukkit.command.Command command, String label, String[] args); public abstract void registerRecipes(); diff --git a/src/main/java/dev/zxq5/fantasysmp/items/gear/BlazingGear.java b/src/main/java/dev/zxq5/fantasysmp/items/gear/BlazingGear.java index 88283a8..557f1a0 100644 --- a/src/main/java/dev/zxq5/fantasysmp/items/gear/BlazingGear.java +++ b/src/main/java/dev/zxq5/fantasysmp/items/gear/BlazingGear.java @@ -23,6 +23,7 @@ import org.bukkit.potion.PotionEffectType; import org.bukkit.util.Vector; import java.util.ArrayList; +import java.util.List; import java.util.Objects; import static org.bukkit.Bukkit.*; @@ -30,6 +31,13 @@ import static org.bukkit.Bukkit.*; public class BlazingGear extends GenericGearSet implements Listener, CommandExecutor { private ArrayList cooldown = new ArrayList<>(); + private final ArrayList damageTypes = new ArrayList<>(List.of( + DamageType.HOT_FLOOR, + DamageType.ON_FIRE, + DamageType.IN_FIRE, + DamageType.LAVA + )); + @Override public boolean onCommand(org.bukkit.command.CommandSender sender, org.bukkit.command.Command command, String label, String[] args) { Player player = (Player) sender; @@ -54,9 +62,7 @@ public class BlazingGear extends GenericGearSet implements Listener, CommandExec if (!(LoreChecker.itemLoreContains(player.getInventory().getLeggings(), this.leggings.lore))) return; if (!(LoreChecker.itemLoreContains(player.getInventory().getBoots(), this.boots.lore))) return; - if (event.getDamageSource().getDamageType() == DamageType.ON_FIRE) event.setCancelled(true); - if (event.getDamageSource().getDamageType() == DamageType.IN_FIRE) event.setCancelled(true); - if (event.getDamageSource().getDamageType() == DamageType.LAVA) event.setCancelled(true); + if (damageTypes.contains(event.getDamageSource().getDamageType())) event.setCancelled(true); player.setFireTicks(0); } @@ -102,22 +108,22 @@ public class BlazingGear extends GenericGearSet implements Listener, CommandExec public BlazingGear() { this.setTier4(); - this.sword.name = "Blazing Sword"; + this.sword.name = ChatColor.GOLD + "Blazing Sword" + ChatColor.RESET; this.sword.customItemModel = "blazing_sword"; - this.helmet.name = "Blazing Helmet"; + this.helmet.name = ChatColor.GOLD + "Blazing Helmet" + ChatColor.RESET; this.helmet.customItemModel = "blazing_helmet"; this.helmet.customEquipmentModel = "blazing"; - this.chestplate.name = "Blazing Chestplate"; + this.chestplate.name = ChatColor.GOLD + "Blazing Chestplate" + ChatColor.RESET; this.chestplate.customItemModel = "blazing_chestplate"; this.chestplate.customEquipmentModel = "blazing"; - this.leggings.name = "Blazing Leggings"; + this.leggings.name = ChatColor.GOLD + "Blazing Leggings" + ChatColor.RESET; this.leggings.customItemModel = "blazing_leggings"; this.leggings.customEquipmentModel = "blazing"; - this.boots.name = "Blazing Boots"; + this.boots.name = ChatColor.GOLD + "Blazing Boots" + ChatColor.RESET; this.boots.customItemModel = "blazing_boots"; this.boots.customEquipmentModel = "blazing"; diff --git a/src/main/java/dev/zxq5/fantasysmp/items/gear/CrimsonGear.java b/src/main/java/dev/zxq5/fantasysmp/items/gear/CrimsonGear.java new file mode 100644 index 0000000..8e6ca49 --- /dev/null +++ b/src/main/java/dev/zxq5/fantasysmp/items/gear/CrimsonGear.java @@ -0,0 +1,69 @@ +package dev.zxq5.fantasysmp.items.gear; + +import dev.zxq5.fantasysmp.items.GenericGearSet; +import dev.zxq5.fantasysmp.util.LoreChecker; +import org.bukkit.ChatColor; +import org.bukkit.command.CommandExecutor; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; + +public class CrimsonGear extends GenericGearSet implements CommandExecutor, Listener { + @Override + public boolean onCommand(org.bukkit.command.CommandSender sender, org.bukkit.command.Command command, String label, String[] args) { + Player player = (Player) sender; + + player.getInventory().addItem(this.getSword()); + player.getInventory().addItem(this.getHelmet()); + player.getInventory().addItem(this.getChestplate()); + player.getInventory().addItem(this.getLeggings()); + player.getInventory().addItem(this.getBoots()); + return true; + } + + @EventHandler + public void onEntityDamageByEntity(org.bukkit.event.entity.EntityDamageByEntityEvent event) { + if (!(event.getDamager() instanceof Player player)) return; + if (!(LoreChecker.itemLoreContains(player.getInventory().getItemInMainHand(), this.sword.lore))) return; + + player.setHealth( Math.min(player.getHealth() + 1, player.getMaxHealth()) ); + + if (!(LoreChecker.itemLoreContains(player.getInventory().getHelmet(), this.helmet.lore))) return; + if (!(LoreChecker.itemLoreContains(player.getInventory().getChestplate(), this.chestplate.lore))) return; + if (!(LoreChecker.itemLoreContains(player.getInventory().getLeggings(), this.leggings.lore))) return; + if (!(LoreChecker.itemLoreContains(player.getInventory().getBoots(), this.boots.lore))) return; + + player.setHealth( Math.min(player.getHealth() + 1, player.getMaxHealth()) ); + player.setFoodLevel( Math.min(player.getFoodLevel() + 1, 20) ); + } + + @Override + public void registerRecipes() {} + + public CrimsonGear() { + this.setTier5(); + this.sword.name = ChatColor.DARK_RED + "Bloodlust" + ChatColor.RESET; + this.sword.customItemModel = "crimson_sword"; + this.sword.lore = "Live off the blood of your enemies."; + + this.helmet.name = ChatColor.DARK_RED + "Crimson Helmet" + ChatColor.RESET; + this.helmet.customItemModel = "crimson_helmet"; + this.helmet.customEquipmentModel = "crimson"; + this.helmet.lore = "A helmet that grants its wearer vampiric senses."; + + this.chestplate.name = ChatColor.DARK_RED + "Crimson Chestplate" + ChatColor.RESET; + this.chestplate.customItemModel = "crimson_chestplate"; + this.chestplate.customEquipmentModel = "crimson"; + this.chestplate.lore = "A chestplate that strengthens the heart of the wearer."; + + this.leggings.name = ChatColor.DARK_RED + "Crimson Leggings" + ChatColor.RESET; + this.leggings.customItemModel = "crimson_leggings"; + this.leggings.customEquipmentModel = "crimson"; + this.leggings.lore = "Leggings that enhance the wearer's speed and agility."; + + this.boots.name = ChatColor.DARK_RED + "Crimson Boots" + ChatColor.RESET; + this.boots.customItemModel = "crimson_boots"; + this.boots.customEquipmentModel = "crimson"; + this.boots.lore = "Boots that allow the wearer to move silently and swiftly."; + } +} diff --git a/src/main/java/dev/zxq5/fantasysmp/items/gear/DragonGear.java b/src/main/java/dev/zxq5/fantasysmp/items/gear/DragonGear.java index 3bf4762..dea0df8 100644 --- a/src/main/java/dev/zxq5/fantasysmp/items/gear/DragonGear.java +++ b/src/main/java/dev/zxq5/fantasysmp/items/gear/DragonGear.java @@ -7,6 +7,7 @@ import org.bukkit.*; import org.bukkit.attribute.Attribute; import org.bukkit.attribute.AttributeModifier; import org.bukkit.command.CommandExecutor; +import org.bukkit.damage.DamageType; import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; @@ -26,6 +27,7 @@ import java.util.List; import java.util.Objects; import java.util.UUID; +import static org.bukkit.Bukkit.broadcastMessage; import static org.bukkit.Bukkit.getServer; public class DragonGear extends GenericGearSet implements Listener, CommandExecutor { @@ -69,6 +71,36 @@ public class DragonGear extends GenericGearSet implements Listener, CommandExecu } } + @EventHandler + public void onEntityDamage(org.bukkit.event.entity.EntityDamageEvent event) { + // check if fall damage + if (!(event.getEntity() instanceof Player player)) return; + if (!(LoreChecker.itemLoreContains(player.getInventory().getHelmet(), this.helmet.lore) + && LoreChecker.itemLoreContains(player.getInventory().getChestplate(), this.chestplate.lore) + && LoreChecker.itemLoreContains(player.getInventory().getLeggings(), this.leggings.lore) + && LoreChecker.itemLoreContains(player.getInventory().getBoots(), this.boots.lore) + )) return; + if (!(event.getDamageSource().getDamageType() == DamageType.FLY_INTO_WALL)) return; + + event.setCancelled(true); + } + + @EventHandler + public void onEntityDamageByEntity(org.bukkit.event.entity.EntityDamageByEntityEvent event) { + if (!(event.getDamager() instanceof Player player)) return; + if (!(LoreChecker.itemLoreContains(player.getInventory().getItemInMainHand(), this.sword.lore))) return; + if (!(player.isFlying() || player.isGliding())) return; + + double baseDamage = event.getDamage(); + double newDamage = baseDamage * Math.min(Math.max(player.getVelocity().length(), 1.0), 2.0); + + broadcastMessage("damage " + baseDamage); + broadcastMessage("velocity " + player.getVelocity().length()); + broadcastMessage("new damage " + newDamage); + + event.setDamage(newDamage); + } + @EventHandler public void onPlayerInteract(PlayerInteractEvent event) { Player player = event.getPlayer(); @@ -83,10 +115,11 @@ public class DragonGear extends GenericGearSet implements Listener, CommandExecu Location location = player.getLocation(); Vector direction = location.getDirection(); + player.setVelocity(direction.multiply(2.0)); - player.playSound(location, Sound.ENTITY_ENDERMAN_TELEPORT, 1.0f, 1.0f); + player.playSound(location, Sound.ENTITY_ENDER_DRAGON_FLAP, 1.0f, 1.0f); World world = player.getWorld(); - world.spawnParticle(Particle.PORTAL, location, 1); + world.spawnParticle(Particle.DRAGON_BREATH, location, 100); cooldown.add(player); Bukkit.getScheduler().scheduleSyncDelayedTask( @@ -114,22 +147,22 @@ public class DragonGear extends GenericGearSet implements Listener, CommandExecu public DragonGear() { this.setTier5(); - this.sword.name = "Dragon Sword"; + this.sword.name = ChatColor.DARK_PURPLE + "Dragon Sword" + ChatColor.RESET; this.sword.customItemModel = "dragon_sword"; - this.helmet.name = "Dragon Helmet"; + this.helmet.name = ChatColor.DARK_PURPLE + "Dragon Helmet" + ChatColor.RESET; this.helmet.customItemModel = "dragon_helmet"; this.helmet.customEquipmentModel = "dragon"; - this.chestplate.name = "Dragon Chestplate"; + this.chestplate.name = ChatColor.DARK_PURPLE + "Dragon Chestplate" + ChatColor.RESET; this.chestplate.customItemModel = "dragon_chestplate"; this.chestplate.customEquipmentModel = "dragon"; - this.leggings.name = "Dragon Leggings"; + this.leggings.name = ChatColor.DARK_PURPLE + "Dragon Leggings" + ChatColor.RESET; this.leggings.customItemModel = "dragon_leggings"; this.leggings.customEquipmentModel = "dragon"; - this.boots.name = "Dragon Boots"; + this.boots.name = ChatColor.DARK_PURPLE + "Dragon Boots" + ChatColor.RESET; this.boots.customItemModel = "dragon_boots"; this.boots.customEquipmentModel = "dragon"; diff --git a/src/main/java/dev/zxq5/fantasysmp/items/gear/EnderGear.java b/src/main/java/dev/zxq5/fantasysmp/items/gear/EnderGear.java new file mode 100644 index 0000000..3b1fe5a --- /dev/null +++ b/src/main/java/dev/zxq5/fantasysmp/items/gear/EnderGear.java @@ -0,0 +1,109 @@ +package dev.zxq5.fantasysmp.items.gear; + +import dev.zxq5.fantasysmp.items.GenericGearSet; +import dev.zxq5.fantasysmp.util.LoreChecker; +import org.bukkit.*; +import org.bukkit.block.Block; +import org.bukkit.command.CommandExecutor; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.block.Action; +import org.bukkit.event.player.PlayerInteractEvent; +import org.bukkit.inventory.*; +import org.bukkit.util.Vector; + +import java.util.ArrayList; +import java.util.Objects; + +public class EnderGear extends GenericGearSet implements Listener, CommandExecutor { + private ArrayList cooldown = new ArrayList<>(); + + @Override + public boolean onCommand(org.bukkit.command.CommandSender sender, org.bukkit.command.Command command, String label, String[] args) { + Player player = (Player) sender; + player.getInventory().addItem(this.getSword()); + player.getInventory().addItem(this.getHelmet()); + player.getInventory().addItem(this.getChestplate()); + player.getInventory().addItem(this.getLeggings()); + player.getInventory().addItem(this.getBoots()); + + return true; + } + + @Override + public void registerRecipes() {} + + @EventHandler + public void onPlayerInteract(PlayerInteractEvent event) { + Player player = event.getPlayer(); + ItemStack item = event.getItem(); // Get the item the player interacted with + + if (!(event.getAction() == Action.RIGHT_CLICK_AIR || event.getAction() == Action.RIGHT_CLICK_BLOCK)) { + return; + } + + if (!(LoreChecker.itemLoreContains(item, this.sword.lore))) return; + if (cooldown.contains(player)) return; + + Location old_location = player.getLocation(); + World world = player.getWorld(); + Vector direction = old_location.getDirection(); + // find nearest block in that direction + + Block block = player.getTargetBlock(null, 64); + + if (block.getType() == Material.AIR || block.getType() == Material.CAVE_AIR) { + return; + } + + player.playSound(old_location, Sound.ENTITY_ENDERMAN_TELEPORT, 1.0f, 1.0f); + world.spawnParticle(Particle.PORTAL, old_location, 100); + + Location new_location = block.getLocation(); + new_location.setPitch(old_location.getPitch()); + new_location.setYaw(old_location.getYaw()); + player.setVelocity(new Vector(player.getVelocity().getX(), 0, player.getVelocity().getZ())); + player.teleport(new_location); + + player.playSound(new_location, Sound.ENTITY_ENDERMAN_TELEPORT, 1.0f, 1.0f); + world.spawnParticle(Particle.PORTAL, new_location, 100); + + cooldown.add(player); + Bukkit.getScheduler().scheduleSyncDelayedTask( + Objects.requireNonNull(Bukkit.getPluginManager().getPlugin("fantasysmp")), + () -> cooldown.remove(player), + 25 + ); + } + + public static void init() {} + + public EnderGear() { + this.setTier4(); + this.sword.name = ChatColor.DARK_AQUA + "Ender Sword" + ChatColor.RESET; + this.sword.customItemModel = "ender_sword"; + + this.helmet.name = ChatColor.DARK_AQUA + "Ender Helmet" + ChatColor.RESET; + this.helmet.customItemModel = "ender_helmet"; + this.helmet.customEquipmentModel = "ender"; + + this.chestplate.name = ChatColor.DARK_AQUA + "Ender Chestplate" + ChatColor.RESET; + this.chestplate.customItemModel = "ender_chestplate"; + this.chestplate.customEquipmentModel = "ender"; + + this.leggings.name = ChatColor.DARK_AQUA + "Ender Leggings" + ChatColor.RESET; + this.leggings.customItemModel = "ender_leggings"; + this.leggings.customEquipmentModel = "ender"; + + this.boots.name = ChatColor.DARK_AQUA + "Ender Boots" + ChatColor.RESET; + this.boots.customItemModel = "ender_boots"; + this.boots.customEquipmentModel = "ender"; + + this.sword.lore = "A sword forged from the essence of ender pearls,"; + this.helmet.lore = "A helmet forged from the essence of ender pearls,"; + this.chestplate.lore = "A chestplate forged from the essence of ender pearls,"; + this.leggings.lore = "Leggings forged from the essence of ender pearls,"; + this.boots.lore = "Boots forged from the essence of ender pearls,"; + } +} diff --git a/src/main/java/dev/zxq5/fantasysmp/items/gear/PoseidonGear.java b/src/main/java/dev/zxq5/fantasysmp/items/gear/PoseidonGear.java new file mode 100644 index 0000000..8ac0818 --- /dev/null +++ b/src/main/java/dev/zxq5/fantasysmp/items/gear/PoseidonGear.java @@ -0,0 +1,94 @@ +package dev.zxq5.fantasysmp.items.gear; + +import dev.zxq5.fantasysmp.items.GenericGearSet; +import dev.zxq5.fantasysmp.items.ItemStats; +import org.bukkit.Bukkit; +import org.bukkit.ChatColor; +import org.bukkit.Material; +import org.bukkit.command.CommandExecutor; +import org.bukkit.enchantments.Enchantment; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.inventory.ItemStack; +import org.bukkit.inventory.meta.ItemMeta; + +import static org.bukkit.Bukkit.getPluginManager; + +public class PoseidonGear extends GenericGearSet implements CommandExecutor, Listener { + @Override + public boolean onCommand(org.bukkit.command.CommandSender sender, org.bukkit.command.Command command, String label, String[] args) { + Player player = (Player) sender; + + player.getInventory().addItem(this.getTrident()); + player.getInventory().addItem(this.getHelmet()); + player.getInventory().addItem(this.getChestplate()); + player.getInventory().addItem(this.getLeggings()); + player.getInventory().addItem(this.getBoots()); + return true; + } + + public ItemStack getTrident() { + ItemStack item = super.getSword(); + item.addUnsafeEnchantment(Enchantment.RIPTIDE, 5); + return item; + } + + public ItemStack getHelmet() { + ItemStack item = super.getHelmet(); + item.addUnsafeEnchantment(Enchantment.AQUA_AFFINITY, 3); + return item; + } + + public ItemStack getBoots() { + ItemStack item = super.getBoots(); + item.addUnsafeEnchantment(Enchantment.DEPTH_STRIDER, 5); + return item; + } + + @Override + public void registerRecipes() { + Bukkit.getScheduler().scheduleSyncRepeatingTask(getPluginManager().getPlugin("fantasysmp"), this::checkPlayerAir, 0, 20); + } + + public void checkPlayerAir() { + // any players wearing the armour will never run out of breath + for (Player player : Bukkit.getOnlinePlayers()) { + if (this.hasGear(player)) { + if (player.getRemainingAir() < player.getMaximumAir()) { + player.setRemainingAir(player.getMaximumAir()); + } + } + } + } + + public PoseidonGear() { + this.setTier5(); + this.sword.setMaterial(Material.TRIDENT); + this.sword.attackDamage = 10; + this.sword.attackSpeed = 1.2f; + this.sword.name = ChatColor.AQUA + "Poseidon's Fury" + ChatColor.RESET; + this.sword.lore = "A powerful trident imbued with the power of the ocean."; + this.sword.customItemModel = "poseidons_trident"; + + this.helmet.name = ChatColor.AQUA + "Poseidon's Crown" + ChatColor.RESET; + this.helmet.lore = "A helmet granted to those who harness the power of the ocean."; + this.helmet.customItemModel = "poseidons_helmet"; + this.helmet.customEquipmentModel = "poseidon"; + + this.chestplate.name = ChatColor.AQUA + "Poseidon's Chestplate" + ChatColor.RESET; + this.chestplate.lore = "A chestplate granted to those who harness the power of the ocean."; + this.chestplate.customItemModel = "poseidons_chestplate"; + this.chestplate.customEquipmentModel = "poseidon"; + + this.leggings.name = ChatColor.AQUA + "Poseidon's Leggings" + ChatColor.RESET; + this.leggings.lore = "Leggings granted to those who harness the power of the ocean."; + this.leggings.customItemModel = "poseidons_leggings"; + this.leggings.customEquipmentModel = "poseidon"; + + this.boots.name = ChatColor.AQUA + "Poseidon's Boots" + ChatColor.RESET; + this.boots.lore = "Boots granted to those who harness the power of the ocean."; + this.boots.customItemModel = "poseidons_boots"; + this.boots.customEquipmentModel = "poseidon"; + } +} diff --git a/src/main/java/dev/zxq5/fantasysmp/items/gear/TrueNetheriteGear.java b/src/main/java/dev/zxq5/fantasysmp/items/gear/TrueNetheriteGear.java index b2f31ea..147b35a 100644 --- a/src/main/java/dev/zxq5/fantasysmp/items/gear/TrueNetheriteGear.java +++ b/src/main/java/dev/zxq5/fantasysmp/items/gear/TrueNetheriteGear.java @@ -1,13 +1,22 @@ package dev.zxq5.fantasysmp.items.gear; import dev.zxq5.fantasysmp.items.GenericGearSet; +import org.bukkit.ChatColor; import org.bukkit.command.CommandExecutor; +import org.bukkit.entity.Player; import org.bukkit.event.Listener; public class TrueNetheriteGear extends GenericGearSet implements CommandExecutor, Listener { @Override public boolean onCommand(org.bukkit.command.CommandSender sender, org.bukkit.command.Command command, String label, String[] args) { - return false; + Player player = (Player) sender; + + player.getInventory().addItem(this.getSword()); + player.getInventory().addItem(this.getHelmet()); + player.getInventory().addItem(this.getChestplate()); + player.getInventory().addItem(this.getLeggings()); + player.getInventory().addItem(this.getBoots()); + return true; } @Override @@ -15,8 +24,29 @@ public class TrueNetheriteGear extends GenericGearSet implements CommandExecutor public TrueNetheriteGear() { this.setTier6(); - this.sword.name = "True Netherite Sword"; + this.sword.name = ChatColor.WHITE + "True Netherite Sword" + ChatColor.RESET; + this.sword.lore = "A sword forged with the skulls of wither skeletons."; this.sword.customItemModel = "true_netherite_sword"; this.sword.lore = "Destruction awaits."; + + this.helmet.name = ChatColor.WHITE + "True Netherite Helmet" + ChatColor.RESET; + this.helmet.lore = "A helmet forged with the skulls of wither skeletons."; + this.helmet.customItemModel = "true_netherite_helmet"; + this.helmet.customEquipmentModel = "true_netherite"; + + this.chestplate.name = ChatColor.WHITE + "True Netherite Chestplate" + ChatColor.RESET; + this.chestplate.lore = "A chestplate forged with the skulls of wither skeletons."; + this.chestplate.customItemModel = "true_netherite_chestplate"; + this.chestplate.customEquipmentModel = "true_netherite"; + + this.leggings.name = ChatColor.WHITE + "True Netherite Leggings" + ChatColor.RESET; + this.leggings.lore = "Leggings forged with the skulls of wither skeletons."; + this.leggings.customItemModel = "true_netherite_leggings"; + this.leggings.customEquipmentModel = "true_netherite"; + + this.boots.name = ChatColor.WHITE + "True Netherite Boots" + ChatColor.RESET; + this.boots.lore = "Boots forged with the skulls of wither skeletons."; + this.boots.customItemModel = "true_netherite_boots"; + this.boots.customEquipmentModel = "true_netherite"; } } diff --git a/src/main/java/dev/zxq5/fantasysmp/items/gear/WitheriteGear.java b/src/main/java/dev/zxq5/fantasysmp/items/gear/WitheriteGear.java index 6a42389..e16094d 100644 --- a/src/main/java/dev/zxq5/fantasysmp/items/gear/WitheriteGear.java +++ b/src/main/java/dev/zxq5/fantasysmp/items/gear/WitheriteGear.java @@ -19,6 +19,7 @@ import org.bukkit.potion.PotionEffect; import java.util.ArrayList; import java.util.Objects; +import static org.bukkit.Bukkit.broadcastMessage; import static org.bukkit.Bukkit.getServer; public class WitheriteGear extends GenericGearSet implements Listener, CommandExecutor { @@ -143,29 +144,28 @@ public class WitheriteGear extends GenericGearSet implements Listener, CommandEx public WitheriteGear() { this.setTier5(); - this.sword.name = "Witherite Sword"; + this.sword.name = ChatColor.BLACK + "Witherite Sword" + ChatColor.RESET; + this.sword.lore = "A sword forged with the skulls of wither skeletons."; this.sword.customItemModel = "witherite_sword"; - this.helmet.name = "Witherite Helmet"; + this.helmet.name = ChatColor.BLACK + "Witherite Helmet" + ChatColor.RESET; + this.helmet.lore = "A helmet forged with the skulls of wither skeletons."; this.helmet.customItemModel = "witherite_helmet"; this.helmet.customEquipmentModel = "witherite"; - this.chestplate.name = "Witherite Chestplate"; + this.chestplate.name = ChatColor.BLACK + "Witherite Chestplate" + ChatColor.RESET; + this.chestplate.lore = "A chestplate forged with the skulls of wither skeletons."; this.chestplate.customItemModel = "witherite_chestplate"; this.chestplate.customEquipmentModel = "witherite"; - this.leggings.name = "Witherite Leggings"; + this.leggings.name = ChatColor.BLACK + "Witherite Leggings" + ChatColor.RESET; + this.leggings.lore = "Leggings forged with the skulls of wither skeletons."; this.leggings.customItemModel = "witherite_leggings"; this.leggings.customEquipmentModel = "witherite"; - this.boots.name = "Witherite Boots"; + this.boots.name = ChatColor.BLACK + "Witherite Boots" + ChatColor.RESET; + this.boots.lore = "Boots forged with the skulls of wither skeletons."; this.boots.customItemModel = "witherite_boots"; this.boots.customEquipmentModel = "witherite"; - - this.sword.lore = "A sword forged with the skulls of wither skeletons."; - this.helmet.lore = "A helmet forged with the skulls of wither skeletons."; - this.chestplate.lore = "A chestplate forged with the skulls of wither skeletons."; - this.leggings.lore = "Leggings forged with the skulls of wither skeletons."; - this.boots.lore = "Boots forged with the skulls of wither skeletons."; } } diff --git a/src/main/java/dev/zxq5/fantasysmp/warps/Warp.java b/src/main/java/dev/zxq5/fantasysmp/warps/Warp.java index 54ae113..371c22f 100644 --- a/src/main/java/dev/zxq5/fantasysmp/warps/Warp.java +++ b/src/main/java/dev/zxq5/fantasysmp/warps/Warp.java @@ -1,6 +1,7 @@ package dev.zxq5.fantasysmp.warps; import com.google.gson.Gson; +import org.bukkit.ChatColor; import org.bukkit.Location; import org.bukkit.World; import org.bukkit.command.CommandExecutor; @@ -104,6 +105,18 @@ public class Warp { return null; } + public static String listWarps(UUID player) { + String message = ChatColor.WHITE + "All Warps: [\n" + ChatColor.GREEN; + + for (Warp warp : warps) { + if (warp.type.equals(WarpType.PUBLIC) || warp.setby.equals(player.toString())) { + message += " " + warp.name + "\n"; + } + } + + return message + ChatColor.WHITE + "]"; + } + public static void setHome(Player player) { setWarp("Home (" + player.getName() + ")", player, WarpType.HOME); } diff --git a/src/main/java/dev/zxq5/fantasysmp/warps/Warper.java b/src/main/java/dev/zxq5/fantasysmp/warps/Warper.java index cb26029..81264bf 100644 --- a/src/main/java/dev/zxq5/fantasysmp/warps/Warper.java +++ b/src/main/java/dev/zxq5/fantasysmp/warps/Warper.java @@ -1,73 +1,136 @@ package dev.zxq5.fantasysmp.warps; +import org.bukkit.ChatColor; +import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.entity.Player; +import static dev.zxq5.fantasysmp.chatutils.Chat.EVENTPREFIX; + +/* +* Commands: +* +* ** PLAYER ** +* +* home => DONE +* sethome => DONE +* warp => DONE +* +* ** ADMIN ONLY ** +* +* rewarps => DONE +* setwarp => DONE +* delwarp => TODO +* */ + public class Warper implements CommandExecutor { @Override - public boolean onCommand(org.bukkit.command.CommandSender sender, org.bukkit.command.Command command, String label, String[] args) { + public boolean onCommand(org.bukkit.command.CommandSender sender, Command command, String label, String[] args) { if (!(sender instanceof Player player)) { return false; } - if (command.getName().equals("reloadwarps")) { - // reply - try { - Warp.loadWarps(); - } catch (Exception e) { - player.sendMessage("Failed to reload warps. please contact an admin."); - e.printStackTrace(); - } + switch (command.getName()) { + case "home" -> this.handleHome(player, args); + case "sethome" -> this.handleSetHome(player, args); + case "warp" -> this.handleWarp(player, args); + case "setwarp" -> this.handleSetWarp(player, args); + case "delwarp" -> this.handleDelWarp(player, args); + case "rewarps" -> this.handleReWarps(player, args); + case "warps" -> this.handleWarpsOther(player, args); } - if (command.getName().equals("home")) { - if (args.length != 0) { - player.sendMessage("Usage: /home"); - return true; - } - - Warp warp = Warp.getHome(player.getUniqueId()); - - if (warp != null) { - warp.execute(player); - } - } - - if (command.getName().equals("sethome")) { - if (args.length != 0) { - player.sendMessage("Usage: /sethome"); - return true; - } - - Warp.setHome(player); - } - - if (command.getName().equals("warp")) { - if (args.length != 1) { - player.sendMessage("Usage: /warp "); - return true; - } - - Warp warp = Warp.getWarp(args[0]); - - if (warp != null) { - warp.execute(player); - } - } - - if (command.getName().equals("setwarp")) { - if (!(player.hasPermission("fantasysmp.manage_warps"))) { - player.sendMessage("You do not have permission to use this command."); - return false; - } - - if (args.length != 1) { - player.sendMessage("Usage: /setwarp "); - return true; - } - - Warp.setWarp(args[0], player, WarpType.PUBLIC); - } return true; } + + public void handleHome(Player player, String[] args) { + if (args.length != 0) { + this.error(player,"Usage: /home"); + return; + } + + Warp warp = Warp.getHome(player.getUniqueId()); + + if (warp == null) { + this.error(player,"No home set! use /sethome to set one."); + return; + } + + warp.execute(player); + this.success(player,"Warped Home!"); + } + + public void handleSetHome(Player player, String[] args) { + if (args.length != 0) { + this.error(player,"Usage: /sethome"); + return; + } + + Warp.setHome(player); + this.success(player,"Home set Successfully!"); + } + + public void handleWarp(Player player, String[] args) { + if (args.length != 1) { + this.error(player, "Usage: /warp "); + return; + } + + Warp warp = Warp.getWarp(args[0]); + + if (warp == null) { + this.error(player, "Location [" + args[0] + "] does not exist or is not accessible to you!"); + return; + }; + warp.execute(player); + this.success(player, "Warped!"); + } + + public void handleSetWarp(Player player, String[] args) { + if (!(player.hasPermission("fantasysmp.manage_warps"))) { + this.error(player, "You do not have permission to use this command."); + return; + } + + if (args.length != 1) { + this.error(player, "Usage: /setwarp "); + return; + } + + Warp.setWarp(args[0], player, WarpType.PUBLIC); + this.success(player, "Warp [" + args[0] + "] set Successfully!"); + } + + public void handleDelWarp(Player player, String[] args) { + + } + + public void handleReWarps(Player player, String[] args) { + try { + Warp.loadWarps(); + } catch (Exception e) { + this.error(player, "Failed to reload warps. please contact zxq5."); + e.printStackTrace(); + } + this.success(player, "Successfully reloaded warps from warps.json"); + } + + public void handleWarpsOther(Player player, String[] args) { + if (args.length == 0) { + this.info(player, Warp.listWarps(player.getUniqueId())); + } + } + + + public void error(Player player, String message) { + player.sendMessage(EVENTPREFIX + ChatColor.RED + message); + } + + public void success(Player player, String message) { + player.sendMessage(EVENTPREFIX + ChatColor.GREEN + message); + } + + public void info(Player player, String message) { + player.sendMessage(EVENTPREFIX + message); + } } diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 40b96b0..d7cb75d 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -27,10 +27,20 @@ commands: usage: /setwarp permission: fantasysmp.manage_warps - reloadwarps: + delwarp: + description: delete a warp + usage: /delwarp + permission: fantasysmp.manage_warps + + warps: + description: list all warps + usage: /warps + permission: fantasysmp.warps + + rewarps: description: reload warps - usage: /reloadwarps - permission: fantasysmp.admin + usage: /rewarps + permission: fantasysmp.manage_warps warp: description: teleport to a warp @@ -49,7 +59,7 @@ permissions: fantasysmp.manage_warps: description: commands for managing warps - default: true + default: false fantasysmp.home: description: commands for teleporting home From 3eac0e391fdfd919b1016dc75d5e35db875e8fd3 Mon Sep 17 00:00:00 2001 From: zxq5 Date: Mon, 10 Feb 2025 18:49:00 +0000 Subject: [PATCH 6/9] did some more work on commands --- .../dev/zxq5/fantasysmp/chatutils/Chat.java | 13 +++ .../dev/zxq5/fantasysmp/groups/Commands.java | 84 +++++++++++++++++-- .../java/dev/zxq5/fantasysmp/groups/Team.java | 43 +++++++++- .../dev/zxq5/fantasysmp/warps/Warper.java | 42 ++++------ 4 files changed, 145 insertions(+), 37 deletions(-) diff --git a/src/main/java/dev/zxq5/fantasysmp/chatutils/Chat.java b/src/main/java/dev/zxq5/fantasysmp/chatutils/Chat.java index 11abdd0..686be77 100644 --- a/src/main/java/dev/zxq5/fantasysmp/chatutils/Chat.java +++ b/src/main/java/dev/zxq5/fantasysmp/chatutils/Chat.java @@ -1,7 +1,20 @@ package dev.zxq5.fantasysmp.chatutils; import org.bukkit.ChatColor; +import org.bukkit.entity.Player; public class Chat { public static String EVENTPREFIX = ChatColor.WHITE + "<" + ChatColor.AQUA + "Server" + ChatColor.WHITE + "> " + ChatColor.RESET; + + public static void success(Player player, String message) { + player.sendMessage(EVENTPREFIX + ChatColor.GREEN + message); + } + + public static void error(Player player, String message) { + player.sendMessage(EVENTPREFIX + ChatColor.RED + message); + } + + public static void info(Player player, String message) { + player.sendMessage(EVENTPREFIX + message); + } } diff --git a/src/main/java/dev/zxq5/fantasysmp/groups/Commands.java b/src/main/java/dev/zxq5/fantasysmp/groups/Commands.java index 93bed17..248fdbf 100644 --- a/src/main/java/dev/zxq5/fantasysmp/groups/Commands.java +++ b/src/main/java/dev/zxq5/fantasysmp/groups/Commands.java @@ -1,5 +1,6 @@ package dev.zxq5.fantasysmp.groups; +import dev.zxq5.fantasysmp.chatutils.Chat; import org.bukkit.command.CommandExecutor; import org.bukkit.entity.Player; @@ -10,14 +11,15 @@ import org.bukkit.entity.Player; * * team list => TODO * team create => TODO - * team rename => TODO - * team transfer => TODO + * team rename => TODO + * team transfer => TODO * team join => TODO - * team invite => TODO - * team leave => TODO - * team disband => TODO - * team setwarp => TODO + * team invite => TODO + * team leave => TODO + * team disband => TODO + * team setwarp => TODO * team delwarp => TODO + * team warp => TODO * team kick => TODO * team log => TODO * @@ -41,9 +43,75 @@ public class Commands implements CommandExecutor { return true; } - public void handleTeamCommands(Player player, String[] args) {} + public void handleTeamCommands(Player player, String[] args) { + switch (args[0]) { + case "list" -> this.handleList(player, args); + case "create" -> this.handleCreate(player, args); + case "rename" -> this.handleRename(player, args); + case "transfer" -> this.handleTransfer(player, args); + case "join" -> this.handleJoin(player, args); + case "invite" -> this.handleInvite(player, args); + case "leave" -> this.handleLeave(player, args); + case "disband" -> this.handleDisband(player, args); + case "setwarp" -> this.handleSetWarp(player, args); + case "delwarp" -> this.handleDelWarp(player, args); + case "warp" -> this.handleWarp(player, args); + case "kick" -> this.handleKick(player, args); + case "log" -> this.handleLog(player, args); + } + } - public void handleRankCommands(Player player, String[] args) {} + public void handleRankCommands(Player player, String[] args) { + // check perms + if (!(player.hasPermission("fantasysmp.ranks"))) { + Chat.error(player, "You do not have permission to use this command."); + return; + } + + switch (args[0]) { + case "create" -> this.handleCreateRank(player, args); + case "rename" -> this.handleRenameRank(player, args); + case "delete" -> this.handleDeleteRank(player, args); + case "add" -> this.handleAddRank(player, args); + case "remove" -> this.handleRemoveRank(player, args); + } + } + + public void handleList(Player player, String[] args) {} + + public void handleCreate(Player player, String[] args) {} + + public void handleRename(Player player, String[] args) {} + + public void handleTransfer(Player player, String[] args) {} + + public void handleJoin(Player player, String[] args) {} + + public void handleInvite(Player player, String[] args) {} + + public void handleLeave(Player player, String[] args) {} + + public void handleDisband(Player player, String[] args) {} + + public void handleSetWarp(Player player, String[] args) {} + + public void handleDelWarp(Player player, String[] args) {} + + public void handleWarp(Player player, String[] args) {} + + public void handleKick(Player player, String[] args) {} + + public void handleLog(Player player, String[] args) {} + + public void handleCreateRank(Player player, String[] args) {} + + public void handleRenameRank(Player player, String[] args) {} + + public void handleDeleteRank(Player player, String[] args) {} + + public void handleAddRank(Player player, String[] args) {} + + public void handleRemoveRank(Player player, String[] args) {} public Commands() {} } diff --git a/src/main/java/dev/zxq5/fantasysmp/groups/Team.java b/src/main/java/dev/zxq5/fantasysmp/groups/Team.java index 3a2ae0d..17984cf 100644 --- a/src/main/java/dev/zxq5/fantasysmp/groups/Team.java +++ b/src/main/java/dev/zxq5/fantasysmp/groups/Team.java @@ -1,7 +1,11 @@ package dev.zxq5.fantasysmp.groups; import com.google.gson.Gson; +import org.bukkit.entity.Player; + import java.io.*; +import java.util.ArrayList; + import static org.bukkit.Bukkit.getServer; public class Team { @@ -9,8 +13,43 @@ public class Team { private String name; private String ownerUUID; - private String[] members; - private String[] tag; + private ArrayList members; + private String tag; + + public Team(Player creator, String name, String tag) { + this.name = name; + this.tag = tag; + this.ownerUUID = creator.getUniqueId().toString(); + this.members = new ArrayList<>(); + members.add(creator.getUniqueId().toString()); + } + + public Team createTeam(Player creator, String name) { + Team team = new Team(creator, name, name); + + + + return team; + } + + + + + + + + + + + + + + + + + + + public static void loadTeams() throws Exception { File dataFolder = getServer().getPluginManager().getPlugin("Fantasysmp").getDataFolder(); diff --git a/src/main/java/dev/zxq5/fantasysmp/warps/Warper.java b/src/main/java/dev/zxq5/fantasysmp/warps/Warper.java index 81264bf..61ec411 100644 --- a/src/main/java/dev/zxq5/fantasysmp/warps/Warper.java +++ b/src/main/java/dev/zxq5/fantasysmp/warps/Warper.java @@ -1,5 +1,6 @@ package dev.zxq5.fantasysmp.warps; +import dev.zxq5.fantasysmp.chatutils.Chat; import org.bukkit.ChatColor; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; @@ -45,60 +46,60 @@ public class Warper implements CommandExecutor { public void handleHome(Player player, String[] args) { if (args.length != 0) { - this.error(player,"Usage: /home"); + Chat.error(player,"Usage: /home"); return; } Warp warp = Warp.getHome(player.getUniqueId()); if (warp == null) { - this.error(player,"No home set! use /sethome to set one."); + Chat.error(player,"No home set! use /sethome to set one."); return; } warp.execute(player); - this.success(player,"Warped Home!"); + Chat.success(player,"Warped Home!"); } public void handleSetHome(Player player, String[] args) { if (args.length != 0) { - this.error(player,"Usage: /sethome"); + Chat.error(player,"Usage: /sethome"); return; } Warp.setHome(player); - this.success(player,"Home set Successfully!"); + Chat.success(player,"Home set Successfully!"); } public void handleWarp(Player player, String[] args) { if (args.length != 1) { - this.error(player, "Usage: /warp "); + Chat.error(player, "Usage: /warp "); return; } Warp warp = Warp.getWarp(args[0]); if (warp == null) { - this.error(player, "Location [" + args[0] + "] does not exist or is not accessible to you!"); + Chat.error(player, "Location [" + args[0] + "] does not exist or is not accessible to you!"); return; }; warp.execute(player); - this.success(player, "Warped!"); + Chat.success(player, "Warped!"); } public void handleSetWarp(Player player, String[] args) { if (!(player.hasPermission("fantasysmp.manage_warps"))) { - this.error(player, "You do not have permission to use this command."); + Chat.error(player, "You do not have permission to use this command."); return; } if (args.length != 1) { - this.error(player, "Usage: /setwarp "); + Chat.error(player, "Usage: /setwarp "); return; } Warp.setWarp(args[0], player, WarpType.PUBLIC); - this.success(player, "Warp [" + args[0] + "] set Successfully!"); + Chat.success(player, "Warp [" + args[0] + "] set Successfully!"); } public void handleDelWarp(Player player, String[] args) { @@ -109,28 +110,15 @@ public class Warper implements CommandExecutor { try { Warp.loadWarps(); } catch (Exception e) { - this.error(player, "Failed to reload warps. please contact zxq5."); + Chat.error(player, "Failed to reload warps. please contact zxq5."); e.printStackTrace(); } - this.success(player, "Successfully reloaded warps from warps.json"); + Chat.success(player, "Successfully reloaded warps from warps.json"); } public void handleWarpsOther(Player player, String[] args) { if (args.length == 0) { - this.info(player, Warp.listWarps(player.getUniqueId())); + Chat.info(player, Warp.listWarps(player.getUniqueId())); } } - - - public void error(Player player, String message) { - player.sendMessage(EVENTPREFIX + ChatColor.RED + message); - } - - public void success(Player player, String message) { - player.sendMessage(EVENTPREFIX + ChatColor.GREEN + message); - } - - public void info(Player player, String message) { - player.sendMessage(EVENTPREFIX + message); - } } From 14452adf0898e33d61b3d92bd0ee1f32e381dbec Mon Sep 17 00:00:00 2001 From: zxq5 Date: Wed, 12 Feb 2025 18:55:11 +0000 Subject: [PATCH 7/9] progress on teams --- .../dev/zxq5/fantasysmp/groups/Commands.java | 129 ++++++++++++++++-- .../java/dev/zxq5/fantasysmp/groups/Team.java | 118 +++++++++++++++- .../java/dev/zxq5/fantasysmp/warps/Warp.java | 19 ++- .../dev/zxq5/fantasysmp/warps/WarpType.java | 8 ++ 4 files changed, 248 insertions(+), 26 deletions(-) create mode 100644 src/main/java/dev/zxq5/fantasysmp/warps/WarpType.java diff --git a/src/main/java/dev/zxq5/fantasysmp/groups/Commands.java b/src/main/java/dev/zxq5/fantasysmp/groups/Commands.java index 248fdbf..4b86534 100644 --- a/src/main/java/dev/zxq5/fantasysmp/groups/Commands.java +++ b/src/main/java/dev/zxq5/fantasysmp/groups/Commands.java @@ -1,9 +1,15 @@ package dev.zxq5.fantasysmp.groups; import dev.zxq5.fantasysmp.chatutils.Chat; +import dev.zxq5.fantasysmp.warps.Warp; +import dev.zxq5.fantasysmp.warps.WarpType; import org.bukkit.command.CommandExecutor; import org.bukkit.entity.Player; +import java.util.ArrayList; + +import static org.bukkit.Bukkit.getServer; + /* * Commands: * @@ -48,6 +54,7 @@ public class Commands implements CommandExecutor { case "list" -> this.handleList(player, args); case "create" -> this.handleCreate(player, args); case "rename" -> this.handleRename(player, args); + case "tag" -> this.handleSetTag(player, args); case "transfer" -> this.handleTransfer(player, args); case "join" -> this.handleJoin(player, args); case "invite" -> this.handleInvite(player, args); @@ -77,31 +84,127 @@ public class Commands implements CommandExecutor { } } - public void handleList(Player player, String[] args) {} + public void handleList(Player player, String[] args) { + String[] teams = Team.getTeams(); + String result = "Teams: [\n " + String.join("\n ", teams) + "\n]"; + Chat.info(player, result); + } - public void handleCreate(Player player, String[] args) {} + public void handleCreate(Player player, String[] args) { + if (args.length != 2) { + Chat.error(player, "Usage: /team create "); + return; + } - public void handleRename(Player player, String[] args) {} + Team.createTeam(player, args[1]); + } - public void handleTransfer(Player player, String[] args) {} + public void handleRename(Player player, String[] args) { + if (args.length != 2) { + Chat.error(player, "Usage: /team rename "); + return; + } - public void handleJoin(Player player, String[] args) {} + if (args[1].isEmpty() || args[1].contains(" ") || args[1].contains("\t")) { + Chat.error(player, "Invalid name!"); + return; + } - public void handleInvite(Player player, String[] args) {} + Team.renameTeam(player, args[1]); + } - public void handleLeave(Player player, String[] args) {} + public void handleSetTag(Player player, String[] args) { + if (args.length != 2) { + Chat.error(player, "Usage: /team tag "); + return; + } - public void handleDisband(Player player, String[] args) {} + if (args[1].length < 3 || args[1].contains(" ") || args[1].contains("\t") || args.length > 8) { + Chat.error(player, "Invalid tag!"); + Chat.error(player, "tags should be 3-8 chars, alphanumeric and have no spaces"); + } + } - public void handleSetWarp(Player player, String[] args) {} + public void handleTransfer(Player player, String[] args) { + if (args.length != 2) { + Chat.error(player, "Usage: /team transfer "); + return; + } + } - public void handleDelWarp(Player player, String[] args) {} + public void handleJoin(Player player, String[] args) { + if (args.length != 2) { + Chat.error(player, "Usage: /team join "); + return; + } + } - public void handleWarp(Player player, String[] args) {} + public void handleInvite(Player player, String[] args) { + if (args.length != 2) { + Chat.error(player, "Usage: /team invite "); + return; + } + } - public void handleKick(Player player, String[] args) {} + public void handleLeave(Player player, String[] args) { + if (args.length != 1) { + Chat.error(player, "Usage: /team leave"); + return; + } - public void handleLog(Player player, String[] args) {} + Team.leaveTeam(player); + } + + public void handleDisband(Player player, String[] args) { + if (args.length != 1) { + Chat.error(player, "Usage: /team disband"); + return; + } + + Team.disbandTeam(player); + } + + public void handleSetWarp(Player player, String[] args) { + if (args.length != 2) { + Chat.error(player, "Usage: /team setwarp "); + return; + } + + Warp.setWarp(args[1], player, WarpType.TEAM); + } + + public void handleDelWarp(Player player, String[] args) { + + } + + public void handleWarp(Player player, String[] args) { + if (args.length != 2) { + Chat.error(player, "Usage: /team warp "); + return; + } + Team team = Team.fromMember(player); + Warp warp = Warp.getTeamWarp(team, args[1]); + } + + public void handleKick(Player player, String[] args) { + if (args.length != 2) { + Chat.error(player, "Usage: /team kick "); + return; + } + + Team.removePlayer(player, args[1]); + } + + public void handleLog(Player player, String[] args) { + if (args.length != 1) { + Chat.error(player, "Usage: /team log"); + return; + } + + ArrayList logs = Team.getLogs(player); + String result = "Logs: [\n " + String.join("\n ", logs) + "\n]"; + Chat.info(player, result); + } public void handleCreateRank(Player player, String[] args) {} diff --git a/src/main/java/dev/zxq5/fantasysmp/groups/Team.java b/src/main/java/dev/zxq5/fantasysmp/groups/Team.java index 17984cf..620b395 100644 --- a/src/main/java/dev/zxq5/fantasysmp/groups/Team.java +++ b/src/main/java/dev/zxq5/fantasysmp/groups/Team.java @@ -1,55 +1,157 @@ package dev.zxq5.fantasysmp.groups; import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; +import dev.zxq5.fantasysmp.chatutils.Chat; import org.bukkit.entity.Player; import java.io.*; import java.util.ArrayList; +import java.util.UUID; import static org.bukkit.Bukkit.getServer; public class Team { - private static Team[] teams; + private static ArrayList teams; private String name; private String ownerUUID; private ArrayList members; + private ArrayList logs; + private String teamUUID; private String tag; public Team(Player creator, String name, String tag) { this.name = name; this.tag = tag; + this.teamUUID = UUID.randomUUID().toString(); this.ownerUUID = creator.getUniqueId().toString(); this.members = new ArrayList<>(); members.add(creator.getUniqueId().toString()); } - public Team createTeam(Player creator, String name) { + public static Team createTeam(Player creator, String name) { Team team = new Team(creator, name, name); - - - + teams.add(team); return team; } + public static Team fromMember(Player member) { + for (Team team : teams) { + if (team.members.contains(member.getUniqueId().toString())) return team; + } + return null; + } + public static String[] getTeams() { + String[] names = new String[teams.size()]; + for (int i = 0; i < teams.size(); i++) { + names[i] = teams.get(i).name; + } + return names; + } + public static void renameTeam(Player player, String newName) { + for (Team team : teams) { + if (!team.ownerUUID.equals(player.getUniqueId().toString())) continue; + team.name = newName; + team.log(player.getName() + " renamed the team to " + newName + "."); + return; + } + } + public static void transferTeam(Player player, String playerName) { + Player newOwner = getServer().getPlayer(playerName); + for (Team team : teams) { + if (!team.ownerUUID.equals(player.getUniqueId().toString())) continue; + team.ownerUUID = newOwner.getUniqueId().toString(); + team.log(player.getName() + " transferred ownership to " + newOwner.getName() + "."); + return; + } + } + public static void removePlayer(Player remover, String playerName) { + Player removedPlayer = getServer().getPlayer(playerName); + if (removedPlayer == null) { + Chat.error(remover, "Player not found!"); + return; + } + String removerUUID = remover.getUniqueId().toString(); + String removedPlayerUUID = removedPlayer.getUniqueId().toString(); + for (Team team : teams) { + if (!team.members.contains(removerUUID)) continue; + if (!team.ownerUUID.equals(removerUUID)) { + Chat.error(remover, "You do not have permission to remove players from this team."); + return; + } + if (!team.members.contains(removedPlayerUUID)) { + Chat.error(remover, "This player is not in your team."); + return; + } + if (removedPlayerUUID.equals(team.ownerUUID)) { + Chat.error(remover, "You cannot remove yourself!"); + return; + } + team.members.remove(removedPlayerUUID); + team.log(remover.getName() + " removed " + removedPlayer.getName() + " from the team."); + return; + } + } + public static void leaveTeam(Player player) { + for (Team team : teams) { + if (!team.members.contains(player.getUniqueId().toString())) continue; + if (team.ownerUUID.equals(player.getUniqueId().toString())) { + player.sendMessage("You cannot leave a team that you own!"); + } + team.members.remove(player.getUniqueId().toString()); + team.log(player.getName() + " left the team."); + return; + } + } + public static void disbandTeam(Player player) { + for (Team team : teams) { + if (!team.ownerUUID.equals(player.getUniqueId().toString())) continue; + teams.remove(team); + team.log(player.getName() + " disbanded the team."); + return; + } + } + public static void addMember(Player player) { + for (Team team : teams) { + if (!team.ownerUUID.equals(player.getUniqueId().toString())) continue; + + team.members.add(player.getUniqueId().toString()); + team.log(player.getName() + " joined the team."); + return; + } + } + + public static ArrayList getLogs(Player player) { + for (Team team : teams) { + if (team.ownerUUID.equals(player.getUniqueId().toString())) { + return team.logs; + } + } + return null; + } + + public void log(String message) { + this.logs.add(message); + } public static void loadTeams() throws Exception { File dataFolder = getServer().getPluginManager().getPlugin("Fantasysmp").getDataFolder(); @@ -63,7 +165,7 @@ public class Team { reader = new BufferedReader(new FileReader(file)); Gson gson = new Gson(); - teams = gson.fromJson(reader, Team[].class); + teams = gson.fromJson(reader, new TypeToken>(){}.getType()); reader.close(); } @@ -96,4 +198,8 @@ public class Team { } } } + + public String getUUID() { + return this.teamUUID; + } } diff --git a/src/main/java/dev/zxq5/fantasysmp/warps/Warp.java b/src/main/java/dev/zxq5/fantasysmp/warps/Warp.java index 371c22f..3f4b6e3 100644 --- a/src/main/java/dev/zxq5/fantasysmp/warps/Warp.java +++ b/src/main/java/dev/zxq5/fantasysmp/warps/Warp.java @@ -1,6 +1,7 @@ package dev.zxq5.fantasysmp.warps; import com.google.gson.Gson; +import dev.zxq5.fantasysmp.groups.Team; import org.bukkit.ChatColor; import org.bukkit.Location; import org.bukkit.World; @@ -105,6 +106,17 @@ public class Warp { return null; } + public static Warp getTeamWarp(Team team, String name) { + for (Warp warp : warps) { + if (warp.type.equals(WarpType.TEAM)) { + if (warp.name.equals(name) && warp.setby.equals(team.getUUID())) { + return warp; + } + } + } + return null; + } + public static String listWarps(UUID player) { String message = ChatColor.WHITE + "All Warps: [\n" + ChatColor.GREEN; @@ -162,13 +174,6 @@ public class Warp { } } -enum WarpType { - HOME, - PUBLIC, - DEATH, - TEAM, -} - diff --git a/src/main/java/dev/zxq5/fantasysmp/warps/WarpType.java b/src/main/java/dev/zxq5/fantasysmp/warps/WarpType.java new file mode 100644 index 0000000..c78b198 --- /dev/null +++ b/src/main/java/dev/zxq5/fantasysmp/warps/WarpType.java @@ -0,0 +1,8 @@ +package dev.zxq5.fantasysmp.warps; + +public enum WarpType { + HOME, + PUBLIC, + DEATH, + TEAM, +} From 03d01f94221681ae37acec965d9fefab62872eb1 Mon Sep 17 00:00:00 2001 From: zxq5 Date: Thu, 28 Aug 2025 23:06:35 +0100 Subject: [PATCH 8/9] idk --- .../java/dev/zxq5/fantasysmp/Fantasysmp.java | 14 +- .../java/dev/zxq5/fantasysmp/events/Chat.java | 16 ++ .../dev/zxq5/fantasysmp/groups/Commands.java | 45 +++- .../java/dev/zxq5/fantasysmp/groups/Team.java | 241 +++++++++++++----- .../java/dev/zxq5/fantasysmp/warps/Warp.java | 8 +- src/main/resources/plugin.yml | 10 + 6 files changed, 255 insertions(+), 79 deletions(-) create mode 100644 src/main/java/dev/zxq5/fantasysmp/events/Chat.java diff --git a/src/main/java/dev/zxq5/fantasysmp/Fantasysmp.java b/src/main/java/dev/zxq5/fantasysmp/Fantasysmp.java index 2dd81f5..5c0bb37 100644 --- a/src/main/java/dev/zxq5/fantasysmp/Fantasysmp.java +++ b/src/main/java/dev/zxq5/fantasysmp/Fantasysmp.java @@ -1,8 +1,11 @@ package dev.zxq5.fantasysmp; +import dev.zxq5.fantasysmp.events.Chat; import dev.zxq5.fantasysmp.events.HereticWarner; import dev.zxq5.fantasysmp.events.StevenKillCheck; import dev.zxq5.fantasysmp.events.XrayDetector; +import dev.zxq5.fantasysmp.groups.Commands; +import dev.zxq5.fantasysmp.groups.Team; import dev.zxq5.fantasysmp.items.*; import dev.zxq5.fantasysmp.warps.Warp; import dev.zxq5.fantasysmp.warps.Warper; @@ -19,6 +22,7 @@ public final class Fantasysmp extends JavaPlugin { try { Warp.loadWarps(); + Team.loadTeams(); } catch (Exception e) { e.printStackTrace(); } @@ -30,6 +34,9 @@ public final class Fantasysmp extends JavaPlugin { getCommand("warp").setExecutor(new Warper()); getCommand("rewarps").setExecutor(new Warper()); getCommand("warps").setExecutor(new Warper()); + getCommand("team").setExecutor(new Commands()); + + getServer().getPluginManager().registerEvents(new Chat(), this); getServer().getPluginManager().registerEvents(new StevenKillCheck(), this); @@ -42,6 +49,11 @@ public final class Fantasysmp extends JavaPlugin { @Override public void onDisable() { - // Plugin shutdown logic + try { + Warp.saveWarps(); + Team.saveTeams(); + } catch (Exception e) { + e.printStackTrace(); + } } } diff --git a/src/main/java/dev/zxq5/fantasysmp/events/Chat.java b/src/main/java/dev/zxq5/fantasysmp/events/Chat.java new file mode 100644 index 0000000..c4be163 --- /dev/null +++ b/src/main/java/dev/zxq5/fantasysmp/events/Chat.java @@ -0,0 +1,16 @@ +package dev.zxq5.fantasysmp.events; + +import dev.zxq5.fantasysmp.groups.Team; +import org.bukkit.ChatColor; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; + +public class Chat implements Listener { + @EventHandler + public void onChat(org.bukkit.event.player.AsyncPlayerChatEvent event) { + Team team = Team.fromMember(event.getPlayer()); + if (team != null) { + event.setFormat(ChatColor.WHITE + "[" + team.getTag() + ChatColor.WHITE + "]" + ChatColor.RESET + " <%s> %s"); + } + } +} diff --git a/src/main/java/dev/zxq5/fantasysmp/groups/Commands.java b/src/main/java/dev/zxq5/fantasysmp/groups/Commands.java index 4b86534..cec0523 100644 --- a/src/main/java/dev/zxq5/fantasysmp/groups/Commands.java +++ b/src/main/java/dev/zxq5/fantasysmp/groups/Commands.java @@ -62,6 +62,7 @@ public class Commands implements CommandExecutor { case "disband" -> this.handleDisband(player, args); case "setwarp" -> this.handleSetWarp(player, args); case "delwarp" -> this.handleDelWarp(player, args); + case "colour" -> this.handleSetColour(player, args); case "warp" -> this.handleWarp(player, args); case "kick" -> this.handleKick(player, args); case "log" -> this.handleLog(player, args); @@ -99,6 +100,18 @@ public class Commands implements CommandExecutor { Team.createTeam(player, args[1]); } + public void handleSetColour(Player player, String[] args) { + if (args.length != 2) { + Chat.error(player, "Usage: /team colour "); + return; + } + + Team team = Team.fromMember(player); + if (team == null) return; + + team.setColour(player, args[1]); + } + public void handleRename(Player player, String[] args) { if (args.length != 2) { Chat.error(player, "Usage: /team rename "); @@ -110,7 +123,10 @@ public class Commands implements CommandExecutor { return; } - Team.renameTeam(player, args[1]); + Team team = Team.fromMember(player); + if (team == null) return; + + team.renameTeam(player, args[1]); } public void handleSetTag(Player player, String[] args) { @@ -119,10 +135,16 @@ public class Commands implements CommandExecutor { return; } - if (args[1].length < 3 || args[1].contains(" ") || args[1].contains("\t") || args.length > 8) { + if (args[1].length() < 3 || args[1].contains(" ") || args[1].contains("\t") || args[1].length() > 8) { Chat.error(player, "Invalid tag!"); Chat.error(player, "tags should be 3-8 chars, alphanumeric and have no spaces"); + return; } + + Team team = Team.fromMember(player); + if (team == null) return; + + team.changeTeamTag(player, args[1]); } public void handleTransfer(Player player, String[] args) { @@ -151,8 +173,10 @@ public class Commands implements CommandExecutor { Chat.error(player, "Usage: /team leave"); return; } + Team team = Team.fromMember(player); + if (team == null) return; - Team.leaveTeam(player); + team.leaveTeam(player); } public void handleDisband(Player player, String[] args) { @@ -160,8 +184,10 @@ public class Commands implements CommandExecutor { Chat.error(player, "Usage: /team disband"); return; } + Team team = Team.fromMember(player); + if (team == null) return; - Team.disbandTeam(player); + team.disbandTeam(player); } public void handleSetWarp(Player player, String[] args) { @@ -183,6 +209,8 @@ public class Commands implements CommandExecutor { return; } Team team = Team.fromMember(player); + if (team == null) return; + Warp warp = Warp.getTeamWarp(team, args[1]); } @@ -191,8 +219,10 @@ public class Commands implements CommandExecutor { Chat.error(player, "Usage: /team kick "); return; } + Team team = Team.fromMember(player); + if (team == null) return; - Team.removePlayer(player, args[1]); + team.removePlayer(player, args[1]); } public void handleLog(Player player, String[] args) { @@ -201,7 +231,10 @@ public class Commands implements CommandExecutor { return; } - ArrayList logs = Team.getLogs(player); + Team team = Team.fromMember(player); + if (team == null) return; + + ArrayList logs = team.getLogs(player); String result = "Logs: [\n " + String.join("\n ", logs) + "\n]"; Chat.info(player, result); } diff --git a/src/main/java/dev/zxq5/fantasysmp/groups/Team.java b/src/main/java/dev/zxq5/fantasysmp/groups/Team.java index 620b395..2db1658 100644 --- a/src/main/java/dev/zxq5/fantasysmp/groups/Team.java +++ b/src/main/java/dev/zxq5/fantasysmp/groups/Team.java @@ -3,16 +3,19 @@ package dev.zxq5.fantasysmp.groups; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import dev.zxq5.fantasysmp.chatutils.Chat; +import org.bukkit.ChatColor; import org.bukkit.entity.Player; import java.io.*; import java.util.ArrayList; import java.util.UUID; +import static org.bukkit.Bukkit.broadcastMessage; import static org.bukkit.Bukkit.getServer; public class Team { private static ArrayList teams; + private final static String FILENAME = "teams.json"; private String name; private String ownerUUID; @@ -27,12 +30,21 @@ public class Team { this.teamUUID = UUID.randomUUID().toString(); this.ownerUUID = creator.getUniqueId().toString(); this.members = new ArrayList<>(); + this.logs = new ArrayList<>(); members.add(creator.getUniqueId().toString()); } public static Team createTeam(Player creator, String name) { + if (Team.fromMember(creator) != null) { + Team.error(creator, Error.SELF_IN_TEAM); + return null; + } + Team team = new Team(creator, name, name); + team.logs.add(creator.getName() + " created the team."); teams.add(team); + + Chat.success(creator, "You created " + team.name + "."); return team; } @@ -40,6 +52,8 @@ public class Team { for (Team team : teams) { if (team.members.contains(member.getUniqueId().toString())) return team; } + + Team.error(member, Error.TEAM_NOT_FOUND); return null; } @@ -51,111 +65,166 @@ public class Team { return names; } - public static void renameTeam(Player player, String newName) { - for (Team team : teams) { - if (!team.ownerUUID.equals(player.getUniqueId().toString())) continue; - - team.name = newName; - team.log(player.getName() + " renamed the team to " + newName + "."); + public void renameTeam(Player player, String newName) { + if (!this.ownerUUID.equals(player.getUniqueId().toString())) { + Team.error(player, Error.NO_PERMISSION); return; } + + String oldName = this.name; + this.name = newName; + this.log(player.getName() + " renamed the team to " + newName + "."); + + Chat.success(player, "You renamed " + oldName + " to " + newName + "."); } - public static void transferTeam(Player player, String playerName) { + public void changeTeamTag(Player player, String newTag) { + if (!this.ownerUUID.equals(player.getUniqueId().toString())) { + Team.error(player, Error.NO_PERMISSION); + return; + } + + this.tag = newTag; + this.log(player.getName() + " changed the team tag to " + newTag + "."); + + Chat.success(player, "You changed the tag of " + this.name + " to " + newTag + "."); + } + + public void setColour (Player player, String colour) { + if (!this.ownerUUID.equals(player.getUniqueId().toString())) { + Team.error(player, Error.NO_PERMISSION); + return; + } + + switch (colour) { + case "red" -> this.tag = ChatColor.RED + this.tag; + case "green" -> this.tag = ChatColor.GREEN + this.tag; + case "blue" -> this.tag = ChatColor.BLUE + this.tag; + case "yellow" -> this.tag = ChatColor.YELLOW + this.tag; + case "aqua" -> this.tag = ChatColor.AQUA + this.tag; + case "dark_aqua" -> this.tag = ChatColor.DARK_AQUA + this.tag; + case "dark_blue" -> this.tag = ChatColor.DARK_BLUE + this.tag; + case "dark_gray" -> this.tag = ChatColor.DARK_GRAY + this.tag; + case "dark_green" -> this.tag = ChatColor.DARK_GREEN + this.tag; + case "dark_purple" -> this.tag = ChatColor.DARK_PURPLE + this.tag; + case "gold" -> this.tag = ChatColor.GOLD + this.tag; + case "gray" -> this.tag = ChatColor.GRAY + this.tag; + case "light_purple" -> this.tag = ChatColor.LIGHT_PURPLE + this.tag; + case "white" -> this.tag = ChatColor.WHITE + this.tag; + case "black" -> this.tag = ChatColor.BLACK + this.tag; + } + + this.log(player.getName() + " changed the team colour to " + colour + "."); + Chat.success(player, "You changed the colour of " + this.name + " to " + colour + "."); + } + + public void transferTeam(Player player, String playerName) { + if (!this.ownerUUID.equals(player.getUniqueId().toString())) { + Team.error(player, Error.NO_PERMISSION); + return; + } + Player newOwner = getServer().getPlayer(playerName); - for (Team team : teams) { - if (!team.ownerUUID.equals(player.getUniqueId().toString())) continue; - - team.ownerUUID = newOwner.getUniqueId().toString(); - team.log(player.getName() + " transferred ownership to " + newOwner.getName() + "."); + if (newOwner == null) { + Team.error(player, Error.PLAYER_NOT_FOUND); return; } + + String newUUID = newOwner.getUniqueId().toString(); + if (!this.members.contains(newUUID)) { + Team.error(player, Error.PLAYER_NOT_FOUND); + return; + } + + this.ownerUUID = newUUID; + this.log(player.getName() + " transferred ownership to " + newOwner.getName() + "."); + + Chat.success(player, "You transferred ownership of " + this.name + " to " + newOwner.getName() + "."); } - public static void removePlayer(Player remover, String playerName) { + public void removePlayer(Player remover, String playerName) { Player removedPlayer = getServer().getPlayer(playerName); if (removedPlayer == null) { - Chat.error(remover, "Player not found!"); + Team.error(remover, Error.PLAYER_NOT_FOUND); return; } String removerUUID = remover.getUniqueId().toString(); String removedPlayerUUID = removedPlayer.getUniqueId().toString(); - for (Team team : teams) { - if (!team.members.contains(removerUUID)) continue; - - if (!team.ownerUUID.equals(removerUUID)) { - Chat.error(remover, "You do not have permission to remove players from this team."); - return; - } - - if (!team.members.contains(removedPlayerUUID)) { - Chat.error(remover, "This player is not in your team."); - return; - } - - if (removedPlayerUUID.equals(team.ownerUUID)) { - Chat.error(remover, "You cannot remove yourself!"); - return; - } - - team.members.remove(removedPlayerUUID); - team.log(remover.getName() + " removed " + removedPlayer.getName() + " from the team."); + if (removedPlayerUUID.equals(this.ownerUUID)) { + Team.error(remover, Error.TEAM_OWNER); return; } - } - public static void leaveTeam(Player player) { - for (Team team : teams) { - if (!team.members.contains(player.getUniqueId().toString())) continue; - if (team.ownerUUID.equals(player.getUniqueId().toString())) { - player.sendMessage("You cannot leave a team that you own!"); - } - - team.members.remove(player.getUniqueId().toString()); - team.log(player.getName() + " left the team."); + if (!this.ownerUUID.equals(removerUUID)) { + Team.error(remover, Error.NO_PERMISSION); return; } - } - public static void disbandTeam(Player player) { - for (Team team : teams) { - if (!team.ownerUUID.equals(player.getUniqueId().toString())) continue; - - teams.remove(team); - team.log(player.getName() + " disbanded the team."); + if (!this.members.contains(removedPlayerUUID)) { + Team.error(remover, Error.PLAYER_NOT_FOUND); return; } + + this.members.remove(removedPlayerUUID); + this.log(remover.getName() + " removed " + removedPlayer.getName() + " from the team."); + + Chat.success(remover, "You removed " + removedPlayer.getName() + " from " + this.name + "."); } - public static void addMember(Player player) { - for (Team team : teams) { - if (!team.ownerUUID.equals(player.getUniqueId().toString())) continue; - - team.members.add(player.getUniqueId().toString()); - team.log(player.getName() + " joined the team."); + public void leaveTeam(Player member) { + if (this.ownerUUID.equals(member.getUniqueId().toString())) { + Team.error(member, Error.TEAM_OWNER); return; } + + this.members.remove(member.getUniqueId().toString()); + this.log(member.getName() + " left the team."); + + Chat.success(member, "You left " + this.name + "."); } - public static ArrayList getLogs(Player player) { - for (Team team : teams) { - if (team.ownerUUID.equals(player.getUniqueId().toString())) { - return team.logs; - } + public void disbandTeam(Player member) { + if (!this.ownerUUID.equals(member.getUniqueId().toString())) { + Team.error(member, Error.NO_PERMISSION); + return; } + + teams.remove(this); + this.log(member.getName() + " disbanded the team."); + + Chat.success(member, "You disbanded " + this.name + "."); + } + + public void addMember(Player member) { + if (!this.ownerUUID.equals(member.getUniqueId().toString())) { + Team.error(member, Error.NO_PERMISSION); + return; + } + + this.members.add(member.getUniqueId().toString()); + this.log(member.getName() + " joined the team."); + + Chat.success(member, "You joined " + this.name + "."); + } + + public ArrayList getLogs(Player member) { + if (this.ownerUUID.equals(member.getUniqueId().toString())) return this.logs; + + Team.error(member, Error.NO_PERMISSION); return null; } public void log(String message) { this.logs.add(message); + Team.saveTeams(); } public static void loadTeams() throws Exception { File dataFolder = getServer().getPluginManager().getPlugin("Fantasysmp").getDataFolder(); - File file = new File(dataFolder, "warps.json"); + File file = new File(dataFolder, FILENAME); if (!file.exists()) { createTeamsFile(); @@ -170,20 +239,26 @@ public class Team { reader.close(); } - public static void saveTeams() throws Exception { + public static void saveTeams() { File dataFolder = getServer().getPluginManager().getPlugin("Fantasysmp").getDataFolder(); - File file = new File(dataFolder, "teams.json"); + File file = new File(dataFolder, FILENAME); Gson gson = new Gson(); String json = gson.toJson(teams); - Writer writer = new FileWriter(file); - writer.write(json); - writer.close(); + + try { + Writer writer = new FileWriter(file); + writer.write(json); + writer.close(); + } catch (Exception e) { + broadcastMessage("Error saving teams. Please contact an admin."); + e.printStackTrace(); + } } public static void createTeamsFile() { File dataFolder = getServer().getPluginManager().getPlugin("Fantasysmp").getDataFolder(); - File file = new File(dataFolder, "teams.json"); + File file = new File(dataFolder, FILENAME); if (!file.exists()) { try { @@ -202,4 +277,32 @@ public class Team { public String getUUID() { return this.teamUUID; } + + public String getTag() { + return this.tag; + } + + public static void error(Player player, Error error) { + Chat.error(player, switch (error) { + case NO_PERMISSION -> "You do not have permission to do that!"; + case SELF_IN_TEAM -> "You are already in a team!"; + case NOT_IN_TEAM -> "You are not in a team!"; + case TEAM_NOT_FOUND -> "Team not found!"; + case PLAYER_NOT_FOUND -> "Player not found!"; + case ALREADY_TAKEN -> "That name is already taken!"; + case PLAYER_IN_TEAM -> "That player is already in a team!"; + case TEAM_OWNER -> "You cannot do this to/as the owner!"; + }); + } } + +enum Error { + NO_PERMISSION, + TEAM_OWNER, + SELF_IN_TEAM, + NOT_IN_TEAM, + TEAM_NOT_FOUND, + PLAYER_NOT_FOUND, + ALREADY_TAKEN, + PLAYER_IN_TEAM, +} \ No newline at end of file diff --git a/src/main/java/dev/zxq5/fantasysmp/warps/Warp.java b/src/main/java/dev/zxq5/fantasysmp/warps/Warp.java index 3f4b6e3..c131eeb 100644 --- a/src/main/java/dev/zxq5/fantasysmp/warps/Warp.java +++ b/src/main/java/dev/zxq5/fantasysmp/warps/Warp.java @@ -17,11 +17,13 @@ import static org.bukkit.Bukkit.getServer; public class Warp { + private static final String FILENAME = "warps.json"; private static Warp[] warps; private String name; private String setby; private String world; + private String teamUUID; private WarpType type; private int x; private int y; @@ -37,7 +39,7 @@ public class Warp { public static void loadWarps() throws Exception { File dataFolder = getServer().getPluginManager().getPlugin("Fantasysmp").getDataFolder(); - File file = new File(dataFolder, "warps.json"); + File file = new File(dataFolder, FILENAME); if (!file.exists()) { createWarpFile(); @@ -54,7 +56,7 @@ public class Warp { public static void saveWarps() throws Exception { File dataFolder = getServer().getPluginManager().getPlugin("Fantasysmp").getDataFolder(); - File file = new File(dataFolder, "warps.json"); + File file = new File(dataFolder, FILENAME); Gson gson = new Gson(); String json = gson.toJson(warps); @@ -65,7 +67,7 @@ public class Warp { public static void createWarpFile() { File dataFolder = getServer().getPluginManager().getPlugin("Fantasysmp").getDataFolder(); - File file = new File(dataFolder, "warps.json"); + File file = new File(dataFolder, FILENAME); if (!file.exists()) { try { diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index d7cb75d..8ffc50d 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -47,12 +47,21 @@ commands: usage: /warp permission: fantasysmp.warps + team: + description: team commands + usage: /team + permission: fantasysmp.teams + permissions: fantasysmp.items: description: create custom items from plugin default: false + fantasysmp.teams: + description: team commands + default: true + fantasysmp.warps: description: teleport to custom warps default: true @@ -73,4 +82,5 @@ permissions: fantasysmp.manage_warps: true fantasysmp.home: true fantasysmp.warps: true + fantasysmp.teams: true From a4254a94f40eb2f2ec6c70f383f67926cd090e21 Mon Sep 17 00:00:00 2001 From: zxq5 Date: Fri, 29 Aug 2025 00:46:27 +0100 Subject: [PATCH 9/9] added funny death messages --- .../java/dev/zxq5/fantasysmp/Fantasysmp.java | 6 ++-- .../dev/zxq5/fantasysmp/chatutils/Chat.java | 10 +++--- .../events/DeathMessageCustomiser.java | 33 +++++++++++++++++++ .../dev/zxq5/fantasysmp/warps/Warper.java | 3 -- 4 files changed, 41 insertions(+), 11 deletions(-) create mode 100644 src/main/java/dev/zxq5/fantasysmp/events/DeathMessageCustomiser.java diff --git a/src/main/java/dev/zxq5/fantasysmp/Fantasysmp.java b/src/main/java/dev/zxq5/fantasysmp/Fantasysmp.java index 5c0bb37..9165d25 100644 --- a/src/main/java/dev/zxq5/fantasysmp/Fantasysmp.java +++ b/src/main/java/dev/zxq5/fantasysmp/Fantasysmp.java @@ -1,9 +1,6 @@ package dev.zxq5.fantasysmp; -import dev.zxq5.fantasysmp.events.Chat; -import dev.zxq5.fantasysmp.events.HereticWarner; -import dev.zxq5.fantasysmp.events.StevenKillCheck; -import dev.zxq5.fantasysmp.events.XrayDetector; +import dev.zxq5.fantasysmp.events.*; import dev.zxq5.fantasysmp.groups.Commands; import dev.zxq5.fantasysmp.groups.Team; import dev.zxq5.fantasysmp.items.*; @@ -39,6 +36,7 @@ public final class Fantasysmp extends JavaPlugin { getServer().getPluginManager().registerEvents(new Chat(), this); getServer().getPluginManager().registerEvents(new StevenKillCheck(), this); + getServer().getPluginManager().registerEvents(new DeathMessageCustomiser(), this); HereticWarner hereticWarner = new HereticWarner(); hereticWarner.checkHereticInventory(); diff --git a/src/main/java/dev/zxq5/fantasysmp/chatutils/Chat.java b/src/main/java/dev/zxq5/fantasysmp/chatutils/Chat.java index 686be77..4c1a298 100644 --- a/src/main/java/dev/zxq5/fantasysmp/chatutils/Chat.java +++ b/src/main/java/dev/zxq5/fantasysmp/chatutils/Chat.java @@ -4,17 +4,19 @@ import org.bukkit.ChatColor; import org.bukkit.entity.Player; public class Chat { - public static String EVENTPREFIX = ChatColor.WHITE + "<" + ChatColor.AQUA + "Server" + ChatColor.WHITE + "> " + ChatColor.RESET; + public static final String EVENT_PREFIX = ChatColor.WHITE + "<" + ChatColor.AQUA + "Server" + ChatColor.WHITE + "> " + ChatColor.RESET; + + private Chat() {} public static void success(Player player, String message) { - player.sendMessage(EVENTPREFIX + ChatColor.GREEN + message); + player.sendMessage(EVENT_PREFIX + ChatColor.GREEN + message); } public static void error(Player player, String message) { - player.sendMessage(EVENTPREFIX + ChatColor.RED + message); + player.sendMessage(EVENT_PREFIX + ChatColor.RED + message); } public static void info(Player player, String message) { - player.sendMessage(EVENTPREFIX + message); + player.sendMessage(EVENT_PREFIX + message); } } diff --git a/src/main/java/dev/zxq5/fantasysmp/events/DeathMessageCustomiser.java b/src/main/java/dev/zxq5/fantasysmp/events/DeathMessageCustomiser.java new file mode 100644 index 0000000..ea6f3d0 --- /dev/null +++ b/src/main/java/dev/zxq5/fantasysmp/events/DeathMessageCustomiser.java @@ -0,0 +1,33 @@ +package dev.zxq5.fantasysmp.events; + +import org.bukkit.damage.DamageType; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.entity.PlayerDeathEvent; + +import java.util.Random; + +public class DeathMessageCustomiser implements Listener { + public DeathMessageCustomiser() {} + + final String[] FALL_MESSAGES = new String[] { + "%p Forgot to use chalk.", + "%p Tried to free solo.", + "%p Tried lead climbing.", + "%p Discovered it was not in fact a jug.", + "It was not a v1 in %p's gym." + }; + + @EventHandler + public void onPlayerDeath(PlayerDeathEvent event) { + Random random = new Random(); + int randomIndex = random.nextInt(FALL_MESSAGES.length); + + Player player = event.getEntity(); + + if (event.getDamageSource().getDamageType() == DamageType.FALL) { + event.setDeathMessage(FALL_MESSAGES[randomIndex].replace("%p", player.getName())); + } + } +} diff --git a/src/main/java/dev/zxq5/fantasysmp/warps/Warper.java b/src/main/java/dev/zxq5/fantasysmp/warps/Warper.java index 61ec411..7bb290c 100644 --- a/src/main/java/dev/zxq5/fantasysmp/warps/Warper.java +++ b/src/main/java/dev/zxq5/fantasysmp/warps/Warper.java @@ -1,13 +1,10 @@ package dev.zxq5.fantasysmp.warps; import dev.zxq5.fantasysmp.chatutils.Chat; -import org.bukkit.ChatColor; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.entity.Player; -import static dev.zxq5.fantasysmp.chatutils.Chat.EVENTPREFIX; - /* * Commands: *