mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2024-11-24 22:26:45 +01:00
Merge branch 'master' of http://git.intellectualsites.com/citymonstret/plot_new
Conflicts: PlotSquared/src/com/intellectualcrafters/plot/WorldGenerator.java
This commit is contained in:
boy0001
commit
6f1572e5d2
@ -12,12 +12,9 @@
|
||||
<bookmark url="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/ConsoleColors.java" line="37" mnemonic="2" />
|
||||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="f6aaf715-4424-4f9e-96dc-b47edea10520" name="Default" comment="Could you implement this setting? xD">
|
||||
<list default="true" id="f6aaf715-4424-4f9e-96dc-b47edea10520" name="Default" comment="Fixed yml formatting -.-">
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/database/DBFunc.java" afterPath="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/database/DBFunc.java" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/PlotSquared/PlotSquared.iml" afterPath="$PROJECT_DIR$/PlotSquared/PlotSquared.iml" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/plotsquared.xml" afterPath="$PROJECT_DIR$/plotsquared.xml" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/artifacts/plotsquared__.xml" afterPath="$PROJECT_DIR$/.idea/artifacts/plotsquared__.xml" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/PlotSquared/src/plugin.yml" afterPath="$PROJECT_DIR$/PlotSquared/src/plugin.yml" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
|
||||
</list>
|
||||
<ignored path="plot_news.iws" />
|
||||
@ -41,31 +38,11 @@
|
||||
</component>
|
||||
<component name="FileEditorManager">
|
||||
<leaf>
|
||||
<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">
|
||||
<file leaf-file-name="PlotWorld.java" pinned="false" current="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotWorld.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="68" 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="SchematicHandler.java" pinned="false" current="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/SchematicHandler.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="2125" max-vertical-offset="3026">
|
||||
<caret line="125" column="32" selection-start-line="125" selection-start-column="32" selection-end-line="125" selection-end-column="32" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="Title.java" pinned="false" current="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/Title.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="306" max-vertical-offset="7514">
|
||||
<caret line="18" column="13" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" />
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="3604">
|
||||
<caret line="208" column="0" selection-start-line="208" selection-start-column="0" selection-end-line="208" selection-end-column="0" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
@ -74,28 +51,20 @@
|
||||
<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="10829" max-vertical-offset="12257">
|
||||
<caret line="637" column="48" selection-start-line="637" selection-start-column="48" selection-end-line="637" selection-end-column="48" />
|
||||
<folding />
|
||||
<state vertical-scroll-proportion="-17.25" vertical-offset="3920" max-vertical-offset="13345">
|
||||
<caret line="283" column="7" selection-start-line="283" selection-start-column="7" selection-end-line="283" selection-end-column="7" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="PlotWorld.java" pinned="false" current="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotWorld.java">
|
||||
<file leaf-file-name="WorldGenerator.java" pinned="false" current="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/WorldGenerator.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="2788" max-vertical-offset="2941">
|
||||
<caret line="164" column="11" selection-start-line="164" selection-start-column="11" selection-end-line="164" selection-end-column="11" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="Clear.java" pinned="false" current="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Clear.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="340" max-vertical-offset="748">
|
||||
<caret line="20" column="13" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="408" max-vertical-offset="7072">
|
||||
<caret line="117" column="57" selection-start-line="117" selection-start-column="57" selection-end-line="117" selection-end-column="57" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
@ -104,8 +73,8 @@
|
||||
<file leaf-file-name="Claim.java" pinned="false" current="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Claim.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="1088" max-vertical-offset="1241">
|
||||
<caret line="64" column="35" selection-start-line="64" selection-start-column="35" selection-end-line="64" selection-end-column="35" />
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="1071" max-vertical-offset="1360">
|
||||
<caret line="63" column="35" selection-start-line="63" selection-start-column="35" selection-end-line="63" selection-end-column="35" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
@ -114,20 +83,73 @@
|
||||
<file leaf-file-name="PlotAPI.java" pinned="false" current="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/api/PlotAPI.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="40" max-vertical-offset="4046">
|
||||
<caret line="34" column="32" selection-start-line="34" selection-start-column="32" selection-end-line="34" selection-end-column="32" />
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="221" max-vertical-offset="4590">
|
||||
<caret line="32" column="32" selection-start-line="32" selection-start-column="32" selection-end-line="32" selection-end-column="32" />
|
||||
<folding>
|
||||
<element signature="e#834#874#0" expanded="true" />
|
||||
<marker date="1411466293698" expanded="true" signature="5509:5619" placeholder="/**...*/" />
|
||||
<marker date="1411466293698" expanded="true" signature="5757:5861" placeholder="/**...*/" />
|
||||
<marker date="1411466293698" expanded="true" signature="5972:6099" placeholder="/**...*/" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="plugin.yml" pinned="false" current="true" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/PlotSquared/src/plugin.yml">
|
||||
<file leaf-file-name="MainCommand.java" pinned="false" current="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/MainCommand.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.36598492" vertical-offset="0" max-vertical-offset="929">
|
||||
<caret line="20" column="18" selection-start-line="20" selection-start-column="18" selection-end-line="20" selection-end-column="18" />
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="2074" max-vertical-offset="2788">
|
||||
<caret line="122" column="38" selection-start-line="122" selection-start-column="38" selection-end-line="122" selection-end-column="38" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="CommandPermission.java" pinned="false" current="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/CommandPermission.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="289" max-vertical-offset="782">
|
||||
<caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="DBFunc.java" pinned="false" current="true" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/database/DBFunc.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.9628821" vertical-offset="3929" max-vertical-offset="10727">
|
||||
<caret line="310" column="13" selection-start-line="310" selection-start-column="13" selection-end-line="310" selection-end-column="13" />
|
||||
<folding>
|
||||
<marker date="1411469004774" expanded="true" signature="1865:1946" placeholder="INSERT INTO ..." />
|
||||
<marker date="1411469004774" expanded="true" signature="2560:3012" placeholder="CREATE TABLE..IF..." />
|
||||
<marker date="1411469004774" expanded="true" signature="3053:3247" placeholder="CREATE TABLE..IF..." />
|
||||
<marker date="1411469004774" expanded="true" signature="3301:3506" placeholder="CREATE TABLE..IF..." />
|
||||
<marker date="1411469004774" expanded="true" signature="3556:4239" placeholder="CREATE TABLE..IF..." />
|
||||
<marker date="1411469004774" expanded="true" signature="4289:4411" placeholder="ALTER TABLE ..." />
|
||||
<marker date="1411469004774" expanded="true" signature="6224:6276" placeholder="DELETE FROM ..." />
|
||||
<marker date="1411469004774" expanded="true" signature="6468:6519" placeholder="DELETE FROM ..." />
|
||||
<marker date="1411469004774" expanded="true" signature="6711:6744" placeholder="DELETE FROM ..." />
|
||||
<marker date="1411469004774" expanded="true" signature="7497:7583" placeholder="INSERT INTO ..." />
|
||||
<marker date="1411469004774" expanded="true" signature="7995:8099" placeholder="SELECT `id` ..." />
|
||||
<marker date="1411469004774" expanded="true" signature="10656:10674" placeholder="ALTER TABLE ..." />
|
||||
<marker date="1411469004774" expanded="true" signature="11335:11402" placeholder="SELECT `id`,..." />
|
||||
<marker date="1411469004774" expanded="true" signature="18738:18792" placeholder="SELECT * FRO..." />
|
||||
<marker date="1411469004774" expanded="true" signature="20377:20439" placeholder="SELECT `user..." />
|
||||
<marker date="1411469004774" expanded="true" signature="21146:21208" placeholder="SELECT `user..." />
|
||||
<marker date="1411469004774" expanded="true" signature="21837:21908" placeholder="DELETE FROM ..." />
|
||||
<marker date="1411469004774" expanded="true" signature="22720:22788" placeholder="INSERT INTO ..." />
|
||||
<marker date="1411469004774" expanded="true" signature="23601:23671" placeholder="DELETE FROM ..." />
|
||||
<marker date="1411469004774" expanded="true" signature="24484:24551" placeholder="INSERT INTO ..." />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="Schematic.java" pinned="false" current="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Schematic.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="986" max-vertical-offset="1292">
|
||||
<caret line="58" column="69" selection-start-line="58" selection-start-column="69" selection-end-line="58" selection-end-column="69" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
@ -136,7 +158,7 @@
|
||||
<file leaf-file-name="Helpers.java" pinned="false" current="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Helpers.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="15" max-vertical-offset="1785">
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="867" max-vertical-offset="2057">
|
||||
<caret line="51" column="56" selection-start-line="51" selection-start-column="56" selection-end-line="51" selection-end-column="56" />
|
||||
<folding />
|
||||
</state>
|
||||
@ -166,11 +188,12 @@
|
||||
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/SchematicHandler.java" />
|
||||
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/Plot.java" />
|
||||
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlayerFunctions.java" />
|
||||
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/WorldGenerator.java" />
|
||||
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotMain.java" />
|
||||
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotWorld.java" />
|
||||
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Claim.java" />
|
||||
<option value="$PROJECT_DIR$/PlotSquared/src/plugin.yml" />
|
||||
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotMain.java" />
|
||||
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/WorldGenerator.java" />
|
||||
<option value="$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/database/DBFunc.java" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
@ -212,6 +235,7 @@
|
||||
</navigator>
|
||||
<panes>
|
||||
<pane id="PackagesPane" />
|
||||
<pane id="Scope" />
|
||||
<pane id="ProjectPane">
|
||||
<subPane>
|
||||
<PATH>
|
||||
@ -284,6 +308,84 @@
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</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_ELEMENT>
|
||||
<option name="myItemId" value="src" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="com" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="plot" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="events" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</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_ELEMENT>
|
||||
<option name="myItemId" value="src" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="com" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="plot" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="database" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</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_ELEMENT>
|
||||
<option name="myItemId" value="src" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="com" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="plot" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="commands" />
|
||||
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
||||
</PATH_ELEMENT>
|
||||
</PATH>
|
||||
<PATH>
|
||||
<PATH_ELEMENT>
|
||||
<option name="myItemId" value="plot_news" />
|
||||
@ -312,7 +414,6 @@
|
||||
</PATH>
|
||||
</subPane>
|
||||
</pane>
|
||||
<pane id="Scope" />
|
||||
</panes>
|
||||
</component>
|
||||
<component name="PropertiesComponent">
|
||||
@ -323,7 +424,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="Facets" />
|
||||
<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!/" />
|
||||
@ -351,6 +452,125 @@
|
||||
<recent name="C:\Users\Citymonstret\Desktop\workspace\bukkit\plot_news\lib" />
|
||||
</key>
|
||||
</component>
|
||||
<component name="RestoreUpdateTree">
|
||||
<UpdateInfo date="Moments ago" ActionInfo="_Update">
|
||||
<UpdatedFiles>
|
||||
<FILE-GROUP>
|
||||
<option name="myUpdateName" value="Updated from server" />
|
||||
<option name="myStatusName" value="Changed on server" />
|
||||
<option name="mySupportsDeletion" value="false" />
|
||||
<option name="myCanBeAbsent" value="false" />
|
||||
<option name="myId" value="CHANGED_ON_SERVER" />
|
||||
<FILE-GROUP>
|
||||
<option name="myUpdateName" value="Updated" />
|
||||
<option name="myStatusName" value="Changed" />
|
||||
<option name="mySupportsDeletion" value="false" />
|
||||
<option name="myCanBeAbsent" value="false" />
|
||||
<option name="myId" value="UPDATED" />
|
||||
<PATH vcs="Git" revision="">$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/C.java</PATH>
|
||||
<PATH vcs="Git" revision="">$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/Flag.java</PATH>
|
||||
<PATH vcs="Git" revision="">$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotHelper.java</PATH>
|
||||
<PATH vcs="Git" revision="">$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotMain.java</PATH>
|
||||
<PATH vcs="Git" revision="">$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/api/PlotAPI.java</PATH>
|
||||
<PATH vcs="Git" revision="">$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Claim.java</PATH>
|
||||
<PATH vcs="Git" revision="">$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Set.java</PATH>
|
||||
<PATH vcs="Git" revision="">$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/database/DBFunc.java</PATH>
|
||||
</FILE-GROUP>
|
||||
<FILE-GROUP>
|
||||
<option name="myUpdateName" value="Created" />
|
||||
<option name="myStatusName" value="Created" />
|
||||
<option name="mySupportsDeletion" value="false" />
|
||||
<option name="myCanBeAbsent" value="false" />
|
||||
<option name="myId" value="CREATED" />
|
||||
</FILE-GROUP>
|
||||
<FILE-GROUP>
|
||||
<option name="myUpdateName" value="Deleted" />
|
||||
<option name="myStatusName" value="Deleted" />
|
||||
<option name="mySupportsDeletion" value="false" />
|
||||
<option name="myCanBeAbsent" value="true" />
|
||||
<option name="myId" value="REMOVED_FROM_REPOSITORY" />
|
||||
</FILE-GROUP>
|
||||
<FILE-GROUP>
|
||||
<option name="myUpdateName" value="Restored" />
|
||||
<option name="myStatusName" value="Will be restored" />
|
||||
<option name="mySupportsDeletion" value="false" />
|
||||
<option name="myCanBeAbsent" value="false" />
|
||||
<option name="myId" value="RESTORED" />
|
||||
</FILE-GROUP>
|
||||
</FILE-GROUP>
|
||||
<FILE-GROUP>
|
||||
<option name="myUpdateName" value="Modified" />
|
||||
<option name="myStatusName" value="Modified" />
|
||||
<option name="mySupportsDeletion" value="false" />
|
||||
<option name="myCanBeAbsent" value="false" />
|
||||
<option name="myId" value="MODIFIED" />
|
||||
</FILE-GROUP>
|
||||
<FILE-GROUP>
|
||||
<option name="myUpdateName" value="Skipped" />
|
||||
<option name="myStatusName" value="Skipped" />
|
||||
<option name="mySupportsDeletion" value="false" />
|
||||
<option name="myCanBeAbsent" value="false" />
|
||||
<option name="myId" value="SKIPPED" />
|
||||
</FILE-GROUP>
|
||||
<FILE-GROUP>
|
||||
<option name="myUpdateName" value="Merged with conflicts" />
|
||||
<option name="myStatusName" value="Will be merged with conflicts" />
|
||||
<option name="mySupportsDeletion" value="false" />
|
||||
<option name="myCanBeAbsent" value="false" />
|
||||
<option name="myId" value="MERGED_WITH_CONFLICTS" />
|
||||
</FILE-GROUP>
|
||||
<FILE-GROUP>
|
||||
<option name="myUpdateName" value="Merged with tree conflicts" />
|
||||
<option name="myStatusName" value="Merged with tree conflicts" />
|
||||
<option name="mySupportsDeletion" value="false" />
|
||||
<option name="myCanBeAbsent" value="false" />
|
||||
<option name="myId" value="MERGED_WITH_TREE_CONFLICT" />
|
||||
</FILE-GROUP>
|
||||
<FILE-GROUP>
|
||||
<option name="myUpdateName" value="Merged with property conflicts" />
|
||||
<option name="myStatusName" value="Will be merged with property conflicts" />
|
||||
<option name="mySupportsDeletion" value="false" />
|
||||
<option name="myCanBeAbsent" value="false" />
|
||||
<option name="myId" value="MERGED_WITH_PROPERTY_CONFLICT" />
|
||||
</FILE-GROUP>
|
||||
<FILE-GROUP>
|
||||
<option name="myUpdateName" value="Merged" />
|
||||
<option name="myStatusName" value="Will be merged" />
|
||||
<option name="mySupportsDeletion" value="false" />
|
||||
<option name="myCanBeAbsent" value="false" />
|
||||
<option name="myId" value="MERGED" />
|
||||
</FILE-GROUP>
|
||||
<FILE-GROUP>
|
||||
<option name="myUpdateName" value="Not in repository" />
|
||||
<option name="myStatusName" value="Not in repository" />
|
||||
<option name="mySupportsDeletion" value="true" />
|
||||
<option name="myCanBeAbsent" value="false" />
|
||||
<option name="myId" value="UNKNOWN" />
|
||||
</FILE-GROUP>
|
||||
<FILE-GROUP>
|
||||
<option name="myUpdateName" value="Locally added" />
|
||||
<option name="myStatusName" value="Locally added" />
|
||||
<option name="mySupportsDeletion" value="false" />
|
||||
<option name="myCanBeAbsent" value="false" />
|
||||
<option name="myId" value="LOCALLY_ADDED" />
|
||||
</FILE-GROUP>
|
||||
<FILE-GROUP>
|
||||
<option name="myUpdateName" value="Locally removed" />
|
||||
<option name="myStatusName" value="Locally removed" />
|
||||
<option name="mySupportsDeletion" value="false" />
|
||||
<option name="myCanBeAbsent" value="false" />
|
||||
<option name="myId" value="LOCALLY_REMOVED" />
|
||||
</FILE-GROUP>
|
||||
<FILE-GROUP>
|
||||
<option name="myUpdateName" value="Switched" />
|
||||
<option name="myStatusName" value="Switched" />
|
||||
<option name="mySupportsDeletion" value="false" />
|
||||
<option name="myCanBeAbsent" value="false" />
|
||||
<option name="myId" value="SWITCHED" />
|
||||
</FILE-GROUP>
|
||||
</UpdatedFiles>
|
||||
</UpdateInfo>
|
||||
</component>
|
||||
<component name="RunManager">
|
||||
<configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
|
||||
<module name="" />
|
||||
@ -493,7 +713,9 @@
|
||||
<workItem from="1411411100568" duration="871000" />
|
||||
<workItem from="1411411996316" duration="271000" />
|
||||
<workItem from="1411412287455" duration="33000" />
|
||||
<workItem from="1411412344326" duration="1339000" />
|
||||
<workItem from="1411412344326" duration="2559000" />
|
||||
<workItem from="1411428266938" duration="702000" />
|
||||
<workItem from="1411458289707" duration="4285000" />
|
||||
</task>
|
||||
<task id="LOCAL-00001" summary="First Commit">
|
||||
<created>1411382351159</created>
|
||||
@ -539,17 +761,28 @@
|
||||
<created>1411413674578</created>
|
||||
<updated>1411413674578</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="12" />
|
||||
<task id="LOCAL-00012" summary="Fixed yml formatting -.-">
|
||||
<created>1411413792985</created>
|
||||
<updated>1411413792985</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00013" summary="Small fixes">
|
||||
<created>1411459185754</created>
|
||||
<updated>1411459185754</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00014" summary="I like pretty configs.">
|
||||
<created>1411466605452</created>
|
||||
<updated>1411466605452</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="15" />
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TimeTrackingManager">
|
||||
<option name="totallyTimeSpent" value="15600000" />
|
||||
<option name="totallyTimeSpent" value="21807000" />
|
||||
</component>
|
||||
<component name="ToolWindowManager">
|
||||
<frame x="-6" y="-6" width="1932" height="1062" extended-state="6" />
|
||||
<editor active="true" />
|
||||
<layout>
|
||||
<window_info id="IntelliGuard" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
||||
@ -561,7 +794,7 @@
|
||||
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3291536" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
|
||||
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
|
||||
<window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3291536" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3291536" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
||||
@ -569,12 +802,13 @@
|
||||
<window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
|
||||
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3291536" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="IntelliGuard" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
|
||||
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
|
||||
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
|
||||
</layout>
|
||||
</component>
|
||||
<component name="Vcs.Log.UiProperties">
|
||||
@ -600,39 +834,21 @@
|
||||
<MESSAGE value="Console Colour Support" />
|
||||
<MESSAGE value="Schematics Fixed" />
|
||||
<MESSAGE value="Could you implement this setting? xD" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="Could you implement this setting? xD" />
|
||||
<MESSAGE value="Fixed yml formatting -.-" />
|
||||
<MESSAGE value="Small fixes" />
|
||||
<MESSAGE value="I like pretty configs." />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="I like pretty configs." />
|
||||
</component>
|
||||
<component name="XDebuggerManager">
|
||||
<breakpoint-manager />
|
||||
<breakpoint-manager>
|
||||
<option name="time" value="1" />
|
||||
</breakpoint-manager>
|
||||
</component>
|
||||
<component name="antWorkspaceConfiguration">
|
||||
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
|
||||
<option name="FILTER_TARGETS" value="false" />
|
||||
</component>
|
||||
<component name="editorHistoryManager">
|
||||
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlayerFunctions.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="2414" max-vertical-offset="4097">
|
||||
<caret line="142" column="5" selection-start-line="142" selection-start-column="5" selection-end-line="142" selection-end-column="5" />
|
||||
</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="10829" max-vertical-offset="12257">
|
||||
<caret line="637" column="48" selection-start-line="637" selection-start-column="48" selection-end-line="637" selection-end-column="48" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotWorld.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="2788" max-vertical-offset="2941">
|
||||
<caret line="164" column="11" selection-start-line="164" selection-start-column="11" selection-end-line="164" selection-end-column="11" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Clear.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="340" max-vertical-offset="748">
|
||||
@ -654,7 +870,9 @@
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="306" max-vertical-offset="4046">
|
||||
<caret line="77" column="7" selection-start-line="77" selection-start-column="7" selection-end-line="287" selection-end-column="0" />
|
||||
<folding>
|
||||
<element signature="e#834#874#0" expanded="true" />
|
||||
<marker date="1411466293698" expanded="true" signature="5509:5619" placeholder="/**...*/" />
|
||||
<marker date="1411466293698" expanded="true" signature="5757:5861" placeholder="/**...*/" />
|
||||
<marker date="1411466293698" expanded="true" signature="5972:6099" placeholder="/**...*/" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
@ -670,7 +888,6 @@
|
||||
<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>
|
||||
@ -686,7 +903,6 @@
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="306" max-vertical-offset="7514">
|
||||
<caret line="18" column="13" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
@ -734,7 +950,9 @@
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="306" max-vertical-offset="4046">
|
||||
<caret line="37" column="22" selection-start-line="0" selection-start-column="0" selection-end-line="287" selection-end-column="0" />
|
||||
<folding>
|
||||
<element signature="e#834#874#0" expanded="true" />
|
||||
<marker date="1411466293698" expanded="true" signature="5509:5619" placeholder="/**...*/" />
|
||||
<marker date="1411466293698" expanded="true" signature="5757:5861" placeholder="/**...*/" />
|
||||
<marker date="1411466293698" expanded="true" signature="5972:6099" placeholder="/**...*/" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
@ -764,7 +982,6 @@
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="68" 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>
|
||||
@ -885,13 +1102,6 @@
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Schematic.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="202" max-vertical-offset="1224">
|
||||
<caret line="58" column="69" selection-start-line="58" selection-start-column="69" selection-end-line="58" selection-end-column="69" />
|
||||
</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.3327787" vertical-offset="4" max-vertical-offset="3927">
|
||||
@ -907,13 +1117,6 @@
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/WorldGenerator.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="748" max-vertical-offset="6766">
|
||||
<caret line="85" column="73" selection-start-line="85" selection-start-column="73" selection-end-line="85" selection-end-column="73" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlayerFunctions.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="1870" max-vertical-offset="3740">
|
||||
@ -925,7 +1128,6 @@
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="7089">
|
||||
<caret line="18" column="13" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
@ -933,7 +1135,6 @@
|
||||
<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>
|
||||
@ -945,14 +1146,6 @@
|
||||
</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="10829" max-vertical-offset="12257">
|
||||
<caret line="637" column="48" selection-start-line="637" selection-start-column="48" selection-end-line="637" selection-end-column="48" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Clear.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="527">
|
||||
@ -961,18 +1154,10 @@
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotWorld.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="2788" max-vertical-offset="2941">
|
||||
<caret line="164" column="11" selection-start-line="164" selection-start-column="11" selection-end-line="164" selection-end-column="11" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Claim.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="357" max-vertical-offset="1071">
|
||||
<caret line="64" column="35" selection-start-line="64" selection-start-column="35" selection-end-line="64" selection-end-column="35" />
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="1071" max-vertical-offset="1360">
|
||||
<caret line="63" column="35" selection-start-line="63" selection-start-column="35" selection-end-line="63" selection-end-column="35" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
@ -985,24 +1170,105 @@
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/api/PlotAPI.java">
|
||||
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/Schematic.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="40" max-vertical-offset="4046">
|
||||
<caret line="34" column="32" selection-start-line="34" selection-start-column="32" selection-end-line="34" selection-end-column="32" />
|
||||
<folding>
|
||||
<element signature="e#834#874#0" expanded="true" />
|
||||
</folding>
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1224">
|
||||
<caret line="58" column="69" selection-start-line="58" selection-start-column="69" selection-end-line="58" selection-end-column="69" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/MainCommand.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="1298" max-vertical-offset="2635">
|
||||
<caret line="122" column="38" selection-start-line="122" selection-start-column="38" selection-end-line="122" selection-end-column="38" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/commands/CommandPermission.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="629">
|
||||
<caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/PlotSquared/src/plugin.yml">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.36598492" vertical-offset="0" max-vertical-offset="929">
|
||||
<caret line="20" column="18" selection-start-line="20" selection-start-column="18" selection-end-line="20" selection-end-column="18" />
|
||||
<state vertical-scroll-proportion="0.3476857" vertical-offset="0" max-vertical-offset="929">
|
||||
<caret line="19" column="2" selection-start-line="19" selection-start-column="2" selection-end-line="19" selection-end-column="2" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/api/PlotAPI.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="221" max-vertical-offset="4590">
|
||||
<caret line="32" column="32" selection-start-line="32" selection-start-column="32" selection-end-line="32" selection-end-column="32" />
|
||||
<folding>
|
||||
<marker date="1411466293698" expanded="true" signature="5509:5619" placeholder="/**...*/" />
|
||||
<marker date="1411466293698" expanded="true" signature="5757:5861" placeholder="/**...*/" />
|
||||
<marker date="1411466293698" expanded="true" signature="5972:6099" placeholder="/**...*/" />
|
||||
</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="-17.25" vertical-offset="3920" max-vertical-offset="13345">
|
||||
<caret line="283" column="7" selection-start-line="283" selection-start-column="7" selection-end-line="283" selection-end-column="7" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/PlotWorld.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="3604">
|
||||
<caret line="208" column="0" selection-start-line="208" selection-start-column="0" selection-end-line="208" selection-end-column="0" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/WorldGenerator.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.0" vertical-offset="408" max-vertical-offset="7072">
|
||||
<caret line="117" column="57" selection-start-line="117" selection-start-column="57" selection-end-line="117" selection-end-column="57" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/PlotSquared/src/com/intellectualcrafters/plot/database/DBFunc.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state vertical-scroll-proportion="0.9628821" vertical-offset="3929" max-vertical-offset="10727">
|
||||
<caret line="310" column="13" selection-start-line="310" selection-start-column="13" selection-end-line="310" selection-end-column="13" />
|
||||
<folding>
|
||||
<marker date="1411469004774" expanded="true" signature="1865:1946" placeholder="INSERT INTO ..." />
|
||||
<marker date="1411469004774" expanded="true" signature="2560:3012" placeholder="CREATE TABLE..IF..." />
|
||||
<marker date="1411469004774" expanded="true" signature="3053:3247" placeholder="CREATE TABLE..IF..." />
|
||||
<marker date="1411469004774" expanded="true" signature="3301:3506" placeholder="CREATE TABLE..IF..." />
|
||||
<marker date="1411469004774" expanded="true" signature="3556:4239" placeholder="CREATE TABLE..IF..." />
|
||||
<marker date="1411469004774" expanded="true" signature="4289:4411" placeholder="ALTER TABLE ..." />
|
||||
<marker date="1411469004774" expanded="true" signature="6224:6276" placeholder="DELETE FROM ..." />
|
||||
<marker date="1411469004774" expanded="true" signature="6468:6519" placeholder="DELETE FROM ..." />
|
||||
<marker date="1411469004774" expanded="true" signature="6711:6744" placeholder="DELETE FROM ..." />
|
||||
<marker date="1411469004774" expanded="true" signature="7497:7583" placeholder="INSERT INTO ..." />
|
||||
<marker date="1411469004774" expanded="true" signature="7995:8099" placeholder="SELECT `id` ..." />
|
||||
<marker date="1411469004774" expanded="true" signature="10656:10674" placeholder="ALTER TABLE ..." />
|
||||
<marker date="1411469004774" expanded="true" signature="11335:11402" placeholder="SELECT `id`,..." />
|
||||
<marker date="1411469004774" expanded="true" signature="18738:18792" placeholder="SELECT * FRO..." />
|
||||
<marker date="1411469004774" expanded="true" signature="20377:20439" placeholder="SELECT `user..." />
|
||||
<marker date="1411469004774" expanded="true" signature="21146:21208" placeholder="SELECT `user..." />
|
||||
<marker date="1411469004774" expanded="true" signature="21837:21908" placeholder="DELETE FROM ..." />
|
||||
<marker date="1411469004774" expanded="true" signature="22720:22788" placeholder="INSERT INTO ..." />
|
||||
<marker date="1411469004774" expanded="true" signature="23601:23671" placeholder="DELETE FROM ..." />
|
||||
<marker date="1411469004774" expanded="true" signature="24484:24551" placeholder="INSERT INTO ..." />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</component>
|
||||
<component name="masterDetails">
|
||||
<states>
|
||||
@ -1022,7 +1288,7 @@
|
||||
</state>
|
||||
<state key="FacetStructureConfigurable.UI">
|
||||
<settings>
|
||||
<last-edited>Obfuscation (PlotSquared)|Obfuscation</last-edited>
|
||||
<last-edited>No facets are configured</last-edited>
|
||||
<splitter-proportions>
|
||||
<option name="proportions">
|
||||
<list>
|
||||
@ -1057,7 +1323,7 @@
|
||||
</state>
|
||||
<state key="ModuleStructureConfigurable.UI">
|
||||
<settings>
|
||||
<last-edited>Obfuscation|PlotSquared</last-edited>
|
||||
<last-edited>PlotSquared</last-edited>
|
||||
<splitter-proportions>
|
||||
<option name="proportions">
|
||||
<list>
|
||||
|
||||
@ -1,23 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module type="JAVA_MODULE" version="4">
|
||||
<component name="FacetManager">
|
||||
<facet type="IntelliGuard" name="Obfuscation">
|
||||
<configuration>
|
||||
<option name="yGuardJar" value="C:\Users\Citymonstret\Desktop\lib\yguard.jar" />
|
||||
<option name="mainclass" value="com.intellectualcrafters.plot.PlotMain" />
|
||||
<option name="errorChecking" value="false" />
|
||||
<option name="jarConfig">
|
||||
<JarConfig>
|
||||
<option name="jarEntries">
|
||||
<list>
|
||||
<option value="C:\Users\Citymonstret\Desktop\workspace\bukkit\plot_news\out\production\PlotSquared" />
|
||||
</list>
|
||||
</option>
|
||||
</JarConfig>
|
||||
</option>
|
||||
</configuration>
|
||||
</facet>
|
||||
</component>
|
||||
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
||||
<exclude-output />
|
||||
<content url="file://$MODULE_DIR$">
|
||||
|
||||
@ -1,21 +1,15 @@
|
||||
package com.intellectualcrafters.plot;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.block.Biome;
|
||||
import org.bukkit.command.defaults.SaveCommand;
|
||||
import org.bukkit.configuration.file.YamlConfiguration;
|
||||
import org.bukkit.generator.BlockPopulator;
|
||||
import org.bukkit.generator.ChunkGenerator;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.Arrays;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Random;
|
||||
import java.util.*;
|
||||
import java.util.Map.Entry;
|
||||
|
||||
import static com.intellectualcrafters.plot.PlotWorld.*;
|
||||
@ -77,15 +71,15 @@ public class WorldGenerator extends ChunkGenerator {
|
||||
options.put("worlds."+world+".plot_biome", PLOT_BIOME_DEFAULT);
|
||||
options.put("worlds."+world+".plot_filling", Arrays.asList(MAIN_BLOCK_DEFAULT));
|
||||
options.put("worlds."+world+".top_floor", Arrays.asList(TOP_BLOCK_DEFAULT));
|
||||
options.put("worlds."+world+".wall_block", WALL_BLOCK_DEFAULT);
|
||||
options.put("worlds."+world+".road_width", ROAD_WIDTH_DEFAULT);
|
||||
options.put("worlds."+world+".road_height", ROAD_HEIGHT_DEFAULT);
|
||||
options.put("worlds."+world+".road_block", ROAD_BLOCK_DEFAULT);
|
||||
options.put("worlds."+world+".road_stripes", ROAD_STRIPES_DEFAULT);
|
||||
options.put("worlds."+world+".wall_filling", WALL_FILLING_DEFAULT);
|
||||
options.put("worlds."+world+".wall_height", WALL_HEIGHT_DEFAULT);
|
||||
options.put("worlds."+world+".schematic_on_claim", SCHEMATIC_ON_CLAIM_DEFAULT);
|
||||
options.put("worlds."+world+".schematic_file", SCHEMATIC_FILE_DEFAULT);
|
||||
options.put("worlds."+world+".wall.block", WALL_BLOCK_DEFAULT);
|
||||
options.put("worlds."+world+".road.width", ROAD_WIDTH_DEFAULT);
|
||||
options.put("worlds."+world+".road.height", ROAD_HEIGHT_DEFAULT);
|
||||
options.put("worlds."+world+".road.block", ROAD_BLOCK_DEFAULT);
|
||||
options.put("worlds."+world+".road.stripes", ROAD_STRIPES_DEFAULT);
|
||||
options.put("worlds."+world+".wall.filling", WALL_FILLING_DEFAULT);
|
||||
options.put("worlds."+world+".wall.height", WALL_HEIGHT_DEFAULT);
|
||||
options.put("worlds."+world+".schematic.on_claim", SCHEMATIC_ON_CLAIM_DEFAULT);
|
||||
options.put("worlds."+world+".schematic.file", SCHEMATIC_FILE_DEFAULT);
|
||||
options.put("worlds."+world+".default_flags", DEFAULT_FLAGS_DEFAULT);
|
||||
|
||||
for (Entry<String, Object> node : options.entrySet()) {
|
||||
@ -103,16 +97,16 @@ public class WorldGenerator extends ChunkGenerator {
|
||||
plotworld.PLOT_BIOME = config.getString("worlds."+world+".plot_biome");
|
||||
plotworld.MAIN_BLOCK = config.getStringList("worlds."+world+".plot_filling").toArray(new String[0]);
|
||||
plotworld.TOP_BLOCK = config.getStringList("worlds."+world+".top_floor").toArray(new String[0]);
|
||||
plotworld.WALL_BLOCK = config.getString("worlds."+world+".wall_block");
|
||||
plotworld.ROAD_WIDTH = config.getInt("worlds."+world+".road_width");
|
||||
plotworld.ROAD_HEIGHT = config.getInt("worlds."+world+".road_height");
|
||||
plotworld.ROAD_BLOCK = config.getString("worlds."+world+".road_block");
|
||||
plotworld.ROAD_STRIPES = config.getString("worlds."+world+".road_stripes");
|
||||
plotworld.WALL_FILLING = config.getString("worlds."+world+".wall_filling");
|
||||
plotworld.WALL_HEIGHT = config.getInt("worlds."+world+".wall_height");
|
||||
plotworld.WALL_BLOCK = config.getString("worlds."+world+".wall.block");
|
||||
plotworld.ROAD_WIDTH = config.getInt("worlds."+world+".road.width");
|
||||
plotworld.ROAD_HEIGHT = config.getInt("worlds."+world+".road.height");
|
||||
plotworld.ROAD_BLOCK = config.getString("worlds."+world+".road.block");
|
||||
plotworld.ROAD_STRIPES = config.getString("worlds."+world+".road.stripes");
|
||||
plotworld.WALL_FILLING = config.getString("worlds."+world+".wall.filling");
|
||||
plotworld.WALL_HEIGHT = config.getInt("worlds."+world+".wall.height");
|
||||
plotworld.PLOT_CHAT = config.getBoolean("worlds."+world+".plot_chat");
|
||||
plotworld.SCHEMATIC_ON_CLAIM = config.getBoolean("worlds."+world+".schematic_on_claim");
|
||||
plotworld.SCHEMATIC_FILE = config.getString("worlds."+world+".schematic_file");
|
||||
plotworld.SCHEMATIC_ON_CLAIM = config.getBoolean("worlds."+world+".schematic.on_claim");
|
||||
plotworld.SCHEMATIC_FILE = config.getString("worlds."+world+".schematic.file");
|
||||
|
||||
String[] default_flags_string = config.getStringList("worlds."+world+".default_flags").toArray(new String[0]);
|
||||
Flag[] default_flags = new Flag[default_flags_string.length];
|
||||
|
||||
@ -14,10 +14,7 @@ import org.bukkit.OfflinePlayer;
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.block.Biome;
|
||||
|
||||
import java.sql.PreparedStatement;
|
||||
import java.sql.ResultSet;
|
||||
import java.sql.SQLException;
|
||||
import java.sql.Statement;
|
||||
import java.sql.*;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.UUID;
|
||||
@ -267,6 +264,43 @@ public class DBFunc {
|
||||
* @return
|
||||
*/
|
||||
public static HashMap<String, HashMap<PlotId, Plot>> getPlots() {
|
||||
try {
|
||||
DatabaseMetaData data = connection.getMetaData();
|
||||
ResultSet rs = data.getColumns(null, null, "plot", "plot_id");
|
||||
boolean execute = rs.next();
|
||||
if(execute) {
|
||||
Statement statement = connection.createStatement();
|
||||
statement.addBatch(
|
||||
"ALTER IGNORE TABLE `plot` ADD `plot_id_x` int(11) DEFAULT 0"
|
||||
);
|
||||
statement.addBatch(
|
||||
"ALTER IGNORE TABLE `plot` ADD `plot_id_z` int(11) DEFAULT 0"
|
||||
);
|
||||
statement.addBatch(
|
||||
"UPDATE `plot` SET\n" +
|
||||
" `plot_id_x` = IF(" +
|
||||
" LOCATE(';', `plot_id`) > 0," +
|
||||
" SUBSTRING(`plot_id`, 1, LOCATE(';', `plot_id`) - 1)," +
|
||||
" `plot_id`" +
|
||||
" )," +
|
||||
" `plot_id_z` = IF(" +
|
||||
" LOCATE(';', `plot_id`) > 0," +
|
||||
" SUBSTRING(`plot_id`, LOCATE(';', `plot_id`) + 1)," +
|
||||
" NULL" +
|
||||
" )"
|
||||
);
|
||||
statement.addBatch(
|
||||
"ALTER TABLE `plot` DROP `plot_id`"
|
||||
);
|
||||
statement.addBatch(
|
||||
"ALTER IGNORE TABLE `plot_settings` ADD `flags` VARCHAR(512) DEFAULT NULL"
|
||||
);
|
||||
statement.executeBatch();
|
||||
statement.close();
|
||||
}
|
||||
} catch(Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
HashMap<String, HashMap<PlotId, Plot>> plots = new HashMap<String, HashMap<PlotId, Plot>>();
|
||||
HashMap<String, World> worldMap = new HashMap<String, World>();
|
||||
Statement stmt = null;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user