Upstream/Auction-House
1
0
Fork 0
mirror of https://github.com/kiranhart/Auction-House.git synced 2024-11-25 05:55:13 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Outstanding changes

Browse Source
This commit is contained in:
Kiran Hart 2020-12-09 21:46:19 -05:00
parent cb86eafb05
commit 4a6d72e0e2
22 changed files with 270 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.idea/compiler.xml
View File

@ -12,6 +12,7 @@
<bytecodeTargetLevel> <bytecodeTargetLevel>
<module name="Auction House - Multiversion" target="1.8" /> <module name="Auction House - Multiversion" target="1.8" />
<module name="AuctionHouse" target="1.8" /> <module name="AuctionHouse" target="1.8" />
<module name="AuctionHouse-Dev" target="1.8" />
</bytecodeTargetLevel> </bytecodeTargetLevel>
</component> </component>
</project> </project>

13
.idea/libraries/Maven__com_google_code_gson_gson_2_8_6.xml
View File

@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="Maven: com.google.code.gson:gson:2.8.6">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/code/gson/gson/2.8.6/gson-2.8.6.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/google/code/gson/gson/2.8.6/gson-2.8.6-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/code/gson/gson/2.8.6/gson-2.8.6-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__com_zaxxer_HikariCP_3_4_2.xml
View File

@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="Maven: com.zaxxer:HikariCP:3.4.2">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/zaxxer/HikariCP/3.4.2/HikariCP-3.4.2.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/zaxxer/HikariCP/3.4.2/HikariCP-3.4.2-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/zaxxer/HikariCP/3.4.2/HikariCP-3.4.2-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__org_yaml_snakeyaml_1_25.xml
View File

@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="Maven: org.yaml:snakeyaml:1.25">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.25/snakeyaml-1.25.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.25/snakeyaml-1.25-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.25/snakeyaml-1.25-sources.jar!/" />
</SOURCES>
</library>
</component>

209
.idea/workspace.xml
View File

