diff --git a/.metadata/.log b/.metadata/.log index 4c8d1e0..1d5699e 100644 --- a/.metadata/.log +++ b/.metadata/.log @@ -1175,3 +1175,138 @@ 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-20 12:03:37.735 ----------------------------------------------- +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-20 12:04:30.018 +!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-20 12:04:30.041 +!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. +!SESSION 2015-08-21 17:16:18.124 ----------------------------------------------- +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 -product org.eclipse.epp.package.jee.product +Command-line arguments: -os win32 -ws win32 -arch x86_64 -product org.eclipse.epp.package.jee.product -data D:\Z - Norbi cucca\0 Projektek\TheButtonMCAutoFlairProto\Spigot plugin -product org.eclipse.epp.package.jee.product + +!ENTRY org.eclipse.egit.ui 2 0 2015-08-21 17:16:33.522 +!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-21 17:16:33.559 +!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. +!SESSION 2015-08-22 17:26:16.114 ----------------------------------------------- +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 -product org.eclipse.epp.package.jee.product +Command-line arguments: -os win32 -ws win32 -arch x86_64 -product org.eclipse.epp.package.jee.product -data D:\Z - Norbi cucca\0 Projektek\TheButtonMCAutoFlairProto\Spigot plugin -product org.eclipse.epp.package.jee.product + +!ENTRY org.eclipse.egit.ui 2 0 2015-08-22 17:26:38.355 +!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-22 17:26:38.382 +!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. +!SESSION 2015-08-23 17:16:55.833 ----------------------------------------------- +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.osgi 4 0 2015-08-23 17:17:21.079 +!MESSAGE Application error +!STACK 1 +org.eclipse.swt.SWTError: No more handles + at org.eclipse.swt.SWT.error(SWT.java:4387) + at org.eclipse.swt.SWT.error(SWT.java:4276) + at org.eclipse.swt.SWT.error(SWT.java:4247) + at org.eclipse.swt.widgets.Widget.error(Widget.java:468) + at org.eclipse.swt.widgets.Control.createHandle(Control.java:704) + at org.eclipse.swt.widgets.Composite.createHandle(Composite.java:305) + at org.eclipse.swt.widgets.Control.createWidget(Control.java:744) + at org.eclipse.swt.widgets.Scrollable.createWidget(Scrollable.java:134) + at org.eclipse.swt.widgets.Control.(Control.java:112) + at org.eclipse.swt.widgets.Scrollable.(Scrollable.java:75) + at org.eclipse.swt.widgets.Composite.(Composite.java:95) + at org.eclipse.ui.splash.BasicSplashHandler.getBundleProgressMonitor(BasicSplashHandler.java:159) + at org.eclipse.ui.splash.BasicSplashHandler.getContent(BasicSplashHandler.java:265) + at org.eclipse.ui.internal.splash.EclipseSplashHandler.init(EclipseSplashHandler.java:91) + at org.eclipse.ui.internal.Workbench$6.run(Workbench.java:751) + at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:42) + at org.eclipse.ui.internal.Workbench.createSplashWrapper(Workbench.java:772) + at org.eclipse.ui.internal.Workbench.access$5(Workbench.java:690) + at org.eclipse.ui.internal.Workbench$5.run(Workbench.java:568) + at org.eclipse.core.databinding.observable.Realm.runWithDefault(Realm.java:332) + at org.eclipse.ui.internal.Workbench.createAndRunWorkbench(Workbench.java:543) + at org.eclipse.ui.PlatformUI.createAndRunWorkbench(PlatformUI.java:149) + at org.eclipse.ui.internal.ide.application.IDEApplication.start(IDEApplication.java:124) + at org.eclipse.equinox.internal.app.EclipseAppHandle.run(EclipseAppHandle.java:196) + at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.runApplication(EclipseAppLauncher.java:110) + at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.start(EclipseAppLauncher.java:79) + at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:353) + at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:180) + at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source) + at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source) + at java.lang.reflect.Method.invoke(Unknown Source) + at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java:629) + at org.eclipse.equinox.launcher.Main.basicRun(Main.java:584) + at org.eclipse.equinox.launcher.Main.run(Main.java:1438) +!SESSION 2015-08-25 11:30:37.334 ----------------------------------------------- +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-25 11:35:58.463 +!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-25 11:35:58.581 +!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 5280580..a53ff67 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 4a6e02b..812aac4 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 1fe6b56..3b70f8f 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 339747b..ba852d5 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 68014b3..08c0600 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 9cf03bd..a13ec9f 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.e4.workbench/workbench.xmi b/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi index d4bae74..d465f2c 100644 --- a/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi +++ b/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi @@ -240,20 +240,20 @@ org.eclipse.e4.primaryDataStack EditorStack - + Editor org.eclipse.jdt.ui.CompilationUnitEditor removeOnHide activeOnClose - + Editor org.eclipse.jdt.ui.CompilationUnitEditor removeOnHide - + 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 549ee0a..771e783 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/866502542.index b/.metadata/.plugins/org.eclipse.jdt.core/866502542.index deleted file mode 100644 index 9e3ceb2..0000000 Binary files a/.metadata/.plugins/org.eclipse.jdt.core/866502542.index and /dev/null differ diff --git a/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps b/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps index 00892b2..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 0e7cf1c..3795b71 100644 --- a/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt +++ b/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt @@ -1,26 +1,25 @@ INDEX VERSION 1.126+D:\Z - Norbi cucca\0 Projektek\TheButtonMCAutoFlairProto\Spigot plugin\.metadata\.plugins\org.eclipse.jdt.core -3045053200.index +3656756579.index 3089967703.index 2674037006.index 323251068.index 355369697.index -1934142626.index 3716007315.index +1934142626.index 1045485630.index 605290374.index 533208796.index 1337478678.index 1528680760.index -1737447423.index 1467104569.index +1737447423.index 4187470955.index 2535676096.index 1787405673.index -866502542.index 1017853417.index 115418958.index -3954291735.index -994834796.index 3604769962.index +994834796.index +3954291735.index +3045053200.index 1508644233.index -3656756579.index diff --git a/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties b/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties index 18b269c..878c50e 100644 --- a/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties +++ b/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties @@ -1,2 +1,2 @@ #Cached timestamps -#Thu Jul 16 13:42:59 CEST 2015 +#Thu Aug 20 23:57:56 CEST 2015 diff --git a/.metadata/.plugins/org.eclipse.ui.workbench.texteditor/dialog_settings.xml b/.metadata/.plugins/org.eclipse.ui.workbench.texteditor/dialog_settings.xml index a3478be..bb686e1 100644 --- a/.metadata/.plugins/org.eclipse.ui.workbench.texteditor/dialog_settings.xml +++ b/.metadata/.plugins/org.eclipse.ui.workbench.texteditor/dialog_settings.xml @@ -2,12 +2,13 @@
- + + diff --git a/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml b/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml index 089ceda..2ffa316 100644 --- a/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml +++ b/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml @@ -18,4 +18,8 @@ + + + + \ No newline at end of file diff --git a/TheButtonAutoFlair.jar b/TheButtonAutoFlair.jar index 659e14c..f4e616a 100644 Binary files a/TheButtonAutoFlair.jar and b/TheButtonAutoFlair.jar differ diff --git a/TheButtonAutoFlair/.classpath b/TheButtonAutoFlair/.classpath index 702b25c..88e0f3c 100644 --- a/TheButtonAutoFlair/.classpath +++ b/TheButtonAutoFlair/.classpath @@ -6,7 +6,6 @@ - diff --git a/TheButtonAutoFlair/bin/de/inventivegames/TellRawAutoMessage/Reflection.class b/TheButtonAutoFlair/bin/de/inventivegames/TellRawAutoMessage/Reflection.class index 0f454bd..07671d3 100644 Binary files a/TheButtonAutoFlair/bin/de/inventivegames/TellRawAutoMessage/Reflection.class and b/TheButtonAutoFlair/bin/de/inventivegames/TellRawAutoMessage/Reflection.class differ diff --git a/TheButtonAutoFlair/bin/org/json/CDL.class b/TheButtonAutoFlair/bin/org/json/CDL.class index a766932..ceeef9a 100644 Binary files a/TheButtonAutoFlair/bin/org/json/CDL.class and b/TheButtonAutoFlair/bin/org/json/CDL.class differ diff --git a/TheButtonAutoFlair/bin/org/json/Cookie.class b/TheButtonAutoFlair/bin/org/json/Cookie.class index f109dcf..7799866 100644 Binary files a/TheButtonAutoFlair/bin/org/json/Cookie.class and b/TheButtonAutoFlair/bin/org/json/Cookie.class differ diff --git a/TheButtonAutoFlair/bin/org/json/CookieList.class b/TheButtonAutoFlair/bin/org/json/CookieList.class index 7150bcf..80c3d23 100644 Binary files a/TheButtonAutoFlair/bin/org/json/CookieList.class and b/TheButtonAutoFlair/bin/org/json/CookieList.class differ diff --git a/TheButtonAutoFlair/bin/org/json/HTTP.class b/TheButtonAutoFlair/bin/org/json/HTTP.class index 600f62e..adc60a9 100644 Binary files a/TheButtonAutoFlair/bin/org/json/HTTP.class and b/TheButtonAutoFlair/bin/org/json/HTTP.class differ diff --git a/TheButtonAutoFlair/bin/org/json/HTTPTokener.class b/TheButtonAutoFlair/bin/org/json/HTTPTokener.class index c16f018..f9e5bcd 100644 Binary files a/TheButtonAutoFlair/bin/org/json/HTTPTokener.class and b/TheButtonAutoFlair/bin/org/json/HTTPTokener.class differ diff --git a/TheButtonAutoFlair/bin/org/json/JSONArray.class b/TheButtonAutoFlair/bin/org/json/JSONArray.class index 9f7c7a0..db0e324 100644 Binary files a/TheButtonAutoFlair/bin/org/json/JSONArray.class and b/TheButtonAutoFlair/bin/org/json/JSONArray.class differ diff --git a/TheButtonAutoFlair/bin/org/json/JSONException.class b/TheButtonAutoFlair/bin/org/json/JSONException.class index db36831..bc646c9 100644 Binary files a/TheButtonAutoFlair/bin/org/json/JSONException.class and b/TheButtonAutoFlair/bin/org/json/JSONException.class differ diff --git a/TheButtonAutoFlair/bin/org/json/JSONML.class b/TheButtonAutoFlair/bin/org/json/JSONML.class index a05eae7..990c552 100644 Binary files a/TheButtonAutoFlair/bin/org/json/JSONML.class and b/TheButtonAutoFlair/bin/org/json/JSONML.class differ diff --git a/TheButtonAutoFlair/bin/org/json/JSONObject$Null.class b/TheButtonAutoFlair/bin/org/json/JSONObject$Null.class index 8b7cc7b..0e5a505 100644 Binary files a/TheButtonAutoFlair/bin/org/json/JSONObject$Null.class and b/TheButtonAutoFlair/bin/org/json/JSONObject$Null.class differ diff --git a/TheButtonAutoFlair/bin/org/json/JSONObject.class b/TheButtonAutoFlair/bin/org/json/JSONObject.class index eb86131..d35d404 100644 Binary files a/TheButtonAutoFlair/bin/org/json/JSONObject.class and b/TheButtonAutoFlair/bin/org/json/JSONObject.class differ diff --git a/TheButtonAutoFlair/bin/org/json/JSONString.class b/TheButtonAutoFlair/bin/org/json/JSONString.class index df7818f..f891964 100644 Binary files a/TheButtonAutoFlair/bin/org/json/JSONString.class and b/TheButtonAutoFlair/bin/org/json/JSONString.class differ diff --git a/TheButtonAutoFlair/bin/org/json/JSONStringer.class b/TheButtonAutoFlair/bin/org/json/JSONStringer.class index 2e6ad18..5a1fefa 100644 Binary files a/TheButtonAutoFlair/bin/org/json/JSONStringer.class and b/TheButtonAutoFlair/bin/org/json/JSONStringer.class differ diff --git a/TheButtonAutoFlair/bin/org/json/JSONTokener.class b/TheButtonAutoFlair/bin/org/json/JSONTokener.class index 181d3cb..964ef46 100644 Binary files a/TheButtonAutoFlair/bin/org/json/JSONTokener.class and b/TheButtonAutoFlair/bin/org/json/JSONTokener.class differ diff --git a/TheButtonAutoFlair/bin/org/json/JSONWriter.class b/TheButtonAutoFlair/bin/org/json/JSONWriter.class index e41f8a0..70d8c6f 100644 Binary files a/TheButtonAutoFlair/bin/org/json/JSONWriter.class and b/TheButtonAutoFlair/bin/org/json/JSONWriter.class differ diff --git a/TheButtonAutoFlair/bin/org/json/Property.class b/TheButtonAutoFlair/bin/org/json/Property.class index ad1f6da..2202081 100644 Binary files a/TheButtonAutoFlair/bin/org/json/Property.class and b/TheButtonAutoFlair/bin/org/json/Property.class differ diff --git a/TheButtonAutoFlair/bin/org/json/XML.class b/TheButtonAutoFlair/bin/org/json/XML.class index 8fde813..2141cde 100644 Binary files a/TheButtonAutoFlair/bin/org/json/XML.class and b/TheButtonAutoFlair/bin/org/json/XML.class differ diff --git a/TheButtonAutoFlair/bin/org/json/XMLTokener.class b/TheButtonAutoFlair/bin/org/json/XMLTokener.class index 89470fd..e173cd0 100644 Binary files a/TheButtonAutoFlair/bin/org/json/XMLTokener.class and b/TheButtonAutoFlair/bin/org/json/XMLTokener.class differ diff --git a/TheButtonAutoFlair/bin/tk/sznp/thebuttonautoflair/Commands.class b/TheButtonAutoFlair/bin/tk/sznp/thebuttonautoflair/Commands.class index 244362e..3da9fb9 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 9508131..b37d251 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 ee3fe46..5f90b40 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$1.class b/TheButtonAutoFlair/bin/tk/sznp/thebuttonautoflair/PluginMain$1.class index 4df7d07..c2bcb97 100644 Binary files a/TheButtonAutoFlair/bin/tk/sznp/thebuttonautoflair/PluginMain$1.class and b/TheButtonAutoFlair/bin/tk/sznp/thebuttonautoflair/PluginMain$1.class differ diff --git a/TheButtonAutoFlair/bin/tk/sznp/thebuttonautoflair/PluginMain.class b/TheButtonAutoFlair/bin/tk/sznp/thebuttonautoflair/PluginMain.class index 2591e3c..b5c4d3a 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 8c6d194..1267961 100644 --- a/TheButtonAutoFlair/plugin.yml +++ b/TheButtonAutoFlair/plugin.yml @@ -5,3 +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" diff --git a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/AnnouncerThread.java b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/AnnouncerThread.java index 1084bcf..fec5459 100644 --- a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/AnnouncerThread.java +++ b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/AnnouncerThread.java @@ -12,12 +12,14 @@ public class AnnouncerThread { } catch (InterruptedException ex) { Thread.currentThread().interrupt(); } - for (Player player : PluginMain.GetPlayers()) - player.sendMessage(PluginMain.AnnounceMessages - .get(AnnounceMessageIndex)); - AnnounceMessageIndex++; - if (AnnounceMessageIndex == PluginMain.AnnounceMessages.size()) - AnnounceMessageIndex = 0; + if (PluginMain.AnnounceMessages.size() > AnnounceMessageIndex) { + for (Player player : PluginMain.GetPlayers()) + player.sendMessage(PluginMain.AnnounceMessages + .get(AnnounceMessageIndex)); + AnnounceMessageIndex++; + if (AnnounceMessageIndex == PluginMain.AnnounceMessages.size()) + AnnounceMessageIndex = 0; + } } } } diff --git a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/Commands.java b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/Commands.java index e04d680..ab17787 100644 --- a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/Commands.java +++ b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/Commands.java @@ -22,92 +22,135 @@ public class Commands implements CommandExecutor { 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.CommentedOnReddit && !args[0].toLowerCase().equals("admin")) { - player.sendMessage("§cError: You need to write your username to the reddit thread at /r/TheButtonMinecraft§r"); + switch (cmd.getName()) { + case "u": { + if (args.length < 1) + return false; + MaybeOfflinePlayer p = MaybeOfflinePlayer.AllPlayers.get(player + .getName()); // 2015.08.08. + // if(!PluginMain.PlayerFlairs.containsKey(player.getName())) + if (!p.CommentedOnReddit + && !args[0].toLowerCase().equals("admin")) { + player.sendMessage("§cError: You need to write your username to the reddit thread at /r/TheButtonMinecraft§r"); + return true; + } + if (!p.FlairRecognised + && !args[0].toLowerCase().equals("admin")) { // 2015.08.10. + player.sendMessage("Sorry, but your flair isn't recorded. Please ask a mod to set it for you."); + return true; + } + if (!p.FlairDecided && !args[0].toLowerCase().equals("admin")) { // 2015.08.19. + player.sendMessage("Please select between /u nonpresser and /u cantpress"); + 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("§bYour 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("§bYou 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; + } + SetPlayerFlair(player, p, "§7(--s)§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; + } + SetPlayerFlair(player, p, "§r(??s)§r"); + break; + case "opme": // 2015.08.10. + player.sendMessage("It would be nice, isn't it?"); // Sometimes + // I'm + // bored + // too + break; + case "announce": + DoAnnounce(player, args); + break; + default: + return false; + } return true; } - if (!p.FlairRecognised && !args[0].toLowerCase().equals("admin")) { // 2015.08.10. - player.sendMessage("Sorry, but your flair isn't recorded. Please ask a mod to set it for you."); + 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; - } - if (!p.FlairDecided && !args[0].toLowerCase().equals("admin")) { // 2015.08.19. - player.sendMessage("Please select between /u nonpresser and /u cantpress"); + case "nrp": + if (args.length == 0) { + MaybeOfflinePlayer.AddPlayerIfNeeded(player.getName()).RPMode = false; + player.sendMessage("§8RP mode off.§r"); + } else { + 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; + } 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("§bYour 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("§bYou 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; - } - SetPlayerFlair(player, p, "§7(--s)§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; - } - SetPlayerFlair(player, p, "§r(??s)§r"); - break; - case "opme": // 2015.08.10. - player.sendMessage("It would be nice, isn't it?"); // Sometimes - // I'm bored - // too - break; - case "announce": - DoAnnounce(player, args); - break; default: - return false; + player.sendMessage("Unknown command: " + cmd.getName()); + break; } - return true; } /* * if(args[0].toLowerCase()=="reload") DoReload(null); //2015.07.20. @@ -332,7 +375,7 @@ public class Commands implements CommandExecutor { if (i != args.length - 1) sb.append(" "); } - String finalmessage=sb.toString().replace('&', '§'); + String finalmessage = sb.toString().replace('&', '§'); PluginMain.AnnounceMessages.add(finalmessage); bw.write(finalmessage); bw.write(System.lineSeparator()); diff --git a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/MaybeOfflinePlayer.java b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/MaybeOfflinePlayer.java index 1a8bafb..6b5858b 100644 --- a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/MaybeOfflinePlayer.java +++ b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/MaybeOfflinePlayer.java @@ -12,6 +12,7 @@ public class MaybeOfflinePlayer 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) { diff --git a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java index 50583bf..358284e 100644 --- a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java +++ b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java @@ -62,6 +62,8 @@ public class PlayerListener implements Listener { // 2015.07.16. if (secretstuff >= 2) pl.chat("Hey, " + p.getName() + "!"); } + + mp.RPMode=true; //2015.08.25. } @EventHandler @@ -118,7 +120,7 @@ public class PlayerListener implements Listener { // 2015.07.16. + nwithoutformatting.charAt(index + 1), ""); // System.out.println("Index: "+index+" "+"CharAt(index+1): "+nwithoutformatting.charAt(index+1)); // } - //System.out.println("nwithoutformatting: " + nwithoutformatting); + // System.out.println("nwithoutformatting: " + nwithoutformatting); if (message.contains(nwithoutformatting)) { p = Bukkit.getPlayer(nicknames.get(n)); if (NotificationSound == null) @@ -133,9 +135,12 @@ public class PlayerListener implements Listener { // 2015.07.16. } } - event.setFormat(event.getFormat().substring(0, - event.getFormat().indexOf(">")) - + flair + "> " + message); // 2015.08.08. + event.setFormat("<" + + (player.RPMode ? "§2[RP]§r" : "§8[non-RP]§r") + + event.getFormat().substring( + event.getFormat().indexOf("<") + 1, + event.getFormat().indexOf(">")) + flair + "> " + + message); // 2015.08.08. } private static Class nmsChatSerializer = Reflection diff --git a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PluginMain.java b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PluginMain.java index e1aa9bd..57a3cb8 100644 --- a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PluginMain.java +++ b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PluginMain.java @@ -28,12 +28,19 @@ public class PluginMain extends JavaPlugin { // Translated to Java: 2015.07.15. // Fired when plugin is first enabled @Override public void onEnable() { - System.out.println("The Button Minecraft server plugin by NorbiPeti"); + System.out.println("The Button Minecraft server plugin"); getServer().getPluginManager().registerEvents(new PlayerListener(), this); - this.getCommand("u").setExecutor(new Commands()); + Commands comm = new Commands(); + 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('&', '§')); Instance = this; // 2015.08.08. Console = this.getServer().getConsoleSender(); // 2015.08.12. LoadFiles(false); // 2015.08.09.