Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-25 12:25:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Yey!

Browse Source
This commit is contained in:
Sauilitired 2014-09-22 13:39:45 +02:00
parent 8a5cf06e66
commit e6849e4ace
4 changed files with 294 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.idea/artifacts/plotsquared.xml Normal file
View File

@ -0,0 +1,8 @@
<component name="ArtifactManager">
<artifact type="jar" name="plotsquared">
<output-path>$PROJECT_DIR$/out/artifacts/plotsquared</output-path>
<root id="archive" name="plotsquared.jar">
<element id="module-output" name="PlotSquared" />
</root>
</artifact>
</component>

129
.idea/workspace.xml
View File

@ -1,7 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ArtifactsWorkspaceSettings">
<artifacts-to-build>
<artifact name="plotsquared" />
</artifacts-to-build>
</component>
<component name="ChangeListManager">
<list default="true" id="f6aaf715-4424-4f9e-96dc-b47edea10520" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/plotsquared.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/artifacts/plotsquared.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotMain.java" afterPath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotMain.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
</list>
<ignored path="plot_news.iws" />
@ -35,16 +43,61 @@
</provider>
</entry>
</file>
<file leaf-file-name="encodings.xml" pinned="false" current="true" current-in-tab="true">
<file leaf-file-name="encodings.xml" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/.idea/encodings.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.09149623" vertical-offset="0" max-vertical-offset="929">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="187">
<caret line="5" column="0" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="PlotId.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotId.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="629">
<caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Plot.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/Plot.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="1900" max-vertical-offset="3757">
<caret line="173" column="43" selection-start-line="173" selection-start-column="43" selection-end-line="173" selection-end-column="43" />
<folding>
<element signature="e#4212#4213#0" expanded="true" />
<element signature="e#4262#4263#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="PlotMain.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotMain.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="5104" max-vertical-offset="11832">
<caret line="362" column="53" selection-start-line="362" selection-start-column="53" selection-end-line="362" selection-end-column="53" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="plotsquared.xml" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/plotsquared.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2856">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FindManager">
@ -62,6 +115,8 @@
<option value="$PROJECT_DIR$/src/plot_news1.iml" />
<option value="$PROJECT_DIR$/src/com/intellectualcrafters/plot/database/PlotMeConverter.java" />
<option value="$PROJECT_DIR$/src/com/intellectualcrafters/plot/PlotMain.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/Plot.java" />
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotMain.java" />
</list>
</option>
</component>
@ -105,6 +160,16 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="plot_news" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="PlotSquared" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
<pane id="PackagesPane">
@ -132,7 +197,7 @@
<property name="MemberChooser.showClasses" value="true" />
<property name="MemberChooser.copyJavadoc" value="false" />
<property name="WebServerToolWindowFactoryState" value="true" />
<property name="project.structure.last.edited" value="Modules" />
<property name="project.structure.last.edited" value="Artifacts" />
<property name="project.structure.proportion" value="0.15" />
<property name="project.structure.side.proportion" value="0.2" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/lib/BarAPI.jar!/" />
@ -141,6 +206,13 @@
<property name="Repository.Attach.Sources" value="false" />
<property name="LayoutCode.rearrangeEntriesJava" value="false" />
<property name="FullScreen" value="false" />
<property name="GenerateAntBuildDialog.generateSingleFile" value="false" />
<property name="GenerateAntBuildDialog.enableUiFormCompile" value="true" />
<property name="GenerateAntBuildDialog.forceTargetJdk" value="true" />
<property name="GenerateAntBuildDialog.backupFiles" value="true" />
<property name="GenerateAntBuildDialog.inclineRuntiemClasspath" value="false" />
<property name="GenerateAntBuildDialog.generateIdeaHomeProperty" value="false" />
<property name="GenerateAntBuildDialog.outputFileNameProperty" value="plotsquared" />
</component>
<component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS">
@ -285,7 +357,7 @@
<updated>1411382235722</updated>
<workItem from="1411382238709" duration="182000" />
<workItem from="1411382421959" duration="656000" />
<workItem from="1411383098267" duration="1312000" />
<workItem from="1411383098267" duration="2225000" />
</task>
<task id="LOCAL-00001" summary="First Commit">
<created>1411382351159</created>
@ -299,11 +371,15 @@
<created>1411383734427</created>
<updated>1411383734427</updated>
</task>
<option name="localTasksCounter" value="4" />
<task id="LOCAL-00004" summary="Included source...">
<created>1411385686603</created>
<updated>1411385686603</updated>
</task>
<option name="localTasksCounter" value="5" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="2150000" />
<option name="totallyTimeSpent" value="3063000" />
</component>
<component name="ToolWindowManager">
<frame x="-6" y="-6" width="1932" height="1062" extended-state="6" />
@ -413,22 +489,61 @@
</entry>
<entry file="file://$PROJECT_DIR$/.idea/encodings.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.09149623" vertical-offset="0" max-vertical-offset="929">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="187">
<caret line="5" column="0" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotId.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="629">
<caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/Plot.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="1900" max-vertical-offset="3757">
<caret line="173" column="43" selection-start-line="173" selection-start-column="43" selection-end-line="173" selection-end-column="43" />
<folding>
<element signature="e#4212#4213#0" expanded="true" />
<element signature="e#4262#4263#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotMain.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="5104" max-vertical-offset="11832">
<caret line="362" column="53" selection-start-line="362" selection-start-column="53" selection-end-line="362" selection-end-column="53" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/plotsquared.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2856">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>
<state key="ArtifactsStructureConfigurable.UI">
<settings>
<artifact-editor />
<last-edited>plotsquared</last-edited>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
<option value="0.5" />
</list>
</option>
</splitter-proportions>

