From ad8c9e213d689b72ca46415788b0fc7e398cd297 Mon Sep 17 00:00:00 2001 From: minenash Date: Wed, 8 Feb 2017 16:00:22 -0500 Subject: [PATCH 1/5] Added Illumination module. --- .../modules/illumination/Illumination.java | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 src/com/redstoner/modules/illumination/Illumination.java diff --git a/src/com/redstoner/modules/illumination/Illumination.java b/src/com/redstoner/modules/illumination/Illumination.java new file mode 100644 index 0000000..65438a3 --- /dev/null +++ b/src/com/redstoner/modules/illumination/Illumination.java @@ -0,0 +1,57 @@ +package com.redstoner.modules.illumination; + +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; +import org.bukkit.potion.PotionEffect; +import org.bukkit.potion.PotionEffectType; + +import com.nemez.cmdmgr.Command; +import com.redstoner.modules.Module; + +public class Illumination implements Module{ + + boolean enabled = false; + PotionEffect effect = new PotionEffect(PotionEffectType.NIGHT_VISION, Integer.MAX_VALUE, 0, false, false); + + @Command(hook = "illuminate") + public void illuminate(CommandSender sender) { + Player player = (Player) sender; + if(player.hasPotionEffect(PotionEffectType.NIGHT_VISION)) { + player.removePotionEffect(PotionEffectType.NIGHT_VISION); + } + else { + player.addPotionEffect(effect, true); + } + } + + @Override + public void onEnable() { + enabled = true; + + } + + @Override + public void onDisable() { + enabled = false; + + } + + @Override + public boolean enabled() { + return enabled; + } + + @Override + public String getCommandString() { + return "command nightvision {\n" + + " [empty] {\n" + + " run illuminate;\n" + + " type player;\n" + + " help Gives the player infinte night vision;\n" + + " perm utils.illuminate;\n" + + " }\n" + + "}\n" + + "\n" + + "}"; + } +} -- 2.45.2 From b30d8228bb31734402c0ac0d1342bfd57596ca24 Mon Sep 17 00:00:00 2001 From: minenash Date: Wed, 8 Feb 2017 17:07:50 -0500 Subject: [PATCH 2/5] Added Illumination to Main --- src/com/redstoner/misc/Main.java | 2 ++ src/com/redstoner/modules/illumination/Illumination.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/com/redstoner/misc/Main.java b/src/com/redstoner/misc/Main.java index 797da9c..f72f49c 100644 --- a/src/com/redstoner/misc/Main.java +++ b/src/com/redstoner/misc/Main.java @@ -14,6 +14,7 @@ import com.redstoner.modules.chatgroups.Chatgroups; import com.redstoner.modules.check.Check; import com.redstoner.modules.cycle.Cycle; import com.redstoner.modules.damnspam.DamnSpam; +import com.redstoner.modules.illumination.Illumination; import com.redstoner.modules.imout.Imout; import com.redstoner.modules.lagchunks.LagChunks; import com.redstoner.modules.loginsecurity.LoginSecurity; @@ -57,6 +58,7 @@ public class Main extends JavaPlugin ModuleLoader.addModule(Check.class); ModuleLoader.addModule(DamnSpam.class); // TODO: ModuleLoader.addModule(Friends.class); + ModuleLoader.addModule(Illumination.class); // TODO: ModuleLoader.addModule(Imbusy.class); ModuleLoader.addModule(Imout.class); ModuleLoader.addModule(LagChunks.class); diff --git a/src/com/redstoner/modules/illumination/Illumination.java b/src/com/redstoner/modules/illumination/Illumination.java index 65438a3..f962368 100644 --- a/src/com/redstoner/modules/illumination/Illumination.java +++ b/src/com/redstoner/modules/illumination/Illumination.java @@ -6,8 +6,10 @@ import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; import com.nemez.cmdmgr.Command; +import com.redstoner.annotations.Version; import com.redstoner.modules.Module; +@Version(major = 1, minor = 0, revision = 0, compatible = 1) public class Illumination implements Module{ boolean enabled = false; -- 2.45.2 From e49ceec37641b2426b7a08279f47025cc9207e5e Mon Sep 17 00:00:00 2001 From: minenash Date: Wed, 8 Feb 2017 17:18:14 -0500 Subject: [PATCH 3/5] Added Chat Feedback to Illumination --- src/com/redstoner/misc/Main.java | 2 +- src/com/redstoner/modules/illumination/Illumination.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/com/redstoner/misc/Main.java b/src/com/redstoner/misc/Main.java index f72f49c..e7d4707 100644 --- a/src/com/redstoner/misc/Main.java +++ b/src/com/redstoner/misc/Main.java @@ -35,7 +35,7 @@ import com.redstoner.modules.webtoken.WebToken; /** Main class. Duh. * * @author Pepich */ -@Version(major = 1, minor = 4, revision = 0, compatible = -1) +@Version(major = 1, minor = 4, revision = 1, compatible = -1) public class Main extends JavaPlugin { public static JavaPlugin plugin; diff --git a/src/com/redstoner/modules/illumination/Illumination.java b/src/com/redstoner/modules/illumination/Illumination.java index f962368..5404a30 100644 --- a/src/com/redstoner/modules/illumination/Illumination.java +++ b/src/com/redstoner/modules/illumination/Illumination.java @@ -7,6 +7,7 @@ import org.bukkit.potion.PotionEffectType; import com.nemez.cmdmgr.Command; import com.redstoner.annotations.Version; +import com.redstoner.misc.Utils; import com.redstoner.modules.Module; @Version(major = 1, minor = 0, revision = 0, compatible = 1) @@ -20,9 +21,11 @@ public class Illumination implements Module{ Player player = (Player) sender; if(player.hasPotionEffect(PotionEffectType.NIGHT_VISION)) { player.removePotionEffect(PotionEffectType.NIGHT_VISION); + Utils.sendMessage(sender, null, "Night Vision Disabled."); } else { player.addPotionEffect(effect, true); + Utils.sendMessage(sender, null, "Night Vision Enabled."); } } -- 2.45.2 From 3a8927169acd44e9f6b3b2715501033e68a12212 Mon Sep 17 00:00:00 2001 From: minenash Date: Thu, 9 Feb 2017 17:02:45 -0500 Subject: [PATCH 4/5] Back to defualt. --- src/com/redstoner/misc/Main.java | 2 - .../modules/illumination/Illumination.java | 62 ------------------- 2 files changed, 64 deletions(-) delete mode 100644 src/com/redstoner/modules/illumination/Illumination.java diff --git a/src/com/redstoner/misc/Main.java b/src/com/redstoner/misc/Main.java index e7d4707..8543dde 100644 --- a/src/com/redstoner/misc/Main.java +++ b/src/com/redstoner/misc/Main.java @@ -14,7 +14,6 @@ import com.redstoner.modules.chatgroups.Chatgroups; import com.redstoner.modules.check.Check; import com.redstoner.modules.cycle.Cycle; import com.redstoner.modules.damnspam.DamnSpam; -import com.redstoner.modules.illumination.Illumination; import com.redstoner.modules.imout.Imout; import com.redstoner.modules.lagchunks.LagChunks; import com.redstoner.modules.loginsecurity.LoginSecurity; @@ -58,7 +57,6 @@ public class Main extends JavaPlugin ModuleLoader.addModule(Check.class); ModuleLoader.addModule(DamnSpam.class); // TODO: ModuleLoader.addModule(Friends.class); - ModuleLoader.addModule(Illumination.class); // TODO: ModuleLoader.addModule(Imbusy.class); ModuleLoader.addModule(Imout.class); ModuleLoader.addModule(LagChunks.class); diff --git a/src/com/redstoner/modules/illumination/Illumination.java b/src/com/redstoner/modules/illumination/Illumination.java deleted file mode 100644 index 5404a30..0000000 --- a/src/com/redstoner/modules/illumination/Illumination.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.redstoner.modules.illumination; - -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.bukkit.potion.PotionEffect; -import org.bukkit.potion.PotionEffectType; - -import com.nemez.cmdmgr.Command; -import com.redstoner.annotations.Version; -import com.redstoner.misc.Utils; -import com.redstoner.modules.Module; - -@Version(major = 1, minor = 0, revision = 0, compatible = 1) -public class Illumination implements Module{ - - boolean enabled = false; - PotionEffect effect = new PotionEffect(PotionEffectType.NIGHT_VISION, Integer.MAX_VALUE, 0, false, false); - - @Command(hook = "illuminate") - public void illuminate(CommandSender sender) { - Player player = (Player) sender; - if(player.hasPotionEffect(PotionEffectType.NIGHT_VISION)) { - player.removePotionEffect(PotionEffectType.NIGHT_VISION); - Utils.sendMessage(sender, null, "Night Vision Disabled."); - } - else { - player.addPotionEffect(effect, true); - Utils.sendMessage(sender, null, "Night Vision Enabled."); - } - } - - @Override - public void onEnable() { - enabled = true; - - } - - @Override - public void onDisable() { - enabled = false; - - } - - @Override - public boolean enabled() { - return enabled; - } - - @Override - public String getCommandString() { - return "command nightvision {\n" + - " [empty] {\n" + - " run illuminate;\n" + - " type player;\n" + - " help Gives the player infinte night vision;\n" + - " perm utils.illuminate;\n" + - " }\n" + - "}\n" + - "\n" + - "}"; - } -} -- 2.45.2 From a2a2334be667ae805e66a9321d5b62f76eaa4dfa Mon Sep 17 00:00:00 2001 From: minenash Date: Sat, 11 Feb 2017 11:42:19 -0500 Subject: [PATCH 5/5] Added ClearOnJoin Module --- src/com/redstoner/misc/Main.java | 2 + .../modules/clearonjoin/ClearOnJoin.java | 106 ++++++++++++++++++ 2 files changed, 108 insertions(+) create mode 100644 src/com/redstoner/modules/clearonjoin/ClearOnJoin.java diff --git a/src/com/redstoner/misc/Main.java b/src/com/redstoner/misc/Main.java index 8543dde..d61c6ce 100644 --- a/src/com/redstoner/misc/Main.java +++ b/src/com/redstoner/misc/Main.java @@ -12,6 +12,7 @@ import com.redstoner.modules.adminnotes.AdminNotes; import com.redstoner.modules.chatalias.Chatalias; import com.redstoner.modules.chatgroups.Chatgroups; import com.redstoner.modules.check.Check; +import com.redstoner.modules.clearonjoin.ClearOnJoin; import com.redstoner.modules.cycle.Cycle; import com.redstoner.modules.damnspam.DamnSpam; import com.redstoner.modules.imout.Imout; @@ -51,6 +52,7 @@ public class Main extends JavaPlugin ModuleLoader.addModule(AdminNotes.class); // TODO: ModuleLoader.addModule(BlockplaceMods.class); // TODO: ModuleLoader.addModule(Calc.class); + ModuleLoader.addModule(ClearOnJoin.class); ModuleLoader.addModule(Chatalias.class); ModuleLoader.addModule(Cycle.class); ModuleLoader.addModule(Chatgroups.class); diff --git a/src/com/redstoner/modules/clearonjoin/ClearOnJoin.java b/src/com/redstoner/modules/clearonjoin/ClearOnJoin.java new file mode 100644 index 0000000..12affd2 --- /dev/null +++ b/src/com/redstoner/modules/clearonjoin/ClearOnJoin.java @@ -0,0 +1,106 @@ +package com.redstoner.modules.clearonjoin; + +import java.io.File; + +import org.bukkit.Bukkit; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.player.PlayerJoinEvent; +import org.json.simple.JSONArray; + +import com.nemez.cmdmgr.Command; +import com.redstoner.misc.JsonManager; +import com.redstoner.misc.Main; +import com.redstoner.misc.Utils; +import com.redstoner.modules.Module; + +public class ClearOnJoin implements Module, Listener{ + + boolean enabled = false; + private File listLocation = new File(Main.plugin.getDataFolder(), "clearonjoins.json"); + private JSONArray list; + + @SuppressWarnings("unchecked") + @Command(hook = "clearonjoin") + public void clearOnJoin(CommandSender sender, String player) { + list.add("!" + player.toLowerCase()); + saveList(); + Utils.sendMessage(sender, null, player +"'s inventory will be cleared next time he joins."); + } + + @SuppressWarnings("unchecked") + @Command(hook = "clearonjoinself") + public void clearOnJoinSelf(CommandSender sender) { + String name = sender.getName().toLowerCase(); + if(list.contains(name)) { + list.remove(name); + Utils.sendMessage(sender, null, "Your inventory will no longer be cleared apon joining"); + saveList(); + return; + } + list.add(name); + saveList(); + Utils.sendMessage(sender, null, "Your inventory will now be cleared apon joining."); + } + + @EventHandler + public void aponJoin(PlayerJoinEvent e) + { + Player player = e.getPlayer(); + String playerName = player.getName().toLowerCase(); + if(list.contains(playerName)) { + e.getPlayer().getInventory().clear(); + Utils.sendMessage(e.getPlayer(), null, "Inventory Cleared."); + } + else if(list.contains("!" + playerName)){ + e.getPlayer().getInventory().clear(); + list.remove("!" + playerName); + saveList(); + Utils.sendMessage(e.getPlayer(), null, "Inventory Cleared."); + } + } + + public void saveList() + { + JsonManager.save(list, listLocation); + } + + @Override + public void onEnable() { + enabled = true; + list = JsonManager.getArray(listLocation); + if (list == null) list = new JSONArray(); + Bukkit.getServer().getPluginManager().registerEvents(this, Main.plugin); + } + + @Override + public void onDisable() { + saveList(); + enabled = false; + + } + + @Override + public boolean enabled() { + return enabled; + } + + @Override + public String getCommandString() { + return "command clearonjoin {\n" + + " [string:name] {\n" + + " help Clears that players inventory the nect time they join.;\n" + + " run clearonjoin name;\n" + + " perm utils.clearonjoin.other;\n" + + " }\n" + + " [empty] {\n" + + " help Clears your inventory every time you join.;\n" + + " run clearonjoinself;\n" + + " perm utils.clearonjoin.self;\n" + + " }\n" + + "}"; + } + +} -- 2.45.2