From 05463da034b3ed4aaeef111403f602286d450af2 Mon Sep 17 00:00:00 2001 From: alisolarflare Date: Tue, 23 May 2017 01:37:29 -0400 Subject: [PATCH] Adjusted Hello World Classes, fixed a few bugs --- .../presents/architecture/commands/UniversalCommand.java | 3 +++ .../presents/hello/commands/HelloCommand.java | 2 +- .../buttondevteam/presents/hello/commands/HelloSave.java | 2 +- .../buttondevteam/presents/hello/effects/HelloBlock.java | 2 +- .../presents/hello/effects/HelloMagicPotato.java | 9 ++++++--- .../presents/hello/effects/HelloParticle.java | 2 +- .../buttondevteam/presents/hello/effects/HelloSound.java | 4 ++-- 7 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/main/java/buttondevteam/presents/architecture/commands/UniversalCommand.java b/src/main/java/buttondevteam/presents/architecture/commands/UniversalCommand.java index fef0970..0d006d6 100644 --- a/src/main/java/buttondevteam/presents/architecture/commands/UniversalCommand.java +++ b/src/main/java/buttondevteam/presents/architecture/commands/UniversalCommand.java @@ -8,6 +8,9 @@ public abstract class UniversalCommand extends BaseCommand{ public String[] GetHelpText(String alias){ return new String[] { "This command doesn't have help text. ", + "If you're a player, ask a mod to write one", + "If you're a mod, ask a dev to write one", + "If you're a dev, write the help text you lazy bastard. -Ali" }; } } diff --git a/src/main/java/buttondevteam/presents/hello/commands/HelloCommand.java b/src/main/java/buttondevteam/presents/hello/commands/HelloCommand.java index a6fb4e8..27549c6 100644 --- a/src/main/java/buttondevteam/presents/hello/commands/HelloCommand.java +++ b/src/main/java/buttondevteam/presents/hello/commands/HelloCommand.java @@ -11,6 +11,6 @@ public class HelloCommand extends UniversalCommand { @Override public boolean OnCommand(CommandSender sender, String alias, String[] args) { sender.sendMessage("Hello World!"); - return false; + return true; } } diff --git a/src/main/java/buttondevteam/presents/hello/commands/HelloSave.java b/src/main/java/buttondevteam/presents/hello/commands/HelloSave.java index f741b02..3c4e4f7 100644 --- a/src/main/java/buttondevteam/presents/hello/commands/HelloSave.java +++ b/src/main/java/buttondevteam/presents/hello/commands/HelloSave.java @@ -23,6 +23,6 @@ public class HelloSave extends UniversalCommand { sender.sendMessage(e.toString()); } } - return false; + return true; } } diff --git a/src/main/java/buttondevteam/presents/hello/effects/HelloBlock.java b/src/main/java/buttondevteam/presents/hello/effects/HelloBlock.java index b42f452..9a127c8 100644 --- a/src/main/java/buttondevteam/presents/hello/effects/HelloBlock.java +++ b/src/main/java/buttondevteam/presents/hello/effects/HelloBlock.java @@ -16,7 +16,7 @@ public class HelloBlock extends PlayerCommand { blockAtPlayer.setType(Material.CAKE_BLOCK); - return false; + return true; } } diff --git a/src/main/java/buttondevteam/presents/hello/effects/HelloMagicPotato.java b/src/main/java/buttondevteam/presents/hello/effects/HelloMagicPotato.java index dc3639a..106c0f4 100644 --- a/src/main/java/buttondevteam/presents/hello/effects/HelloMagicPotato.java +++ b/src/main/java/buttondevteam/presents/hello/effects/HelloMagicPotato.java @@ -19,12 +19,15 @@ public class HelloMagicPotato extends ModCommand { ItemStack potato = new ItemStack(Material.BAKED_POTATO); ItemMeta meta = potato.getItemMeta(); - potato.addUnsafeEnchantment(Enchantment.DURABILITY, 10); + meta.addEnchant(Enchantment.DURABILITY, 10, true); ArrayList lore = new ArrayList(); lore.add("Once upon a time"); - lore.add("There was a beautiful potato that ruled a fantastic kingdom. With its armies of french" - + "fries and cannons of hash browns, it was unstopple."); + lore.add("There was a beautiful potato"); + lore.add("that ruled a fantastic kingdom."); + lore.add("With its armies of french fries"); + lore.add("and cannons of hash browns,"); + lore.add("it was unstopple."); lore.add("Until one fateful day..."); meta.setLore(lore); diff --git a/src/main/java/buttondevteam/presents/hello/effects/HelloParticle.java b/src/main/java/buttondevteam/presents/hello/effects/HelloParticle.java index 2c82fe7..56e5523 100644 --- a/src/main/java/buttondevteam/presents/hello/effects/HelloParticle.java +++ b/src/main/java/buttondevteam/presents/hello/effects/HelloParticle.java @@ -12,7 +12,7 @@ public class HelloParticle extends PlayerCommand { @Override public boolean OnCommand(Player player, String alias, String[] args) { player.getWorld().spawnParticle(Particle.CLOUD, player.getLocation(), 10); - return false; + return true; } } diff --git a/src/main/java/buttondevteam/presents/hello/effects/HelloSound.java b/src/main/java/buttondevteam/presents/hello/effects/HelloSound.java index 51f934d..2571f71 100644 --- a/src/main/java/buttondevteam/presents/hello/effects/HelloSound.java +++ b/src/main/java/buttondevteam/presents/hello/effects/HelloSound.java @@ -29,8 +29,8 @@ public class HelloSound extends PlayerCommand{ } } - player.getWorld().playSound(player.getLocation(), Sound.BLOCK_ANVIL_FALL, volume, pitch); - return false; + player.getWorld().playSound(player.getLocation(), Sound.BLOCK_ANVIL_LAND, volume, pitch); + return true; }