@ -1,13 +1,50 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="AutoImportSettings">
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="BranchesTreeState">
<expand>
<path>
<item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
<item name="LOCAL_ROOT" type="e8cecc67:BranchNodeDescriptor" />
</path>
<path>
<item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
<item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
</path>
<path>
<item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
<item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
<item name="GROUP_NODE:origin" type="e8cecc67:BranchNodeDescriptor" />
</path>
</expand>
<select />
</component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="0969fd6c-557b-481f-aa73-48fb4fa145ea" name="Default Changelist" comment=""> <list default="true" id="0969fd6c-557b-481f-aa73-48fb4fa145ea" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_bukkit_bukkit_1_15_1_R0_1_SNAPSHOT.xml" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_spigotmc_spigot_1_15_1_R0_1_SNAPSHOT.xml" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_code_gson_gson_2_8_6.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_zaxxer_HikariCP_3_4_2.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_yaml_snakeyaml_1_25.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Auction House - Multiversion.iml" beforeDir="false" afterPath="$PROJECT_DIR$/Auction House - Multiversion.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/AuctionHouse.iml" beforeDir="false" afterPath="$PROJECT_DIR$/AuctionHouse.iml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/AuctionHouse.iml" beforeDir="false" afterPath="$PROJECT_DIR$/AuctionHouse.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/dependency-reduced-pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/dependency-reduced-pom.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/dependency-reduced-pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/dependency-reduced-pom.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/kiranhart/auctionhouse/api/version/HartUpdater.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/kiranhart/auctionhouse/api/version/HartUpdater.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/java/com/kiranhart/auctionhouse/Core.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/kiranhart/auctionhouse/Core.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/kiranhart/auctionhouse/api/statics/AuctionLang.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/kiranhart/auctionhouse/api/statics/AuctionLang.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/kiranhart/auctionhouse/api/statics/AuctionSettings.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/kiranhart/auctionhouse/api/statics/AuctionSettings.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/kiranhart/auctionhouse/api/version/ServerVersion.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/kiranhart/auctionhouse/api/version/ServerVersion.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/kiranhart/auctionhouse/cmds/subcommands/SellCommand.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/kiranhart/auctionhouse/cmds/subcommands/SellCommand.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/kiranhart/auctionhouse/inventory/inventories/AuctionGUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/kiranhart/auctionhouse/inventory/inventories/AuctionGUI.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/kiranhart/auctionhouse/inventory/inventories/ConfirmationGUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/kiranhart/auctionhouse/inventory/inventories/ConfirmationGUI.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/kiranhart/auctionhouse/util/economy/Economy.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/kiranhart/auctionhouse/util/economy/VaultEconomy.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/kiranhart/auctionhouse/util/tasks/TickAuctionsTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/kiranhart/auctionhouse/util/tasks/TickAuctionsTask.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/config.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/config.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/en_US.lang" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/en_US.lang" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/plugin.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/plugin.yml" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -26,12 +63,22 @@
<component name="Git.Settings"> <component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component> </component>
<component name="InvalidFacetManager">
<ignored-facets>
<facet id="Auction House - Multiversion/invalid/Minecraft" />
<facet id="AuctionHouse/invalid/Minecraft" />
</ignored-facets>
</component>
<component name="MavenImportPreferences"> <component name="MavenImportPreferences">
<option name="generalSettings">
<MavenGeneralSettings>
<option name="mavenHome" value="C:\Program Files\JetBrains\IntelliJ IDEA 2020.2.1\plugins\maven\lib\maven3" />
</MavenGeneralSettings>
</option>
<option name="importingSettings"> <option name="importingSettings">
<MavenImportingSettings> <MavenImportingSettings>
<option name="downloadDocsAutomatically" value="true" /> <option name="downloadDocsAutomatically" value="true" />
<option name="downloadSourcesAutomatically" value="true" /> <option name="downloadSourcesAutomatically" value="true" />
<option name="importAutomatically" value="true" />
</MavenImportingSettings> </MavenImportingSettings>
</option> </option>
</component> </component>
@ -41,13 +88,15 @@
</component> </component>
<component name="ProjectViewState"> <component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" /> <option name="hideEmptyMiddlePackages" value="true" />
<option name="showExcludedFiles" value="true" />
<option name="showLibraryContents" value="true" /> <option name="showLibraryContents" value="true" />
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" /> <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" /> <property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" /> <property name="aspect.path.notification.shown" value="true" />
<property name="last_directory_selection" value="$PROJECT_DIR$/src/main/java/com/kiranhart" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" /> <property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="node.js.detected.package.eslint" value="true" /> <property name="node.js.detected.package.eslint" value="true" />
<property name="node.js.detected.package.tslint" value="true" /> <property name="node.js.detected.package.tslint" value="true" />
@ -58,7 +107,7 @@
<property name="project.structure.last.edited" value="Project" /> <property name="project.structure.last.edited" value="Project" />
<property name="project.structure.proportion" value="0.0" /> <property name="project.structure.proportion" value="0.0" />
<property name="project.structure.side.proportion" value="0.2" /> <property name="project.structure.side.proportion" value="0.2" />
<property name="settings.editor.selected.configurable" value="preferences.keymap" /> <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
</component> </component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="CopyClassDialog.RECENTS_KEY"> <key name="CopyClassDialog.RECENTS_KEY">
@ -124,18 +173,7 @@
</list> </list>
</recent_temporary> </recent_temporary>
</component> </component>
<component name="ServiceViewManager"> <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
<option name="viewStates">
<list>
<serviceView>
<treeState>
<expand />
<select />
</treeState>
</serviceView>
</list>
</option>
</component>
<component name="SvnConfiguration"> <component name="SvnConfiguration">
<configuration /> <configuration />
</component> </component>
@ -157,7 +195,59 @@
<workItem from="1579561325965" duration="1008000" /> <workItem from="1579561325965" duration="1008000" />
<workItem from="1579564495543" duration="91000" /> <workItem from="1579564495543" duration="91000" />
<workItem from="1579564969544" duration="43000" /> <workItem from="1579564969544" duration="43000" />
<workItem from="1580693846063" duration="266000" /> <workItem from="1580693846063" duration="749000" />
<workItem from="1581989936943" duration="82000" />
<workItem from="1582401364455" duration="112000" />
<workItem from="1584032787307" duration="608000" />
<workItem from="1584114711502" duration="210000" />
<workItem from="1584116758058" duration="285000" />
<workItem from="1584117255345" duration="42000" />
<workItem from="1584117354129" duration="583000" />
<workItem from="1584118830586" duration="144000" />
<workItem from="1584120120198" duration="23000" />
<workItem from="1584546814099" duration="379000" />
<workItem from="1584547273091" duration="11000" />
<workItem from="1585073197775" duration="1112000" />
<workItem from="1585074521503" duration="45000" />
<workItem from="1585272654542" duration="49000" />
<workItem from="1587396738884" duration="105000" />
<workItem from="1588299872726" duration="631000" />
<workItem from="1588623689571" duration="23000" />
<workItem from="1588817565531" duration="7000" />
<workItem from="1589485178050" duration="3694000" />
<workItem from="1589575412623" duration="36000" />
<workItem from="1589661973111" duration="179000" />
<workItem from="1589662769905" duration="936000" />
<workItem from="1589663752317" duration="430000" />
<workItem from="1589842651617" duration="1255000" />
<workItem from="1589943352970" duration="782000" />
<workItem from="1590174494331" duration="59000" />
<workItem from="1590586028648" duration="701000" />
<workItem from="1590592417193" duration="10000" />
<workItem from="1590702697472" duration="431000" />
<workItem from="1591641467082" duration="68000" />
<workItem from="1594300358232" duration="796000" />
<workItem from="1594302213325" duration="929000" />
<workItem from="1594309542745" duration="56000" />
<workItem from="1594309697056" duration="22000" />
<workItem from="1594309785809" duration="8000" />
<workItem from="1597242199453" duration="129000" />
<workItem from="1597613620222" duration="27000" />
<workItem from="1598216367342" duration="26000" />
<workItem from="1598227558149" duration="59000" />
<workItem from="1598560154621" duration="5574000" />
<workItem from="1598728007713" duration="1283000" />
<workItem from="1598729368115" duration="693000" />
<workItem from="1598806475644" duration="4790000" />
<workItem from="1602193901524" duration="27000" />
<workItem from="1603038880820" duration="334000" />
<workItem from="1604552700622" duration="334000" />
<workItem from="1604553049062" duration="3276000" />
<workItem from="1606361198568" duration="54000" />
<workItem from="1606702119229" duration="59000" />
<workItem from="1606702230385" duration="3000" />
<workItem from="1606702271018" duration="73000" />
<workItem from="1606702993300" duration="600000" />
</task> </task>
<task id="LOCAL-00001" summary="refresh"> <task id="LOCAL-00001" summary="refresh">
<created>1565054245917</created> <created>1565054245917</created>
@ -236,7 +326,28 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1569108826106</updated> <updated>1569108826106</updated>
</task> </task>
<option name="localTasksCounter" value="12" /> <task id="LOCAL-00012" summary="1.12">
<created>1580694120315</created>
<option name="number" value="00012" />
<option name="presentableId" value="LOCAL-00012" />
<option name="project" value="LOCAL" />
<updated>1580694120315</updated>
</task>
<task id="LOCAL-00013" summary="pushes">
<created>1585272688806</created>
<option name="number" value="00013" />
<option name="presentableId" value="LOCAL-00013" />
<option name="project" value="LOCAL" />
<updated>1585272688806</updated>
</task>
<task id="LOCAL-00014" summary="1.16 Support">
<created>1594309579806</created>
<option name="number" value="00014" />
<option name="presentableId" value="LOCAL-00014" />
<option name="project" value="LOCAL" />
<updated>1594309579806</updated>
</task>
<option name="localTasksCounter" value="15" />
<servers /> <servers />
</component> </component>
<component name="TodoView"> <component name="TodoView">
@ -249,20 +360,19 @@
</todo-panel> </todo-panel>
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" /> <option name="version" value="3" />
</component> </component>
<component name="Vcs.Log.Tabs.Properties"> <component name="Vcs.Log.Tabs.Properties">
<option name="TAB_STATES"> <option name="TAB_STATES">
<map> <map>
<entry key="MAIN"> <entry key="MAIN">
<value> <value>
<State> <State />
<option name="COLUMN_ORDER" />
</State>
</value> </value>
</entry> </entry>
</map> </map>
</option> </option>
<option name="oldMeFiltersMigrated" value="true" />
</component> </component>
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<option name="CHECK_NEW_TODO" value="false" /> <option name="CHECK_NEW_TODO" value="false" />
@ -276,42 +386,59 @@
<MESSAGE value="Production Ready 1.10 - Mutliversion Build" /> <MESSAGE value="Production Ready 1.10 - Mutliversion Build" />
<MESSAGE value="1.10.1" /> <MESSAGE value="1.10.1" />
<MESSAGE value="github sync" /> <MESSAGE value="github sync" />
<option name="LAST_COMMIT_MESSAGE" value="github sync" /> <MESSAGE value="1.12" />
<MESSAGE value="pushes" />
<MESSAGE value="1.16 Support" />
<option name="LAST_COMMIT_MESSAGE" value="1.16 Support" />
<option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="true" /> <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="true" />
<option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="true" /> <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="true" />
</component> </component>
<component name="WindowStateProjectService"> <component name="WindowStateProjectService">
<state x="416" y="182" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1579561359045"> <state x="881" y="275" key="FileChooserDialogImpl" timestamp="1606361234649">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state x="416" y="182" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1920.1040/1920.0.1920.1040@0.0.1920.1040" timestamp="1579561359045" /> <state x="881" y="275" key="FileChooserDialogImpl/0.0.1920.1040/1920.0.1920.1040@0.0.1920.1040" timestamp="1606361234649" />
<state x="808" y="410" key="#com.intellij.ide.util.projectWizard.JdkChooserPanel.MyDialog" timestamp="1579288175523"> <state width="1574" height="282" key="GridCell.Tab.0.bottom" timestamp="1604556356031">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state x="808" y="410" key="#com.intellij.ide.util.projectWizard.JdkChooserPanel.MyDialog/0.0.1920.1040/1920.0.1920.1040@0.0.1920.1040" timestamp="1579288175523" /> <state width="1574" height="282" key="GridCell.Tab.0.bottom/0.0.1920.1040/1920.0.1920.1040@0.0.1920.1040" timestamp="1604556356031" />
<state x="690" y="268" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog" timestamp="1579288162839"> <state width="1574" height="282" key="GridCell.Tab.0.center" timestamp="1604556356031">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state x="690" y="268" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/0.0.1920.1040/1920.0.1920.1040@0.0.1920.1040" timestamp="1579288162839" /> <state width="1574" height="282" key="GridCell.Tab.0.center/0.0.1920.1040/1920.0.1920.1040@0.0.1920.1040" timestamp="1604556356031" />
<state width="1877" height="185" key="GridCell.Tab.0.bottom" timestamp="1580694096917"> <state width="1574" height="282" key="GridCell.Tab.0.left" timestamp="1604556356031">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="185" key="GridCell.Tab.0.bottom/0.0.1920.1040/1920.0.1920.1040@0.0.1920.1040" timestamp="1580694096917" /> <state width="1574" height="282" key="GridCell.Tab.0.left/0.0.1920.1040/1920.0.1920.1040@0.0.1920.1040" timestamp="1604556356031" />
<state width="1877" height="185" key="GridCell.Tab.0.center" timestamp="1580694096917"> <state width="1574" height="282" key="GridCell.Tab.0.right" timestamp="1604556356031">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="185" key="GridCell.Tab.0.center/0.0.1920.1040/1920.0.1920.1040@0.0.1920.1040" timestamp="1580694096917" /> <state width="1574" height="282" key="GridCell.Tab.0.right/0.0.1920.1040/1920.0.1920.1040@0.0.1920.1040" timestamp="1604556356031" />
<state width="1877" height="185" key="GridCell.Tab.0.left" timestamp="1580694096917"> <state x="573" y="138" key="SettingsEditor" timestamp="1604553149121">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="185" key="GridCell.Tab.0.left/0.0.1920.1040/1920.0.1920.1040@0.0.1920.1040" timestamp="1580694096917" /> <state x="573" y="138" key="SettingsEditor/0.0.1920.1040/1920.0.1920.1040@0.0.1920.1040" timestamp="1604553149121" />
<state width="1877" height="185" key="GridCell.Tab.0.right" timestamp="1580694096917"> <state x="484" y="181" key="new project wizard" timestamp="1606361250393">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="185" key="GridCell.Tab.0.right/0.0.1920.1040/1920.0.1920.1040@0.0.1920.1040" timestamp="1580694096917" /> <state x="484" y="181" key="new project wizard/0.0.1920.1040/1920.0.1920.1040@0.0.1920.1040" timestamp="1606361250393" />
<state x="655" y="345" key="com.intellij.ide.util.TipDialog" timestamp="1579461879291"> <state x="623" y="225" width="672" height="678" key="search.everywhere.popup" timestamp="1604553203981">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state x="655" y="345" key="com.intellij.ide.util.TipDialog/0.0.1920.1040/1920.0.1920.1040@0.0.1920.1040" timestamp="1579461879291" /> <state x="623" y="225" width="672" height="678" key="search.everywhere.popup/0.0.1920.1040/1920.0.1920.1040@0.0.1920.1040" timestamp="1604553203981" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<breakpoints>
<line-breakpoint enabled="true" type="java-method">
<url>file://$PROJECT_DIR$/src/main/java/com/kiranhart/auctionhouse/api/version/NBTEditor.java</url>
<line>240</line>
<properties class="com.kiranhart.auctionhouse.api.version.NBTEditor" method="getNBTVar">
<option name="EMULATED" value="true" />
</properties>
<option name="timeStamp" value="1" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
</component> </component>
</project> </project>

