Resolved an issue with the kit command not overriding correctly.

CommandHandler redone.
player instancing is now using UUID's as to dramatically cut down on memory usage.
Player instancing condensed.
Redid some of the code with the BlockEditor.
This commit is contained in:
Brianna O'Keefe 2018-04-01 18:16:44 -04:00
parent 18df9c05c3
commit 630ad5d01b
20 changed files with 4 additions and 291 deletions

4
.gitignore vendored Normal file
View File

@ -0,0 +1,4 @@
\.idea/
out/

View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="JavacSettings">
<option name="ADDITIONAL_OPTIONS_STRING" value="-XDignore.symbol.file=true" />
</component>
</project>

View File

@ -1,36 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding">
<file url="file://$PROJECT_DIR$/src/SettingDefinitions.yml" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/src/com/songoda/kitpreview/KitPreview.java" charset="UTF-16" />
<file url="file://$PROJECT_DIR$/src/com/songoda/kitpreview/Lang.java" charset="UTF-16" />
<file url="file://$PROJECT_DIR$/src/com/songoda/kitpreview/References.java" charset="UTF-16" />
<file url="file://$PROJECT_DIR$/src/com/songoda/kitpreview/api/Update.java" charset="UTF-16" />
<file url="file://$PROJECT_DIR$/src/com/songoda/kitpreview/events/BlockListeners.java" charset="UTF-16" />
<file url="file://$PROJECT_DIR$/src/com/songoda/kitpreview/events/ChatListeners.java" charset="UTF-16" />
<file url="file://$PROJECT_DIR$/src/com/songoda/kitpreview/events/EntityListeners.java" charset="UTF-16" />
<file url="file://$PROJECT_DIR$/src/com/songoda/kitpreview/events/InteractListeners.java" charset="UTF-16" />
<file url="file://$PROJECT_DIR$/src/com/songoda/kitpreview/events/InventoryListeners.java" charset="UTF-16" />
<file url="file://$PROJECT_DIR$/src/com/songoda/kitpreview/events/QuitListeners.java" charset="UTF-16" />
<file url="file://$PROJECT_DIR$/src/com/songoda/kitpreview/events/SignListeners.java" charset="UTF-16" />
<file url="file://$PROJECT_DIR$/src/com/songoda/kitpreview/handlers/CommandHandler.java" charset="UTF-16" />
<file url="file://$PROJECT_DIR$/src/com/songoda/kitpreview/handlers/DailyHandler.java" charset="UTF-16" />
<file url="file://$PROJECT_DIR$/src/com/songoda/kitpreview/handlers/DisplayItemHandler.java" charset="UTF-16" />
<file url="file://$PROJECT_DIR$/src/com/songoda/kitpreview/handlers/HologramHandler.java" charset="UTF-16" />
<file url="file://$PROJECT_DIR$/src/com/songoda/kitpreview/handlers/ParticleHandler.java" charset="UTF-16" />
<file url="file://$PROJECT_DIR$/src/com/songoda/kitpreview/hooks/EssentialsHook.java" charset="UTF-16" />
<file url="file://$PROJECT_DIR$/src/com/songoda/kitpreview/hooks/Hooks.java" charset="UTF-16" />
<file url="file://$PROJECT_DIR$/src/com/songoda/kitpreview/hooks/UltimateCoreHook.java" charset="UTF-16" />
<file url="file://$PROJECT_DIR$/src/com/songoda/kitpreview/kits/BlockEditor.java" charset="UTF-16" />
<file url="file://$PROJECT_DIR$/src/com/songoda/kitpreview/kits/Buy.java" charset="UTF-16" />
<file url="file://$PROJECT_DIR$/src/com/songoda/kitpreview/kits/Editor.java" charset="UTF-16" />
<file url="file://$PROJECT_DIR$/src/com/songoda/kitpreview/kits/Keys.java" charset="UTF-16" />
<file url="file://$PROJECT_DIR$/src/com/songoda/kitpreview/kits/Kit.java" charset="UTF-16" />
<file url="file://$PROJECT_DIR$/src/com/songoda/kitpreview/kits/KitsGUI.java" charset="UTF-16" />
<file url="file://$PROJECT_DIR$/src/com/songoda/kitpreview/utils/ConfigWrapper.java" charset="UTF-16" />
<file url="file://$PROJECT_DIR$/src/com/songoda/kitpreview/utils/Debugger.java" charset="UTF-16" />
<file url="file://$PROJECT_DIR$/src/com/songoda/kitpreview/utils/Methods.java" charset="UTF-16" />
<file url="file://$PROJECT_DIR$/src/com/songoda/kitpreview/utils/SettingsManager.java" charset="UTF-16" />
<file url="PROJECT" charset="windows-1252" />
</component>
</project>

View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="KotlinCommonCompilerArguments">
<option name="languageVersion" value="1.1" />
<option name="apiVersion" value="1.1" />
</component>
</project>

View File

@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="Lib">
<CLASSES>
<root url="file://$PROJECT_DIR$/../Lib" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="file://$PROJECT_DIR$/../Lib" />
</SOURCES>
<jarDirectory url="file://$PROJECT_DIR$/../Lib" recursive="false" />
<jarDirectory url="file://$PROJECT_DIR$/../Lib" recursive="false" type="SOURCES" />
</library>
</component>

View File

@ -1,11 +0,0 @@
<component name="libraryTable">
<library name="spigot-1.12.2">
<CLASSES>
<root url="jar://$PROJECT_DIR$/../old/spigot-1.12.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/../old/spigot-1.12.2.jar!/" />
</SOURCES>
</library>
</component>

View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>

View File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/KitPreview.iml" filepath="$PROJECT_DIR$/KitPreview.iml" />
</modules>
</component>
</project>

View File

@ -1,124 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Palette2">
<group name="Swing">
<item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
</item>
<item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
</item>
<item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
</item>
<item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
<default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
</item>
<item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
<initial-values>
<property name="text" value="Button" />
</initial-values>
</item>
<item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
<initial-values>
<property name="text" value="RadioButton" />
</initial-values>
</item>
<item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
<initial-values>
<property name="text" value="CheckBox" />
</initial-values>
</item>
<item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
<initial-values>
<property name="text" value="Label" />
</initial-values>
</item>
<item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
</item>
<item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
<preferred-size width="200" height="200" />
</default-constraints>
</item>
<item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
<preferred-size width="200" height="200" />
</default-constraints>
</item>
<item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
</item>
<item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
</item>
<item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
</item>
<item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
</item>
<item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
<preferred-size width="-1" height="20" />
</default-constraints>
</item>
<item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
</item>
<item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
</item>
</group>
</component>
</project>

View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>

View File

@ -1,74 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../Lib/spigot-1.11.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/../Lib/spigot-1.11.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../Lib/ProtocolLib.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../Lib/EssentialsX-2.0.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../Lib/PlaceholderAPI.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../Lib/Vault.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="file://$MODULE_DIR$/../Lib" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="file://$MODULE_DIR$/../Lib" />
</SOURCES>
<jarDirectory url="file://$MODULE_DIR$/../Lib" recursive="false" />
<jarDirectory url="file://$MODULE_DIR$/../Lib" recursive="false" type="SOURCES" />
</library>
</orderEntry>
<orderEntry type="library" name="Lib" level="project" />
<orderEntry type="library" name="spigot-1.12.2" level="project" />
<orderEntry type="library" name="spigot-1.7.10" level="project" />
</component>
</module>