From d2f6a5ef0775c666671551734a30690477a3b5fa Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Mon, 17 Aug 2015 10:27:44 +0200 Subject: [PATCH] Removed some debug code, added colors by flair color to name mentioning, etc. - Removed some debug code - Added name coloring by flair color when using name mentioning - Fixed custom flair saving - Added a check for /u admin setflair to only allow flairs starting with a color code - Updated version number (2.0) - Updated plugin name --- .metadata/.log | 176 +++++++++++ .metadata/.mylyn/.tasks.xml.zip | Bin 250 -> 250 bytes .metadata/.mylyn/tasks.xml.zip | Bin 250 -> 250 bytes .../b0/b070e8826b3f00151fb6edb183f9215c | 277 ------------------ .../.indexes/e4/77/69/e/history.index | Bin 5358 -> 5910 bytes .../TheButtonAutoFlair/.indexes/history.index | Bin 44 -> 116 bytes .../.projects/TheButtonAutoFlair/.markers | Bin 1774 -> 1774 bytes .../.safetable/org.eclipse.core.resources | Bin 4236 -> 4236 bytes .../org.eclipse.e4.workbench/workbench.xmi | 108 +++---- .../org.eclipse.jdt.core/1508644233.index | Bin 17462 -> 17469 bytes .../externalLibsTimeStamps | Bin 1593 -> 1593 bytes .../org.eclipse.jdt.core/savedIndexNames.txt | 6 +- .../org.eclipse.ui.workbench/workingsets.xml | 1 + .../tk/sznp/thebuttonautoflair/Commands.class | Bin 9088 -> 9225 bytes .../thebuttonautoflair/PlayerListener.class | Bin 5742 -> 5582 bytes .../sznp/thebuttonautoflair/PluginMain.class | Bin 13636 -> 13593 bytes TheButtonAutoFlair/plugin.yml | 6 +- .../tk/sznp/thebuttonautoflair/Commands.java | 7 +- .../thebuttonautoflair/PlayerListener.java | 11 +- .../sznp/thebuttonautoflair/PluginMain.java | 3 +- 20 files changed, 248 insertions(+), 347 deletions(-) delete mode 100644 .metadata/.plugins/org.eclipse.core.resources/.history/b0/b070e8826b3f00151fb6edb183f9215c diff --git a/.metadata/.log b/.metadata/.log index 4c68db1..224ed46 100644 --- a/.metadata/.log +++ b/.metadata/.log @@ -977,3 +977,179 @@ 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-17 10:02:15.483 ----------------------------------------------- +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-17 10:02:46.235 +!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-17 10:02:46.268 +!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. + +!ENTRY org.eclipse.jdt.core 4 4 2015-08-17 10:16:13.602 +!MESSAGE JavaBuilder handling CoreException +!STACK 1 +org.eclipse.core.runtime.CoreException: Could not write file: D:\Z - Norbi cucca\0 Projektek\TheButtonMCAutoFlairProto\Spigot plugin\TheButtonAutoFlair\bin\tk\sznp\thebuttonautoflair\Commands.class. + at org.eclipse.core.internal.filesystem.Policy.error(Policy.java:55) + at org.eclipse.core.internal.filesystem.local.LocalFile.openOutputStream(LocalFile.java:397) + at org.eclipse.core.internal.localstore.FileSystemResourceManager.write(FileSystemResourceManager.java:1101) + at org.eclipse.core.internal.resources.File.internalSetContents(File.java:321) + at org.eclipse.core.internal.resources.File.setContents(File.java:360) + at org.eclipse.core.internal.resources.File.setContents(File.java:464) + at org.eclipse.jdt.internal.core.builder.IncrementalImageBuilder.writeClassFileContents(IncrementalImageBuilder.java:835) + at org.eclipse.jdt.internal.core.builder.AbstractImageBuilder.writeClassFile(AbstractImageBuilder.java:857) + at org.eclipse.jdt.internal.core.builder.AbstractImageBuilder.acceptResult(AbstractImageBuilder.java:188) + at org.eclipse.jdt.internal.compiler.Compiler.compile(Compiler.java:510) + at org.eclipse.jdt.internal.core.builder.AbstractImageBuilder.compile(AbstractImageBuilder.java:365) + at org.eclipse.jdt.internal.core.builder.IncrementalImageBuilder.compile(IncrementalImageBuilder.java:329) + at org.eclipse.jdt.internal.core.builder.AbstractImageBuilder.compile(AbstractImageBuilder.java:302) + at org.eclipse.jdt.internal.core.builder.IncrementalImageBuilder.build(IncrementalImageBuilder.java:134) + at org.eclipse.jdt.internal.core.builder.JavaBuilder.buildDeltas(JavaBuilder.java:265) + at org.eclipse.jdt.internal.core.builder.JavaBuilder.build(JavaBuilder.java:193) + at org.eclipse.core.internal.events.BuildManager$2.run(BuildManager.java:726) + at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:42) + at org.eclipse.core.internal.events.BuildManager.basicBuild(BuildManager.java:199) + at org.eclipse.core.internal.events.BuildManager.basicBuild(BuildManager.java:239) + at org.eclipse.core.internal.events.BuildManager$1.run(BuildManager.java:292) + at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:42) + at org.eclipse.core.internal.events.BuildManager.basicBuild(BuildManager.java:295) + at org.eclipse.core.internal.events.BuildManager.basicBuildLoop(BuildManager.java:351) + at org.eclipse.core.internal.events.BuildManager.build(BuildManager.java:374) + at org.eclipse.core.internal.events.AutoBuildJob.doBuild(AutoBuildJob.java:143) + at org.eclipse.core.internal.events.AutoBuildJob.run(AutoBuildJob.java:241) + at org.eclipse.core.internal.jobs.Worker.run(Worker.java:53) +Caused by: java.io.FileNotFoundException: D:\Z - Norbi cucca\0 Projektek\TheButtonMCAutoFlairProto\Spigot plugin\TheButtonAutoFlair\bin\tk\sznp\thebuttonautoflair\Commands.class (A folyamat nem fér hozzá a fájlhoz, mert azt egy másik folyamat használja) + at java.io.FileOutputStream.open0(Native Method) + at java.io.FileOutputStream.open(Unknown Source) + at java.io.FileOutputStream.(Unknown Source) + at org.eclipse.core.internal.filesystem.local.LocalFile.openOutputStream(LocalFile.java:388) + ... 26 more +!SUBENTRY 1 org.eclipse.core.filesystem 4 272 2015-08-17 10:16:13.654 +!MESSAGE Could not write file: D:\Z - Norbi cucca\0 Projektek\TheButtonMCAutoFlairProto\Spigot plugin\TheButtonAutoFlair\bin\tk\sznp\thebuttonautoflair\Commands.class. +!STACK 0 +java.io.FileNotFoundException: D:\Z - Norbi cucca\0 Projektek\TheButtonMCAutoFlairProto\Spigot plugin\TheButtonAutoFlair\bin\tk\sznp\thebuttonautoflair\Commands.class (A folyamat nem fér hozzá a fájlhoz, mert azt egy másik folyamat használja) + at java.io.FileOutputStream.open0(Native Method) + at java.io.FileOutputStream.open(Unknown Source) + at java.io.FileOutputStream.(Unknown Source) + at org.eclipse.core.internal.filesystem.local.LocalFile.openOutputStream(LocalFile.java:388) + at org.eclipse.core.internal.localstore.FileSystemResourceManager.write(FileSystemResourceManager.java:1101) + at org.eclipse.core.internal.resources.File.internalSetContents(File.java:321) + at org.eclipse.core.internal.resources.File.setContents(File.java:360) + at org.eclipse.core.internal.resources.File.setContents(File.java:464) + at org.eclipse.jdt.internal.core.builder.IncrementalImageBuilder.writeClassFileContents(IncrementalImageBuilder.java:835) + at org.eclipse.jdt.internal.core.builder.AbstractImageBuilder.writeClassFile(AbstractImageBuilder.java:857) + at org.eclipse.jdt.internal.core.builder.AbstractImageBuilder.acceptResult(AbstractImageBuilder.java:188) + at org.eclipse.jdt.internal.compiler.Compiler.compile(Compiler.java:510) + at org.eclipse.jdt.internal.core.builder.AbstractImageBuilder.compile(AbstractImageBuilder.java:365) + at org.eclipse.jdt.internal.core.builder.IncrementalImageBuilder.compile(IncrementalImageBuilder.java:329) + at org.eclipse.jdt.internal.core.builder.AbstractImageBuilder.compile(AbstractImageBuilder.java:302) + at org.eclipse.jdt.internal.core.builder.IncrementalImageBuilder.build(IncrementalImageBuilder.java:134) + at org.eclipse.jdt.internal.core.builder.JavaBuilder.buildDeltas(JavaBuilder.java:265) + at org.eclipse.jdt.internal.core.builder.JavaBuilder.build(JavaBuilder.java:193) + at org.eclipse.core.internal.events.BuildManager$2.run(BuildManager.java:726) + at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:42) + at org.eclipse.core.internal.events.BuildManager.basicBuild(BuildManager.java:199) + at org.eclipse.core.internal.events.BuildManager.basicBuild(BuildManager.java:239) + at org.eclipse.core.internal.events.BuildManager$1.run(BuildManager.java:292) + at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:42) + at org.eclipse.core.internal.events.BuildManager.basicBuild(BuildManager.java:295) + at org.eclipse.core.internal.events.BuildManager.basicBuildLoop(BuildManager.java:351) + at org.eclipse.core.internal.events.BuildManager.build(BuildManager.java:374) + at org.eclipse.core.internal.events.AutoBuildJob.doBuild(AutoBuildJob.java:143) + at org.eclipse.core.internal.events.AutoBuildJob.run(AutoBuildJob.java:241) + at org.eclipse.core.internal.jobs.Worker.run(Worker.java:53) + +!ENTRY org.eclipse.jdt.core 4 4 2015-08-17 10:16:13.690 +!MESSAGE JavaBuilder handling ImageBuilderInternalException while building: TheButtonAutoFlair +!STACK 1 +org.eclipse.core.internal.resources.ResourceException: Problems encountered while deleting resources. + at org.eclipse.core.internal.resources.Resource.delete(Resource.java:816) + at org.eclipse.jdt.internal.core.builder.IncrementalImageBuilder.removeClassFile(IncrementalImageBuilder.java:757) + at org.eclipse.jdt.internal.core.builder.IncrementalImageBuilder.removeSecondaryTypes(IncrementalImageBuilder.java:770) + at org.eclipse.jdt.internal.core.builder.IncrementalImageBuilder.build(IncrementalImageBuilder.java:135) + at org.eclipse.jdt.internal.core.builder.JavaBuilder.buildDeltas(JavaBuilder.java:265) + at org.eclipse.jdt.internal.core.builder.JavaBuilder.build(JavaBuilder.java:193) + at org.eclipse.core.internal.events.BuildManager$2.run(BuildManager.java:726) + at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:42) + at org.eclipse.core.internal.events.BuildManager.basicBuild(BuildManager.java:199) + at org.eclipse.core.internal.events.BuildManager.basicBuild(BuildManager.java:239) + at org.eclipse.core.internal.events.BuildManager$1.run(BuildManager.java:292) + at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:42) + at org.eclipse.core.internal.events.BuildManager.basicBuild(BuildManager.java:295) + at org.eclipse.core.internal.events.BuildManager.basicBuildLoop(BuildManager.java:351) + at org.eclipse.core.internal.events.BuildManager.build(BuildManager.java:374) + at org.eclipse.core.internal.events.AutoBuildJob.doBuild(AutoBuildJob.java:143) + at org.eclipse.core.internal.events.AutoBuildJob.run(AutoBuildJob.java:241) + at org.eclipse.core.internal.jobs.Worker.run(Worker.java:53) +Contains: Could not delete 'D:\Z - Norbi cucca\0 Projektek\TheButtonMCAutoFlairProto\Spigot plugin\TheButtonAutoFlair\bin\tk\sznp\thebuttonautoflair\Commands.class'. +org.eclipse.core.runtime.CoreException: Problems encountered while deleting files. + at org.eclipse.core.internal.filesystem.local.LocalFile.delete(LocalFile.java:131) + at org.eclipse.core.internal.resources.ResourceTree.internalDeleteFile(ResourceTree.java:304) + at org.eclipse.core.internal.resources.ResourceTree.standardDeleteFile(ResourceTree.java:785) + at org.eclipse.core.internal.resources.Resource.unprotectedDelete(Resource.java:1973) + at org.eclipse.core.internal.resources.Resource.delete(Resource.java:803) + at org.eclipse.jdt.internal.core.builder.IncrementalImageBuilder.removeClassFile(IncrementalImageBuilder.java:757) + at org.eclipse.jdt.internal.core.builder.IncrementalImageBuilder.removeSecondaryTypes(IncrementalImageBuilder.java:770) + at org.eclipse.jdt.internal.core.builder.IncrementalImageBuilder.build(IncrementalImageBuilder.java:135) + at org.eclipse.jdt.internal.core.builder.JavaBuilder.buildDeltas(JavaBuilder.java:265) + at org.eclipse.jdt.internal.core.builder.JavaBuilder.build(JavaBuilder.java:193) + at org.eclipse.core.internal.events.BuildManager$2.run(BuildManager.java:726) + at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:42) + at org.eclipse.core.internal.events.BuildManager.basicBuild(BuildManager.java:199) + at org.eclipse.core.internal.events.BuildManager.basicBuild(BuildManager.java:239) + at org.eclipse.core.internal.events.BuildManager$1.run(BuildManager.java:292) + at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:42) + at org.eclipse.core.internal.events.BuildManager.basicBuild(BuildManager.java:295) + at org.eclipse.core.internal.events.BuildManager.basicBuildLoop(BuildManager.java:351) + at org.eclipse.core.internal.events.BuildManager.build(BuildManager.java:374) + at org.eclipse.core.internal.events.AutoBuildJob.doBuild(AutoBuildJob.java:143) + at org.eclipse.core.internal.events.AutoBuildJob.run(AutoBuildJob.java:241) + at org.eclipse.core.internal.jobs.Worker.run(Worker.java:53) +Contains: Could not delete: D:\Z - Norbi cucca\0 Projektek\TheButtonMCAutoFlairProto\Spigot plugin\TheButtonAutoFlair\bin\tk\sznp\thebuttonautoflair\Commands.class. +!SUBENTRY 1 org.eclipse.core.resources 4 273 2015-08-17 10:16:13.691 +!MESSAGE Problems encountered while deleting resources. +!SUBENTRY 2 org.eclipse.core.resources 4 273 2015-08-17 10:16:13.691 +!MESSAGE Could not delete 'D:\Z - Norbi cucca\0 Projektek\TheButtonMCAutoFlairProto\Spigot plugin\TheButtonAutoFlair\bin\tk\sznp\thebuttonautoflair\Commands.class'. +!STACK 1 +org.eclipse.core.runtime.CoreException: Problems encountered while deleting files. + at org.eclipse.core.internal.filesystem.local.LocalFile.delete(LocalFile.java:131) + at org.eclipse.core.internal.resources.ResourceTree.internalDeleteFile(ResourceTree.java:304) + at org.eclipse.core.internal.resources.ResourceTree.standardDeleteFile(ResourceTree.java:785) + at org.eclipse.core.internal.resources.Resource.unprotectedDelete(Resource.java:1973) + at org.eclipse.core.internal.resources.Resource.delete(Resource.java:803) + at org.eclipse.jdt.internal.core.builder.IncrementalImageBuilder.removeClassFile(IncrementalImageBuilder.java:757) + at org.eclipse.jdt.internal.core.builder.IncrementalImageBuilder.removeSecondaryTypes(IncrementalImageBuilder.java:770) + at org.eclipse.jdt.internal.core.builder.IncrementalImageBuilder.build(IncrementalImageBuilder.java:135) + at org.eclipse.jdt.internal.core.builder.JavaBuilder.buildDeltas(JavaBuilder.java:265) + at org.eclipse.jdt.internal.core.builder.JavaBuilder.build(JavaBuilder.java:193) + at org.eclipse.core.internal.events.BuildManager$2.run(BuildManager.java:726) + at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:42) + at org.eclipse.core.internal.events.BuildManager.basicBuild(BuildManager.java:199) + at org.eclipse.core.internal.events.BuildManager.basicBuild(BuildManager.java:239) + at org.eclipse.core.internal.events.BuildManager$1.run(BuildManager.java:292) + at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:42) + at org.eclipse.core.internal.events.BuildManager.basicBuild(BuildManager.java:295) + at org.eclipse.core.internal.events.BuildManager.basicBuildLoop(BuildManager.java:351) + at org.eclipse.core.internal.events.BuildManager.build(BuildManager.java:374) + at org.eclipse.core.internal.events.AutoBuildJob.doBuild(AutoBuildJob.java:143) + at org.eclipse.core.internal.events.AutoBuildJob.run(AutoBuildJob.java:241) + at org.eclipse.core.internal.jobs.Worker.run(Worker.java:53) +Contains: Could not delete: D:\Z - Norbi cucca\0 Projektek\TheButtonMCAutoFlairProto\Spigot plugin\TheButtonAutoFlair\bin\tk\sznp\thebuttonautoflair\Commands.class. +!SUBENTRY 3 org.eclipse.core.filesystem 4 273 2015-08-17 10:16:13.691 +!MESSAGE Problems encountered while deleting files. +!SUBENTRY 4 org.eclipse.core.filesystem 4 273 2015-08-17 10:16:13.691 +!MESSAGE Could not delete: D:\Z - Norbi cucca\0 Projektek\TheButtonMCAutoFlairProto\Spigot plugin\TheButtonAutoFlair\bin\tk\sznp\thebuttonautoflair\Commands.class. diff --git a/.metadata/.mylyn/.tasks.xml.zip b/.metadata/.mylyn/.tasks.xml.zip index 328872a9ea1db9f09e2f41e0f909a26110a22087..5a423d4e7b83cd38696023a27ba2976072eb7bbb 100644 GIT binary patch delta 28 hcmeyx_=}M@z?+#xgn@&DgJDvD;6&b)%phu~BLHW32aNy# delta 28 hcmeyx_=}M@z?+#xgn@&DgJI5OzKOgmnL*S}M*wVm2q6Ff diff --git a/.metadata/.mylyn/tasks.xml.zip b/.metadata/.mylyn/tasks.xml.zip index e4463e75a1e2e7499802ec880dd54961434af968..f82dd75caac3f7187fabcedabc01bc7349148fb5 100644 GIT binary patch delta 28 hcmeyx_=}M@z?+#xgn@&DgFz@*a3b$YW)QX05ddB*29p2) delta 28 hcmeyx_=}M@z?+#xgn@&DgJI5WzKOgmnL*S}M*wXE2r&Qv diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/b0/b070e8826b3f00151fb6edb183f9215c b/.metadata/.plugins/org.eclipse.core.resources/.history/b0/b070e8826b3f00151fb6edb183f9215c deleted file mode 100644 index a3033de..0000000 --- a/.metadata/.plugins/org.eclipse.core.resources/.history/b0/b070e8826b3f00151fb6edb183f9215c +++ /dev/null @@ -1,277 +0,0 @@ -package tk.sznp.thebuttonautoflair; - -import java.io.BufferedWriter; -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; - -import org.apache.commons.io.FileUtils; -import org.bukkit.command.Command; -import org.bukkit.command.CommandExecutor; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; - -public class Commands implements CommandExecutor { - // This method is called, when somebody uses our command - @Override - public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) { - if (sender instanceof Player) { - Player player = (Player) sender; - if(args.length<1) - return false; - MaybeOfflinePlayer p=MaybeOfflinePlayer.AllPlayers.get(player.getName()); //2015.08.08. - //if(!PluginMain.PlayerFlairs.containsKey(player.getName())) - if(p.Flair==null) - { - player.sendMessage("Error: You need to write your username to the reddit thread at /r/TheButtonMinecraft"); - return true; - } - switch(args[0].toLowerCase()) //toLowerCase: 2015.08.09. - { - case "accept": - { - if(p.IgnoredFlair) - p.IgnoredFlair=false; //2015.08.08. - if(!p.AcceptedFlair) - { - String flair=p.Flair; //2015.08.08. - //PluginMain.AppendPlayerDisplayFlairFinal(player, flair); //2015.07.20. - p.AcceptedFlair=true; //2015.08.08. - PluginMain.AppendPlayerDisplayFlair(p, player); - player.sendMessage("§6Your flair has been set:§r "+flair); - } - else - player.sendMessage("§cYou already have this user's flair.§r"); - break; - } - case "ignore": - { - if(p.AcceptedFlair) - p.AcceptedFlair=false; //2015.08.08. - if(!p.IgnoredFlair) - { - p.IgnoredFlair=true; - //String flair=p.Flair; //2015.08.08. - //PluginMain.RemovePlayerDisplayFlairFinal(player, flair); //2015.07.20. - player.sendMessage("§6You have ignored this request. You can still use /u accept though.§r"); - } - else - player.sendMessage("§cYou already ignored this request.§r"); - break; - } - /*case "reload": //2015.07.20. - DoReload(player); - break;*/ - case "admin": //2015.08.09. - DoAdmin(player, args); - break; - case "nonpresser": //2015.08.09. - if(!p.AcceptedFlair) - { - player.sendMessage("§cYou need to accept the flair first.§r"); - break; - } - if(p.FlairDecided) - { - player.sendMessage("§cYou have already set the flair type.§r"); - break; - } - //p.Flair="§7(non-pr.)§r"; - SetPlayerFlair(player, p, "§7(non-pr.)§r"); - break; - case "cantpress": //2015.08.09. - if(!p.AcceptedFlair) - { - player.sendMessage("§cYou need to accept the flair first.§r"); - break; - } - if(p.FlairDecided) - { - player.sendMessage("§cYou have already set the flair type or your flair type is known.§r"); - break; - } - //p.Flair="§r(can't press)§r"; - SetPlayerFlair(player, p, "§r(can't pr.)§r"); - break; - default: - return false; - } - return true; - } - /*if(args[0].toLowerCase()=="reload") - DoReload(null); //2015.07.20.*/ - else if(args.length>0 && args[0].toLowerCase().equals("admin")) //2015.08.09. - { - DoAdmin(null, args); //2015.08.09. - return true; //2015.08.09. - } - return false; - } - private static void DoReload(Player player) - { //2015.07.20. - //if(player==null || player.isOp() || player.getName()=="NorbiPeti") - //{ - try - { - File file=new File("autoflairconfig.txt"); - if(file.exists()) - { - PluginMain.LoadFiles(true); //2015.08.09. - for(Player p : PluginMain.GetPlayers()) - { - MaybeOfflinePlayer mp = MaybeOfflinePlayer.AddPlayerIfNeeded(p.getName()); - if(mp.Flair!=null) - { - //String flair=mp.Flair; - //PluginMain.RemovePlayerDisplayFlairFinal(p, flair); - //PluginMain.AppendPlayerDisplayFlairFinal(p, flair); - PluginMain.AppendPlayerDisplayFlair(mp, p); //2015.08.09. - } - String msg="§6Note: The auto-flair plugin has been reloaded. You might need to wait 10s to have your flair.§r"; //2015.08.09. - p.sendMessage(msg); //2015.08.09. - } - //String msg="§6Reloaded config file.§r"; - //SendMessage(player, msg); //2015.08.09. - } - } - catch(Exception e) - { - System.out.println("Error!\n"+e); - if(player!=null) - player.sendMessage("§cAn error occured. See console for details.§r"); - PluginMain.LastException=e; //2015.08.09. - } - //} - //else - //player.sendMessage("§cYou need to be OP to use this command.§r"); - } - private static Player ReloadPlayer; //2015.08.09. - private static void DoAdmin(Player player, String[] args) - { //2015.08.09. - if(player==null || player.isOp() || player.getName()=="NorbiPeti") - { - //System.out.println("Args length: " + args.length); - if(args.length==1) - { - String message="§cUsage: /u admin reload|playerinfo|getlasterror|save|setflair|updateplugin§r"; - SendMessage(player, message); - return; - } - //args[0] is "admin" - switch(args[1].toLowerCase()) - { - case "reload": - ReloadPlayer=player; //2015.08.09. - SendMessage(player, "§6Make sure to save the current settings before you modify and reload them! Type /u admin confirm when done.§r"); - break; - case "playerinfo": - DoPlayerInfo(player, args); - break; - case "getlasterror": - DoGetLastError(player, args); - break; //<-- 2015.08.10. - case "confirm": - if(ReloadPlayer==player) - DoReload(player); //2015.08.09. - else - SendMessage(player, "§cYou need to do /u admin reload first.§r"); - break; - case "save": - PluginMain.SaveFiles(); //2015.08.09. - SendMessage(player, "§6Saved files. Now you can edit them and reload if you want.§r"); - break; - case "setflair": - DoSetFlair(player, args); - break; - case "updateplugin": //2015.08.10. - DoUpdatePlugin(player); - break; - default: - String message="§cUsage: /u admin reload|playerinfo|getlasterror|save|setflair|updateplugin§r"; - SendMessage(player, message); - return; - } - } - else - player.sendMessage("§cYou need to be OP to use this command.§r"); - } - private static void DoPlayerInfo(Player player, String[] args) - { //2015.08.09. - //args[0] is "admin" - args[1] is "playerinfo" - if(args.length==2) - { - String message="§cUsage: /u admin playerinfo §r"; - SendMessage(player, message); - return; - } - if(!MaybeOfflinePlayer.AllPlayers.containsKey(args[2])) - { - String message="§cPlayer not found: "+args[2]+"§r"; - SendMessage(player, message); - return; - } - MaybeOfflinePlayer p = MaybeOfflinePlayer.AllPlayers.get(args[2]); - SendMessage(player, "Player name: "+p.PlayerName); - SendMessage(player, "User flair: "+p.Flair); - SendMessage(player, "Username: "+p.UserName); - SendMessage(player, "Flair accepted: "+p.AcceptedFlair); - SendMessage(player, "Flair ignored: "+p.IgnoredFlair); - } - private static void SendMessage(Player player, String message) - { //2015.08.09. - if(player==null) - System.out.println(message); - else - player.sendMessage(message); - } - private static void DoGetLastError(Player player, String[] args) - { //2015.08.09. - //args[0] is "admin" - args[1] is "getlasterror" - if(PluginMain.LastException!=null) - { - SendMessage(player, "Last error:"); - SendMessage(player, PluginMain.LastException.toString()); - PluginMain.LastException=null; - } - else - SendMessage(player, "There were no exceptions."); - } - private static void SetPlayerFlair(Player player, MaybeOfflinePlayer targetplayer, String flair) - { //2015.08.09. - flair=flair.replace('&', '§'); - targetplayer.Flair=flair; - if(!PluginMain.RemoveLineFromFile("customflairs.txt", targetplayer.PlayerName)) - { - SendMessage(player, "§cError removing previous custom flair!§r"); - return; - } - File file=new File("customflairs.txt"); - try { - BufferedWriter bw; - bw = new BufferedWriter(new FileWriter(file, true)); - bw.write(targetplayer.PlayerName+"\n"); - bw.close(); - } catch (IOException e) { - System.out.println("Error!\n"+e); - PluginMain.LastException=e; //2015.08.09. - } - SendMessage(player, "§6The flair has been set. Player: "+targetplayer.PlayerName+" Flair: "+flair+"§r"); - } - private static void DoSetFlair(Player player, String[] args) - { - //args[0] is "admin" - args[1] is "setflair" - if(args.length<4) - { - SendMessage(player, "§cUsage: /u admin setflair "); - return; - } - SetPlayerFlair(player, MaybeOfflinePlayer.AddPlayerIfNeeded(args[2]), args[3]); - } - private static void DoUpdatePlugin(Player player) - { //2015.08.10. - SendMessage(player, "Updating Auto-Flair plugin..."); - System.out.println("Forced updating of Auto-Flair plugin..."); - String URL="https://github.com/NorbiPeti/thebuttonautoflairmc/raw/master/TheButtonAutoFlair.jar"; - FileUtils.copyURLToFile(URL, File) - } -} 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 e5442d1657a2f977d97f7d0e9d7a5c43960da6e1..37f916e9f1b58452a36e4d19b933dbd37a004e39 100644 GIT binary patch delta 870 zcmaE-IZbavC0o7I1{d3+?Jf+WV&;2aW|kf@TYF)vl|Lf`gG0)qLS*q%XCUGN3LGfn z%T7SV3r^(}AgjN51R}0raVZ~J{KNr>ID@nWP`n;t@$Nkki3Z`hdB_?LZ-afIC4l1Q5)ko#=IT&n z@egmefJ5kj5WhdN_!)kP_=8hFb&$nsi-Z7Aa3pFqSNb_<}0Pj~<|XHJUw z4i_gxOc=;OBt9&Tl0>%P`fg_(kb5V11Zp+|)eCK&J~8B|Vf56z6^dYgM03wznf!r8 zX|k?>VEuvulQ(;jRK41NL>Htg!GrT9vUto&s5tNBr^w>FO&5dJ3rst>XdaR|PTRhN zU6C+x;e2Fq0WDv!_=VfMXSO&o)We;(mJ1@GaOK$)paeo(AL5+_3g3m1y;Jwu32cx+ v^nNa6ap40FVDSaV&TVNzGAC;9L2Z!71Xg4P=L5y%FZ^zA4&Ce{u!$J})N4Yd delta 292 zcmbQH_fB&|B^#sB=3nd&Sb)@Q-We>y8wy@DW!p1|%5QtSvH7QB%&|ZJChG}VYz`AX zz+C@qGB7OoC^H>d+&cy$-tdRD9a;R%EjO_G1~-pl zWbxa(A>sx5y7G|4B_>1FuL#HhiWkBye$fb#_z*iM6s=%*9IYr^DDW49SQ)B2V2?z 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 3a4d40a486b6e63be761326fd2c9dc9202d64ba0..1a40c36496fa26d984c156fef63830f509a734ab 100644 GIT binary patch literal 116 zcmZQ#U|?Wm;MOn5DNWDJ)2qzQVPG)`pY(p43xlYb`QDeArH9NWWNotYXJlY-IDhpG qviJ-wsJJHcV`TAzbND4d>J9z|ea*FJ5S8Edc4PBT#h8_e5ODz8K`1H! delta 26 hcmXTX5n*CrU|?k6)-T8@P0!5JtIW+|V4N5u0RTgG1_uBD diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/TheButtonAutoFlair/.markers b/.metadata/.plugins/org.eclipse.core.resources/.projects/TheButtonAutoFlair/.markers index 4ae0c3ea8be2f2a5e6a77be997fad29a8324622a..cf96a4bad031c26684bf15c7ae6a770729a14fbf 100644 GIT binary patch delta 144 zcmaFI`;K=*IV0n-$rX&Y^5+R|>j5IH_smPt+S7(PvElP@z`h%(AEFfjTfbTY^>G3ZVHz$7;L2$Lq`rpfP^ N_A&--Uc>Cf3;>R~DpLRe delta 150 zcmaFI`;K=*IV0nm$rX&Ya>p2WN{dsATvIYj5|eUL85tPZlQR;FT=P3`EvWmSs|t--l19+M&r;7|lf)`|PcARL@nqTpDXu3%`YU|?WnU}0r!wAr7Fg=w-mlNN`ifuW(1fsw`JK%S$F zCX*YvWGDaObP&SSvw0q~1rxIJy2&wY4wLzKIpEs3Ske-6iYGhr8Vmd8=Rxc=S1>fN z0wNQ$$^Kl+Ht%7VVwyaMO?9#zFB_-6UP)1Es;!~P`|PcAnaC@so+?eu3%`QU}$7zYGh?#ve}=Dg=w-mlNN`GrKypjg^A_lK%Nhb z#*;6y83|#iH{3jr*@6jKY2D-)HiyZ4ys83ei8;loyj=QvB}J*JwuWF6P;4}@GBvg` zGM?org.eclipse.e4.primaryDataStack EditorStack - + Editor org.eclipse.jdt.ui.CompilationUnitEditor removeOnHide activeOnClose - + Editor org.eclipse.jdt.ui.CompilationUnitEditor removeOnHide @@ -324,7 +324,7 @@ categoryTag:General - + View categoryTag:General @@ -426,18 +426,18 @@ Draggable - - - - - - - - - - - - + + + + + + + + + + + + toolbarSeparator @@ -445,38 +445,38 @@ Draggable - - - + + + Draggable - - + + Draggable - - + + Draggable - - + + Draggable - - - - + + + + Draggable - - - - + + + + Draggable @@ -486,20 +486,20 @@ Draggable - - - - + + + + Draggable - - - - - - - + + + + + + + Draggable @@ -517,15 +517,15 @@ Draggable - - - - - - - - - + + + + + + + + + toolbarSeparator @@ -537,8 +537,8 @@ Draggable - - + + stretch diff --git a/.metadata/.plugins/org.eclipse.jdt.core/1508644233.index b/.metadata/.plugins/org.eclipse.jdt.core/1508644233.index index 9c6eff0af1b31a72396c2f8ca11c15870d3bd1fa..b3764d50a9cd3da7d6c040204678aea262ba176b 100644 GIT binary patch delta 4530 zcmZ8lOKcn06@8@m8~!PhmMlB5-B_Q*k|_Dp+W9s5+H$E+EZIR26z!ONlqMR^&@)3@ zN((Rrx@b2|i&r2h3iPwes%ZlOT?FkSMS!&EqR6&D(Pr185~Rc`7`TDebKe`va(A3J z@7;Irx#ymHhrj(^;P>AP{IECh)Ax?ITOeOp8Bd&JKnvYq~=>?Xw8|eC_Ml8%$=Irq|(zi|FujZ|liyFpy2uHzyoN-z*z0 z#qdC!$`!>-Zm};`Yno;UNZc^7aFwnEhT`4awQTsVZZ^rWNFW$Ntl~epQ=-3HBtmt& zDjiOw#K+x(#|sngrd3&z5lyY>-ppNY(M>yBU3o1adJDxwL`99owiqsaBN)ty9~6Fb zA?V(Q{dgeQ6$(dUNhB|K=<4%}w_isxUL==U7)gKQ4eVv&PVwyVI5Fb}*Q*l3Z5A>- z`Rjprw^)gXE4C@~y(6;6_UW!@PqXLcn={KRFd#V+Uhkx8OZ0pg)IztpZb|QM^_>;p z?Yo>yE_;q)txh&;HEH@l{JHO9CT{T!Z$)O1c5h`*tOR@GHB&bnNlPqlv#z>MRBdm4 z`-yj=;!gil!W(=_T<;$gKkmOM{@LFzS_7v=YQPasVeO-V0rB&JA(0*&6gvZF#HGQn zia++B7N>_s#M^@-VsCIvd^k8P=7-LSy`dMxuZJeY#?V)`MxL$*!oAm*7Z*fsxF@hL zcAh!io1e1nb%U2|XLa;-*S1Qf0D~(J#ZR7jaw~PN9_TABIW{QbZT|nB&&1~NsQANh z-*DWsRq!PuArhmdGOQbU>0F(K}7sxwv<*99!Hr!X%Knk~^S8$Tj9tOLz2;G{pE%8w)eJfJeopot-pQSvT zkd)+;CJx{__sZN__15H`J(e`wIjcs6&86dQma5v#+a_1;jZySajrT|TT4^{vZ&!_) zfnxMG$JY7gGFLG}AXJRxSx`%{3=WV3iu3Y9D4pRdhsbnS1Zo2}%l178jqWNu;1%S} z<+G-(d;YP+YKwcDty8;W#l_dbB(%T>dxVj z#Ik;uQ^_F~au|A?A@Cr24cqZ}RhrsoVL(PU22imP*LVY0C{S1ykt^QJQmvFOAa}ds zt+5{QvrE0NWfA?H)o6O49oOr=W6_Gq;e@0a)3D`he6s^)7?0B12P|e-Rp`wjduZp1 zea}({#gBr;E18Pj*t~h8ykb)j^4u<1+Ej<)P#-1CtC!5E?;;Y zd>NRQV=?JEp!WmKH2m@+T~*$G#!@JVrm1^;URQwQZK7OrBheKYr3lf4TfakNQku6W(mo{vTdy%B0-&S-N z_H#Y0oZ*(a2N76wrj1oYRl=S`q-3srEW#XhN84E0{I zEl)Qrq)s9bZ(7`~=nW-{!C)6lRQVd;ps?hYhcX&}NKzoP6gs@8Z_GFj<%;471gSAl z%T6F3zhB4>0FCJ^<%tit^>e0SlcdLa5r5&tNE~{gl;9#>Z?mZ6Pw4_I2V)tg$)qpV z5A4KTL9Y>|`niC0RsH zWy2EVR(r}m1^o)wi4b%Mgq4XDQjad98L@sfKvL?Z2z+<5eOLm~yB`AfeozO07 zC-Iu?S1y70P<*FU6s>4)c~`2?GI#D$%4su`H~7#d{mD^FriqADgrEW>p85-#tlKb2 z4CtIz5cX&>txek#)w*FRbrFBLeC#ZV?2+zIVINRexofX?e9nt+UMh%B$BQkEy3Gcd zNq#~jO-SBj{U0KFr>UDtDB~8iv1~z-y$i#Wrsy>>y>qBF-r1-@)sXy#VAfwixjV3 zIWa_oA}Kq>kks5SRX_z%u;FP25lg*iG58oEJ+5hsOaz}5c@Q&mc5FLKWkoI&1 zG6kh4>WhS6i>cx7)ihE_$6-)E1P>DvF>1w@_^FBL$S1)A`HkSCr0OFj#pH+&2f`S6 zGI#XTfi|{9?)-^tq;5NE>EA4k-sbv4)eT-_?95v%=F*=N@~MB2#XPVI8e=l{ W^xv2UqG4W;FNgmj&P*2q&Hn-OULK7A delta 4329 zcmY*cTWnlc6+QF5cRb^Hc2YTLh>QASfF?kN|}r_^7BrmiR!TN>RU%`cZ+XgoKLtM7Cm*NNz0=v-df79OrB1 zoU_k9`?2=g`~K;j&>!9j{irkali%;#N`|hkwXx_W-Jn%CS72(@&|G&$YtRM?xSnP2?Ch+=R_aVggj;o7JY})URJn2m z&m&4E3zyP;h0KK2XlQ2b;yqsVJkrJV!Sd2j$Nz^fpWArtayQfs6mL);U94;m(xqdfepn&^kP8?L3~l zYTCYs*SOZ0=UPo1J!NsLUYGA}vhZzfJ`4a znY_W{wO;$5%Wq%#Kx;G{?oiPnoJUZ0@+|I4(C?oKC*>byOKnW!Da5!yy>X z6|yajm9pb#D`YduZNp@4t}8lTp1F*Y6hfxdeZy!*9p2Affkgg5=8k6gWLG>Cj+4!Y z^FM|EL)?8p5>aCBf0w);=O1N?tu;27)- zd>K9%D8t(W7uHU_+z7!JM_-C{zFwJ~f#GAt&{O#AXcv5Vv}dj37#{v|aHy+&&ap80 z-b%@G7LVU{EwfY#F|_V6{AI8kz7%fDM=+L5!K{3Ruar)R0K75WKAOgz-OIxmtZ*w< zo@rHVt;$QoDEB!_qRe$FQ*mz{J~`f&RuJH`wpSVvnz}C>7)^SX3|xtj90_F#EN=Vm zl2G!5JwK*bFtutr1JlR5;D4vPu22?&%k<<^rY!T73iqU;Orme0sb82GPqTD|o3&}l zAi|JG5E^TnRdut*@6Far;-Qe5YAdi7df^6PxO9S?#0qakuPCOX9E6eUEM2qwTLynY z5Z*iA)u(W`s@WJ2yc`W9pjetTPFN;ZKAK57l?)sjZHL#+cC4y(%b^ky@`z@Ko48uA zf@f5j1~+g|(ak&7a#L7wc*D9QS7c|hijQcz=?Z0Ga>hp5saU>QD~(~aHdq{asv(Ss zVzC$4dExE?>NLe}B#H(n-DTaL(_ByL!JSOichE9#VF`(M4T561PytC;si?nsYOwQ6Ih@C;LIAhQ+NUN_}iir~;@Ak%w2rYhQDqE=yb6quDi3gka+~JU+5l5`sNYikuEf%vaTcrF6WX|nh zqM(ZUq{59cl@ivfyEm5*Gp=MlJcz`w9mbJ~q~17|5n0e8U@6>}OoVex)!-TeO=OI) z6EFz;aHxGSrqvL-%2TOv?QA1&(VQjH1 zB}@ncMwUiZ7MG-e+L4Yi-w65A2s|9_nNK$viCT$ZL^YQ$FojBxI1Uv=seiNVq;=h{ zVXo&4e-Sx@>fjNR?uofi)?A_u9+bMS5ZI7VUCZD^>{wkgo(b1B^nhH{0?VS1zuHZjU_nQUM+jONuPKf2RAZDHIyF z&}~hI=oxaC*@RGF>TXk`bR#QJ`!%sc3s=-MOWbvcP)7st_+3Y{;Xz_Q9EP~UNsRM^b~ot!Bi2D**bi1s`HepyB8ZaQZ8lc zv7{IQEqo=D&E<&)g<-ND#-w%d&BVS}A2FrI4IVTB9IR!a=@INXK}VF{Nz$uu=MG_l zbg%*pNB6_(2_=<~;ir4pNltaZr>C>987r(3P6UNdVLAdZ;hg`bZ{eH5X$%_?!HbnF z@+0Gj+|+`J;Evx*{94bcjf1 z4pA?rRsk6dH#$SqNV}HrAT5dSoNd@FkHMeIC72)o zHU4%%W1=1UCWhei@#FBViTd?_vsP?d=&fJHnQ)%h89Ve{rno*1gksfufGOUJ&8d1B Yd--onZHOK$4hKKQY5DneDRaU6Kg@=#JOBUy diff --git a/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps b/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps index 68afc218bc387affeee105a7d57ba92b6a9ff808..00892b2250202df643954617ad952e0fbeff28f0 100644 GIT binary patch delta 46 zcmdnVvy*4TM`lLbNsL;PBU#)h%diMdc4X4tynscTk~)f*?~!8@*`GJ07!`p A?f?J) delta 42 xcmdnVvy*4TN9M_nOxlx^S%fBkWG>pgfJK@SD4;%Bg-w)+!D14l*5qfbVgNb+4FUiF diff --git a/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt b/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt index 0031340..7741d94 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 -1934142626.index 3716007315.index +1934142626.index 1045485630.index 605290374.index 533208796.index @@ -23,4 +23,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.ui.workbench/workingsets.xml b/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml index 4d7d77d..b035480 100644 --- a/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml +++ b/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml @@ -16,4 +16,5 @@ + \ No newline at end of file diff --git a/TheButtonAutoFlair/bin/tk/sznp/thebuttonautoflair/Commands.class b/TheButtonAutoFlair/bin/tk/sznp/thebuttonautoflair/Commands.class index b1b31df930c20b6f8fb27272434df1f46b156348..4c2d9a769e9ed842f86224e43986dedc71ddf457 100644 GIT binary patch delta 866 zcmX|I8#%!o;Yp^g!k|OABSX=xI?ofEzP?S4=O@jaZKq5pZx$V^ z;FwO@HcwZlnWc=AHZ3!m&*lqaQ}%$_y&xY&{?mMJt}O zo%ra;u+B^BRq&8!5=os`)SqCN=Niizud7ICwd)3Ns=cB9&~3s$dOl@2ncNvOmCxCo z8t=Y;5&Ge6xC{^KurmxW9r_>;n#nGdL=?f^>xkSGp@atbUo1-edDP75l)} zTEPjiy|t)isdNE9=RowsL5Y?c?2MQ5bi-jirs%;_YM5mMKGTb4QQa)+qKzle#Y@B_ zo=JZ-_Z$aNCzEEFq74^zU@cGc4BVJPJH9h5k&?<*xT1fs2W|~P4a+seG;RSkS{?F) zdO}bLpA^nWL!J0UY*Bj+Uys2|6*uNt@2c=zp!;Plmsh@UTRB_>q8}ax(8Oi%(?Baj z=wu7RT!A=O))r`4n)rW#1RmkB=vBc)&2I>T53@@Iasan10!)bZ1<`(oF9wSheEY=7 zaf79KP7TLCam#pnm&*ba>y2+%|uI}v3V z33kbMUyXjQ!ESa-M+75`BF!FT*;}LT5e}jFN8N@MyvO^(*e}QY&Ihv7NG(cBRNce} Tmr>Ms=a?L|738$!>NxWklW(ay delta 716 zcmX|<%TJS05XH~oYx|Y9l=EZS0x&?bV?xM1OeD5zm0QXVQ|p@kMpd9;ELq@ZrZ zDA5}?E_GpCR!G}Of{6d-gb5Zb{|0WpKuB^HnG!{9bKKVOy zNt%$R85vrzNgZ3PMv*qu%Ipi`Ar9DrRZdZi;x$;wy}<~o5XLi3ata#y(9Rg+Fd+jk z4md4JNo5nXjz8#!NrziUy^fI1UQp*mi>%g~Lskabr7$TCRdRYmd-{9Wg9c|xILrq_ z=5r-%hb$7;@^Y`iDY35ncsgOB3pG3jCk-^yUBRw9n)4sqiHivyuu_KIFA@?wcuA$q9J1g`Y2!i6qelfipZo>c42kgo diff --git a/TheButtonAutoFlair/bin/tk/sznp/thebuttonautoflair/PlayerListener.class b/TheButtonAutoFlair/bin/tk/sznp/thebuttonautoflair/PlayerListener.class index 4abb928f64e5ca0ee94f5c600f923efad86fc9f1..c335796a33fc25440901001c81eefbb5ce676f4f 100644 GIT binary patch delta 1220 zcmYk5YfzMB6vuzhzPr53@^D))+K5y{0vE!O%2)5V&&OxSkhZBv_c%PN<^1MRTISemocJiWK zqKo}rURJp3ra72bHM^vzoq9=`!qXY;jY<=z@wVn2=1)>JS&^>Zun&X1ns<56-jq4x ztPd19v0iIMI9?x(M8chkWzmQO{7AEpkL@FwEoq<7VDhQGFzd{c&!r2?mQ`f@z#%)3-8h{e75)YFJyzlpt3O;H z?TbYt;Yh;A0e;r}!msw7*-buv=cvgMMUlNByU3&YgJbsb?3xyiD}4RoNLQ=Xc|%xW zCm1(5smS}UlZNG;;g~alR*)-A#zgl-TS5?v<5p)loo40I%24i+yK~&iQ-_y}N7m#H zD4(kklXOrXyEyOMX{!Tiqui<(qdMgAM?z-69q^1YN0H>VH8k7tyy}6;K#B`O-hg)_ zJ%%UA1OH3i%G&mTnc~sSJn=7joqt1;bxDSkYzn!ZGNX!n$Gd_~b}-2{!#Vt8Np=X^ zB)C!#{+Hwkxc|YvGQsbn5iG%%aR%%Ov7Zsa`f z;C$|3F85O-OH;{SYL%M{1p}9fBq9Q(oGqSXE#WmpWqG03xeAw5IK&&0Wz3cW``Im~ zTgu!e^h@zbvD4r4q+zH-c?Rz74sDnR@E-aEd7s z`)Tqz;1>J0kVn+pm!j zJCn@xr$5d+&15qTMggT60d-v@$?V&TEc>vsqAdHiGRv}p&RwPcH22QA=bZbT=RNOp z-g~D)r;9R=%p8~m5T-&E7Q!;QQ^}T17S~9{ux?ken-Gwbj(}G~KS4P>RIZ~Bj|dcC zK<*R)$2v0}5_lAk$p;-(OZKKw-DY;5z!O+S&=OsdM0b0h?aCj<8398Z9R!tr@*^-k2~(V zJwfo-r(d^sl{9g;3GO)-?X1#poEur8<3pTK@e#rMKPZ8ZF+fnan1vm29rN+2z%Z0-1j+lnenW|KWf-eNV#3@_tV1a}QHHxwj=d=6Lwh+7uLAj8Q4KrWQ&@sa`DuF1cmpgCj$sNn z!@_J+c#}m?n0*pQ*|TCbHseODhYcIJ<|f$WYG2`^RZvxsicKmiRP?6ru!_3?-z=8O z246t-`JBmCUea82coc7W-Z${U@)SO4FoVxHC^B%;^HmDpu=7Ksnf-~gqsaE0u^z

