From 324c15735326fd9dddd9b2534d5a803ba5095d9c Mon Sep 17 00:00:00 2001 From: Wakka Date: Thu, 1 Aug 2019 00:56:15 -0500 Subject: [PATCH 1/3] added hat.java --- .../spleefleague/commands/commands/hat.java | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 src/main/java/com/spleefleague/commands/commands/hat.java diff --git a/src/main/java/com/spleefleague/commands/commands/hat.java b/src/main/java/com/spleefleague/commands/commands/hat.java new file mode 100644 index 0000000..0c4638b --- /dev/null +++ b/src/main/java/com/spleefleague/commands/commands/hat.java @@ -0,0 +1,50 @@ +import com.spleefleague.annotations.Endpoint; +import com.spleefleague.annotations.PlayerArg; +import com.spleefleague.annotations.LiteralArg; +import com.spleefleague.core.plugin.CorePlugin; +import com.spleefleague.commands.command.BasicCommand; +import com.spleefleague.core.player.Rank; +import org.bukkit.Bukkit; +import org.bukkit.Material; +import org.bukkit.command.Command; +import org.bukkit.entity.Player; +import org.bukkit.inventory.ItemStack; +import org.bukkit.inventory.PlayerInventory; + +public class hat extends BasicCommand { + + public hat(CorePlugin plugin, String name, String usage) { + super(plugin, new hatDispatcher(), name, usage, Rank.MODERATOR); + } + + @Endpoint + public void hat(Player p) { + final PlayerInventory inv = p.getInventory(); + final ItemStack hand = inv.getItemInMainHand(); + final ItemStack head = inv.getHelmet(); + if(inv.getItemInMainHand().getType() != Material.AIR) { + inv.setItemInMainHand(head); + inv.setHelmet(hand); + success(p, "Enjoy your new hat!"); + }else if(head != null && inv.getItemInMainHand().getType() == Material.AIR) { + inv.setHelmet(new ItemStack(Material.AIR)); + inv.setItemInMainHand(head); + success(p, "Your hat has been removed!"); + }else{ + error(p, "You must be holding something!"); + } + } + + @Endpoint + public void hat(Player p, @LiteralArg(value = "remove") String l) { + final PlayerInventory inv = p.getInventory(); + final ItemStack head = inv.getHelmet(); + if(head == null || head.getType() == Material.AIR){ + error(p, "You are not wearing a hat!"); + return; + } + inv.setHelmet(new ItemStack(Material.AIR)); + inv.setItemInMainHand(head); + success(p, "Your hat has been removed!"); + } +} From 64eef8ba436cff28c0c93a63f4081fc5d7d14ced Mon Sep 17 00:00:00 2001 From: Wakka Date: Thu, 1 Aug 2019 00:58:11 -0500 Subject: [PATCH 2/3] added /hat to plugin.yml --- src/main/resources/plugin.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index c116d33..1a35f6f 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -269,4 +269,8 @@ commands: setcheckpoint: description: Sets or unsets a checkpoint usage: | - / [x, y, z, yaw, pitch] [duration] \ No newline at end of file + / [x, y, z, yaw, pitch] [duration] + hat: + description: Puts the item in your hand on your head. + usage: | + / [remove] From 5d4c653c54a4306a0d079c7fac98f392ff91e4f4 Mon Sep 17 00:00:00 2001 From: Wakka Date: Thu, 1 Aug 2019 01:26:08 -0500 Subject: [PATCH 3/3] unused imports --- src/main/java/com/spleefleague/commands/commands/hat.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/spleefleague/commands/commands/hat.java b/src/main/java/com/spleefleague/commands/commands/hat.java index 0c4638b..2fb6ea9 100644 --- a/src/main/java/com/spleefleague/commands/commands/hat.java +++ b/src/main/java/com/spleefleague/commands/commands/hat.java @@ -1,12 +1,9 @@ import com.spleefleague.annotations.Endpoint; -import com.spleefleague.annotations.PlayerArg; import com.spleefleague.annotations.LiteralArg; import com.spleefleague.core.plugin.CorePlugin; import com.spleefleague.commands.command.BasicCommand; import com.spleefleague.core.player.Rank; -import org.bukkit.Bukkit; import org.bukkit.Material; -import org.bukkit.command.Command; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.PlayerInventory; @@ -18,7 +15,7 @@ public hat(CorePlugin plugin, String name, String usage) { } @Endpoint - public void hat(Player p) { + public void giveHat(Player p) { final PlayerInventory inv = p.getInventory(); final ItemStack hand = inv.getItemInMainHand(); final ItemStack head = inv.getHelmet(); @@ -36,7 +33,7 @@ public void hat(Player p) { } @Endpoint - public void hat(Player p, @LiteralArg(value = "remove") String l) { + public void removeHat(Player p, @LiteralArg(value = "remove") String l) { final PlayerInventory inv = p.getInventory(); final ItemStack head = inv.getHelmet(); if(head == null || head.getType() == Material.AIR){