diff --git a/src/com/redstoner/modules/eastereggs/Eastereggs.cmd b/src/com/redstoner/modules/eastereggs/Eastereggs.cmd index bc58dff..fd64501 100644 --- a/src/com/redstoner/modules/eastereggs/Eastereggs.cmd +++ b/src/com/redstoner/modules/eastereggs/Eastereggs.cmd @@ -42,4 +42,11 @@ command deadbush { run bush; help Does stuff.; } +} + +command /grief { + [empty] { + run grief; + help Does stuff.; + } } \ No newline at end of file diff --git a/src/com/redstoner/modules/eastereggs/Eastereggs.java b/src/com/redstoner/modules/eastereggs/Eastereggs.java index 281b247..fdb2c5f 100644 --- a/src/com/redstoner/modules/eastereggs/Eastereggs.java +++ b/src/com/redstoner/modules/eastereggs/Eastereggs.java @@ -37,7 +37,7 @@ import net.nemez.chatapi.click.Message; @Commands(CommandHolderType.File) @AutoRegisterListener -@Version(major = 4, minor = 0, revision = 0, compatible = 4) +@Version(major = 4, minor = 0, revision = 1, compatible = 4) public class Eastereggs implements Module, Listener { final File prefixFile = new File(Main.plugin.getDataFolder(), "eastereggs/prefix.json"), @@ -165,11 +165,11 @@ public class Eastereggs implements Module, Listener if ((rawMaterialName = itm.get("item")) == null) if ((rawMaterialName = prefx.get("item")) == null) rawMaterialName = "minecraft:stick"; - + Material material = Material.valueOf(((String) rawMaterialName).toUpperCase().replaceFirst(".+?:", "")); if (material == null) material = Material.STICK; - + ItemStack resultingItem = new ItemStack(material); ItemMeta meta = resultingItem.getItemMeta(); if (meta == null) @@ -248,7 +248,7 @@ public class Eastereggs implements Module, Listener meta.addEnchant(entry.getKey() == null ? getRandomValue(Enchantment.values()) : entry.getKey(), override ? overrideLvl : (lvl + totalMod), true); } - + resultingItem.setItemMeta(meta); } @@ -268,7 +268,7 @@ public class Eastereggs implements Module, Listener public HashMap parseEnchants(JSONObject prefx, JSONObject itm, JSONObject mod, JSONObject sufx) { - HashMap result = new HashMap(); + HashMap result = new HashMap<>(); Object raw; if ((raw = sufx.get("ench")) != null) { @@ -333,6 +333,13 @@ public class Eastereggs implements Module, Listener return true; } + @Command(hook = "grief") + public boolean grief(CommandSender sender) + { + ((Player) sender).kickPlayer("You have been banned: Attempted grief!"); + return true; + } + private static Integer parseInt(String raw) { if (raw == null)