cte`c!=NFEh9ZM}MPn2kVOfBF{!aWCMX!dNGgq=CtKq~|@M8`CSFT0~ zHMkbFh+r)esKa(#gI%2I$8{LI4fWWA2L82NpPoQn`bZ74%IleoWl3vHOn4tHq(wY| u0wgJyJ%uTnX)$|NroD{v*t1~}8s$?C!2rm;3{;Sx2M* diff --git a/TheButtonAutoFlair/bin/tk/sznp/thebuttonautoflair/PluginMain.class b/TheButtonAutoFlair/bin/tk/sznp/thebuttonautoflair/PluginMain.class index a9d207e4c8e6a7a6dabc666c8a7e8134e1bf1d03..8b7608b5c46bd634597c2c9a69dea4c64bed504d 100644 GIT binary patch delta 391 zcmXYsODlwN6vm%(=Jw7dsTuT!X(9{7#Jns_O1YJyl*<_R!OWQ1n5NmVV5cnDyen*M zT(Xn=O=w2Q3=$u~f`t#jM&UoQdVc5BInVRl#5d!%`|q<10F7fuw&zNN!h?FTyTm>0 z-~iSM_GmcOpIk_Ulc_};eR9yjqdcZ}xT}p54xT)YyR$B<0u!wA$(`=gIzz3hMIi52 zRK>|ofe(XEH492@!n_ZUYC6YDP_?A-b&6Lf52SfW;7#CNaJOm{tOWg*+)q|D3GOM( z_WC-(BU>nvG9LIF^e3&>u!{rzOVd`)5uyt$QyOcO!3Jfa(KlQ@LVYyRqs6RIOsa#i@YswQ#iQ{3G1oC}w8Zndyiu=fA%d;*Z> z>Kp6uw6ZYETQ+a=j=)?h6)SGOxF$GxKDcPB@oAHH1wAYIqL*Cr%C7HLO1_05PTQQp zQ$alERc`pDvgcPGTk@N;Hs?4W^bVelxHcExjt@5byMZY5z;1AK;j)uaMu>LSRHllB zyjex;6%s1?9^V~hH1Ovge)MswK_|q|5WhlRRgsXUlQmjLEfo!Ut>fdPBO&iSM~{|; zsbdptr-!;;pcWja)9WAL$VWVq1~#OLP5F#1*+n2<@J#mbQd+1<8+G}L9oa`y4sc30 zEF<3O$x%6>wL>XQqT4sP#3YD*yyksPT}Z;G$1y~32`-m8slS}S9CP|2mcSLH_&}q9 mCphz;u49;ay)#h{>Y1$c1>Z8~1`0Zee8?58mJahf$-qAi9cMfM diff --git a/TheButtonAutoFlair/plugin.yml b/TheButtonAutoFlair/plugin.yml index 2db0cd1..b71fce5 100644 --- a/TheButtonAutoFlair/plugin.yml +++ b/TheButtonAutoFlair/plugin.yml @@ -1,7 +1,7 @@ -name: TheButtonAutoFlair +name: TheButtonMCPlugin main: tk.sznp.thebuttonautoflair.PluginMain -version: 1.0 +version: 2.0 commands: u: - description: Auto-flair system. Accept or ignore flair. + description: Auto-flair system and others, like name mentioning usage: "&cUsage: /u accept|ignore|opme&r" diff --git a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/Commands.java b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/Commands.java index 9213475..7884299 100644 --- a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/Commands.java +++ b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/Commands.java @@ -256,7 +256,7 @@ public class Commands implements CommandExecutor { try { BufferedWriter bw; bw = new BufferedWriter(new FileWriter(file, true)); - bw.write(targetplayer.PlayerName+targetplayer.Flair+"\n"); + bw.write(targetplayer.PlayerName+" "+targetplayer.Flair+"\n"); bw.close(); } catch (IOException e) { System.out.println("Error!\n"+e); @@ -272,6 +272,11 @@ public class Commands implements CommandExecutor { SendMessage(player, "§cUsage: /u admin setflair "); return; } + if(args[3].charAt(0)!='&') + { + SendMessage(player, "§cYou need to start the flair with a color code: &6(19s)&r"); + return; + } SetPlayerFlair(player, MaybeOfflinePlayer.AddPlayerIfNeeded(args[2]), args[3]); } private static void DoUpdatePlugin(Player player) diff --git a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java index 5eac697..9f10d95 100644 --- a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java +++ b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java @@ -44,14 +44,17 @@ public class PlayerListener implements Listener String message=event.getMessage(); //2015.08.08. for(Player p : PluginMain.GetPlayers()) { //2015.08.12. + String color=""; //2015.08.17. if(message.contains(p.getName())) { if(NotificationSound==null) p.playSound(p.getLocation(), Sound.ORB_PICKUP, 1.0f, 0.5f); //2015.08.12. else p.playSound(p.getLocation(), NotificationSound, 1.0f, NotificationPitch); //2015.08.14. + MaybeOfflinePlayer mp = MaybeOfflinePlayer.AddPlayerIfNeeded(p.getName()); //2015.08.17. + color=mp.Flair.substring(0, 2); } - message = message.replaceAll(p.getName(), "§6"+p.getName()+"§r"); + message = message.replaceAll(p.getName(), color+p.getName()+"§r"); } event.setFormat(event.getFormat().substring(0, event.getFormat().indexOf(">"))+flair+"> "+message); //2015.08.08. } @@ -61,17 +64,11 @@ public class PlayerListener implements Listener public static void sendRawMessage(Player player, String message) { try { - System.out.println("1"); Object handle = Reflection.getHandle(player); - System.out.println("2"); Object connection = Reflection.getField(handle.getClass(), "playerConnection").get(handle); - System.out.println("3"); Object serialized = Reflection.getMethod(nmsChatSerializer, "a", String.class).invoke(null, message); - System.out.println("4"); Object packet = nmsPacketPlayOutChat.getConstructor(Reflection.getNMSClass("IChatBaseComponent")).newInstance(serialized); - System.out.println("5"); Reflection.getMethod(connection.getClass(), "sendPacket").invoke(connection, packet); - System.out.println("6"); } catch (Exception e) { e.printStackTrace(); PluginMain.LastException=e; //2015.08.09. diff --git a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PluginMain.java b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PluginMain.java index 21eb060..9635df7 100644 --- a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PluginMain.java +++ b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PluginMain.java @@ -440,8 +440,7 @@ public class PluginMain extends JavaPlugin while((currentLine = reader.readLine()) != null) { // trim newline when comparing with lineToRemove String trimmedLine = currentLine.trim(); - //if(trimmedLine.equals(lineToRemove)) continue; - if(trimmedLine.contains(lineToRemove)) continue; //2015.08.09. + if(trimmedLine.split(" ")[0].equals(lineToRemove)) continue; //2015.08.17. writer.write(currentLine + System.getProperty("line.separator")); } writer.close();