20
PlotSquared/src/com/intellectualcrafters/plot/PlotMain.java
View File

@ -23,7 +23,6 @@ import com.intellectualsites.web.PlotWeb;
import com.sk89q.worldedit.bukkit.WorldEditPlugin;
import me.confuser.barapi.BarAPI;
import net.gravitydevelopment.updater.Updater;
import org.bukkit.*;
import org.bukkit.configuration.file.YamlConfiguration;
@ -210,7 +209,6 @@ public class PlotMain extends JavaPlugin {
/**
* Replace the plot object with an updated version
*
* @param id plot Id
* @param plot plot object
*/
public static void updatePlot(Plot plot) {
@ -329,23 +327,7 @@ public class PlotMain extends JavaPlugin {
if (C.ENABLED.s().length() > 0) {
Broadcast(C.ENABLED);
}
if (Settings.Update.AUTO_UPDATE) {
Updater updater = new Updater(this, 83369, this.getFile(), Updater.UpdateType.DEFAULT, true);
switch (updater.getResult()) {
case SUCCESS:
sendConsoleSenderMessage(C.PREFIX.s() + "&cUpdate " + updater.getLatestName() + " installed successfully. Restart the server to load it.");
break;
case FAIL_DOWNLOAD:
sendConsoleSenderMessage(C.PREFIX.s() + "&cUpdate could not be installed.");
break;
case UPDATE_AVAILABLE:
sendConsoleSenderMessage(C.PREFIX.s() + ChatColor.GREEN + "There is an available update.");
break;
default:
sendConsoleSenderMessage(C.PREFIX.s() + ChatColor.GREEN + "You're using the latest update.");
break;
}
}
if (Settings.DB.USE_MYSQL) {
try {
mySQL = new MySQL(this, Settings.DB.HOST_NAME, Settings.DB.PORT,

163
plotsquared.xml Normal file
View File

@ -0,0 +1,163 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="plot_news" default="all">
<property file="plotsquared.properties"/>
<!-- Uncomment the following property if no tests compilation is needed -->
<!--
<property name="skip.tests" value="true"/>
-->
<!-- Compiler options -->
<property name="compiler.debug" value="on"/>
<property name="compiler.generate.no.warnings" value="off"/>
<property name="compiler.args" value=""/>
<property name="compiler.max.memory" value="700m"/>
<patternset id="ignored.files">
<exclude name="**/CVS/**"/>
<exclude name="**/SCCS/**"/>
<exclude name="**/RCS/**"/>
<exclude name="**/rcs/**"/>
<exclude name="**/.DS_Store/**"/>
<exclude name="**/.svn/**"/>
<exclude name="**/.pyc/**"/>
<exclude name="**/.pyo/**"/>
<exclude name="**/*.pyc/**"/>
<exclude name="**/*.pyo/**"/>
<exclude name="**/.git/**"/>
<exclude name="**/*.hprof/**"/>
<exclude name="**/_svn/**"/>
<exclude name="**/.hg/**"/>
<exclude name="**/*.lib/**"/>
<exclude name="**/*~/**"/>
<exclude name="**/__pycache__/**"/>
<exclude name="**/.bundle/**"/>
<exclude name="**/*.rbc/**"/>
</patternset>
<patternset id="library.patterns">
<include name="*.war"/>
<include name="*.ear"/>
<include name="*.apk"/>
<include name="*.zip"/>
<include name="*.swc"/>
<include name="*.ane"/>
<include name="*.egg"/>
<include name="*.jar"/>
</patternset>
<patternset id="compiler.resources">
<exclude name="**/?*.java"/>
<exclude name="**/?*.form"/>
<exclude name="**/?*.class"/>
<exclude name="**/?*.groovy"/>
<exclude name="**/?*.scala"/>
<exclude name="**/?*.flex"/>
<exclude name="**/?*.kt"/>
<exclude name="**/?*.clj"/>
</patternset>
<!-- JDK definitions -->
<property name="jdk.bin.1.7" value="${jdk.home.1.7}/bin"/>
<path id="jdk.classpath.1.7">
<fileset dir="${jdk.home.1.7}">
<include name="jre/lib/charsets.jar"/>
<include name="jre/lib/deploy.jar"/>
<include name="jre/lib/javaws.jar"/>
<include name="jre/lib/jce.jar"/>
<include name="jre/lib/jfr.jar"/>
<include name="jre/lib/jfxrt.jar"/>
<include name="jre/lib/jsse.jar"/>
<include name="jre/lib/management-agent.jar"/>
<include name="jre/lib/plugin.jar"/>
<include name="jre/lib/resources.jar"/>
<include name="jre/lib/rt.jar"/>
<include name="jre/lib/ext/access-bridge-64.jar"/>
<include name="jre/lib/ext/dnsns.jar"/>
<include name="jre/lib/ext/jaccess.jar"/>
<include name="jre/lib/ext/localedata.jar"/>
<include name="jre/lib/ext/sunec.jar"/>
<include name="jre/lib/ext/sunjce_provider.jar"/>
<include name="jre/lib/ext/sunmscapi.jar"/>
<include name="jre/lib/ext/zipfs.jar"/>
</fileset>
</path>
<property name="project.jdk.home" value="${jdk.home.1.7}"/>
<property name="project.jdk.bin" value="${jdk.bin.1.7}"/>
<property name="project.jdk.classpath" value="jdk.classpath.1.7"/>
<!-- Project Libraries -->
<path id="library.bukkit-1.7.9-r0.2.classpath">
<pathelement location="${basedir}/lib/bukkit-1.7.9-R0.2.jar"/>
</path>
<path id="library.lib.classpath">
<fileset dir="${basedir}/lib">
<patternset refid="library.patterns"/>
</fileset>
<pathelement location="${basedir}/lib/BarAPI.jar"/>
<pathelement location="${basedir}/lib/CameraAPI.jar"/>
<pathelement location="${basedir}/lib/PlotMe.jar"/>
<pathelement location="${basedir}/lib/WorldEdit.jar"/>
</path>
<path id="library.simple-xml.classpath">
<pathelement location="${basedir}/lib/simple-5.1.6.jar"/>
<pathelement location="${basedir}/lib/simple-xml.jar"/>
</path>
<!-- Register Custom Compiler Taskdefs -->
<property name="javac2.home" value="${idea.home}/lib"/>
<path id="javac2.classpath">
<pathelement location="${javac2.home}/javac2.jar"/>
<pathelement location="${javac2.home}/jdom.jar"/>
<pathelement location="${javac2.home}/asm4-all.jar"/>
<pathelement location="${javac2.home}/jgoodies-forms.jar"/>
</path>
<target name="register.custom.compilers">
<taskdef name="javac2" classname="com.intellij.ant.Javac2" classpathref="javac2.classpath"/>
<taskdef name="instrumentIdeaExtensions" classname="com.intellij.ant.InstrumentIdeaExtensions" classpathref="javac2.classpath"/>
</target>
<!-- Modules -->
<import file="${basedir}/PlotSquared/module_plotsquared.xml"/>
<target name="init" description="Build initialization">
<!-- Perform any build initialization in this target -->
</target>
<target name="clean" depends="clean.module.plotsquared" description="cleanup all"/>
<target name="build.modules" depends="init, clean, compile.module.plotsquared" description="build all modules"/>
<target name="init.artifacts">
<property name="artifacts.temp.dir" value="${basedir}/__artifacts_temp"/>
<property name="artifact.output.plotsquared" value="${basedir}/out/artifacts/plotsquared"/>
<mkdir dir="${artifacts.temp.dir}"/>
<property name="temp.jar.path.plotsquared.jar" value="${artifacts.temp.dir}/plotsquared.jar"/>
</target>
<target name="artifact.plotsquared" depends="init.artifacts, compile.module.plotsquared" description="Build &#39;plotsquared&#39; artifact">
<property name="artifact.temp.output.plotsquared" value="${artifacts.temp.dir}/plotsquared"/>
<mkdir dir="${artifact.temp.output.plotsquared}"/>
<jar destfile="${temp.jar.path.plotsquared.jar}" duplicate="preserve" filesetmanifest="mergewithoutmain">
<zipfileset dir="${plotsquared.output.dir}"/>
</jar>
<copy file="${temp.jar.path.plotsquared.jar}" tofile="${artifact.temp.output.plotsquared}/plotsquared.jar"/>
</target>
<target name="build.all.artifacts" depends="artifact.plotsquared" description="Build all artifacts">
<mkdir dir="${artifact.output.plotsquared}"/>
<copy todir="${artifact.output.plotsquared}">
<fileset dir="${artifact.temp.output.plotsquared}"/>
</copy>
<!-- Delete temporary files -->
<delete dir="${artifacts.temp.dir}"/>
</target>
<target name="all" depends="build.modules, build.all.artifacts" description="build all"/>
</project>