diff --git a/.metadata/.log b/.metadata/.log index 09b411f..23c593d 100644 --- a/.metadata/.log +++ b/.metadata/.log @@ -20,3 +20,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-07-19 09:02:01.096 ----------------------------------------------- +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-07-19 09:03:46.155 +!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-07-19 09:03:46.219 +!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 25c3be4..67d7fa6 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 67d7fa6..4d44a88 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/.history/3c/206a1ebcab2b00151fa6e49f3e10bf0b b/.metadata/.plugins/org.eclipse.core.resources/.history/11/b0a0fc59e42d0015105bf01c854e42e3 similarity index 87% rename from .metadata/.plugins/org.eclipse.core.resources/.history/3c/206a1ebcab2b00151fa6e49f3e10bf0b rename to .metadata/.plugins/org.eclipse.core.resources/.history/11/b0a0fc59e42d0015105bf01c854e42e3 index d4c36c8..e0a12bf 100644 --- a/.metadata/.plugins/org.eclipse.core.resources/.history/3c/206a1ebcab2b00151fa6e49f3e10bf0b +++ b/.metadata/.plugins/org.eclipse.core.resources/.history/11/b0a0fc59e42d0015105bf01c854e42e3 @@ -2,6 +2,7 @@ package tk.sznp.thebuttonautoflair; import java.io.BufferedReader; import java.io.BufferedWriter; +import java.io.File; import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; @@ -42,22 +43,28 @@ public class PluginMain extends JavaPlugin this.getCommand("u").setExecutor(new Commands()); this.getCommand("u").setUsage(this.getCommand("u").getUsage().replace('&', '§')); try { - BufferedReader br=new BufferedReader(new FileReader("flairsaccepted.txt")); - String line; - while ((line = br.readLine()) != null) - { - AcceptedPlayers.add(line.replace("\n", "")); + File file=new File("flairsaccepted.txt"); + if(file.exists()) + { + BufferedReader br=new BufferedReader(new FileReader("flairsaccepted.txt")); + String line; + while ((line = br.readLine()) != null) + { + AcceptedPlayers.add(line.replace("\n", "")); + } + br.close(); } - br.close(); - BufferedReader br=new BufferedReader(new FileReader("flairsignored.txt")); - while ((line = br.readLine()) != null) - { - IgnoredPlayers.add(line.replace("\n", "")); - } - br.close(); - FileWriter fw; - fw = new FileWriter("flairsaccepted.txt"); - fw.close(); + file=new File("flairsignored.txt"); + if(file.exists()) + { + BufferedReader br=new BufferedReader(new FileReader("flairsignored.txt")); + String line; + while ((line = br.readLine()) != null) + { + IgnoredPlayers.add(line.replace("\n", "")); + } + br.close(); + } } catch (IOException e) { System.out.println("Error!\n"+e); } @@ -71,6 +78,40 @@ public class PluginMain extends JavaPlugin @Override public void onDisable() { + try + { + FileWriter fw; + fw = new FileWriter("flairsaccepted.txt"); + fw.close(); + fw = new FileWriter("flairsignored.txt"); + fw.close(); + } + catch(Exception e) + { + System.out.println("Error!\n"+e); + } + for(String player : AcceptedPlayers) + { + File file=new File("flairsaccepted.txt"); + try { + BufferedWriter bw=new BufferedWriter(new FileWriter(file, true)); + bw.write(player+"\n"); + bw.close(); + } catch (IOException e) { + System.out.println("Error!\n"+e); + } + } + for(String player : IgnoredPlayers) + { + File file=new File("flairsignored.txt"); + try { + BufferedWriter bw = new BufferedWriter(new FileWriter(file, true)); + bw.write(player+"\n"); + bw.close(); + } catch (IOException e) { + System.out.println("Error!\n"+e); + } + } stop=true; } @@ -235,27 +276,9 @@ public class PluginMain extends JavaPlugin public static void AppendPlayerDisplayFlair(Player player, String username, String flair) { if(IgnoredPlayers.contains(player.getName())) - { - try { - BufferedWriter bw=new BufferedWriter(new FileWriter("flairsaccepted.txt", true)); - bw.write(player.getName()+"\n"); - bw.close(); - } catch (IOException e) { - System.out.println("Error!\n"+e); - } return; - } if(AcceptedPlayers.contains(player.getName())) - { player.setDisplayName(player.getDisplayName()+flair); - try { - BufferedWriter bw=new BufferedWriter(new FileWriter("flairsaccepted.txt", true)); - bw.write(player.getName()+"\n"); - bw.close(); - } catch (IOException e) { - System.out.println("Error!\n"+e); - } - } else player.sendMessage("§9Are you Reddit user "+username+"?§r §6Type /u accept or /u ignore§r"); diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/d1/d03932bfab2b00151fa6e49f3e10bf0b b/.metadata/.plugins/org.eclipse.core.resources/.history/45/c091f870e42d0015105bf01c854e42e3 similarity index 86% rename from .metadata/.plugins/org.eclipse.core.resources/.history/d1/d03932bfab2b00151fa6e49f3e10bf0b rename to .metadata/.plugins/org.eclipse.core.resources/.history/45/c091f870e42d0015105bf01c854e42e3 index 18abd5c..c02963d 100644 --- a/.metadata/.plugins/org.eclipse.core.resources/.history/d1/d03932bfab2b00151fa6e49f3e10bf0b +++ b/.metadata/.plugins/org.eclipse.core.resources/.history/45/c091f870e42d0015105bf01c854e42e3 @@ -2,6 +2,7 @@ package tk.sznp.thebuttonautoflair; import java.io.BufferedReader; import java.io.BufferedWriter; +import java.io.File; import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; @@ -42,22 +43,28 @@ public class PluginMain extends JavaPlugin this.getCommand("u").setExecutor(new Commands()); this.getCommand("u").setUsage(this.getCommand("u").getUsage().replace('&', '§')); try { - BufferedReader br=new BufferedReader(new FileReader("flairsaccepted.txt")); - String line; - while ((line = br.readLine()) != null) - { - AcceptedPlayers.add(line.replace("\n", "")); + File file=new File("flairsaccepted.txt"); + if(file.exists()) + { + BufferedReader br=new BufferedReader(new FileReader("flairsaccepted.txt")); + String line; + while ((line = br.readLine()) != null) + { + AcceptedPlayers.add(line.replace("\n", "")); + } + br.close(); } - br.close(); - BufferedReader br=new BufferedReader(new FileReader("flairsignored.txt")); - while ((line = br.readLine()) != null) - { - IgnoredPlayers.add(line.replace("\n", "")); - } - br.close(); - FileWriter fw; - fw = new FileWriter("flairsaccepted.txt"); - fw.close(); + file=new File("flairsignored.txt"); + if(file.exists()) + { + BufferedReader br=new BufferedReader(new FileReader("flairsignored.txt")); + String line; + while ((line = br.readLine()) != null) + { + IgnoredPlayers.add(line.replace("\n", "")); + } + br.close(); + } } catch (IOException e) { System.out.println("Error!\n"+e); } @@ -71,6 +78,40 @@ public class PluginMain extends JavaPlugin @Override public void onDisable() { + try + { + FileWriter fw; + fw = new FileWriter("flairsaccepted.txt"); + fw.close(); + fw = new FileWriter("flairsignored.txt"); + fw.close(); + } + catch(Exception e) + { + System.out.println("Error!\n"+e); + } + for(String player : AcceptedPlayers) + { + File file=new File("flairsaccepted.txt"); + try { + BufferedWriter bw=new BufferedWriter(new FileWriter(file, true)); + bw.write(player+"\n"); + bw.close(); + } catch (IOException e) { + System.out.println("Error!\n"+e); + } + } + for(String player : IgnoredPlayers) + { + File file=new File("flairsignored.txt"); + try { + BufferedWriter bw = new BufferedWriter(new FileWriter(file, true)); + bw.write(player+"\n"); + bw.close(); + } catch (IOException e) { + System.out.println("Error!\n"+e); + } + } stop=true; } @@ -98,7 +139,7 @@ public class PluginMain extends JavaPlugin ign = ign.trim(); if(HasIGFlair(ign)) continue; - //System.out.println("Author: "+author); + System.out.println("Author: "+author); try { Thread.sleep(10); } catch(InterruptedException ex) { @@ -236,26 +277,8 @@ public class PluginMain extends JavaPlugin { if(IgnoredPlayers.contains(player.getName())) return; - { - try { - BufferedWriter bw=new BufferedWriter(new FileWriter("flairsaccepted.txt", true)); - bw.write(player.getName()+"\n"); - bw.close(); - } catch (IOException e) { - System.out.println("Error!\n"+e); - } - } if(AcceptedPlayers.contains(player.getName())) - { player.setDisplayName(player.getDisplayName()+flair); - try { - BufferedWriter bw=new BufferedWriter(new FileWriter("flairsaccepted.txt", true)); - bw.write(player.getName()+"\n"); - bw.close(); - } catch (IOException e) { - System.out.println("Error!\n"+e); - } - } else player.sendMessage("§9Are you Reddit user "+username+"?§r §6Type /u accept or /u ignore§r"); diff --git a/.metadata/.plugins/org.eclipse.core.resources/.history/c0/10b589a7ab2b00151fa6e49f3e10bf0b b/.metadata/.plugins/org.eclipse.core.resources/.history/b/40053f0ee52d0015105bf01c854e42e3 similarity index 84% rename from .metadata/.plugins/org.eclipse.core.resources/.history/c0/10b589a7ab2b00151fa6e49f3e10bf0b rename to .metadata/.plugins/org.eclipse.core.resources/.history/b/40053f0ee52d0015105bf01c854e42e3 index 07653ad..a456c10 100644 --- a/.metadata/.plugins/org.eclipse.core.resources/.history/c0/10b589a7ab2b00151fa6e49f3e10bf0b +++ b/.metadata/.plugins/org.eclipse.core.resources/.history/b/40053f0ee52d0015105bf01c854e42e3 @@ -2,6 +2,7 @@ package tk.sznp.thebuttonautoflair; import java.io.BufferedReader; import java.io.BufferedWriter; +import java.io.File; import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; @@ -42,22 +43,28 @@ public class PluginMain extends JavaPlugin this.getCommand("u").setExecutor(new Commands()); this.getCommand("u").setUsage(this.getCommand("u").getUsage().replace('&', '§')); try { - BufferedReader br=new BufferedReader(new FileReader("flairsaccepted.txt")); - String line; - while ((line = br.readLine()) != null) - { - AcceptedPlayers.add(line.replace("\n", "")); + File file=new File("flairsaccepted.txt"); + if(file.exists()) + { + BufferedReader br=new BufferedReader(new FileReader("flairsaccepted.txt")); + String line; + while ((line = br.readLine()) != null) + { + AcceptedPlayers.add(line.replace("\n", "")); + } + br.close(); } - br.close(); - BufferedReader br=new BufferedReader(new FileReader("flairsignored.txt")); - while ((line = br.readLine()) != null) - { - IgnoredPlayers.add(line.replace("\n", "")); - } - br.close(); - FileWriter fw; - fw = new FileWriter("flairsaccepted.txt"); - fw.close(); + file=new File("flairsignored.txt"); + if(file.exists()) + { + BufferedReader br=new BufferedReader(new FileReader("flairsignored.txt")); + String line; + while ((line = br.readLine()) != null) + { + IgnoredPlayers.add(line.replace("\n", "")); + } + br.close(); + } } catch (IOException e) { System.out.println("Error!\n"+e); } @@ -71,6 +78,40 @@ public class PluginMain extends JavaPlugin @Override public void onDisable() { + try + { + FileWriter fw; + fw = new FileWriter("flairsaccepted.txt"); + fw.close(); + fw = new FileWriter("flairsignored.txt"); + fw.close(); + } + catch(Exception e) + { + System.out.println("Error!\n"+e); + } + for(String player : AcceptedPlayers) + { + File file=new File("flairsaccepted.txt"); + try { + BufferedWriter bw=new BufferedWriter(new FileWriter(file, true)); + bw.write(player+"\n"); + bw.close(); + } catch (IOException e) { + System.out.println("Error!\n"+e); + } + } + for(String player : IgnoredPlayers) + { + File file=new File("flairsignored.txt"); + try { + BufferedWriter bw = new BufferedWriter(new FileWriter(file, true)); + bw.write(player+"\n"); + bw.close(); + } catch (IOException e) { + System.out.println("Error!\n"+e); + } + } stop=true; } @@ -98,7 +139,7 @@ public class PluginMain extends JavaPlugin ign = ign.trim(); if(HasIGFlair(ign)) continue; - //System.out.println("Author: "+author); + System.out.println("Author: "+author); try { Thread.sleep(10); } catch(InterruptedException ex) { @@ -115,6 +156,7 @@ public class PluginMain extends JavaPlugin else flair = "non-presser"; String flairclass; + System.out.println("flairdata.length:"+flairdata.length); if(flairdata.length>1) flairclass = flairdata[2]; else @@ -237,16 +279,7 @@ public class PluginMain extends JavaPlugin if(IgnoredPlayers.contains(player.getName())) return; if(AcceptedPlayers.contains(player.getName())) - { player.setDisplayName(player.getDisplayName()+flair); - try { - BufferedWriter bw=new BufferedWriter(new FileWriter("flairsaccepted.txt", true)); - bw.write(player.getName()+"\n"); - bw.close(); - } catch (IOException e) { - System.out.println("Error!\n"+e); - } - } else player.sendMessage("§9Are you Reddit user "+username+"?§r §6Type /u accept or /u ignore§r"); 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 f9cc4a2..7e05755 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/.markers b/.metadata/.plugins/org.eclipse.core.resources/.projects/TheButtonAutoFlair/.markers index 86da531..5f455b1 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/.projects/TheButtonAutoFlair/org.eclipse.jdt.core/state.dat b/.metadata/.plugins/org.eclipse.core.resources/.projects/TheButtonAutoFlair/org.eclipse.jdt.core/state.dat deleted file mode 100644 index 4beac5b..0000000 Binary files a/.metadata/.plugins/org.eclipse.core.resources/.projects/TheButtonAutoFlair/org.eclipse.jdt.core/state.dat and /dev/null differ diff --git a/.metadata/.plugins/org.eclipse.core.resources/.root/1.tree b/.metadata/.plugins/org.eclipse.core.resources/.root/2.tree similarity index 79% rename from .metadata/.plugins/org.eclipse.core.resources/.root/1.tree rename to .metadata/.plugins/org.eclipse.core.resources/.root/2.tree index ad6fb55..5edf4fd 100644 Binary files a/.metadata/.plugins/org.eclipse.core.resources/.root/1.tree and b/.metadata/.plugins/org.eclipse.core.resources/.root/2.tree 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 cfec4fa..c3d3710 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.launching.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs index e08abdc..a9b7731 100644 --- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs @@ -1,2 +1,2 @@ eclipse.preferences.version=1 -org.eclipse.jdt.launching.PREF_VM_XML=\r\n\r\n\r\n\r\n\r\n\r\n +org.eclipse.jdt.launching.PREF_VM_XML=\r\n\r\n\r\n\r\n\r\n\r\n diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.rse.core.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.rse.core.prefs index 135d79e..c27d8a2 100644 --- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.rse.core.prefs +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.rse.core.prefs @@ -1,3 +1,4 @@ activeuserprofiles=NORBI-PC;Team eclipse.preferences.version=1 org.eclipse.rse.systemtype.local.systemType.defaultUserId=Norbi +useridperkey=NORBI-PC.Local\=Norbi; diff --git a/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi b/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi index 634ad6e..a3181bb 100644 --- a/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi +++ b/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi @@ -240,7 +240,7 @@ org.eclipse.e4.primaryDataStack EditorStack - + Editor org.eclipse.jdt.ui.CompilationUnitEditor removeOnHide @@ -312,7 +312,7 @@ categoryTag:General - + View categoryTag:General @@ -407,18 +407,18 @@ Draggable - - - - - - - - - - - - + + + + + + + + + + + + toolbarSeparator @@ -426,33 +426,38 @@ Draggable - - - + + + + + + Draggable + + Draggable - - + + Draggable - - + + Draggable - - - - + + + + Draggable - - - - + + + + Draggable @@ -462,10 +467,20 @@ Draggable - - - - + + + + + + + Draggable + + + + + + + Draggable @@ -483,15 +498,15 @@ Draggable - - - - - - - - - + + + + + + + + + toolbarSeparator @@ -503,8 +518,8 @@ Draggable - - + + stretch diff --git a/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps b/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps index e9ed17d..2ab67cc 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 6e0992f..70f4fa9 100644 --- a/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt +++ b/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt @@ -1,21 +1,23 @@ INDEX VERSION 1.126+D:\Z - Norbi cucca\0 Projektek\TheButtonMCAutoFlairProto\Spigot plugin\.metadata\.plugins\org.eclipse.jdt.core -605290374.index -1045485630.index -3604769962.index -355369697.index -4187470955.index -1337478678.index -994834796.index -533208796.index -3716007315.index -3954291735.index -115418958.index -2674037006.index -1508644233.index -3045053200.index -1737447423.index -1017853417.index 3656756579.index +2674037006.index 323251068.index +355369697.index +3716007315.index +1045485630.index +605290374.index +533208796.index +1337478678.index +1467104569.index +1737447423.index +1528680760.index +4187470955.index 2535676096.index 1787405673.index +1017853417.index +115418958.index +3604769962.index +994834796.index +3954291735.index +3045053200.index +1508644233.index diff --git a/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml b/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml index 40cd2f0..df9ab99 100644 --- a/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml +++ b/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml @@ -1,4 +1,5 @@ + \ No newline at end of file diff --git a/TheButtonAutoFlair.jar b/TheButtonAutoFlair.jar index 83c9be3..e64d7f9 100644 Binary files a/TheButtonAutoFlair.jar and b/TheButtonAutoFlair.jar differ diff --git a/TheButtonAutoFlair/bin/tk/sznp/thebuttonautoflair/PluginMain.class b/TheButtonAutoFlair/bin/tk/sznp/thebuttonautoflair/PluginMain.class index 51bafc9..1d3ffab 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/src/tk/sznp/thebuttonautoflair/PluginMain.java b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PluginMain.java index e0a12bf..2715e75 100644 --- a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PluginMain.java +++ b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PluginMain.java @@ -156,7 +156,8 @@ public class PluginMain extends JavaPlugin else flair = "non-presser"; String flairclass; - if(flairdata.length>1) + //System.out.println("flairdata.length:"+flairdata.length); + if(flairdata.length>2) flairclass = flairdata[2]; else flairclass="unknown";