2
Auction House - Multiversion.iml
View File

@ -31,5 +31,7 @@
<orderEntry type="library" name="Maven: com.github.MilkBowl:VaultAPI:1.7" level="project" /> <orderEntry type="library" name="Maven: com.github.MilkBowl:VaultAPI:1.7" level="project" />
<orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.3.1" level="project" /> <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.3.1" level="project" />
<orderEntry type="library" name="Maven: org.json:json:20190722" level="project" /> <orderEntry type="library" name="Maven: org.json:json:20190722" level="project" />
<orderEntry type="library" name="Maven: org.spigotmc:spigot:1.16.3-R0.1-SNAPSHOT" level="project" />
<orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.5" level="project" />
</component> </component>
</module> </module>

17
AuctionHouse.iml
View File

@ -21,15 +21,18 @@
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot:1.15.2-R0.1-SNAPSHOT" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot:1.16.3-R0.1-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.bukkit:bukkit:1.15.2-R0.1-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:21.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.25" level="project" />
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.13" level="project" /> <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.13" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.github.MilkBowl:VaultAPI:1.7" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Maven: com.github.MilkBowl:VaultAPI:1.7" level="project" />
<orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.2" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Maven: org.bukkit:bukkit:1.13.1-R0.1-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: junit:junit:4.10" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:21.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.21" level="project" />
<orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.5" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" /> <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.6" level="project" />
</component> </component>
</module> </module>

