Cleaned up code and added F
This commit is contained in:
parent
cb44dccf56
commit
a16ab64a22
2121
.metadata/.log
2121
.metadata/.log
File diff suppressed because it is too large
Load diff
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -240,26 +240,26 @@
|
|||
<tags>org.eclipse.e4.primaryDataStack</tags>
|
||||
<tags>EditorStack</tags>
|
||||
<children xsi:type="basic:Part" xmi:id="__kGwMD-LEeWprK50eVwiGQ" elementId="org.eclipse.e4.ui.compatibility.editor" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityEditor" label="PluginMain.java" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/obj16/jcu_obj.gif" tooltip="TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PluginMain.java" closeable="true">
|
||||
<persistedState key="memento" value="<?xml version="1.0" encoding="UTF-8"?>
<editor id="org.eclipse.jdt.ui.CompilationUnitEditor">
<input factoryID="org.eclipse.ui.part.FileEditorInputFactory" path="/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PluginMain.java"/>
<editorState selectionHorizontalPixel="0" selectionLength="0" selectionOffset="1615" selectionTopPixel="540"/>
</editor>"/>
|
||||
<persistedState key="memento" value="<?xml version="1.0" encoding="UTF-8"?>
<editor id="org.eclipse.jdt.ui.CompilationUnitEditor">
<input factoryID="org.eclipse.ui.part.FileEditorInputFactory" path="/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PluginMain.java"/>
<editorState selectionHorizontalPixel="0" selectionLength="0" selectionOffset="983" selectionTopPixel="180"/>
</editor>"/>
|
||||
<tags>Editor</tags>
|
||||
<tags>org.eclipse.jdt.ui.CompilationUnitEditor</tags>
|
||||
<tags>removeOnHide</tags>
|
||||
</children>
|
||||
<children xsi:type="basic:Part" xmi:id="_h4cFECuhEeWsptewEJl0pA" elementId="org.eclipse.e4.ui.compatibility.editor" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityEditor" label="Commands.java" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/obj16/jcu_obj.gif" tooltip="TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/Commands.java" closeable="true">
|
||||
<persistedState key="memento" value="<?xml version="1.0" encoding="UTF-8"?>
<editor id="org.eclipse.jdt.ui.CompilationUnitEditor">
<input factoryID="org.eclipse.ui.part.FileEditorInputFactory" path="/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/Commands.java"/>
<editorState selectionHorizontalPixel="0" selectionLength="0" selectionOffset="9871" selectionTopPixel="3768"/>
</editor>"/>
|
||||
<persistedState key="memento" value="<?xml version="1.0" encoding="UTF-8"?>
<editor id="org.eclipse.jdt.ui.CompilationUnitEditor">
<input factoryID="org.eclipse.ui.part.FileEditorInputFactory" path="/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/Commands.java"/>
<editorState selectionHorizontalPixel="0" selectionLength="0" selectionOffset="0" selectionTopPixel="0"/>
</editor>"/>
|
||||
<tags>Editor</tags>
|
||||
<tags>org.eclipse.jdt.ui.CompilationUnitEditor</tags>
|
||||
<tags>removeOnHide</tags>
|
||||
</children>
|
||||
<children xsi:type="basic:Part" xmi:id="_t4aYYD4IEeW_qLWp8BCh0w" elementId="org.eclipse.e4.ui.compatibility.editor" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityEditor" label="PlayerListener.java" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/obj16/jcu_obj.gif" tooltip="TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java" closeable="true">
|
||||
<persistedState key="memento" value="<?xml version="1.0" encoding="UTF-8"?>
<editor id="org.eclipse.jdt.ui.CompilationUnitEditor">
<input factoryID="org.eclipse.ui.part.FileEditorInputFactory" path="/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java"/>
<editorState selectionHorizontalPixel="0" selectionLength="0" selectionOffset="5723" selectionTopPixel="2568"/>
</editor>"/>
|
||||
<persistedState key="memento" value="<?xml version="1.0" encoding="UTF-8"?>
<editor id="org.eclipse.jdt.ui.CompilationUnitEditor">
<input factoryID="org.eclipse.ui.part.FileEditorInputFactory" path="/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java"/>
<editorState selectionHorizontalPixel="0" selectionLength="0" selectionOffset="7818" selectionTopPixel="2808"/>
</editor>"/>
|
||||
<tags>Editor</tags>
|
||||
<tags>org.eclipse.jdt.ui.CompilationUnitEditor</tags>
|
||||
<tags>removeOnHide</tags>
|
||||
<tags>activeOnClose</tags>
|
||||
</children>
|
||||
<children xsi:type="basic:Part" xmi:id="_yopyED35EeW_qLWp8BCh0w" elementId="org.eclipse.e4.ui.compatibility.editor" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityEditor" label="MaybeOfflinePlayer.java" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/obj16/jcu_obj.gif" tooltip="TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/MaybeOfflinePlayer.java" closeable="true">
|
||||
<persistedState key="memento" value="<?xml version="1.0" encoding="UTF-8"?>
<editor id="org.eclipse.jdt.ui.CompilationUnitEditor">
<input factoryID="org.eclipse.ui.part.FileEditorInputFactory" path="/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/MaybeOfflinePlayer.java"/>
<editorState selectionHorizontalPixel="0" selectionLength="0" selectionOffset="547" selectionTopPixel="0"/>
</editor>"/>
|
||||
<persistedState key="memento" value="<?xml version="1.0" encoding="UTF-8"?>
<editor id="org.eclipse.jdt.ui.CompilationUnitEditor">
<input factoryID="org.eclipse.ui.part.FileEditorInputFactory" path="/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/MaybeOfflinePlayer.java"/>
<editorState selectionHorizontalPixel="0" selectionLength="0" selectionOffset="588" selectionTopPixel="0"/>
</editor>"/>
|
||||
<tags>Editor</tags>
|
||||
<tags>org.eclipse.jdt.ui.CompilationUnitEditor</tags>
|
||||
<tags>removeOnHide</tags>
|
||||
|
|
@ -329,8 +329,8 @@
|
|||
<tags>View</tags>
|
||||
<tags>categoryTag:General</tags>
|
||||
</sharedElements>
|
||||
<sharedElements xsi:type="basic:Part" xmi:id="_77aAUCr0EeWsptewEJl0pA" elementId="org.eclipse.ui.views.ProblemView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Problems" iconURI="platform:/plugin/org.eclipse.ui.ide/icons/full/eview16/problems_view.gif" tooltip="0 errors, 2 warnings, 0 others" closeable="true">
|
||||
<persistedState key="memento" value="<?xml version="1.0" encoding="UTF-8"?>
<view PRIMARY_SORT_FIELD="org.eclipse.ui.ide.severityAndDescriptionField" categoryGroup="org.eclipse.ui.ide.severity" markerContentGenerator="org.eclipse.ui.ide.problemsGenerator" partName="Problems">
<columnWidths org.eclipse.ui.ide.locationField="90" org.eclipse.ui.ide.markerType="90" org.eclipse.ui.ide.pathField="120" org.eclipse.ui.ide.resourceField="90" org.eclipse.ui.ide.severityAndDescriptionField="300"/>
<visible IMemento.internal.id="org.eclipse.ui.ide.severityAndDescriptionField"/>
<visible IMemento.internal.id="org.eclipse.ui.ide.resourceField"/>
<visible IMemento.internal.id="org.eclipse.ui.ide.pathField"/>
<visible IMemento.internal.id="org.eclipse.ui.ide.locationField"/>
<visible IMemento.internal.id="org.eclipse.ui.ide.markerType"/>
</view>"/>
|
||||
<sharedElements xsi:type="basic:Part" xmi:id="_77aAUCr0EeWsptewEJl0pA" elementId="org.eclipse.ui.views.ProblemView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Problems" iconURI="platform:/plugin/org.eclipse.ui.ide/icons/full/eview16/problems_view.gif" tooltip="0 errors, 1 warning, 0 others" closeable="true">
|
||||
<persistedState key="memento" value="<?xml version="1.0" encoding="UTF-8"?>
<view PRIMARY_SORT_FIELD="org.eclipse.ui.ide.severityAndDescriptionField" categoryGroup="org.eclipse.ui.ide.severity" markerContentGenerator="org.eclipse.ui.ide.problemsGenerator" partName="Problems">
<expanded>
<category IMemento.internal.id="Warnings (1 item)"/>
</expanded>
<columnWidths org.eclipse.ui.ide.locationField="90" org.eclipse.ui.ide.markerType="90" org.eclipse.ui.ide.pathField="120" org.eclipse.ui.ide.resourceField="90" org.eclipse.ui.ide.severityAndDescriptionField="300"/>
<visible IMemento.internal.id="org.eclipse.ui.ide.severityAndDescriptionField"/>
<visible IMemento.internal.id="org.eclipse.ui.ide.resourceField"/>
<visible IMemento.internal.id="org.eclipse.ui.ide.pathField"/>
<visible IMemento.internal.id="org.eclipse.ui.ide.locationField"/>
<visible IMemento.internal.id="org.eclipse.ui.ide.markerType"/>
</view>"/>
|
||||
<tags>View</tags>
|
||||
<tags>categoryTag:General</tags>
|
||||
<menus xmi:id="_dGEOYCr1EeWsptewEJl0pA" elementId="org.eclipse.ui.views.ProblemView">
|
||||
|
|
@ -432,18 +432,18 @@
|
|||
</children>
|
||||
<children xsi:type="menu:ToolBar" xmi:id="_6K2osCr0EeWsptewEJl0pA" elementId="org.eclipse.ui.workbench.file">
|
||||
<tags>Draggable</tags>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_SKuD8FZfEeWL4_m8A7a0fw" elementId="new.group"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_SKurAFZfEeWL4_m8A7a0fw" elementId="newWizardDropDown"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_SKurAVZfEeWL4_m8A7a0fw" elementId="new.ext" visible="false"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_SKurAlZfEeWL4_m8A7a0fw" elementId="save.group" visible="false"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_SKvSEFZfEeWL4_m8A7a0fw" elementId="save"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_SKvSEVZfEeWL4_m8A7a0fw" elementId="saveAll"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_SKvSElZfEeWL4_m8A7a0fw" elementId="save.ext" visible="false"/>
|
||||
<children xsi:type="menu:HandledToolItem" xmi:id="_SKv5IFZfEeWL4_m8A7a0fw" iconURI="platform:/plugin/org.eclipse.ui/icons/full/etool16/print_edit.gif" tooltip="Print" command="_3_hZmSr0EeWsptewEJl0pA"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_SK0xoFZfEeWL4_m8A7a0fw" elementId="print.ext" visible="false"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_SK0xoVZfEeWL4_m8A7a0fw" elementId="build.group"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_SK1YsFZfEeWL4_m8A7a0fw" elementId="build.ext" visible="false"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_SK1YsVZfEeWL4_m8A7a0fw" elementId="additions"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_p1m9wF4nEeWis__gpXfVNg" elementId="new.group"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_p1m9wV4nEeWis__gpXfVNg" elementId="newWizardDropDown"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_p1nk0F4nEeWis__gpXfVNg" elementId="new.ext" visible="false"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_p1nk0V4nEeWis__gpXfVNg" elementId="save.group" visible="false"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_p1nk0l4nEeWis__gpXfVNg" elementId="save"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_p1oL4F4nEeWis__gpXfVNg" elementId="saveAll"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_p1oL4V4nEeWis__gpXfVNg" elementId="save.ext" visible="false"/>
|
||||
<children xsi:type="menu:HandledToolItem" xmi:id="_p1paAF4nEeWis__gpXfVNg" iconURI="platform:/plugin/org.eclipse.ui/icons/full/etool16/print_edit.gif" tooltip="Print" command="_3_hZmSr0EeWsptewEJl0pA"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_p1uSgF4nEeWis__gpXfVNg" elementId="print.ext" visible="false"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_p1uSgV4nEeWis__gpXfVNg" elementId="build.group"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_p1u5kF4nEeWis__gpXfVNg" elementId="build.ext" visible="false"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_p1u5kV4nEeWis__gpXfVNg" elementId="additions"/>
|
||||
</children>
|
||||
<children xsi:type="menu:ToolBar" xmi:id="_6K2osSr0EeWsptewEJl0pA" elementId="additions" toBeRendered="false">
|
||||
<tags>toolbarSeparator</tags>
|
||||
|
|
@ -451,38 +451,38 @@
|
|||
</children>
|
||||
<children xsi:type="menu:ToolBar" xmi:id="_dIOxkCr1EeWsptewEJl0pA" elementId="adt.actionSet.avdManager">
|
||||
<tags>Draggable</tags>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_SSPoQFZfEeWL4_m8A7a0fw" elementId="android_project"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_SSPoQVZfEeWL4_m8A7a0fw" elementId="com.android.ide.eclipse.adt.ui.sdkmanager"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_SSQPUFZfEeWL4_m8A7a0fw" elementId="com.android.ide.eclipse.adt.ui.avdmanager"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_p7-EcF4nEeWis__gpXfVNg" elementId="android_project"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_p7-EcV4nEeWis__gpXfVNg" elementId="com.android.ide.eclipse.adt.ui.sdkmanager"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_p7-rgF4nEeWis__gpXfVNg" elementId="com.android.ide.eclipse.adt.ui.avdmanager"/>
|
||||
</children>
|
||||
<children xsi:type="menu:ToolBar" xmi:id="_Mv4F0C3kEeWvSKv3oe_gqg" elementId="org.eclipse.debug.ui.breakpointActionSet">
|
||||
<tags>Draggable</tags>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_SSQPUVZfEeWL4_m8A7a0fw" elementId="breakpointGroup"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_SSQPUlZfEeWL4_m8A7a0fw" elementId="org.eclipse.debug.ui.actions.SkipAllBreakpoints"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_p7-rgV4nEeWis__gpXfVNg" elementId="breakpointGroup"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_p7-rgl4nEeWis__gpXfVNg" elementId="org.eclipse.debug.ui.actions.SkipAllBreakpoints"/>
|
||||
</children>
|
||||
<children xsi:type="menu:ToolBar" xmi:id="_dI4R0Cr1EeWsptewEJl0pA" elementId="adt.actionSet.lint">
|
||||
<tags>Draggable</tags>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_SSQPU1ZfEeWL4_m8A7a0fw" elementId="android_project"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_SSQPVFZfEeWL4_m8A7a0fw" elementId="com.android.ide.eclipse.adt.ui.lintrunner"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_p7-rg14nEeWis__gpXfVNg" elementId="android_project"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_p7-rhF4nEeWis__gpXfVNg" elementId="com.android.ide.eclipse.adt.ui.lintrunner"/>
|
||||
</children>
|
||||
<children xsi:type="menu:ToolBar" xmi:id="_dIyyQCr1EeWsptewEJl0pA" elementId="adt.actionSet.wizards">
|
||||
<tags>Draggable</tags>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_SSQPVVZfEeWL4_m8A7a0fw" elementId="android_project"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_SSQPVlZfEeWL4_m8A7a0fw" elementId="com.android.ide.eclipse.adt.wizards.actions.NewXmlFileAction"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_p7_SkF4nEeWis__gpXfVNg" elementId="android_project"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_p7_SkV4nEeWis__gpXfVNg" elementId="com.android.ide.eclipse.adt.wizards.actions.NewXmlFileAction"/>
|
||||
</children>
|
||||
<children xsi:type="menu:ToolBar" xmi:id="_8zAWsCr0EeWsptewEJl0pA" elementId="org.eclipse.debug.ui.launchActionSet">
|
||||
<tags>Draggable</tags>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_SSQ2YFZfEeWL4_m8A7a0fw" elementId="debug"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_SSQ2YVZfEeWL4_m8A7a0fw" elementId="org.eclipse.debug.internal.ui.actions.DebugDropDownAction"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_SSQ2YlZfEeWL4_m8A7a0fw" elementId="org.eclipse.debug.internal.ui.actions.RunDropDownAction"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_SSQ2Y1ZfEeWL4_m8A7a0fw" elementId="org.eclipse.ui.externaltools.ExternalToolMenuDelegateToolbar"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_p7_Skl4nEeWis__gpXfVNg" elementId="debug"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_p7_Sk14nEeWis__gpXfVNg" elementId="org.eclipse.debug.internal.ui.actions.DebugDropDownAction"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_p7_SlF4nEeWis__gpXfVNg" elementId="org.eclipse.debug.internal.ui.actions.RunDropDownAction"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_p7_SlV4nEeWis__gpXfVNg" elementId="org.eclipse.ui.externaltools.ExternalToolMenuDelegateToolbar"/>
|
||||
</children>
|
||||
<children xsi:type="menu:ToolBar" xmi:id="_dG7xECr1EeWsptewEJl0pA" elementId="org.eclipse.jdt.ui.JavaElementCreationActionSet">
|
||||
<tags>Draggable</tags>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_SSQ2ZFZfEeWL4_m8A7a0fw" elementId="JavaWizards"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_SSQ2ZVZfEeWL4_m8A7a0fw" elementId="org.eclipse.jdt.ui.actions.OpenProjectWizard"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_SSRdcFZfEeWL4_m8A7a0fw" elementId="org.eclipse.jdt.ui.actions.OpenPackageWizard"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_SSRdcVZfEeWL4_m8A7a0fw" elementId="org.eclipse.jdt.ui.actions.NewTypeDropDown"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_p7_5oF4nEeWis__gpXfVNg" elementId="JavaWizards"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_p7_5oV4nEeWis__gpXfVNg" elementId="org.eclipse.jdt.ui.actions.OpenProjectWizard"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_p7_5ol4nEeWis__gpXfVNg" elementId="org.eclipse.jdt.ui.actions.OpenPackageWizard"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_p7_5o14nEeWis__gpXfVNg" elementId="org.eclipse.jdt.ui.actions.NewTypeDropDown"/>
|
||||
</children>
|
||||
<children xsi:type="menu:ToolBar" xmi:id="_8voSkCr0EeWsptewEJl0pA" elementId="org.eclipse.jst.j2ee.J2eeMainActionSet" visible="false">
|
||||
<tags>Draggable</tags>
|
||||
|
|
@ -492,20 +492,20 @@
|
|||
</children>
|
||||
<children xsi:type="menu:ToolBar" xmi:id="_8xJVgCr0EeWsptewEJl0pA" elementId="org.eclipse.search.searchActionSet">
|
||||
<tags>Draggable</tags>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_SSRdclZfEeWL4_m8A7a0fw" elementId="Search"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_SSRdc1ZfEeWL4_m8A7a0fw" elementId="openType"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_SSRddFZfEeWL4_m8A7a0fw" elementId="org.eclipse.mylyn.tasks.ui.openTask"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_SSRddVZfEeWL4_m8A7a0fw" elementId="org.eclipse.search.OpenSearchDialogPage"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_p7_5pF4nEeWis__gpXfVNg" elementId="Search"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_p8AgsF4nEeWis__gpXfVNg" elementId="openType"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_p8AgsV4nEeWis__gpXfVNg" elementId="org.eclipse.mylyn.tasks.ui.openTask"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_p8Agsl4nEeWis__gpXfVNg" elementId="org.eclipse.search.OpenSearchDialogPage"/>
|
||||
</children>
|
||||
<children xsi:type="menu:ToolBar" xmi:id="_Slo_UC3kEeWvSKv3oe_gqg" elementId="org.eclipse.ui.edit.text.actionSet.presentation">
|
||||
<tags>Draggable</tags>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_UKnfIFZfEeWL4_m8A7a0fw" elementId="Presentation"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_UKnfIVZfEeWL4_m8A7a0fw" elementId="org.eclipse.jdt.ui.edit.text.java.toggleBreadcrumb"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_UKoGMFZfEeWL4_m8A7a0fw" elementId="org.eclipse.jdt.ui.edit.text.java.toggleMarkOccurrences"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_UKoGMVZfEeWL4_m8A7a0fw" elementId="org.eclipse.mylyn.java.ui.editor.folding.auto"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_UKoGMlZfEeWL4_m8A7a0fw" elementId="org.eclipse.ui.edit.text.toggleBlockSelectionMode"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_UKoGM1ZfEeWL4_m8A7a0fw" elementId="org.eclipse.ui.edit.text.toggleShowWhitespaceCharacters"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_UKoGNFZfEeWL4_m8A7a0fw" elementId="org.eclipse.ui.edit.text.toggleShowSelectedElementOnly"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_rrdFEF4nEeWis__gpXfVNg" elementId="Presentation"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_rrdsIF4nEeWis__gpXfVNg" elementId="org.eclipse.jdt.ui.edit.text.java.toggleBreadcrumb"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_rre6QF4nEeWis__gpXfVNg" elementId="org.eclipse.jdt.ui.edit.text.java.toggleMarkOccurrences"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_rrfhUF4nEeWis__gpXfVNg" elementId="org.eclipse.mylyn.java.ui.editor.folding.auto"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_rrfhUV4nEeWis__gpXfVNg" elementId="org.eclipse.ui.edit.text.toggleBlockSelectionMode"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_rrfhUl4nEeWis__gpXfVNg" elementId="org.eclipse.ui.edit.text.toggleShowWhitespaceCharacters"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_rrgvcF4nEeWis__gpXfVNg" elementId="org.eclipse.ui.edit.text.toggleShowSelectedElementOnly"/>
|
||||
</children>
|
||||
<children xsi:type="menu:ToolBar" xmi:id="_8wdZACr0EeWsptewEJl0pA" elementId="org.eclipse.wst.server.ui.internal.webbrowser.actionSet" visible="false">
|
||||
<tags>Draggable</tags>
|
||||
|
|
@ -523,15 +523,15 @@
|
|||
</children>
|
||||
<children xsi:type="menu:ToolBar" xmi:id="_6LTUoCr0EeWsptewEJl0pA" elementId="org.eclipse.ui.workbench.navigate">
|
||||
<tags>Draggable</tags>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_SK1YslZfEeWL4_m8A7a0fw" elementId="history.group"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_SK1_wFZfEeWL4_m8A7a0fw" elementId="group.application" visible="false"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_SK1_wVZfEeWL4_m8A7a0fw" elementId="backardHistory"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_SK1_wlZfEeWL4_m8A7a0fw" elementId="forwardHistory"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_SK2m0FZfEeWL4_m8A7a0fw" elementId="pin.group"/>
|
||||
<children xsi:type="menu:HandledToolItem" xmi:id="_SK2m0VZfEeWL4_m8A7a0fw" iconURI="platform:/plugin/org.eclipse.ui/icons/full/etool16/pin_editor.gif" tooltip="Pin the current editor" enabled="false" command="_3_eWRCr0EeWsptewEJl0pA"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_SSSEgFZfEeWL4_m8A7a0fw" elementId="org.eclipse.ui.edit.text.gotoNextAnnotation"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_SSSEgVZfEeWL4_m8A7a0fw" elementId="org.eclipse.ui.edit.text.gotoPreviousAnnotation"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_SSSEglZfEeWL4_m8A7a0fw" elementId="org.eclipse.ui.edit.text.gotoLastEditPosition"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_p1u5kl4nEeWis__gpXfVNg" elementId="history.group"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_p1u5k14nEeWis__gpXfVNg" elementId="group.application" visible="false"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_p1vgoF4nEeWis__gpXfVNg" elementId="backardHistory"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_p1vgoV4nEeWis__gpXfVNg" elementId="forwardHistory"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_p1vgol4nEeWis__gpXfVNg" elementId="pin.group"/>
|
||||
<children xsi:type="menu:HandledToolItem" xmi:id="_p1wHsF4nEeWis__gpXfVNg" iconURI="platform:/plugin/org.eclipse.ui/icons/full/etool16/pin_editor.gif" tooltip="Pin the current editor" enabled="false" command="_3_eWRCr0EeWsptewEJl0pA"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_p8Ags14nEeWis__gpXfVNg" elementId="org.eclipse.ui.edit.text.gotoNextAnnotation"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_p8AgtF4nEeWis__gpXfVNg" elementId="org.eclipse.ui.edit.text.gotoPreviousAnnotation"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_p8AgtV4nEeWis__gpXfVNg" elementId="org.eclipse.ui.edit.text.gotoLastEditPosition"/>
|
||||
</children>
|
||||
<children xsi:type="menu:ToolBar" xmi:id="_6LTUoSr0EeWsptewEJl0pA" elementId="group.editor" toBeRendered="false">
|
||||
<tags>toolbarSeparator</tags>
|
||||
|
|
@ -543,8 +543,8 @@
|
|||
</children>
|
||||
<children xsi:type="menu:ToolBar" xmi:id="_6LT7sCr0EeWsptewEJl0pA" elementId="org.eclipse.ui.workbench.help" visible="false">
|
||||
<tags>Draggable</tags>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_SK3N4FZfEeWL4_m8A7a0fw" elementId="group.help"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_SK3N4VZfEeWL4_m8A7a0fw" elementId="group.application" visible="false"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_p1wuwF4nEeWis__gpXfVNg" elementId="group.help"/>
|
||||
<children xsi:type="menu:OpaqueToolItem" xmi:id="_p1wuwV4nEeWis__gpXfVNg" elementId="group.application" visible="false"/>
|
||||
</children>
|
||||
<children xsi:type="menu:ToolControl" xmi:id="_61nc8Cr0EeWsptewEJl0pA" elementId="PerspectiveSpacer" contributionURI="bundleclass://org.eclipse.e4.ui.workbench.renderers.swt/org.eclipse.e4.ui.workbench.renderers.swt.LayoutModifierToolControl">
|
||||
<tags>stretch</tags>
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
|
|
@ -10,8 +10,8 @@ INDEX VERSION 1.126+D:\Z - Norbi cucca\0 Projektek\TheButtonMCAutoFlairProto\Spi
|
|||
605290374.index
|
||||
533208796.index
|
||||
1337478678.index
|
||||
1467104569.index
|
||||
1528680760.index
|
||||
1467104569.index
|
||||
1737447423.index
|
||||
4187470955.index
|
||||
2535676096.index
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<qualifiedTypeNameHistroy>
|
||||
<fullyQualifiedTypeName name="java.io.InputStream"/>
|
||||
<fullyQualifiedTypeName name="java.net.URLConnection"/>
|
||||
<fullyQualifiedTypeName name="java.net.MalformedURLException"/>
|
||||
<fullyQualifiedTypeName name="java.io.IOException"/>
|
||||
<fullyQualifiedTypeName name="java.io.StringWriter"/>
|
||||
|
|
@ -55,9 +53,11 @@
|
|||
<fullyQualifiedTypeName name="org.bukkit.entity.Player"/>
|
||||
<fullyQualifiedTypeName name="tk.sznp.thebuttonautoflair.AnnouncerThread"/>
|
||||
<fullyQualifiedTypeName name="tk.sznp.thebuttonautoflair.PluginMain"/>
|
||||
<fullyQualifiedTypeName name="tk.sznp.thebuttonautoflair.MaybeOfflinePlayer"/>
|
||||
<fullyQualifiedTypeName name="com.google.common.io.Files"/>
|
||||
<fullyQualifiedTypeName name="com.earth2me.essentials.PlayerList"/>
|
||||
<fullyQualifiedTypeName name="tk.sznp.thebuttonautoflair.PlayerListener"/>
|
||||
<fullyQualifiedTypeName name="java.util.ArrayList"/>
|
||||
<fullyQualifiedTypeName name="org.bukkit.event.entity.PlayerDeathEvent"/>
|
||||
<fullyQualifiedTypeName name="tk.sznp.thebuttonautoflair.MaybeOfflinePlayer"/>
|
||||
<fullyQualifiedTypeName name="java.util.Random"/>
|
||||
</qualifiedTypeNameHistroy>
|
||||
|
|
|
|||
|
|
@ -39,4 +39,12 @@
|
|||
<workingSet aggregate="true" factoryID="org.eclipse.ui.internal.WorkingSetFactory" id="1441558175761_36" label="Window Working Set" name="Aggregate for window 1441558175761"/>
|
||||
<workingSet aggregate="true" factoryID="org.eclipse.ui.internal.WorkingSetFactory" id="1441736319862_37" label="Window Working Set" name="Aggregate for window 1441736319862"/>
|
||||
<workingSet aggregate="true" factoryID="org.eclipse.ui.internal.WorkingSetFactory" id="1441740306830_38" label="Window Working Set" name="Aggregate for window 1441740306830"/>
|
||||
<workingSet aggregate="true" factoryID="org.eclipse.ui.internal.WorkingSetFactory" id="1441901335935_39" label="Window Working Set" name="Aggregate for window 1441901335935"/>
|
||||
<workingSet aggregate="true" factoryID="org.eclipse.ui.internal.WorkingSetFactory" id="1441909033938_40" label="Window Working Set" name="Aggregate for window 1441909033938"/>
|
||||
<workingSet aggregate="true" factoryID="org.eclipse.ui.internal.WorkingSetFactory" id="1441996720742_41" label="Window Working Set" name="Aggregate for window 1441996720742"/>
|
||||
<workingSet aggregate="true" factoryID="org.eclipse.ui.internal.WorkingSetFactory" id="1442330391222_42" label="Window Working Set" name="Aggregate for window 1442330391222"/>
|
||||
<workingSet aggregate="true" factoryID="org.eclipse.ui.internal.WorkingSetFactory" id="1442430236504_43" label="Window Working Set" name="Aggregate for window 1442430236503"/>
|
||||
<workingSet aggregate="true" factoryID="org.eclipse.ui.internal.WorkingSetFactory" id="1442519016836_44" label="Window Working Set" name="Aggregate for window 1442519016836"/>
|
||||
<workingSet aggregate="true" factoryID="org.eclipse.ui.internal.WorkingSetFactory" id="1442595001027_45" label="Window Working Set" name="Aggregate for window 1442595001027"/>
|
||||
<workingSet aggregate="true" factoryID="org.eclipse.ui.internal.WorkingSetFactory" id="1442596021019_46" label="Window Working Set" name="Aggregate for window 1442596021018"/>
|
||||
</workingSetManager>
|
||||
|
|
@ -2,7 +2,11 @@
|
|||
<classpath>
|
||||
<classpathentry kind="src" path="src"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
|
||||
<classpathentry kind="lib" path="D:/Z - Norbi cucca/0 Projektek/TheButtonMCAutoFlairProto/Spigot server (build)/Spigot/Spigot-API/target/spigot-api-1.8.7-R0.1-SNAPSHOT-shaded.jar"/>
|
||||
<classpathentry kind="lib" path="D:/Z - Norbi cucca/0 Projektek/TheButtonMCAutoFlairProto/Spigot server (build)/Spigot/Spigot-API/target/spigot-api-1.8.7-R0.1-SNAPSHOT-shaded.jar">
|
||||
<attributes>
|
||||
<attribute name="javadoc_location" value="https://hub.spigotmc.org/javadocs/spigot/"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry kind="lib" path="D:/Downloads/commons-io-2.4-bin/commons-io-2.4/commons-io-2.4.jar"/>
|
||||
<classpathentry kind="lib" path="D:/Downloads/commons-io-2.4-bin/commons-io-2.4/commons-io-2.4-javadoc.jar"/>
|
||||
<classpathentry kind="lib" path="D:/Downloads/Essentials/Essentials.jar"/>
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -31,7 +31,6 @@ public class Commands implements CommandExecutor {
|
|||
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")
|
||||
&& !args[0].toLowerCase().equals("ignore")) {
|
||||
|
|
@ -54,9 +53,6 @@ public class Commands implements CommandExecutor {
|
|||
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 "
|
||||
|
|
@ -70,18 +66,11 @@ public class Commands implements CommandExecutor {
|
|||
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;
|
||||
|
|
@ -149,31 +138,11 @@ public class Commands implements CommandExecutor {
|
|||
}
|
||||
return true;
|
||||
}
|
||||
/*
|
||||
* case "rp": if (args.length == 0) {
|
||||
* MaybeOfflinePlayer.AddPlayerIfNeeded(player.getName()).RPMode =
|
||||
* true; player.sendMessage("§2RP mode on.§r"); } else { boolean
|
||||
* rpmode = MaybeOfflinePlayer
|
||||
* .AddPlayerIfNeeded(player.getName()).RPMode;
|
||||
* MaybeOfflinePlayer.AddPlayerIfNeeded(player.getName()).RPMode =
|
||||
* true; String message = ""; for (String arg : args) message += arg
|
||||
* + " "; player.chat(message.substring(0, message.length() - 1));
|
||||
* MaybeOfflinePlayer.AddPlayerIfNeeded(player.getName()).RPMode =
|
||||
* rpmode; } return true;
|
||||
*/
|
||||
case "nrp":
|
||||
case "ooc":
|
||||
if (args.length == 0) {
|
||||
/*
|
||||
* MaybeOfflinePlayer.AddPlayerIfNeeded(player.getName()).RPMode
|
||||
* = false; player.sendMessage("§8RP mode off.§r");
|
||||
*/
|
||||
return false;
|
||||
} else {
|
||||
/*
|
||||
* boolean rpmode = MaybeOfflinePlayer
|
||||
* .AddPlayerIfNeeded(player.getName()).RPMode;
|
||||
*/
|
||||
MaybeOfflinePlayer.AddPlayerIfNeeded(player.getName()).RPMode = false;
|
||||
String message = "";
|
||||
for (String arg : args)
|
||||
|
|
@ -187,9 +156,6 @@ public class Commands implements CommandExecutor {
|
|||
break;
|
||||
}
|
||||
}
|
||||
/*
|
||||
* 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.
|
||||
|
|
@ -202,8 +168,6 @@ public class Commands implements CommandExecutor {
|
|||
}
|
||||
|
||||
private static void DoReload(Player player) { // 2015.07.20.
|
||||
// if(player==null || player.isOp() || player.getName()=="NorbiPeti")
|
||||
// {
|
||||
try {
|
||||
PluginMain.Console
|
||||
.sendMessage("§6-- Reloading The Button Minecraft plugin...§r");
|
||||
|
|
@ -225,9 +189,6 @@ public class Commands implements CommandExecutor {
|
|||
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.
|
||||
|
|
@ -235,7 +196,6 @@ public class Commands implements CommandExecutor {
|
|||
private static void DoAdmin(Player player, String[] args) { // 2015.08.09.
|
||||
if (player == null || player.isOp()
|
||||
|| player.getName().equals("NorbiPeti")) {
|
||||
// System.out.println("Args length: " + args.length);
|
||||
if (args.length == 1) {
|
||||
String message = "§cUsage: /u admin reload|playerinfo|getlasterror|save|setflair|updateplugin|togglerpshow§r";
|
||||
SendMessage(player, message);
|
||||
|
|
@ -316,7 +276,6 @@ public class Commands implements CommandExecutor {
|
|||
|
||||
private static void SendMessage(Player player, String message) { // 2015.08.09.
|
||||
if (player == null)
|
||||
// System.out.println(message);
|
||||
PluginMain.Console.sendMessage(message); // 2015.08.12.
|
||||
else
|
||||
player.sendMessage(message);
|
||||
|
|
@ -401,19 +360,16 @@ public class Commands implements CommandExecutor {
|
|||
SendMessage(player, message);
|
||||
return;
|
||||
}
|
||||
// args[0] is "announce"
|
||||
switch (args[1].toLowerCase()) {
|
||||
case "add":
|
||||
if (args.length < 3) {
|
||||
SendMessage(player, "§cUsage: /u announce add <message>");
|
||||
return;
|
||||
}
|
||||
// PluginMain.AnnounceMessages.add(args[2]);
|
||||
File file = new File("announcemessages.txt");
|
||||
try {
|
||||
BufferedWriter bw;
|
||||
bw = new BufferedWriter(new FileWriter(file, true));
|
||||
// bw.write(args[2] + "\n");
|
||||
StringBuilder sb = new StringBuilder();
|
||||
for (int i = 2; i < args.length; i++) {
|
||||
sb.append(args[i]);
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ public class MaybeOfflinePlayer { // 2015.08.08.
|
|||
public boolean FlairRecognised; // 2015.08.10.
|
||||
public boolean CommentedOnReddit; // 2015.08.10.
|
||||
public boolean RPMode; // 2015.08.25.
|
||||
public boolean PressedF; //2015.09.18.
|
||||
public static HashMap<String, MaybeOfflinePlayer> AllPlayers = new HashMap<>(); // 2015.08.08.
|
||||
|
||||
public static MaybeOfflinePlayer AddPlayerIfNeeded(String playername) {
|
||||
|
|
@ -25,8 +26,4 @@ public class MaybeOfflinePlayer { // 2015.08.08.
|
|||
}
|
||||
return AllPlayers.get(playername);
|
||||
}
|
||||
/*
|
||||
* public enum FlairClassType { //2015.08.09. NonPresser, CantPress,
|
||||
* Undecided }
|
||||
*/
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ import org.bukkit.configuration.file.YamlConfiguration;
|
|||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.bukkit.event.entity.PlayerDeathEvent;
|
||||
import org.bukkit.event.player.AsyncPlayerChatEvent;
|
||||
import org.bukkit.event.player.PlayerChatTabCompleteEvent;
|
||||
import org.bukkit.event.player.PlayerJoinEvent;
|
||||
|
|
@ -14,8 +15,8 @@ import org.bukkit.event.player.PlayerQuitEvent;
|
|||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.Random;
|
||||
import java.util.UUID;
|
||||
|
||||
public class PlayerListener implements Listener { // 2015.07.16.
|
||||
|
|
@ -31,9 +32,6 @@ public class PlayerListener implements Listener { // 2015.07.16.
|
|||
if (mp.CommentedOnReddit)
|
||||
PluginMain.AppendPlayerDisplayFlair(mp, p); // 2015.08.09.
|
||||
else { // 2015.07.20.
|
||||
// String json =
|
||||
// "[\"\",{\"text\":\"§6Hi! If you'd like your flair displayed ingame, write your §6Minecraft name to \"},{\"text\":\"[this thread.]\",\"clickEvent\":{\"action\":\"open_url\",\"value\":\"https://www.reddit.com/r/TheButtonMinecraft/comments/3d25do/\"},\"hoverEvent\":{\"action\":\"show_text\",\"value\":{\"text\":\"\",\"extra\":[{\"text\":\"Click here to go to the Reddit thread§r\"}]}}}]";
|
||||
// sendRawMessage(p, json);
|
||||
if (!mp.IgnoredFlair) {
|
||||
String message = "§bHi! If you'd like your flair displayed ingame, write your §6Minecraft name to this thread:§r";
|
||||
p.sendMessage(message);
|
||||
|
|
@ -74,29 +72,6 @@ public class PlayerListener implements Listener { // 2015.07.16.
|
|||
}
|
||||
}
|
||||
}
|
||||
/*
|
||||
* System.out.println("Folder plugins exists: "+new
|
||||
* File("plugins").isDirectory());
|
||||
* System.out.println("Folder plugins/essentials exists: "+new
|
||||
* File("plugins/essentials").isDirectory());
|
||||
* System.out.println("Folder plugins/essentials/userdata exists: "+new
|
||||
* File("plugins/essentials/userdata").isDirectory());
|
||||
* System.out.println
|
||||
* ("Folder plugins/essentials/userdata/"+id+".yml exists: "+new
|
||||
* File("plugins/essentials/userdata/"+id+".yml").exists());
|
||||
*/
|
||||
|
||||
SendForDebug("Folder plugins exists: "
|
||||
+ new File("plugins").isDirectory());
|
||||
SendForDebug("Folder plugins/Essentials exists: "
|
||||
+ new File("plugins/Essentials").isDirectory());
|
||||
SendForDebug("Folder plugins/Essentials/userdata exists: "
|
||||
+ new File("plugins/Essentials/userdata").isDirectory());
|
||||
SendForDebug("Folder plugins/Essentials/userdata/"
|
||||
+ id
|
||||
+ ".yml exists: "
|
||||
+ new File("plugins/Essentials/userdata/" + id + ".yml")
|
||||
.exists());
|
||||
|
||||
mp.RPMode = true; // 2015.08.25.
|
||||
|
||||
|
|
@ -134,7 +109,6 @@ public class PlayerListener implements Listener { // 2015.07.16.
|
|||
for (Player p : PluginMain.GetPlayers()) { // 2015.08.12.
|
||||
String color = ""; // 2015.08.17.
|
||||
if (message.contains(p.getName())) {
|
||||
ArrayList<Integer> NamePositions = new ArrayList<>();
|
||||
for (String n : nicknames.keySet()) {
|
||||
String nwithoutformatting = new String(n);
|
||||
int index;
|
||||
|
|
@ -148,12 +122,7 @@ public class PlayerListener implements Listener { // 2015.07.16.
|
|||
while ((index = nwithoutformatting.indexOf('§')) != -1)
|
||||
nwithoutformatting = nwithoutformatting.replaceAll("§"
|
||||
+ nwithoutformatting.charAt(index + 1), "");
|
||||
/*
|
||||
* if (nwithoutformatting.contains(p.getName())) { HasName =
|
||||
* true; break; }
|
||||
*/
|
||||
}
|
||||
// if (!HasName) {
|
||||
if (NotificationSound == null)
|
||||
p.playSound(p.getLocation(), Sound.ORB_PICKUP, 1.0f, 0.5f); // 2015.08.12.
|
||||
else
|
||||
|
|
@ -163,16 +132,13 @@ public class PlayerListener implements Listener { // 2015.07.16.
|
|||
.getName()); // 2015.08.17.
|
||||
if (mp.Flair.length() > 1)
|
||||
color = mp.Flair.substring(0, 2);
|
||||
// }
|
||||
}
|
||||
|
||||
// if (!HasName)
|
||||
message = message.replaceAll(p.getName(), color + p.getName()
|
||||
+ "§r");
|
||||
}
|
||||
for (String n : nicknames.keySet()) {
|
||||
Player p = null;
|
||||
//event.getPlayer().sendMessage("n before: " + n); // TMP
|
||||
String nwithoutformatting = new String(n);
|
||||
int index;
|
||||
while ((index = nwithoutformatting.indexOf("§k")) != -1)
|
||||
|
|
@ -185,10 +151,7 @@ public class PlayerListener implements Listener { // 2015.07.16.
|
|||
while ((index = nwithoutformatting.indexOf('§')) != -1)
|
||||
nwithoutformatting = nwithoutformatting.replaceAll("§"
|
||||
+ nwithoutformatting.charAt(index + 1), "");
|
||||
//event.getPlayer().sendMessage(nwithoutformatting); // TMP
|
||||
if (message.contains(nwithoutformatting)) {
|
||||
//event.getPlayer().sendMessage("Yep"); // TMP
|
||||
//event.getPlayer().sendMessage(n); // TMP
|
||||
p = Bukkit.getPlayer(nicknames.get(n));
|
||||
if (NotificationSound == null)
|
||||
p.playSound(p.getLocation(), Sound.ORB_PICKUP, 1.0f, 0.5f); // 2015.08.12.
|
||||
|
|
@ -246,11 +209,49 @@ public class PlayerListener implements Listener { // 2015.07.16.
|
|||
}
|
||||
}
|
||||
|
||||
private boolean ActiveF = false;
|
||||
|
||||
@EventHandler
|
||||
public void onPlayerMessage(AsyncPlayerChatEvent e)
|
||||
{
|
||||
public void onPlayerMessage(AsyncPlayerChatEvent e) {
|
||||
if (e.getMessage().equals("F")) {
|
||||
MaybeOfflinePlayer.AllPlayers.get(e.getPlayer().getName()).PressedF = true;
|
||||
boolean F = true;
|
||||
if (ActiveF)
|
||||
for (Player player : PluginMain.GetPlayers())
|
||||
if (!MaybeOfflinePlayer.AllPlayers.get(player.getName()).PressedF)
|
||||
F = false;
|
||||
|
||||
if (F && ActiveF) {
|
||||
for (Player player : PluginMain.GetPlayers()) {
|
||||
player.sendMessage("§6We did it!§r");
|
||||
MaybeOfflinePlayer.AllPlayers.get(player.getName()).PressedF = false;
|
||||
}
|
||||
}
|
||||
ActiveF = false;
|
||||
}
|
||||
|
||||
if (e.getMessage().startsWith(">"))
|
||||
e.setMessage("§2"+e.getMessage());
|
||||
e.setMessage("§2" + e.getMessage());
|
||||
|
||||
/*
|
||||
* String message = e.getMessage(); int x = 0; while ((x =
|
||||
* message.indexOf('#', x + 1)) != -1) { String hashtag =
|
||||
* message.substring( x, (message.indexOf(" ", x) == -1 ?
|
||||
* message.length() : message .indexOf(" ", x))); message =
|
||||
* message.replace(hashtag, "!" + hashtag + "!"); }
|
||||
* e.setMessage(message);
|
||||
*/
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onPlayerDeath(PlayerDeathEvent e) {
|
||||
ActiveF = true;
|
||||
for (Player p : PluginMain.GetPlayers()) {
|
||||
MaybeOfflinePlayer mp = MaybeOfflinePlayer.AllPlayers.get(p
|
||||
.getName());
|
||||
mp.PressedF = false;
|
||||
if (new Random().nextBoolean())
|
||||
p.sendMessage("§bPress F to pay respects.§r");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -82,20 +82,16 @@ public class PluginMain extends JavaPlugin { // Translated to Java: 2015.07.15.
|
|||
"author");
|
||||
String ign = item.getJSONObject("data").getString("body");
|
||||
int start = ign.indexOf("IGN:") + "IGN:".length();
|
||||
// System.out.println("Start: "+start);
|
||||
if (start == -1 + "IGN:".length()) // +length: 2015.08.10.
|
||||
continue; // 2015.08.09.
|
||||
int end = ign.indexOf(' ', start);
|
||||
if (end == -1 || end == start)
|
||||
end = ign.indexOf('\n', start); // 2015.07.15.
|
||||
// System.out.println("End: "+end);
|
||||
if (end == -1 || end == start)
|
||||
ign = ign.substring(start);
|
||||
else
|
||||
ign = ign.substring(start, end);
|
||||
// System.out.println("IGN: "+ign);
|
||||
ign = ign.trim();
|
||||
// System.out.println("Trimmed IGN: "+ign);
|
||||
if (HasIGFlair(ign))
|
||||
continue;
|
||||
try {
|
||||
|
|
@ -113,9 +109,6 @@ public class PluginMain extends JavaPlugin { // Translated to Java: 2015.07.15.
|
|||
flair = "";
|
||||
if (flair != "-1")
|
||||
flair = flair + "s";
|
||||
/*
|
||||
* else flair = "non-presser";
|
||||
*/
|
||||
String flairclass;
|
||||
if (flairdata.length > 2)
|
||||
flairclass = flairdata[2];
|
||||
|
|
@ -154,7 +147,6 @@ public class PluginMain extends JavaPlugin { // Translated to Java: 2015.07.15.
|
|||
|
||||
public Boolean HasIGFlair(String playername) {
|
||||
MaybeOfflinePlayer p = MaybeOfflinePlayer.AddPlayerIfNeeded(playername); // 2015.08.08.
|
||||
// return p.Flair!=null; //2015.08.08.
|
||||
return p.CommentedOnReddit; // 2015.08.10.
|
||||
}
|
||||
|
||||
|
|
@ -201,25 +193,14 @@ public class PluginMain extends JavaPlugin { // Translated to Java: 2015.07.15.
|
|||
finalflair = "";
|
||||
break;
|
||||
default:
|
||||
// finalflair="";
|
||||
// break;
|
||||
return;
|
||||
}
|
||||
/*
|
||||
* if(finalflair.length()==0) //<-- 2015.07.20. return;
|
||||
*/
|
||||
p.Flair = finalflair; // 2015.08.08.
|
||||
p.CommentedOnReddit = true; // 2015.08.10.
|
||||
p.UserName = username; // 2015.08.08.
|
||||
/*
|
||||
* if(finalflair.length()==0) //Just for the message
|
||||
* finalflair="undecided";
|
||||
*/
|
||||
// System.out.println("Added new flair to "+playername+": "+finalflair);
|
||||
for (Player player : getServer().getOnlinePlayers()) // <-- 2015.08.08.
|
||||
{
|
||||
if (player.getName().equals(playername)) {
|
||||
// AppendPlayerDisplayFlair(player, username, finalflair);
|
||||
AppendPlayerDisplayFlair(p, player);
|
||||
break;
|
||||
}
|
||||
|
|
@ -232,8 +213,6 @@ public class PluginMain extends JavaPlugin { // Translated to Java: 2015.07.15.
|
|||
return flair; // 2015.08.10.
|
||||
}
|
||||
|
||||
// public static void AppendPlayerDisplayFlair(Player player, String
|
||||
// username, String flair)
|
||||
public static void AppendPlayerDisplayFlair(MaybeOfflinePlayer player,
|
||||
Player p) // <-- 2015.08.09.
|
||||
{
|
||||
|
|
@ -241,7 +220,6 @@ public class PluginMain extends JavaPlugin { // Translated to Java: 2015.07.15.
|
|||
if (MaybeOfflinePlayer.AllPlayers.get(p.getName()).IgnoredFlair)
|
||||
return;
|
||||
if (MaybeOfflinePlayer.AllPlayers.get(p.getName()).AcceptedFlair) {
|
||||
// AppendPlayerDisplayFlairFinal(p, player.Flair); //2015.07.20.
|
||||
if (!player.FlairDecided)
|
||||
p.sendMessage("§9Your flair type is unknown. Are you a non-presser or a can't press? (/u nonpresser or /u cantpress)§r"); // 2015.08.09.
|
||||
} else
|
||||
|
|
@ -249,28 +227,6 @@ public class PluginMain extends JavaPlugin { // Translated to Java: 2015.07.15.
|
|||
+ "?§r §6Type /u accept or /u ignore§r");
|
||||
}
|
||||
|
||||
/*
|
||||
* private static void AppendPlayerDisplayFlairFinal(Player player, String
|
||||
* flair) { //2015.07.20.String color =
|
||||
* GetColorForTown(GetPlayerTown(player)); //TO!DO: Multiple colors put on
|
||||
* first capital letters String[] colors = color.substring(1).split("§");
|
||||
* String displayname=player.getName(); //2015.08.08. ArrayList<Integer>
|
||||
* Positions=new ArrayList<>(); for(int i=0; i<displayname.length(); i++) {
|
||||
* if(Character.isUpperCase(displayname.charAt(i))) { Positions.add(i); } }
|
||||
* String finalname=""; //TODO if(Positions.size()>=colors.length) { int
|
||||
* x=0; for(int i=0; i<Positions.size(); i++) { int pos=Positions.get(i);
|
||||
* int nextpos; if(i!=Positions.size()-1) nextpos=Positions.get(i+1); else
|
||||
* nextpos=displayname.length(); String
|
||||
* substr="§"+colors[x++]+displayname.substring(pos, nextpos)+"§r";
|
||||
* finalname+=substr; } } else { Positions.clear(); int
|
||||
* unit=displayname.length()/colors.length; int x=0; for(int i=0;
|
||||
* i<displayname.length()-unit; i+=unit) { int pos=i; int nextpos;
|
||||
* if(i<displayname.length()-unit-unit) nextpos=i+unit; else
|
||||
* nextpos=displayname.length(); String
|
||||
* substr="§"+colors[x++]+displayname.substring(pos, nextpos)+"§r";
|
||||
* finalname+=substr; } }* }
|
||||
*/
|
||||
|
||||
public static String GetColorForTown(String townname) { // 2015.07.20.
|
||||
if (TownColors.containsKey(townname))
|
||||
return TownColors.get(townname);
|
||||
|
|
@ -287,13 +243,6 @@ public class PluginMain extends JavaPlugin { // Translated to Java: 2015.07.15.
|
|||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* public static void RemovePlayerDisplayFlairFinal(Player player, String
|
||||
* flair) { //2015.07.20.
|
||||
* MaybeOfflinePlayer.AllPlayers.get(player.getName()).Flair=null;
|
||||
* //2015.08.08. }
|
||||
*/
|
||||
|
||||
public static Collection<? extends Player> GetPlayers() {
|
||||
return Instance.getServer().getOnlinePlayers();
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue