diff --git a/.metadata/.log b/.metadata/.log index 487988f..edf2efc 100644 --- a/.metadata/.log +++ b/.metadata/.log @@ -1464,3 +1464,25 @@ user global configuration and to define the default location to store repositori not correct please set the HOME environment variable and restart Eclipse. Otherwise Git for Windows and EGit might behave differently since they see different configuration options. This warning can be switched off on the Team > Git > Confirmations and Warnings preference page. +!SESSION 2015-08-31 18:08:04.953 ----------------------------------------------- +eclipse.buildId=M20130204-1200 +java.version=1.8.0_45 +java.vendor=Oracle Corporation +BootLoader constants: OS=win32, ARCH=x86_64, WS=win32, NL=hu_HU +Framework arguments: -product org.eclipse.epp.package.jee.product +Command-line arguments: -os win32 -ws win32 -arch x86_64 -product org.eclipse.epp.package.jee.product + +!ENTRY org.eclipse.egit.ui 2 0 2015-08-31 18:09:58.906 +!MESSAGE Warning: EGit couldn't detect the installation path "gitPrefix" of native Git. Hence EGit can't respect system level +Git settings which might be configured in ${gitPrefix}/etc/gitconfig under the native Git installation directory. +The most important of these settings is core.autocrlf. Git for Windows by default sets this parameter to true in +this system level configuration. The Git installation location can be configured on the +Team > Git > Configuration preference page's 'System Settings' tab. +This warning can be switched off on the Team > Git > Confirmations and Warnings preference page. + +!ENTRY org.eclipse.egit.ui 2 0 2015-08-31 18:09:58.979 +!MESSAGE Warning: The environment variable HOME is not set. The following directory will be used to store the Git +user global configuration and to define the default location to store repositories: 'C:\Users\Norbi'. If this is +not correct please set the HOME environment variable and restart Eclipse. Otherwise Git for Windows and +EGit might behave differently since they see different configuration options. +This warning can be switched off on the Team > Git > Confirmations and Warnings preference page. diff --git a/.metadata/.mylyn/.tasks.xml.zip b/.metadata/.mylyn/.tasks.xml.zip index 4b32410..ca5913a 100644 Binary files a/.metadata/.mylyn/.tasks.xml.zip and b/.metadata/.mylyn/.tasks.xml.zip differ diff --git a/.metadata/.mylyn/tasks.xml.zip b/.metadata/.mylyn/tasks.xml.zip index 4b4e3ca..fed04e8 100644 Binary files a/.metadata/.mylyn/tasks.xml.zip and b/.metadata/.mylyn/tasks.xml.zip differ diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/TheButtonAutoFlair/.indexes/e4/77/69/e/history.index b/.metadata/.plugins/org.eclipse.core.resources/.projects/TheButtonAutoFlair/.indexes/e4/77/69/e/history.index index 44ccb5c..12413df 100644 Binary files a/.metadata/.plugins/org.eclipse.core.resources/.projects/TheButtonAutoFlair/.indexes/e4/77/69/e/history.index and b/.metadata/.plugins/org.eclipse.core.resources/.projects/TheButtonAutoFlair/.indexes/e4/77/69/e/history.index differ diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/TheButtonAutoFlair/.indexes/history.index b/.metadata/.plugins/org.eclipse.core.resources/.projects/TheButtonAutoFlair/.indexes/history.index index a6727b6..6861193 100644 Binary files a/.metadata/.plugins/org.eclipse.core.resources/.projects/TheButtonAutoFlair/.indexes/history.index and b/.metadata/.plugins/org.eclipse.core.resources/.projects/TheButtonAutoFlair/.indexes/history.index differ diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/TheButtonAutoFlair/.markers b/.metadata/.plugins/org.eclipse.core.resources/.projects/TheButtonAutoFlair/.markers index fe5d155..d726e95 100644 Binary files a/.metadata/.plugins/org.eclipse.core.resources/.projects/TheButtonAutoFlair/.markers and b/.metadata/.plugins/org.eclipse.core.resources/.projects/TheButtonAutoFlair/.markers differ diff --git a/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources b/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources index 38b8403..f950c4c 100644 Binary files a/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources and b/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources differ diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs index 3ba669e..8c596a5 100644 --- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs @@ -5,6 +5,7 @@ content_assist_proposals_background=255,255,255 content_assist_proposals_foreground=0,0,0 eclipse.preferences.version=1 fontPropagated=true +markOccurrences=false org.eclipse.jdt.ui.editor.tab.width= org.eclipse.jdt.ui.formatterprofiles.version=12 org.eclipse.jdt.ui.javadoclocations.migrated=true diff --git a/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi b/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi index d2114dd..af93817 100644 --- a/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi +++ b/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi @@ -240,26 +240,26 @@ org.eclipse.e4.primaryDataStack EditorStack - + Editor org.eclipse.jdt.ui.CompilationUnitEditor removeOnHide - + Editor org.eclipse.jdt.ui.CompilationUnitEditor removeOnHide - + Editor org.eclipse.jdt.ui.CompilationUnitEditor removeOnHide activeOnClose - + Editor org.eclipse.jdt.ui.CompilationUnitEditor removeOnHide @@ -271,7 +271,7 @@ removeOnHide - + Editor org.eclipse.ui.DefaultTextEditor removeOnHide @@ -330,7 +330,7 @@ categoryTag:General - + View categoryTag:General @@ -432,18 +432,18 @@ Draggable - - - - - - - - - - - - + + + + + + + + + + + + toolbarSeparator @@ -451,38 +451,38 @@ Draggable - - - + + + Draggable - - + + Draggable - - + + Draggable - - + + Draggable - - - - + + + + Draggable - - - - + + + + Draggable @@ -492,20 +492,20 @@ Draggable - - - - + + + + Draggable - - - - - - - + + + + + + + Draggable @@ -523,15 +523,15 @@ Draggable - - - - - - - - - + + + + + + + + + toolbarSeparator @@ -543,8 +543,8 @@ Draggable - - + + stretch diff --git a/.metadata/.plugins/org.eclipse.jdt.core/1508644233.index b/.metadata/.plugins/org.eclipse.jdt.core/1508644233.index index 8666ed5..44d088b 100644 Binary files a/.metadata/.plugins/org.eclipse.jdt.core/1508644233.index and b/.metadata/.plugins/org.eclipse.jdt.core/1508644233.index differ diff --git a/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps b/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps index 21b68f1..99a8400 100644 Binary files a/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps and b/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps differ diff --git a/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt b/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt index 9244d53..fe62165 100644 --- a/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt +++ b/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt @@ -1,11 +1,11 @@ INDEX VERSION 1.126+D:\Z - Norbi cucca\0 Projektek\TheButtonMCAutoFlairProto\Spigot plugin\.metadata\.plugins\org.eclipse.jdt.core -3656756579.index +3045053200.index 3089967703.index 2674037006.index 323251068.index 355369697.index -3716007315.index 1934142626.index +3716007315.index 1045485630.index 605290374.index 533208796.index @@ -22,4 +22,4 @@ INDEX VERSION 1.126+D:\Z - Norbi cucca\0 Projektek\TheButtonMCAutoFlairProto\Spi 994834796.index 3604769962.index 1508644233.index -3045053200.index +3656756579.index diff --git a/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml b/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml index 411145e..933d7bf 100644 --- a/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml +++ b/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml @@ -1,6 +1,5 @@ - @@ -46,7 +45,6 @@ - @@ -57,7 +55,9 @@ - + + + diff --git a/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml b/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml index b21cab2..c4d82d7 100644 --- a/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml +++ b/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml @@ -29,4 +29,5 @@ + \ No newline at end of file diff --git a/TheButtonAutoFlair.jar b/TheButtonAutoFlair.jar index 18e265c..92a680a 100644 Binary files a/TheButtonAutoFlair.jar and b/TheButtonAutoFlair.jar differ diff --git a/TheButtonAutoFlair/bin/tk/sznp/thebuttonautoflair/Commands.class b/TheButtonAutoFlair/bin/tk/sznp/thebuttonautoflair/Commands.class index df9042d..63ab764 100644 Binary files a/TheButtonAutoFlair/bin/tk/sznp/thebuttonautoflair/Commands.class and b/TheButtonAutoFlair/bin/tk/sznp/thebuttonautoflair/Commands.class differ diff --git a/TheButtonAutoFlair/bin/tk/sznp/thebuttonautoflair/MaybeOfflinePlayer.class b/TheButtonAutoFlair/bin/tk/sznp/thebuttonautoflair/MaybeOfflinePlayer.class index b37d251..21f742c 100644 Binary files a/TheButtonAutoFlair/bin/tk/sznp/thebuttonautoflair/MaybeOfflinePlayer.class and b/TheButtonAutoFlair/bin/tk/sznp/thebuttonautoflair/MaybeOfflinePlayer.class differ diff --git a/TheButtonAutoFlair/bin/tk/sznp/thebuttonautoflair/PlayerListener.class b/TheButtonAutoFlair/bin/tk/sznp/thebuttonautoflair/PlayerListener.class index 3ff3853..5a8bed1 100644 Binary files a/TheButtonAutoFlair/bin/tk/sznp/thebuttonautoflair/PlayerListener.class and b/TheButtonAutoFlair/bin/tk/sznp/thebuttonautoflair/PlayerListener.class differ diff --git a/TheButtonAutoFlair/bin/tk/sznp/thebuttonautoflair/PluginMain.class b/TheButtonAutoFlair/bin/tk/sznp/thebuttonautoflair/PluginMain.class index b5c4d3a..0fc73ac 100644 Binary files a/TheButtonAutoFlair/bin/tk/sznp/thebuttonautoflair/PluginMain.class and b/TheButtonAutoFlair/bin/tk/sznp/thebuttonautoflair/PluginMain.class differ diff --git a/TheButtonAutoFlair/plugin.yml b/TheButtonAutoFlair/plugin.yml index 1267961..5b3245c 100644 --- a/TheButtonAutoFlair/plugin.yml +++ b/TheButtonAutoFlair/plugin.yml @@ -5,9 +5,9 @@ commands: u: description: Auto-flair system. Accept or ignore flair. usage: "&cUsage: /u accept|ignore|opme&r" - rp: - description: Enable RolePlay mode or say something in RP. - usage: "&cUsage: /rp [message]&r" nrp: - description: Disable RolePlay mode or say something in non-RP. - usage: "&cUsage: /nrp [message]&r" + description: Send message in Out-of-Character + usage: "&cUsage: /nrp &r" + ooc: + description: Send message in Out-of-Character + usage: "&cUsage: /ooc &r" \ No newline at end of file diff --git a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/Commands.java b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/Commands.java index 225a226..d90e013 100644 --- a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/Commands.java +++ b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/Commands.java @@ -16,6 +16,9 @@ import java.net.MalformedURLException; import java.net.URL; public class Commands implements CommandExecutor { + + public static boolean PluginUpdated = false; // 2015.08.31. + // This method is called, when somebody uses our command @Override public boolean onCommand(CommandSender sender, Command cmd, String label, @@ -146,34 +149,37 @@ public class Commands implements CommandExecutor { } return true; } - case "rp": - if (args.length == 0) { - MaybeOfflinePlayer.AddPlayerIfNeeded(player.getName()).RPMode = true; - player.sendMessage("§2RP mode on.§r"); - } else { - boolean rpmode = MaybeOfflinePlayer - .AddPlayerIfNeeded(player.getName()).RPMode; - MaybeOfflinePlayer.AddPlayerIfNeeded(player.getName()).RPMode = true; - String message = ""; - for (String arg : args) - message += arg + " "; - player.chat(message.substring(0, message.length() - 1)); - MaybeOfflinePlayer.AddPlayerIfNeeded(player.getName()).RPMode = rpmode; - } - return true; + /* + * case "rp": if (args.length == 0) { + * MaybeOfflinePlayer.AddPlayerIfNeeded(player.getName()).RPMode = + * true; player.sendMessage("§2RP mode on.§r"); } else { boolean + * rpmode = MaybeOfflinePlayer + * .AddPlayerIfNeeded(player.getName()).RPMode; + * MaybeOfflinePlayer.AddPlayerIfNeeded(player.getName()).RPMode = + * true; String message = ""; for (String arg : args) message += arg + * + " "; player.chat(message.substring(0, message.length() - 1)); + * MaybeOfflinePlayer.AddPlayerIfNeeded(player.getName()).RPMode = + * rpmode; } return true; + */ case "nrp": + case "ooc": if (args.length == 0) { - MaybeOfflinePlayer.AddPlayerIfNeeded(player.getName()).RPMode = false; - player.sendMessage("§8RP mode off.§r"); + /* + * MaybeOfflinePlayer.AddPlayerIfNeeded(player.getName()).RPMode + * = false; player.sendMessage("§8RP mode off.§r"); + */ + return false; } else { - boolean rpmode = MaybeOfflinePlayer - .AddPlayerIfNeeded(player.getName()).RPMode; + /* + * boolean rpmode = MaybeOfflinePlayer + * .AddPlayerIfNeeded(player.getName()).RPMode; + */ MaybeOfflinePlayer.AddPlayerIfNeeded(player.getName()).RPMode = false; String message = ""; for (String arg : args) message += arg + " "; player.chat(message.substring(0, message.length() - 1)); - MaybeOfflinePlayer.AddPlayerIfNeeded(player.getName()).RPMode = rpmode; + MaybeOfflinePlayer.AddPlayerIfNeeded(player.getName()).RPMode = true; } return true; default: @@ -231,7 +237,7 @@ public class Commands implements CommandExecutor { || player.getName().equals("NorbiPeti")) { // System.out.println("Args length: " + args.length); if (args.length == 1) { - String message = "§cUsage: /u admin reload|playerinfo|getlasterror|save|setflair|updateplugin§r"; + String message = "§cUsage: /u admin reload|playerinfo|getlasterror|save|setflair|updateplugin|togglerpshow§r"; SendMessage(player, message); return; } @@ -267,8 +273,13 @@ public class Commands implements CommandExecutor { case "updateplugin": // 2015.08.10. DoUpdatePlugin(player); break; + case "togglerpshow": + PlayerListener.ShowRPTag = !PlayerListener.ShowRPTag; + SendMessage(player, "RP tag showing " + + (PlayerListener.ShowRPTag ? "enabled" : "disabled")); + break; default: - String message = "§cUsage: /u admin reload|playerinfo|getlasterror|save|setflair|updateplugin§r"; + String message = "§cUsage: /u admin reload|playerinfo|getlasterror|save|setflair|updateplugin|togglerpshow§r"; SendMessage(player, message); return; } @@ -367,6 +378,7 @@ public class Commands implements CommandExecutor { "https://github.com/NorbiPeti/thebuttonautoflairmc/raw/master/TheButtonAutoFlair.jar"); FileUtils.copyURLToFile(url, new File( "plugins/TheButtonAutoFlair.jar")); + PluginUpdated = true; // 2015.08.31. SendMessage(player, "Updating done!"); } catch (MalformedURLException e) { System.out.println("Error!\n" + e); diff --git a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/MaybeOfflinePlayer.java b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/MaybeOfflinePlayer.java index 6b5858b..6a9c3fa 100644 --- a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/MaybeOfflinePlayer.java +++ b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/MaybeOfflinePlayer.java @@ -2,34 +2,31 @@ package tk.sznp.thebuttonautoflair; import java.util.HashMap; -public class MaybeOfflinePlayer -{ //2015.08.08. +public class MaybeOfflinePlayer { // 2015.08.08. public String PlayerName; public String UserName; - public String Flair; //If the user comments their name, it gets set, it doesn't matter if they accepted it or not + public String Flair; // If the user comments their name, it gets set, it + // doesn't matter if they accepted it or not public boolean AcceptedFlair; public boolean IgnoredFlair; - public boolean FlairDecided; //2015.08.09. - public boolean FlairRecognised; //2015.08.10. - public boolean CommentedOnReddit; //2015.08.10. - public boolean RPMode; //2015.08.25. - public static HashMap AllPlayers=new HashMap<>(); //2015.08.08. - public static MaybeOfflinePlayer AddPlayerIfNeeded(String playername) - { - if(!AllPlayers.containsKey(playername)) - { - MaybeOfflinePlayer player=new MaybeOfflinePlayer(); - player.PlayerName=playername; - player.Flair=""; //2015.08.10. - AllPlayers.put(playername, player); - return player; + public boolean FlairDecided; // 2015.08.09. + public boolean FlairRecognised; // 2015.08.10. + public boolean CommentedOnReddit; // 2015.08.10. + public boolean RPMode; // 2015.08.25. + public static HashMap AllPlayers = new HashMap<>(); // 2015.08.08. + + public static MaybeOfflinePlayer AddPlayerIfNeeded(String playername) { + if (!AllPlayers.containsKey(playername)) { + MaybeOfflinePlayer player = new MaybeOfflinePlayer(); + player.PlayerName = playername; + player.Flair = ""; // 2015.08.10. + AllPlayers.put(playername, player); + return player; } return AllPlayers.get(playername); - } - /*public enum FlairClassType - { //2015.08.09. - NonPresser, - CantPress, - Undecided - }*/ + } + /* + * public enum FlairClassType { //2015.08.09. NonPresser, CantPress, + * Undecided } + */ } diff --git a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java index 6235d52..b8f725a 100644 --- a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java +++ b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java @@ -73,12 +73,22 @@ public class PlayerListener implements Listener { // 2015.07.16. } } } - System.out.println("Folder plugins exists: "+new File("plugins").isDirectory()); - System.out.println("Folder plugins/essentials exists: "+new File("plugins/essentials").isDirectory()); - System.out.println("Folder plugins/essentials/userdata exists: "+new File("plugins/essentials/userdata").isDirectory()); - System.out.println("Folder plugins/essentials/userdata/"+id+".yml exists: "+new File("plugins/essentials/userdata/"+id+".yml").exists()); + /* + * System.out.println("Folder plugins exists: "+new + * File("plugins").isDirectory()); + * System.out.println("Folder plugins/essentials exists: "+new + * File("plugins/essentials").isDirectory()); + * System.out.println("Folder plugins/essentials/userdata exists: "+new + * File("plugins/essentials/userdata").isDirectory()); + * System.out.println + * ("Folder plugins/essentials/userdata/"+id+".yml exists: "+new + * File("plugins/essentials/userdata/"+id+".yml").exists()); + */ mp.RPMode = true; // 2015.08.25. + + if (p.getName().equals("FigyTuna") && Commands.PluginUpdated) + p.sendMessage("§bThe The Button MC plugin got updated. Please restart the server. :P§r"); } @EventHandler @@ -98,6 +108,8 @@ public class PlayerListener implements Listener { // 2015.07.16. public static String NotificationSound; // 2015.08.14. public static float NotificationPitch; // 2015.08.14. + public static boolean ShowRPTag = false; // 2015.08.31. + @EventHandler public void onPlayerChat(AsyncPlayerChatEvent event) { MaybeOfflinePlayer player = MaybeOfflinePlayer.AllPlayers.get(event @@ -151,7 +163,7 @@ public class PlayerListener implements Listener { // 2015.07.16. } event.setFormat("<" - + (player.RPMode ? "§2[RP]§r" : "§8[non-RP]§r") + + (player.RPMode ? (ShowRPTag ? "§2[RP]§r" : "") : "§8[OOC]§r") + event.getFormat().substring( event.getFormat().indexOf("<") + 1, event.getFormat().indexOf(">")) + flair + "> " @@ -188,6 +200,18 @@ public class PlayerListener implements Listener { // 2015.07.16. if (nwithoutformatting.startsWith(name)) e.getTabCompletions().add(nwithoutformatting); } + } + public boolean DebugMode = false; + + public void SendForDebug(String message) { + if (DebugMode) { + for (Player player : PluginMain.GetPlayers()) { + if (player.getName().equals("NorbiPeti")) { + player.sendMessage("[DEBUG] " + message); + break; + } + } + } } } diff --git a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PluginMain.java b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PluginMain.java index 57a3cb8..3e66260 100644 --- a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PluginMain.java +++ b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PluginMain.java @@ -35,12 +35,12 @@ public class PluginMain extends JavaPlugin { // Translated to Java: 2015.07.15. this.getCommand("u").setExecutor(comm); this.getCommand("u").setUsage( this.getCommand("u").getUsage().replace('&', '§')); - this.getCommand("rp").setExecutor(comm); - this.getCommand("rp").setUsage( - this.getCommand("rp").getUsage().replace('&', '§')); this.getCommand("nrp").setExecutor(comm); this.getCommand("nrp").setUsage( this.getCommand("nrp").getUsage().replace('&', '§')); + this.getCommand("ooc").setExecutor(comm); + this.getCommand("ooc").setUsage( + this.getCommand("ooc").getUsage().replace('&', '§')); Instance = this; // 2015.08.08. Console = this.getServer().getConsoleSender(); // 2015.08.12. LoadFiles(false); // 2015.08.09.