4
dependency-reduced-pom.xml
View File

@ -4,7 +4,7 @@
<groupId>com.kiranhart</groupId> <groupId>com.kiranhart</groupId>
<artifactId>AuctionHouse</artifactId> <artifactId>AuctionHouse</artifactId>
<name>AuctionHouse</name> <name>AuctionHouse</name>
<version>1.12.6</version> <version>1.12.7</version>
<description>The ultimate auction house plugin</description> <description>The ultimate auction house plugin</description>
<url>https://www.kiranhart.com</url> <url>https://www.kiranhart.com</url>
<build> <build>
@ -55,7 +55,7 @@
<dependency> <dependency>
<groupId>org.spigotmc</groupId> <groupId>org.spigotmc</groupId>
<artifactId>spigot</artifactId> <artifactId>spigot</artifactId>
<version>1.16.1-R0.1-SNAPSHOT</version> <version>1.16.3-R0.1-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

4
pom.xml
View File

@ -6,7 +6,7 @@
<groupId>com.kiranhart</groupId> <groupId>com.kiranhart</groupId>
<artifactId>AuctionHouse</artifactId> <artifactId>AuctionHouse</artifactId>
<version>1.12.6</version> <version>1.12.7</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>AuctionHouse</name> <name>AuctionHouse</name>
@ -69,7 +69,7 @@
<dependency> <dependency>
<groupId>org.spigotmc</groupId> <groupId>org.spigotmc</groupId>
<artifactId>spigot</artifactId> <artifactId>spigot</artifactId>
<version>1.16.1-R0.1-SNAPSHOT</version> <version>1.16.3-R0.1-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

27
src/main/java/com/kiranhart/auctionhouse/Core.java
View File

@ -8,20 +8,20 @@ import com.kiranhart.auctionhouse.cmds.CommandManager;
import com.kiranhart.auctionhouse.inventory.AGUI; import com.kiranhart.auctionhouse.inventory.AGUI;
import com.kiranhart.auctionhouse.listeners.AGUIListener; import com.kiranhart.auctionhouse.listeners.AGUIListener;
import com.kiranhart.auctionhouse.util.Metrics; import com.kiranhart.auctionhouse.util.Metrics;
import com.kiranhart.auctionhouse.util.economy.Economy;
import com.kiranhart.auctionhouse.util.economy.VaultEconomy;
import com.kiranhart.auctionhouse.util.locale.Locale; import com.kiranhart.auctionhouse.util.locale.Locale;
import com.kiranhart.auctionhouse.util.storage.ConfigWrapper; import com.kiranhart.auctionhouse.util.storage.ConfigWrapper;
import com.kiranhart.auctionhouse.util.tasks.AutoSaveTask; import com.kiranhart.auctionhouse.util.tasks.AutoSaveTask;
import com.kiranhart.auctionhouse.util.tasks.LoadAuctionsTask; import com.kiranhart.auctionhouse.util.tasks.LoadAuctionsTask;
import com.kiranhart.auctionhouse.util.tasks.TickAuctionsTask; import com.kiranhart.auctionhouse.util.tasks.TickAuctionsTask;
import com.zaxxer.hikari.HikariDataSource; import com.zaxxer.hikari.HikariDataSource;
import net.milkbowl.vault.economy.Economy;
import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.ArrayUtils;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.command.ConsoleCommandSender; import org.bukkit.command.ConsoleCommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.PluginManager;
import org.bukkit.plugin.RegisteredServiceProvider;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import java.io.File; import java.io.File;
@ -40,7 +40,7 @@ public final class Core extends JavaPlugin {
private AuctionSettings auctionSettings; private AuctionSettings auctionSettings;
private CommandManager commandManager; private CommandManager commandManager;
private Economy economy; private static Economy economy;
private Locale locale; private Locale locale;
private LinkedList<AuctionItem> auctionItems; private LinkedList<AuctionItem> auctionItems;
@ -90,11 +90,10 @@ public final class Core extends JavaPlugin {
this.locale = Locale.getLocale(getConfig().getString("lang")); this.locale = Locale.getLocale(getConfig().getString("lang"));
//Economy //Economy
if (getServer().getPluginManager().getPlugin("Vault") != null) { if (!setupEconomy()) {
economy = new VaultEconomy(); console.sendMessage(ChatColor.translateAlternateColorCodes('&', "&c[&6AuctionHouse&8]&c Disabling due to vault error"));
} else {
console.sendMessage(ChatColor.translateAlternateColorCodes('&', "&8[&6AuctionHouse&8]&c COULD NOT FIND VAULT, DISABLING PLUGIN"));
getServer().getPluginManager().disablePlugin(this); getServer().getPluginManager().disablePlugin(this);
return;
} }
console.sendMessage(ChatColor.translateAlternateColorCodes('&', "&8[&6AuctionHouse&8]&a Loading data files")); console.sendMessage(ChatColor.translateAlternateColorCodes('&', "&8[&6AuctionHouse&8]&a Loading data files"));
@ -236,7 +235,7 @@ public final class Core extends JavaPlugin {
return commandManager; return commandManager;
} }
public Economy getEconomy() { public static Economy getEconomy() {
return economy; return economy;
} }
@ -271,5 +270,17 @@ public final class Core extends JavaPlugin {
public Map<Player, Integer> getCurrentAuctionPage() { public Map<Player, Integer> getCurrentAuctionPage() {
return currentAuctionPage; return currentAuctionPage;
} }
private boolean setupEconomy() {
if (getServer().getPluginManager().getPlugin("Vault") == null) {
return false;
}
RegisteredServiceProvider<Economy> rsp = getServer().getServicesManager().getRegistration(Economy.class);
if (rsp == null) {
return false;
}
economy = rsp.getProvider();
return economy != null;
}
} }

1
src/main/java/com/kiranhart/auctionhouse/api/statics/AuctionLang.java
View File

@ -43,6 +43,7 @@ public class AuctionLang {
public static final String AUCTION_MAX= "auction.max"; public static final String AUCTION_MAX= "auction.max";
public static final String AUCTION_BUY = "auction.buy"; public static final String AUCTION_BUY = "auction.buy";
public static final String AUCTION_SOLD = "auction.sold"; public static final String AUCTION_SOLD = "auction.sold";
public static final String AUCTION_ITEM_LIST_ALERT = "auction.itemlistalert";
//Auction Command Messages //Auction Command Messages
public static final String COMMAND_INVALID = "cmd.invalid"; public static final String COMMAND_INVALID = "cmd.invalid";

2
src/main/java/com/kiranhart/auctionhouse/api/statics/AuctionSettings.java
View File

@ -27,6 +27,7 @@ public class AuctionSettings {
public static boolean INCREASE_AUCTION_TIME_ON_BID = true; public static boolean INCREASE_AUCTION_TIME_ON_BID = true;
public static boolean USE_SHORT_NUMBERS_ON_ITEMS = false; public static boolean USE_SHORT_NUMBERS_ON_ITEMS = false;
public static boolean SAVE_TRANSACTIONS = true; public static boolean SAVE_TRANSACTIONS = true;
public static boolean ALERT_PLAYERS_ON_ITEM_LIST = false;
public static int TIME_TO_INCREASE_BY_BID = 10; public static int TIME_TO_INCREASE_BY_BID = 10;
public static int DECREASE_SECONDS_BY_TICK = 5; public static int DECREASE_SECONDS_BY_TICK = 5;
@ -61,6 +62,7 @@ public class AuctionSettings {
UPDATE_EVERY_TICK = Core.getInstance().getConfig().getInt("settings.update-every-tick"); UPDATE_EVERY_TICK = Core.getInstance().getConfig().getInt("settings.update-every-tick");
AUTO_SAVE_EVERY = Core.getInstance().getConfig().getInt("settings.auto-save-every"); AUTO_SAVE_EVERY = Core.getInstance().getConfig().getInt("settings.auto-save-every");
SAVE_TRANSACTIONS = Core.getInstance().getConfig().getBoolean("settings.save-transactions"); SAVE_TRANSACTIONS = Core.getInstance().getConfig().getBoolean("settings.save-transactions");
ALERT_PLAYERS_ON_ITEM_LIST = Core.getInstance().getConfig().getBoolean("settings.alert-players-on-item-list");
DB_ENABLED = Core.getInstance().getConfig().getBoolean("database.enabled"); DB_ENABLED = Core.getInstance().getConfig().getBoolean("database.enabled");
// ATTEMPT_TO_CREATE_DB_TABLES_ON_START = Core.getInstance().getConfig().getBoolean("database.attempt-table-creation-on-start"); // ATTEMPT_TO_CREATE_DB_TABLES_ON_START = Core.getInstance().getConfig().getBoolean("database.attempt-table-creation-on-start");

3
src/main/java/com/kiranhart/auctionhouse/api/version/ServerVersion.java
View File

@ -18,7 +18,8 @@ public enum ServerVersion {
V1_12("org.bukkit.craftbukkit.v1_12"), V1_12("org.bukkit.craftbukkit.v1_12"),
V1_13("org.bukkit.craftbukkit.v1_13"), V1_13("org.bukkit.craftbukkit.v1_13"),
V1_14("org.bukkit.craftbukkit.v1_14"), V1_14("org.bukkit.craftbukkit.v1_14"),
V1_15("org.bukkit.craftbukkit.v1_15"); V1_15("org.bukkit.craftbukkit.v1_15"),
V1_16("org.bukkit.craftbukkit.v1_16");
private String versionName; private String versionName;

18
src/main/java/com/kiranhart/auctionhouse/cmds/subcommands/SellCommand.java
View File

@ -11,6 +11,7 @@ import com.kiranhart.auctionhouse.api.version.XMaterial;
import com.kiranhart.auctionhouse.auction.AuctionItem; import com.kiranhart.auctionhouse.auction.AuctionItem;
import com.kiranhart.auctionhouse.auction.AuctionPlayer; import com.kiranhart.auctionhouse.auction.AuctionPlayer;
import com.kiranhart.auctionhouse.cmds.SubCommand; import com.kiranhart.auctionhouse.cmds.SubCommand;
import org.bukkit.Bukkit;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -110,6 +111,10 @@ public class SellCommand extends SubCommand {
if (!auctionStartEvent.isCancelled()) { if (!auctionStartEvent.isCancelled()) {
Core.getInstance().getAuctionItems().add(0, auctionItem); Core.getInstance().getAuctionItems().add(0, auctionItem);
Core.getInstance().getLocale().getMessage(AuctionLang.AUCTION_LISTED).processPlaceholder("itemname", auctionItem.getDisplayName()).processPlaceholder("price", AuctionAPI.getInstance().getFriendlyNumber(buyNow)).sendPrefixedMessage(p); Core.getInstance().getLocale().getMessage(AuctionLang.AUCTION_LISTED).processPlaceholder("itemname", auctionItem.getDisplayName()).processPlaceholder("price", AuctionAPI.getInstance().getFriendlyNumber(buyNow)).sendPrefixedMessage(p);
// Alert players
if (AuctionSettings.ALERT_PLAYERS_ON_ITEM_LIST) {
Bukkit.getOnlinePlayers().forEach(allPlayers -> Core.getInstance().getLocale().getMessage(AuctionLang.AUCTION_ITEM_LIST_ALERT).processPlaceholder("amt", auctionItem.getItem().getAmount()).processPlaceholder("player", p.getName()).processPlaceholder("itemname", auctionItem.getDisplayName()).processPlaceholder("price_buy", AuctionAPI.getInstance().getFriendlyNumber(buyNow)).sendPrefixedMessage(allPlayers));
}
AuctionAPI.getInstance().setItemInHand(p, null); AuctionAPI.getInstance().setItemInHand(p, null);
p.updateInventory(); p.updateInventory();
@ -191,6 +196,19 @@ public class SellCommand extends SubCommand {
if (!auctionStartEvent.isCancelled()) { if (!auctionStartEvent.isCancelled()) {
Core.getInstance().getAuctionItems().add(0, auctionItem); Core.getInstance().getAuctionItems().add(0, auctionItem);
Core.getInstance().getLocale().getMessage(AuctionLang.AUCTION_LISTED_WITH_BID).processPlaceholder("itemname", auctionItem.getDisplayName()).processPlaceholder("price", AuctionAPI.getInstance().getFriendlyNumber(buyNow)).sendPrefixedMessage(p); Core.getInstance().getLocale().getMessage(AuctionLang.AUCTION_LISTED_WITH_BID).processPlaceholder("itemname", auctionItem.getDisplayName()).processPlaceholder("price", AuctionAPI.getInstance().getFriendlyNumber(buyNow)).sendPrefixedMessage(p);
// Alert players
if (AuctionSettings.ALERT_PLAYERS_ON_ITEM_LIST) {
Bukkit.getOnlinePlayers().forEach(allPlayers -> Core.getInstance().getLocale().getMessage(AuctionLang.AUCTION_ITEM_LIST_ALERT)
.processPlaceholder("player", p.getName())
.processPlaceholder("itemname", auctionItem.getDisplayName())
.processPlaceholder("amt", auctionItem.getItem().getAmount())
.processPlaceholder("price_buy", AuctionAPI.getInstance().getFriendlyNumber(buyNow))
.processPlaceholder("price_increment", AuctionAPI.getInstance().getFriendlyNumber(increment))
.processPlaceholder("price_start", AuctionAPI.getInstance().getFriendlyNumber(startPrice))
.sendPrefixedMessage(allPlayers));
}
AuctionAPI.getInstance().setItemInHand(p, null); AuctionAPI.getInstance().setItemInHand(p, null);
} }
} else { } else {

6
src/main/java/com/kiranhart/auctionhouse/inventory/inventories/AuctionGUI.java
View File

@ -115,7 +115,7 @@ public class AuctionGUI implements AGUI {
if (auctionItem.getKey().equalsIgnoreCase(auctionItemKey)) possibleAuctionItem = auctionItem; if (auctionItem.getKey().equalsIgnoreCase(auctionItemKey)) possibleAuctionItem = auctionItem;
} }
if (Core.getInstance().getEconomy().hasBalance(p, possibleAuctionItem.getBuyNowPrice())) { if (Core.getInstance().getEconomy().has(p, possibleAuctionItem.getBuyNowPrice())) {
//Check if the person who clicked is the owner //Check if the person who clicked is the owner
if (possibleAuctionItem.getOwner().equals(p.getUniqueId())) { if (possibleAuctionItem.getOwner().equals(p.getUniqueId())) {
if (AuctionSettings.OWNER_CAN_PURCHASE_OWN) { if (AuctionSettings.OWNER_CAN_PURCHASE_OWN) {
@ -141,7 +141,7 @@ public class AuctionGUI implements AGUI {
} }
//Check if player has enough money to bid //Check if player has enough money to bid
if (Core.getInstance().getEconomy().hasBalance(p, possibleAuctionItem.getCurrentPrice() + possibleAuctionItem.getBidIncrement())) { if (Core.getInstance().getEconomy().has(p, possibleAuctionItem.getCurrentPrice() + possibleAuctionItem.getBidIncrement())) {
//Check if the person who clicked is the owner //Check if the person who clicked is the owner
if (possibleAuctionItem.getOwner().equals(p.getUniqueId())) { if (possibleAuctionItem.getOwner().equals(p.getUniqueId())) {
//can the owner bid on their own item? //can the owner bid on their own item?
@ -191,7 +191,7 @@ public class AuctionGUI implements AGUI {
if (auctionItem.getKey().equalsIgnoreCase(auctionItemKey)) possibleAuctionItem = auctionItem; if (auctionItem.getKey().equalsIgnoreCase(auctionItemKey)) possibleAuctionItem = auctionItem;
} }
if (Core.getInstance().getEconomy().hasBalance(p, possibleAuctionItem.getBuyNowPrice())) { if (Core.getInstance().getEconomy().has(p, possibleAuctionItem.getBuyNowPrice())) {
//Check if the person who clicked is the owner //Check if the person who clicked is the owner
if (possibleAuctionItem.getOwner().equals(p.getUniqueId())) { if (possibleAuctionItem.getOwner().equals(p.getUniqueId())) {

6
src/main/java/com/kiranhart/auctionhouse/inventory/inventories/ConfirmationGUI.java
View File

@ -54,10 +54,10 @@ public class ConfirmationGUI implements AGUI {
//Check if the auction item is hasn't been purchased yet //Check if the auction item is hasn't been purchased yet
if (Core.getInstance().getAuctionItems().contains(auctionItem)) { if (Core.getInstance().getAuctionItems().contains(auctionItem)) {
//Check if they have enough money to purchase the item //Check if they have enough money to purchase the item
if (Core.getInstance().getEconomy().hasBalance(p, auctionItem.getBuyNowPrice())) { if (Core.getInstance().getEconomy().has(p, auctionItem.getBuyNowPrice())) {
//Withdraw //Withdraw
Core.getInstance().getEconomy().withdrawBalance(p, auctionItem.getBuyNowPrice()); Core.getInstance().getEconomy().withdrawPlayer(p, auctionItem.getBuyNowPrice());
Core.getInstance().getEconomy().deposit(Bukkit.getOfflinePlayer(auctionItem.getOwner()), auctionItem.getBuyNowPrice()); Core.getInstance().getEconomy().depositPlayer(Bukkit.getOfflinePlayer(auctionItem.getOwner()), auctionItem.getBuyNowPrice());
//Check inventory space //Check inventory space
if (AuctionAPI.getInstance().availableSlots(p.getInventory()) == 0) { if (AuctionAPI.getInstance().availableSlots(p.getInventory()) == 0) {

19
src/main/java/com/kiranhart/auctionhouse/util/economy/Economy.java
View File

@ -1,19 +0,0 @@
package com.kiranhart.auctionhouse.util.economy;
/*
The current file was created by Kiran Hart
Date: August 05 2019
Time: 9:06 PM
Code within this class is not to be redistributed without proper permission.
*/
import org.bukkit.OfflinePlayer;
public interface Economy {
boolean hasBalance(OfflinePlayer p, double cost);
boolean withdrawBalance(OfflinePlayer p, double cost);
boolean deposit(OfflinePlayer p, double amount);
}

35
src/main/java/com/kiranhart/auctionhouse/util/economy/VaultEconomy.java
View File

@ -1,35 +0,0 @@
package com.kiranhart.auctionhouse.util.economy;
/*
The current file was created by Kiran Hart
Date: August 05 2019
Time: 9:13 PM
Code within this class is not to be redistributed without proper permission.
*/
import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
public class VaultEconomy implements Economy {
private net.milkbowl.vault.economy.Economy vault;
public VaultEconomy() {
this.vault = Bukkit.getServicesManager().getRegistration(net.milkbowl.vault.economy.Economy.class).getProvider();
}
@Override
public boolean hasBalance(OfflinePlayer p, double cost) {
return vault.has(p, cost);
}
@Override
public boolean withdrawBalance(OfflinePlayer p, double cost) {
return vault.withdrawPlayer(p, cost).transactionSuccess();
}
@Override
public boolean deposit(OfflinePlayer p, double amount) {
return vault.depositPlayer(p, amount).transactionSuccess();
}
}

12
src/main/java/com/kiranhart/auctionhouse/util/tasks/TickAuctionsTask.java
View File

@ -76,11 +76,11 @@ public class TickAuctionsTask extends BukkitRunnable {
if (highestBidder.isOnline()) { if (highestBidder.isOnline()) {
//Highest bidder is currently online //Highest bidder is currently online
//Check the balance (has enough money) //Check the balance (has enough money)
if (Core.getInstance().getEconomy().hasBalance(highestBidder, auctionItem.getCurrentPrice())) { if (Core.getInstance().getEconomy().has(highestBidder, auctionItem.getCurrentPrice())) {
//Withdraw the money //Withdraw the money
Core.getInstance().getEconomy().withdrawBalance(highestBidder, auctionItem.getCurrentPrice()); Core.getInstance().getEconomy().withdrawPlayer(highestBidder, auctionItem.getCurrentPrice());
//Give money the owner //Give money the owner
Core.getInstance().getEconomy().deposit(Bukkit.getOfflinePlayer(auctionItem.getOwner()), auctionItem.getCurrentPrice()); Core.getInstance().getEconomy().depositPlayer(Bukkit.getOfflinePlayer(auctionItem.getOwner()), auctionItem.getCurrentPrice());
//TODO Send money removal / addition messages //TODO Send money removal / addition messages
//Check if player has available slots //Check if player has available slots
@ -110,12 +110,12 @@ public class TickAuctionsTask extends BukkitRunnable {
Core.getInstance().getAuctionItems().remove(auctionItem); Core.getInstance().getAuctionItems().remove(auctionItem);
} else { } else {
//Highest bidder is currently offline //Highest bidder is currently offline
if (Core.getInstance().getEconomy().hasBalance(highestBidder, auctionItem.getCurrentPrice())) { if (Core.getInstance().getEconomy().has(highestBidder, auctionItem.getCurrentPrice())) {
//Has enough money //Has enough money
Core.getInstance().getData().getConfig().set("expired." + auctionItem.getHighestBidder().toString() + "." + auctionItem.getKey() + ".item", auctionItem.getItem()); Core.getInstance().getData().getConfig().set("expired." + auctionItem.getHighestBidder().toString() + "." + auctionItem.getKey() + ".item", auctionItem.getItem());
Core.getInstance().getData().getConfig().set("expired." + auctionItem.getHighestBidder().toString() + "." + auctionItem.getKey() + ".display", AuctionAPI.getInstance().expiredAuctionItem(auctionItem)); Core.getInstance().getData().getConfig().set("expired." + auctionItem.getHighestBidder().toString() + "." + auctionItem.getKey() + ".display", AuctionAPI.getInstance().expiredAuctionItem(auctionItem));
Core.getInstance().getEconomy().withdrawBalance(highestBidder, auctionItem.getCurrentPrice()); Core.getInstance().getEconomy().withdrawPlayer(highestBidder, auctionItem.getCurrentPrice());
Core.getInstance().getEconomy().deposit(Bukkit.getOfflinePlayer(auctionItem.getOwner()), auctionItem.getCurrentPrice()); Core.getInstance().getEconomy().depositPlayer(Bukkit.getOfflinePlayer(auctionItem.getOwner()), auctionItem.getCurrentPrice());
//Perform the transaction //Perform the transaction
Transaction transaction = new Transaction(Transaction.TransactionType.AUCTION_WON, auctionItem, auctionItem.getHighestBidder(), System.currentTimeMillis()); Transaction transaction = new Transaction(Transaction.TransactionType.AUCTION_WON, auctionItem, auctionItem.getHighestBidder(), System.currentTimeMillis());

1
src/main/resources/config.yml
View File

@ -23,6 +23,7 @@ settings:
update-every-tick: 5 update-every-tick: 5
auto-save-every: 1800 auto-save-every: 1800
save-transactions: true save-transactions: true
alert-players-on-item-list: true
help-msg: help-msg:
- "&6======== &eAuction House&6 ========" - "&6======== &eAuction House&6 ========"

9
src/main/resources/en_US.lang
View File

@ -33,6 +33,15 @@ auction.max = "&cYou cannot auction more items, please upgrade to do so."
auction.buy = "&eYou purchased &6%itemname% &Efor &A$%price%" auction.buy = "&eYou purchased &6%itemname% &Efor &A$%price%"
auction.sold = "&6%player% &Ehas bought your listed item: &6%itemname% &efor &a$%price%" auction.sold = "&6%player% &Ehas bought your listed item: &6%itemname% &efor &a$%price%"
# itemlistalert variables
# player === the name of the player who placed the item for sale
# itemname === the name of the item
# price_buy === the price for the buy now value or when not using the bidding system
# price_increment === the price / value increment when using the bidding system
# price_start === the starting bid price when using the bidding system
# amt === the amount of the item
auction.itemlistalert = "&b%player%&e has placed &fx&6%amt% &d%itemname% &efor&a $%price_buy%"
#Command Messages #Command Messages
cmd.invalid = "&cThat isn't a valid subcommand!" cmd.invalid = "&cThat isn't a valid subcommand!"
cmd.sell.withbid = "&e/ah sell <buyNowPrice> <startPrice> <bidIncrement>" cmd.sell.withbid = "&e/ah sell <buyNowPrice> <startPrice> <bidIncrement>"

1
src/main/resources/plugin.yml
View File

@ -5,6 +5,7 @@ main: com.kiranhart.auctionhouse.Core
authors: [Kiran Hart] authors: [Kiran Hart]
description: The ultimate auction house plugin description: The ultimate auction house plugin
website: https://www.kiranhart.com website: https://www.kiranhart.com
depends: [ Vault ]
commands: commands:
auctionhouse: auctionhouse: