Used log4j as logger
This commit is contained in:
Unknown
parent
6970ab8a68
commit
577238cc0b
5
.idea/codeStyles/codeStyleConfig.xml
generated
Normal file
5
.idea/codeStyles/codeStyleConfig.xml
generated
Normal file
@ -0,0 +1,5 @@
|
||||
<component name="ProjectCodeStyleConfiguration">
|
||||
<state>
|
||||
<option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
|
||||
</state>
|
||||
</component>
|
||||
7
.idea/kotlinc.xml
generated
Normal file
7
.idea/kotlinc.xml
generated
Normal file
@ -0,0 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="Kotlin2JsCompilerArguments">
|
||||
<option name="sourceMapEmbedSources" />
|
||||
<option name="sourceMapPrefix" />
|
||||
</component>
|
||||
</project>
|
||||
238
.idea/workspace.xml
generated
238
.idea/workspace.xml
generated
@ -2,42 +2,13 @@
|
||||
<project version="4">
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="6303f571-4608-4678-b04c-0c6cb20f921f" name="Default Changelist" comment="">
|
||||
<change afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_11_1.xml" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_jcl_2_11_1.xml" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.classpath" beforeDir="false" afterPath="$PROJECT_DIR$/.classpath" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.project" beforeDir="false" afterPath="$PROJECT_DIR$/.project" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.settings/org.eclipse.jdt.core.prefs" beforeDir="false" afterPath="$PROJECT_DIR$/.settings/org.eclipse.jdt.core.prefs" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/bin/.gitignore" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/bin/MLG-BuildID" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/bin/MinecraftLandGenerator.conf" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/bin/MinecraftLandGenerator.jar" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/morlok8k/MinecraftLandGenerator/Arraylist.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/morlok8k/MinecraftLandGenerator/Coordinates.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/morlok8k/MinecraftLandGenerator/DownloadFile.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/morlok8k/MinecraftLandGenerator/FileRead.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/morlok8k/MinecraftLandGenerator/FileWrite.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/morlok8k/MinecraftLandGenerator/GUI/MLG_GUI.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/morlok8k/MinecraftLandGenerator/GUI/Start.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/morlok8k/MinecraftLandGenerator/Input_CLI.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/morlok8k/MinecraftLandGenerator/MD5.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/morlok8k/MinecraftLandGenerator/Main.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/morlok8k/MinecraftLandGenerator/Misc.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/morlok8k/MinecraftLandGenerator/Out.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/morlok8k/MinecraftLandGenerator/Readme_and_HelpInfo.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/morlok8k/MinecraftLandGenerator/SelfAware.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/morlok8k/MinecraftLandGenerator/Server.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/morlok8k/MinecraftLandGenerator/Setup.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/morlok8k/MinecraftLandGenerator/SpawnPoint.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/morlok8k/MinecraftLandGenerator/Startup.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/morlok8k/MinecraftLandGenerator/StringArrayParse.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/morlok8k/MinecraftLandGenerator/Time.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/morlok8k/MinecraftLandGenerator/Update.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/morlok8k/MinecraftLandGenerator/var.java" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/org/w3c/bert_bos/UTF8URL/Unescape.java" beforeDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/.idea/codeStyles/codeStyleConfig.xml" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/.idea/kotlinc.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/MinecraftLandGenerator.iml" beforeDir="false" afterPath="$PROJECT_DIR$/MinecraftLandGenerator.iml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/morlok8k/MinecraftLandGenerator/Arraylist.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/morlok8k/MinecraftLandGenerator/Arraylist.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/morlok8k/MinecraftLandGenerator/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/morlok8k/MinecraftLandGenerator/Main.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/morlok8k/MinecraftLandGenerator/Out.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/morlok8k/MinecraftLandGenerator/Out.java" afterDir="false" />
|
||||
</list>
|
||||
<ignored path="$PROJECT_DIR$/bin/" />
|
||||
<ignored path="$PROJECT_DIR$/target/" />
|
||||
@ -47,43 +18,41 @@
|
||||
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
||||
<option name="LAST_RESOLUTION" value="IGNORE" />
|
||||
</component>
|
||||
<component name="CompilerWorkspaceConfiguration">
|
||||
<option name="MAKE_PROJECT_ON_SAVE" value="true" />
|
||||
</component>
|
||||
<component name="FUSProjectUsageTrigger">
|
||||
<session id="-324306844">
|
||||
<usages-collector id="statistics.lifecycle.project">
|
||||
<counts>
|
||||
<entry key="project.closed" value="3" />
|
||||
<entry key="project.closed" value="4" />
|
||||
<entry key="project.open.time.1" value="1" />
|
||||
<entry key="project.open.time.14" value="1" />
|
||||
<entry key="project.open.time.16" value="1" />
|
||||
<entry key="project.opened" value="3" />
|
||||
<entry key="project.open.time.21" value="2" />
|
||||
<entry key="project.opened" value="5" />
|
||||
</counts>
|
||||
</usages-collector>
|
||||
<usages-collector id="statistics.file.extensions.open">
|
||||
<counts>
|
||||
<entry key="0-SNAPSHOT" value="3" />
|
||||
<entry key="java" value="10" />
|
||||
<entry key="java" value="11" />
|
||||
<entry key="xml" value="1" />
|
||||
</counts>
|
||||
</usages-collector>
|
||||
<usages-collector id="statistics.file.types.open">
|
||||
<counts>
|
||||
<entry key="JAVA" value="10" />
|
||||
<entry key="JAVA" value="11" />
|
||||
<entry key="UML" value="3" />
|
||||
<entry key="XML" value="1" />
|
||||
</counts>
|
||||
</usages-collector>
|
||||
<usages-collector id="statistics.file.extensions.edit">
|
||||
<counts>
|
||||
<entry key="java" value="7" />
|
||||
<entry key="java" value="242" />
|
||||
<entry key="xml" value="1" />
|
||||
</counts>
|
||||
</usages-collector>
|
||||
<usages-collector id="statistics.file.types.edit">
|
||||
<counts>
|
||||
<entry key="JAVA" value="7" />
|
||||
<entry key="JAVA" value="242" />
|
||||
<entry key="XML" value="1" />
|
||||
</counts>
|
||||
</usages-collector>
|
||||
@ -94,7 +63,7 @@
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/pom.xml">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="396">
|
||||
<state relative-caret-position="374">
|
||||
<caret line="17" column="47" selection-start-line="17" selection-start-column="47" selection-end-line="17" selection-end-column="47" />
|
||||
</state>
|
||||
</provider>
|
||||
@ -109,11 +78,14 @@
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<file pinned="false" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/morlok8k/MinecraftLandGenerator/Main.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="242">
|
||||
<caret line="41" column="13" selection-start-line="41" selection-start-column="13" selection-end-line="41" selection-end-column="13" />
|
||||
<state relative-caret-position="9746">
|
||||
<caret line="456" lean-forward="true" selection-start-line="456" selection-end-line="456" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
@ -121,17 +93,17 @@
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/morlok8k/MinecraftLandGenerator/SpawnPoint.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="369">
|
||||
<state relative-caret-position="726">
|
||||
<caret line="63" column="65" selection-start-line="63" selection-start-column="65" selection-end-line="63" selection-end-column="65" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="true">
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/morlok8k/MinecraftLandGenerator/GUI/Start.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="-1025">
|
||||
<caret line="24" column="13" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
|
||||
<state relative-caret-position="770">
|
||||
<caret line="53" column="50" selection-start-line="53" selection-start-column="50" selection-end-line="53" selection-end-column="50" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
@ -157,11 +129,8 @@
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/morlok8k/MinecraftLandGenerator/Out.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="528">
|
||||
<caret line="45" column="17" selection-start-line="45" selection-start-column="17" selection-end-line="45" selection-end-column="17" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
<state relative-caret-position="-506">
|
||||
<caret line="21" selection-start-line="21" selection-end-line="21" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
@ -169,8 +138,17 @@
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/morlok8k/MinecraftLandGenerator/Arraylist.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="374">
|
||||
<caret line="40" selection-start-line="40" selection-end-line="40" />
|
||||
<state relative-caret-position="348">
|
||||
<caret line="51" column="26" selection-start-line="51" selection-start-column="26" selection-end-line="51" selection-end-column="26" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/morlok8k/MinecraftLandGenerator/Coordinates.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="154">
|
||||
<caret line="13" column="54" selection-start-line="13" selection-start-column="54" selection-end-line="13" selection-end-column="54" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
@ -190,9 +168,10 @@
|
||||
<component name="IdeDocumentHistory">
|
||||
<option name="CHANGED_PATHS">
|
||||
<list>
|
||||
<option value="$PROJECT_DIR$/src/main/java/morlok8k/MinecraftLandGenerator/Out.java" />
|
||||
<option value="$PROJECT_DIR$/pom.xml" />
|
||||
<option value="$PROJECT_DIR$/src/main/java/morlok8k/MinecraftLandGenerator/Out.java" />
|
||||
<option value="$PROJECT_DIR$/src/main/java/morlok8k/MinecraftLandGenerator/Arraylist.java" />
|
||||
<option value="$PROJECT_DIR$/src/main/java/morlok8k/MinecraftLandGenerator/Main.java" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
@ -208,6 +187,13 @@
|
||||
<option name="alwaysUpdateSnapshots" value="true" />
|
||||
</MavenGeneralSettings>
|
||||
</option>
|
||||
<option name="importingSettings">
|
||||
<MavenImportingSettings>
|
||||
<option name="downloadDocsAutomatically" value="true" />
|
||||
<option name="downloadSourcesAutomatically" value="true" />
|
||||
<option name="importAutomatically" value="true" />
|
||||
</MavenImportingSettings>
|
||||
</option>
|
||||
</component>
|
||||
<component name="MavenProjectNavigator">
|
||||
<treeState>
|
||||
@ -238,8 +224,8 @@
|
||||
<component name="ProjectFrameBounds" extendedState="7">
|
||||
<option name="x" value="960" />
|
||||
<option name="y" value="28" />
|
||||
<option name="width" value="960" />
|
||||
<option name="height" value="1052" />
|
||||
<option name="width" value="950" />
|
||||
<option name="height" value="1050" />
|
||||
</component>
|
||||
<component name="ProjectLevelVcsManager">
|
||||
<ConfirmationsSetting value="2" id="Add" />
|
||||
@ -249,6 +235,8 @@
|
||||
<foldersAlwaysOnTop value="true" />
|
||||
</navigator>
|
||||
<panes>
|
||||
<pane id="Scope" />
|
||||
<pane id="PackagesPane" />
|
||||
<pane id="ProjectPane">
|
||||
<subPane>
|
||||
<expand>
|
||||
@ -282,20 +270,10 @@
|
||||
<item name="java" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="MinecraftLandGenerator" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="MinecraftLandGenerator" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="MinecraftLandGenerator" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="src" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="main" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="java" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="GUI" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
</expand>
|
||||
<select />
|
||||
</subPane>
|
||||
</pane>
|
||||
<pane id="PackagesPane" />
|
||||
<pane id="Scope" />
|
||||
</panes>
|
||||
</component>
|
||||
<component name="PropertiesComponent">
|
||||
@ -304,10 +282,10 @@
|
||||
<property name="last_opened_file_path" value="$PROJECT_DIR$/lib/JNBT_1.3.jar!/" />
|
||||
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
|
||||
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
|
||||
<property name="project.structure.last.edited" value="Modules" />
|
||||
<property name="project.structure.last.edited" value="SDKs" />
|
||||
<property name="project.structure.proportion" value="0.15" />
|
||||
<property name="project.structure.side.proportion" value="0.2" />
|
||||
<property name="settings.editor.selected.configurable" value="reference.projectsettings.compiler.javacompiler" />
|
||||
<property name="settings.editor.selected.configurable" value="preferences.sourceCode.Java" />
|
||||
</component>
|
||||
<component name="RunDashboard">
|
||||
<option name="ruleStates">
|
||||
@ -380,6 +358,8 @@
|
||||
<workItem from="1540549655189" duration="886000" />
|
||||
<workItem from="1540550558770" duration="2529000" />
|
||||
<workItem from="1540553836182" duration="468000" />
|
||||
<workItem from="1540554536046" duration="1940000" />
|
||||
<workItem from="1540556526960" duration="1923000" />
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
@ -392,12 +372,13 @@
|
||||
</history-entry>
|
||||
</component>
|
||||
<component name="TimeTrackingManager">
|
||||
<option name="totallyTimeSpent" value="3883000" />
|
||||
<option name="totallyTimeSpent" value="7746000" />
|
||||
</component>
|
||||
<component name="ToolWindowManager">
|
||||
<frame x="0" y="28" width="1920" height="1052" extended-state="6" />
|
||||
<editor active="true" />
|
||||
<layout>
|
||||
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.16025642" />
|
||||
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.16346154" />
|
||||
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
||||
<window_info id="Designer" order="2" />
|
||||
<window_info id="UI Designer" order="3" />
|
||||
@ -409,10 +390,10 @@
|
||||
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
|
||||
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
|
||||
<window_info anchor="bottom" id="TODO" order="6" />
|
||||
<window_info anchor="bottom" id="Version Control" order="7" />
|
||||
<window_info anchor="bottom" id="Version Control" order="7" sideWeight="0.49893162" visible="true" weight="0.15846995" />
|
||||
<window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
|
||||
<window_info anchor="bottom" id="Terminal" order="9" />
|
||||
<window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.5016026" side_tool="true" weight="0.32896176" />
|
||||
<window_info anchor="bottom" id="Terminal" order="9" sideWeight="0.49946582" weight="0.32896176" />
|
||||
<window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50106835" side_tool="true" weight="0.32861805" />
|
||||
<window_info anchor="bottom" id="Problems" order="11" />
|
||||
<window_info anchor="bottom" id="Messages" order="12" sideWeight="0.49839744" weight="0.32896176" />
|
||||
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
|
||||
@ -421,12 +402,38 @@
|
||||
<window_info anchor="right" id="Palette" order="3" />
|
||||
<window_info anchor="right" id="Database" order="4" />
|
||||
<window_info anchor="right" id="Palette	" order="5" />
|
||||
<window_info anchor="right" id="Maven Projects" order="6" visible="true" weight="0.28846154" />
|
||||
<window_info anchor="right" id="Maven Projects" order="6" weight="0.28846154" />
|
||||
</layout>
|
||||
</component>
|
||||
<component name="TypeScriptGeneratedFilesManager">
|
||||
<option name="version" value="1" />
|
||||
</component>
|
||||
<component name="Vcs.Log.Tabs.Properties">
|
||||
<option name="TAB_STATES">
|
||||
<map>
|
||||
<entry key="MAIN">
|
||||
<value>
|
||||
<State>
|
||||
<option name="RECENTLY_FILTERED_USER_GROUPS">
|
||||
<collection />
|
||||
</option>
|
||||
<option name="RECENTLY_FILTERED_BRANCH_GROUPS">
|
||||
<collection />
|
||||
</option>
|
||||
<option name="COLUMN_ORDER">
|
||||
<list>
|
||||
<option value="0" />
|
||||
<option value="1" />
|
||||
<option value="2" />
|
||||
<option value="3" />
|
||||
</list>
|
||||
</option>
|
||||
</State>
|
||||
</value>
|
||||
</entry>
|
||||
</map>
|
||||
</option>
|
||||
</component>
|
||||
<component name="VcsContentAnnotationSettings">
|
||||
<option name="myLimit" value="2678400000" />
|
||||
</component>
|
||||
@ -487,6 +494,13 @@
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/pom.xml">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="374">
|
||||
<caret line="17" column="47" selection-start-line="17" selection-start-column="47" selection-end-line="17" selection-end-column="47" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/morlok8k/MinecraftLandGenerator/Time.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="176">
|
||||
@ -494,37 +508,20 @@
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/morlok8k/MinecraftLandGenerator/Out.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="528">
|
||||
<caret line="45" column="17" selection-start-line="45" selection-start-column="17" selection-end-line="45" selection-end-column="17" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/morlok8k/MinecraftLandGenerator/Arraylist.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="374">
|
||||
<caret line="40" selection-start-line="40" selection-end-line="40" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/morlok8k/MinecraftLandGenerator/Main.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="242">
|
||||
<caret line="41" column="13" selection-start-line="41" selection-start-column="13" selection-end-line="41" selection-end-column="13" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/morlok8k/MinecraftLandGenerator/SpawnPoint.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="369">
|
||||
<state relative-caret-position="726">
|
||||
<caret line="63" column="65" selection-start-line="63" selection-start-column="65" selection-end-line="63" selection-end-column="65" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/morlok8k/MinecraftLandGenerator/GUI/Start.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="770">
|
||||
<caret line="53" column="50" selection-start-line="53" selection-start-column="50" selection-end-line="53" selection-end-column="50" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/morlok8k/MinecraftLandGenerator/FileRead.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="396">
|
||||
@ -539,17 +536,34 @@
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/pom.xml">
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/morlok8k/MinecraftLandGenerator/Coordinates.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="396">
|
||||
<caret line="17" column="47" selection-start-line="17" selection-start-column="47" selection-end-line="17" selection-end-column="47" />
|
||||
<state relative-caret-position="154">
|
||||
<caret line="13" column="54" selection-start-line="13" selection-start-column="54" selection-end-line="13" selection-end-column="54" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/morlok8k/MinecraftLandGenerator/GUI/Start.java">
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/morlok8k/MinecraftLandGenerator/Out.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="-1025">
|
||||
<caret line="24" column="13" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
|
||||
<state relative-caret-position="-506">
|
||||
<caret line="21" selection-start-line="21" selection-end-line="21" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/morlok8k/MinecraftLandGenerator/Arraylist.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="348">
|
||||
<caret line="51" column="26" selection-start-line="51" selection-start-column="26" selection-end-line="51" selection-end-column="26" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main/java/morlok8k/MinecraftLandGenerator/Main.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="9746">
|
||||
<caret line="456" lean-forward="true" selection-start-line="456" selection-end-line="456" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
|
||||
<module type="JAVA_MODULE" version="4">
|
||||
<component name="EclipseModuleManager">
|
||||
<libelement value="jar://$MODULE_DIR$/lib/JNBT_1.3.jar!/" />
|
||||
<src_description expected_position="0">
|
||||
|
||||
@ -15,35 +15,41 @@
|
||||
# 0. You just DO WHAT THE FUCK YOU WANT TO. #
|
||||
# #
|
||||
#######################################################################
|
||||
*//*
|
||||
|
||||
|
||||
|
||||
|
||||
*/
|
||||
|
||||
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
*//*
|
||||
|
||||
package morlok8k.MinecraftLandGenerator;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
*/
|
||||
/**
|
||||
* @author morlok8k
|
||||
*
|
||||
*/
|
||||
*//*
|
||||
|
||||
public class Arraylist {
|
||||
|
||||
/**
|
||||
*/
|
||||
/**
|
||||
*
|
||||
* @param list
|
||||
* @param remove
|
||||
* @return
|
||||
*/
|
||||
*//*
|
||||
|
||||
|
||||
public static ArrayList<Coordinates> arrayListRemove(final ArrayList<Coordinates> list,
|
||||
final ArrayList<Coordinates> remove) {
|
||||
|
||||
boolean changed = false;
|
||||
changed = list.removeAll(remove);
|
||||
boolean changed = list.removeAll(remove);
|
||||
|
||||
if (var.verbose) {
|
||||
System.out.println("ArrayList changed: " + changed);
|
||||
@ -52,3 +58,4 @@ public class Arraylist {
|
||||
return list;
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
@ -33,11 +33,12 @@ import java.util.logging.Level;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
import morlok8k.MinecraftLandGenerator.GUI.MLG_GUI;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Corrodias, Morlok8k, pr0f1x
|
||||
*
|
||||
*/
|
||||
public class Main {
|
||||
|
||||
@ -50,12 +51,15 @@ public class Main {
|
||||
|
||||
/**
|
||||
* @param args
|
||||
* the command line arguments
|
||||
* the command line arguments
|
||||
*/
|
||||
private static Log log = LogFactory.getLog(Main.class);
|
||||
|
||||
public static void main(String[] args) {
|
||||
|
||||
var.startTime = System.currentTimeMillis();
|
||||
|
||||
var.originalArgs = args; // we may potentially remove some args later, but we keep a record of the original for the log file.
|
||||
var.originalArgs = args; // we may potentially remove some args later, but we keep a record of the original for the log file.
|
||||
|
||||
// This is really just here for debugging...
|
||||
// I plan on adding more asserts later, but for now, this will do.
|
||||
@ -63,28 +67,28 @@ public class Main {
|
||||
// java -enableassertions -jar MinecraftLandGenerator.jar
|
||||
assert var.assertsEnabled = true; // Intentional side-effect!!! (This may cause a Warning, which is safe to ignore: "Possible accidental assignment in place of a comparison. A condition expression should not be reduced to an assignment")
|
||||
if (var.assertsEnabled) {
|
||||
Out.outD("assertsEnabled: " + var.assertsEnabled);
|
||||
log.info("assertsEnabled: " + var.assertsEnabled);
|
||||
var.verbose = true;
|
||||
Out.outD("Verbose mode forced!");
|
||||
log.info("Verbose mode forced!");
|
||||
var.testing = true;
|
||||
Out.outD("Debug mode forced!");
|
||||
log.info("Debug mode forced!");
|
||||
var.dontWait = true;
|
||||
Out.outD("-nowait mode forced!");
|
||||
Out.outD("");
|
||||
log.info("-nowait mode forced!");
|
||||
log.info("");
|
||||
}
|
||||
|
||||
boolean GUI = false; // GUI needs to be true to run in graphical mode
|
||||
boolean NOGUI = false; // NOGUI is a flag that finds reasons to not use a graphical mode.
|
||||
boolean GUI = false; // GUI needs to be true to run in graphical mode
|
||||
boolean NOGUI = false; // NOGUI is a flag that finds reasons to not use a graphical mode.
|
||||
|
||||
if (args.length != 0) { // if args are present, then we assume we want NOGUI
|
||||
NOGUI = true; // if no args are present, we will attempt GUI
|
||||
if (args.length != 0) { // if args are present, then we assume we want NOGUI
|
||||
NOGUI = true; // if no args are present, we will attempt GUI
|
||||
}
|
||||
|
||||
String[] argsNOGUI = new String[args.length];
|
||||
argsNOGUI = args;
|
||||
argsNOGUI = StringArrayParse.Parse(argsNOGUI, "nogui"); //parse out "nogui"
|
||||
if (!(args.equals(argsNOGUI))) { //do the freshly parsed args match the original?
|
||||
args = argsNOGUI; //use the freshly parsed args for everything else now...
|
||||
argsNOGUI = StringArrayParse.Parse(argsNOGUI, "nogui"); //parse out "nogui"
|
||||
if (!(args.equals(argsNOGUI))) { //do the freshly parsed args match the original?
|
||||
args = argsNOGUI; //use the freshly parsed args for everything else now...
|
||||
NOGUI = true;
|
||||
}
|
||||
|
||||
@ -92,21 +96,21 @@ public class Main {
|
||||
if ((!NOGUI) && (!java.awt.GraphicsEnvironment.isHeadless())) {
|
||||
GUI = true;
|
||||
if (var.testing) {
|
||||
Out.outD("MLG_GUI: This is a graphical enviroment.");
|
||||
log.info("MLG_GUI: This is a graphical enviroment.");
|
||||
}
|
||||
|
||||
//////
|
||||
GUI = false; // forcing GUI to be false for now, because I don't have the MLG_GUI code ready yet!
|
||||
GUI = false; // forcing GUI to be false for now, because I don't have the MLG_GUI code ready yet!
|
||||
//////
|
||||
|
||||
} else {
|
||||
GUI = false; // No GUI for us today...
|
||||
GUI = false; // No GUI for us today...
|
||||
if (var.testing) {
|
||||
Out.outD("MLG_GUI: Command Line Only!");
|
||||
log.info("MLG_GUI: Command Line Only!");
|
||||
}
|
||||
}
|
||||
|
||||
if (GUI) { //GUI
|
||||
if (GUI) { //GUI
|
||||
// Launch MLG_GUI
|
||||
|
||||
EventQueue.invokeLater(new Runnable() {
|
||||
@ -124,7 +128,7 @@ public class Main {
|
||||
}
|
||||
});
|
||||
|
||||
} else { //No GUI
|
||||
} else { //No GUI
|
||||
// Finally, Lets Start MLG!
|
||||
|
||||
var.UsingGUI = false;
|
||||
@ -136,10 +140,8 @@ public class Main {
|
||||
|
||||
/**
|
||||
* Start MinecraftLandGenerator (Command Line Interface)
|
||||
*
|
||||
*
|
||||
* @author Corrodias, Morlok8k
|
||||
* @param args
|
||||
*
|
||||
*/
|
||||
private static void runCLI() {
|
||||
final File backupLevel;
|
||||
@ -148,16 +150,16 @@ public class Main {
|
||||
// Basic Program Initialization
|
||||
Startup.initialStart();
|
||||
if (Startup.programArguments()) {
|
||||
Out.err("Error in program arguments.");
|
||||
log.error("Error in program arguments.");
|
||||
return;
|
||||
}
|
||||
if (Startup.confFile()) {
|
||||
Out.err("Error in conf file.");
|
||||
log.error("Error in conf file.");
|
||||
return;
|
||||
}
|
||||
try {
|
||||
if (Setup.doSetup()) {
|
||||
Out.err("Error in setup.");
|
||||
log.error("Error in setup.");
|
||||
return;
|
||||
}
|
||||
} catch (IOException e1) {
|
||||
@ -169,19 +171,19 @@ public class Main {
|
||||
// PROCESSING
|
||||
// =====================================================================
|
||||
|
||||
Out.out("Processing world \"" + var.worldPath + "\", in " + var.increment
|
||||
log.info("Processing world \"" + var.worldPath + "\", in " + var.increment
|
||||
+ " block increments, with: " + var.javaLine);
|
||||
// out( MLG + "Processing \"" + worldName + "\"...");
|
||||
|
||||
Out.out("");
|
||||
log.info("");
|
||||
|
||||
try {
|
||||
final long generationStartTimeTracking = System.currentTimeMillis(); //Start of time remaining calculations
|
||||
final long generationStartTimeTracking = System.currentTimeMillis(); //Start of time remaining calculations
|
||||
|
||||
final boolean serverLaunch = Server.runMinecraft(); //run server once at spawn point to make sure everything works.
|
||||
final boolean serverLaunch = Server.runMinecraft(); //run server once at spawn point to make sure everything works.
|
||||
//final boolean serverLaunch = true; //testing only
|
||||
if (!(serverLaunch)) {
|
||||
System.exit(1); // we got a warning or severe error
|
||||
System.exit(1); // we got a warning or severe error
|
||||
}
|
||||
|
||||
if ((var.xRange == 0) & (var.zRange == 0)) { //If the server is launched with an X and a Z of zero, then we just shutdown MLG after the initial launch.
|
||||
@ -195,17 +197,16 @@ public class Main {
|
||||
+ var.newLine + "##Size: X" + var.xRange + "Z" + var.zRange
|
||||
+ var.newLine);
|
||||
|
||||
Out.out("");
|
||||
log.info("");
|
||||
|
||||
serverLevel = new File(var.worldPath + var.fileSeparator + "level.dat");
|
||||
backupLevel = new File(var.worldPath + var.fileSeparator + "level_backup.dat");
|
||||
|
||||
Out.out("Backing up level.dat to level_backup.dat.");
|
||||
log.info("Backing up level.dat to level_backup.dat.\n");
|
||||
Misc.copyFile(serverLevel, backupLevel);
|
||||
Out.out("");
|
||||
|
||||
final Coordinates spawn = SpawnPoint.getSpawn(serverLevel);
|
||||
Out.out("Spawn point detected: [X,Y,Z] " + spawn);
|
||||
log.info("Spawn point detected: [X,Y,Z] " + spawn);
|
||||
|
||||
FileWrite.AppendTxtFile(var.worldPath + var.fileSeparator + var.logFile, "# Seed: "
|
||||
+ var.randomSeed + var.newLine + "# Spawn: " + spawn.toString() + var.newLine);
|
||||
@ -224,48 +225,48 @@ public class Main {
|
||||
|
||||
double xR = 0, zR = 0, xO = 0, zO = 0;
|
||||
|
||||
if (var.useChunks) { // use Chunks or Regions
|
||||
if (var.useChunks) { // use Chunks or Regions
|
||||
|
||||
xR = var.xRange; //say xRange was entered as 1000. this changes it to be 1008, a multiple of 16. (the size of a chunk)
|
||||
xR = var.xRange; //say xRange was entered as 1000. this changes it to be 1008, a multiple of 16. (the size of a chunk)
|
||||
xR = xR / 16;
|
||||
xR = Math.ceil(xR);
|
||||
xR = xR * 16;
|
||||
|
||||
zR = var.zRange; //say zRange was entered as 2000. there is no change, as it already is a multiple of 16.
|
||||
zR = var.zRange; //say zRange was entered as 2000. there is no change, as it already is a multiple of 16.
|
||||
zR = zR / 16;
|
||||
zR = Math.ceil(zR);
|
||||
zR = zR * 16;
|
||||
|
||||
xO = var.xOffset;
|
||||
xO = xO / 16;
|
||||
xO = Math.round(xO); //round instead of Ceiling
|
||||
xO = Math.round(xO); //round instead of Ceiling
|
||||
xO = xO * 16;
|
||||
|
||||
zO = var.zOffset;
|
||||
zO = zO / 16;
|
||||
zO = Math.round(zO); //round instead of Ceiling
|
||||
zO = Math.round(zO); //round instead of Ceiling
|
||||
zO = zO * 16;
|
||||
|
||||
} else {
|
||||
|
||||
xR = var.xRange; //say xRange was entered as 1000. this changes it to be 1024, a multiple of 512. (the size of a region)
|
||||
xR = var.xRange; //say xRange was entered as 1000. this changes it to be 1024, a multiple of 512. (the size of a region)
|
||||
xR = xR / 512;
|
||||
xR = Math.ceil(xR);
|
||||
xR = xR * 512;
|
||||
|
||||
zR = var.zRange; //say zRange was entered as 2048. there is no change, as it already is a multiple of 512.
|
||||
zR = var.zRange; //say zRange was entered as 2048. there is no change, as it already is a multiple of 512.
|
||||
zR = zR / 512;
|
||||
zR = Math.ceil(zR);
|
||||
zR = zR * 512;
|
||||
|
||||
xO = var.xOffset;
|
||||
xO = xO / 512;
|
||||
xO = Math.round(xO); //round instead of Ceiling
|
||||
xO = Math.round(xO); //round instead of Ceiling
|
||||
xO = xO * 512;
|
||||
|
||||
zO = var.zOffset;
|
||||
zO = zO / 512;
|
||||
zO = Math.round(zO); //round instead of Ceiling
|
||||
zO = Math.round(zO); //round instead of Ceiling
|
||||
zO = zO * 512;
|
||||
|
||||
}
|
||||
@ -276,14 +277,12 @@ public class Main {
|
||||
var.zOffset = (int) Math.ceil(zO);
|
||||
|
||||
if (overridden) {
|
||||
Out.out("Centering land generation on [" + var.xOffset + ", " + var.zOffset
|
||||
log.info("Centering land generation on [" + var.xOffset + ", " + var.zOffset
|
||||
+ "] due to switches.");
|
||||
} else {
|
||||
Out.out("Centering land generation on [" + var.xOffset + ", " + var.zOffset + "]");
|
||||
log.info("Centering land generation on [" + var.xOffset + ", " + var.zOffset + "]\n");
|
||||
}
|
||||
|
||||
Out.out("");
|
||||
|
||||
double xLoops, zLoops;
|
||||
long curXloops = 0;
|
||||
long curZloops = 0;
|
||||
@ -296,32 +295,32 @@ public class Main {
|
||||
// run mlg on remaining list of spawn points.
|
||||
|
||||
// X
|
||||
xRangeAdj = var.xRange - var.incrementFull; //Adjusting our range of X
|
||||
xRangeAdj = var.xRange - var.incrementFull; //Adjusting our range of X
|
||||
xRangeAdj = xRangeAdj / var.increment;
|
||||
xRangeAdj = Math.ceil(xRangeAdj); //round up to find out!
|
||||
xRangeAdj = xRangeAdj + 1; //add an additional increment, as we removed a full one above
|
||||
xRangeAdj = Math.ceil(xRangeAdj); //round up to find out!
|
||||
xRangeAdj = xRangeAdj + 1; //add an additional increment, as we removed a full one above
|
||||
xRangeAdj = xRangeAdj * var.increment;
|
||||
|
||||
double inc = var.increment * 2; //increment*2, and casts to double.
|
||||
double inc = var.increment * 2; //increment*2, and casts to double.
|
||||
|
||||
// thanks to e2pii (on reddit) for correcting my math here.
|
||||
// http://www.reddit.com/r/learnmath/comments/2y14fq/what_am_i_overlooking_here/
|
||||
xLoops = (var.xRange - var.incrementFull) / inc; //How many loops do we need?
|
||||
xLoops = (var.xRange - var.incrementFull) / inc; //How many loops do we need?
|
||||
xLoops = Math.ceil(xLoops);
|
||||
xLoops = xLoops + xLoops + 1;
|
||||
|
||||
// Z
|
||||
zRangeAdj = var.zRange - var.incrementFull; //Adjusting our range of Z
|
||||
zRangeAdj = var.zRange - var.incrementFull; //Adjusting our range of Z
|
||||
zRangeAdj = zRangeAdj / var.increment;
|
||||
zRangeAdj = Math.ceil(zRangeAdj); //round up to find out!
|
||||
zRangeAdj = zRangeAdj + 1; //add an additional increment, as we removed a full one above
|
||||
zRangeAdj = Math.ceil(zRangeAdj); //round up to find out!
|
||||
zRangeAdj = zRangeAdj + 1; //add an additional increment, as we removed a full one above
|
||||
zRangeAdj = zRangeAdj * var.increment;
|
||||
|
||||
zLoops = (var.zRange - var.incrementFull) / inc; //How many loops do we need?
|
||||
zLoops = (var.zRange - var.incrementFull) / inc; //How many loops do we need?
|
||||
zLoops = Math.ceil(zLoops);
|
||||
zLoops = zLoops + zLoops + 1;
|
||||
|
||||
Out.out("Calculating Spawn Points...");
|
||||
log.info("Calculating Spawn Points...");
|
||||
|
||||
// Perfect Squares Code:
|
||||
|
||||
@ -337,12 +336,12 @@ public class Main {
|
||||
|
||||
long totalIterations = (long) (xLoops * zLoops);
|
||||
|
||||
Out.out("Estimated Total Spawn Points: " + totalIterations);
|
||||
log.info("Estimated Total Spawn Points: " + totalIterations);
|
||||
|
||||
if (totalIterations > Integer.MAX_VALUE) {
|
||||
Out.err("TOO BIG! Please reduce the world size. World Size can't be larger than 17609200 x 17609200"); //or 17794560 using -i384
|
||||
log.error("TOO BIG! Please reduce the world size. World Size can't be larger than 17609200 x 17609200"); //or 17794560 using -i384
|
||||
backupLevel.delete();
|
||||
Out.out("Removed backup file.");
|
||||
log.info("Removed backup file.");
|
||||
System.exit(0);
|
||||
}
|
||||
|
||||
@ -357,9 +356,9 @@ public class Main {
|
||||
launchList = new ArrayList<>((int) totalIterations);
|
||||
} catch (Exception e1) {
|
||||
e1.printStackTrace();
|
||||
Out.err("TOO BIG! Your computer can't handle such a large map. The size is dependant on 32/64 bit and Memory.");
|
||||
log.error("TOO BIG! Your computer can't handle such a large map. The size is dependant on 32/64 bit and Memory.");
|
||||
backupLevel.delete();
|
||||
Out.out("Removed backup file.");
|
||||
log.info("Removed backup file.");
|
||||
System.exit(0);
|
||||
}
|
||||
|
||||
@ -369,10 +368,10 @@ public class Main {
|
||||
boolean eastEdgeReached = false;
|
||||
|
||||
if (curXloops == 1) {
|
||||
currentX = (((0 - var.xRange) / 2) + (var.incrementFull / 2)); // West Edge of map
|
||||
currentX = (((0 - var.xRange) / 2) + (var.incrementFull / 2)); // West Edge of map
|
||||
|
||||
} else if (currentX >= ((xRangeAdj / 2) - (var.increment / 2))) {
|
||||
currentX = ((var.xRange / 2) - (var.incrementFull / 2)); // East Edge of map
|
||||
currentX = ((var.xRange / 2) - (var.incrementFull / 2)); // East Edge of map
|
||||
eastEdgeReached = true;
|
||||
}
|
||||
|
||||
@ -383,24 +382,24 @@ public class Main {
|
||||
curZloops++;
|
||||
boolean southEdgeReached = false;
|
||||
if (curZloops == 1) {
|
||||
currentZ = (((0 - var.zRange) / 2) + (var.incrementFull / 2)); // North Edge of map
|
||||
currentZ = (((0 - var.zRange) / 2) + (var.incrementFull / 2)); // North Edge of map
|
||||
} else if (currentZ >= ((zRangeAdj / 2) - (var.increment / 2))) {
|
||||
currentZ = ((var.zRange / 2) - (var.incrementFull / 2)); // South Edge of map
|
||||
currentZ = ((var.zRange / 2) - (var.incrementFull / 2)); // South Edge of map
|
||||
southEdgeReached = true;
|
||||
}
|
||||
|
||||
{ // Middle of Loop
|
||||
|
||||
if (currentIteration % 10000000 == 0) { //for long calculations, we output an update every 10,000,000 points
|
||||
if (currentIteration % 10000000 == 0) { //for long calculations, we output an update every 10,000,000 points
|
||||
String percentDone =
|
||||
Double.toString((((double) currentIteration) / totalIterations) * 100);
|
||||
final int percentIndex =
|
||||
((percentDone.indexOf(".") + 3) > percentDone.length())
|
||||
? percentDone.length() : (percentDone.indexOf(".") + 3); //fix index on numbers like 12.3
|
||||
? percentDone.length() : (percentDone.indexOf(".") + 3); //fix index on numbers like 12.3
|
||||
percentDone =
|
||||
percentDone.substring(0, (percentDone.indexOf(".") == -1
|
||||
? percentDone.length() : percentIndex)); //Trim output, unless whole number
|
||||
Out.out("Calculated: " + currentIteration + "/" + totalIterations
|
||||
? percentDone.length() : percentIndex)); //Trim output, unless whole number
|
||||
log.info("Calculated: " + currentIteration + "/" + totalIterations
|
||||
+ " spawn points. (" + percentDone + "% Done)");
|
||||
}
|
||||
|
||||
@ -420,45 +419,45 @@ public class Main {
|
||||
|
||||
} // End of the Middle of Loop
|
||||
|
||||
if (curZloops == 1) { // We are at the North edge. We have special code for the North edge, so we need to change currentZ to be normal again.
|
||||
if (curZloops == 1) { // We are at the North edge. We have special code for the North edge, so we need to change currentZ to be normal again.
|
||||
currentZ =
|
||||
(long) ((Math.ceil((((0 - zRangeAdj) / 2) / var.increment))) * var.increment);
|
||||
}
|
||||
if (southEdgeReached) {
|
||||
currentZ = (long) zRangeAdj; // We reached the South edge, so we make sure that we exit the "for loop", bypassing the "1152 bug"
|
||||
currentZ = (long) zRangeAdj; // We reached the South edge, so we make sure that we exit the "for loop", bypassing the "1152 bug"
|
||||
}
|
||||
|
||||
} // End Z
|
||||
curZloops = 0;
|
||||
if (curXloops == 1) { // We are at the West edge. We have special code for the West edge, so we need to change currentX to be normal again.
|
||||
if (curXloops == 1) { // We are at the West edge. We have special code for the West edge, so we need to change currentX to be normal again.
|
||||
currentX =
|
||||
(long) ((Math.ceil((((0 - xRangeAdj) / 2) / var.increment))) * var.increment);
|
||||
}
|
||||
if (eastEdgeReached) {
|
||||
currentX = (long) xRangeAdj; // We reached the East edge, so we make sure that we exit the "for loop", bypassing the "1152 bug"
|
||||
currentX = (long) xRangeAdj; // We reached the East edge, so we make sure that we exit the "for loop", bypassing the "1152 bug"
|
||||
}
|
||||
|
||||
} // End X
|
||||
|
||||
String pD = Double.toString((((double) currentIteration) / totalIterations) * 100);
|
||||
final int pI =
|
||||
((pD.indexOf(".") + 3) > pD.length()) ? pD.length() : (pD.indexOf(".") + 3); //fix index on numbers like 12.3
|
||||
pD = pD.substring(0, (pD.indexOf(".") == -1 ? pD.length() : pI)); //Trim output, unless whole number
|
||||
Out.out("Calculated: " + currentIteration + "/" + totalIterations + " spawn points. ("
|
||||
((pD.indexOf(".") + 3) > pD.length()) ? pD.length() : (pD.indexOf(".") + 3); //fix index on numbers like 12.3
|
||||
pD = pD.substring(0, (pD.indexOf(".") == -1 ? pD.length() : pI)); //Trim output, unless whole number
|
||||
log.info("Calculated: " + currentIteration + "/" + totalIterations + " spawn points. ("
|
||||
+ pD + "% Done)");
|
||||
|
||||
//get existing list, and remove this list from launchList
|
||||
final ArrayList<Coordinates> removeList =
|
||||
FileRead.readArrayListCoordLog(var.worldPath + var.fileSeparator + var.logFile);
|
||||
|
||||
Out.out("Removing known generated areas...");
|
||||
if (!(removeList.isEmpty())) {
|
||||
Arraylist.arrayListRemove(launchList, removeList);
|
||||
log.info("Removing known generated areas...");
|
||||
if (!removeList.isEmpty()) {
|
||||
launchList.removeAll( removeList);
|
||||
}
|
||||
|
||||
removeList.clear(); // we are done with this now.
|
||||
removeList.clear(); // we are done with this now.
|
||||
|
||||
System.gc(); //run the garbage collector - hopefully free up some memory!
|
||||
System.gc(); //run the garbage collector - hopefully free up some memory!
|
||||
|
||||
currentIteration = 0;
|
||||
totalIterations = launchList.size();
|
||||
@ -474,22 +473,22 @@ public class Main {
|
||||
Double.toString((((double) currentIteration - 1) / totalIterations) * 100);
|
||||
final int percentIndex =
|
||||
((percentDone.indexOf(".") + 3) > percentDone.length()) ? percentDone
|
||||
.length() : (percentDone.indexOf(".") + 3); //fix index on numbers like 12.3
|
||||
.length() : (percentDone.indexOf(".") + 3); //fix index on numbers like 12.3
|
||||
percentDone =
|
||||
percentDone.substring(0,
|
||||
(percentDone.indexOf(".") == -1 ? percentDone.length()
|
||||
: percentIndex)); //Trim output, unless whole number
|
||||
: percentIndex)); //Trim output, unless whole number
|
||||
|
||||
Out.out("Setting spawn to [X,Y,Z]: " + xyz + " (" + currentIteration + " of "
|
||||
log.info("Setting spawn to [X,Y,Z]: " + xyz + " (" + currentIteration + " of "
|
||||
+ totalIterations + ") " + percentDone + "% Done"); // Time Remaining estimate
|
||||
|
||||
timeTracking = System.currentTimeMillis();
|
||||
|
||||
//NEW CODE:
|
||||
differenceTime =
|
||||
(timeTracking - generationStartTimeTracking) / (currentIteration + 1); // Updated. we now count all runs, instead of the last 4.
|
||||
differenceTime *= 1 + (totalIterations - currentIteration); // this should provide a more accurate result.
|
||||
Out.out("Estimated time remaining: " + Time.displayTime(differenceTime)); // I've noticed it gets pretty accurate after about 8 launches!
|
||||
(timeTracking - generationStartTimeTracking) / (currentIteration + 1); // Updated. we now count all runs, instead of the last 4.
|
||||
differenceTime *= 1 + (totalIterations - currentIteration); // this should provide a more accurate result.
|
||||
log.info("Estimated time remaining: " + Time.displayTime(differenceTime)); // I've noticed it gets pretty accurate after about 8 launches!
|
||||
|
||||
// Set the spawn point
|
||||
SpawnPoint.setSpawn(serverLevel, xyz);
|
||||
@ -498,7 +497,7 @@ public class Main {
|
||||
boolean serverSuccess = false;
|
||||
|
||||
serverSuccess = Server.runMinecraft();
|
||||
Out.out("");
|
||||
log.info("");
|
||||
|
||||
//////// End server launch code
|
||||
|
||||
@ -507,36 +506,36 @@ public class Main {
|
||||
FileWrite.AppendTxtFile(var.worldPath + var.fileSeparator + var.logFile,
|
||||
xyz.toString() + var.newLine);
|
||||
} else {
|
||||
System.exit(1); // we got a warning or severe error
|
||||
System.exit(1); // we got a warning or severe error
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if (currentIteration == 0) {
|
||||
Out.out("Nothing to generate!");
|
||||
log.info("Nothing to generate!");
|
||||
} else {
|
||||
//TODO: write completion code to output.
|
||||
// FileWrite.AppendTxtFile(var.worldPath + var.fileSeparator + var.logFile, ####### + var.newLine);
|
||||
//
|
||||
//add xrange, zrange, region/chunk, xoffset, zoffset, increment //anything else?
|
||||
//
|
||||
Out.out("Finished generating chunks.");
|
||||
//add xrange, zrange, region/chunk, xoffset, zoffset, increment //anything else?
|
||||
//
|
||||
log.info("Finished generating chunks.");
|
||||
}
|
||||
|
||||
Misc.copyFile(backupLevel, serverLevel);
|
||||
backupLevel.delete();
|
||||
Out.out("Restored original level.dat.");
|
||||
log.info("Restored original level.dat.");
|
||||
|
||||
Out.out("Generation complete in: "
|
||||
log.info("Generation complete in: "
|
||||
+ Time.displayTime(var.startTime, System.currentTimeMillis()));
|
||||
Time.waitTenSec(false);
|
||||
|
||||
if (var.webLaunch) { //if webLaunch is already false, don't check for these things
|
||||
if (var.webLaunch) { //if webLaunch is already false, don't check for these things
|
||||
if (java.awt.GraphicsEnvironment.isHeadless()) {
|
||||
var.webLaunch = false; //headless enviroment - cant bring up webpage!
|
||||
var.webLaunch = false; //headless enviroment - cant bring up webpage!
|
||||
}
|
||||
final File web1 = new File("web");
|
||||
final File web2 = new File("web.txt"); //user has put in the magical file to not launch the webpage
|
||||
final File web2 = new File("web.txt"); //user has put in the magical file to not launch the webpage
|
||||
final File web3 = new File("web.txt.txt");
|
||||
if (web2.exists() || (web1.exists() || web3.exists())) { //check for "web.txt", if not found, check for "web", and if still not found, check for "web.txt.txt"
|
||||
var.webLaunch = false;
|
||||
@ -548,12 +547,12 @@ public class Main {
|
||||
try {
|
||||
java.awt.Desktop.getDesktop().browse(splashPage);
|
||||
} catch (final IOException e) {
|
||||
Out.err("Error displaying webpage... " + e.getLocalizedMessage());
|
||||
log.error("Error displaying webpage... " + e.getLocalizedMessage());
|
||||
}
|
||||
} else {
|
||||
Out.out("Please Visit: http://adf.ly/520855/mlg");
|
||||
Out.out("Or: " + var.WEBSITE);
|
||||
Out.out("Thanks!");
|
||||
log.info("Please Visit: http://adf.ly/520855/mlg");
|
||||
log.info("Or: " + var.WEBSITE);
|
||||
log.info("Thanks!");
|
||||
}
|
||||
|
||||
} catch (final IOException ex) {
|
||||
|
||||
@ -15,87 +15,107 @@
|
||||
# 0. You just DO WHAT THE FUCK YOU WANT TO. #
|
||||
# #
|
||||
#######################################################################
|
||||
*/
|
||||
*//*
|
||||
|
||||
|
||||
package morlok8k.MinecraftLandGenerator;
|
||||
|
||||
import javax.swing.JOptionPane;
|
||||
|
||||
import morlok8k.MinecraftLandGenerator.GUI.MLG_GUI;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
|
||||
*/
|
||||
/**
|
||||
*
|
||||
*
|
||||
* @author morlok8k
|
||||
*/
|
||||
public class Out {
|
||||
*//*
|
||||
|
||||
/**
|
||||
public class Out {
|
||||
private static Log log = LogFactory.getLog(Main.class);
|
||||
|
||||
|
||||
|
||||
*/
|
||||
/**
|
||||
* Outputs a formatted string to System.err as a line.
|
||||
*
|
||||
*
|
||||
* @param str
|
||||
* String to display and format
|
||||
* @author Morlok8k
|
||||
*/
|
||||
*//*
|
||||
|
||||
public static void err(final String str) {
|
||||
System.err.println(var.MLGe + str);
|
||||
}
|
||||
|
||||
/**
|
||||
*/
|
||||
/**
|
||||
* Outputs a formatted string to System.out as a line.
|
||||
*
|
||||
*
|
||||
* @param str
|
||||
* String to display and format
|
||||
* @author Morlok8k
|
||||
*/
|
||||
*//*
|
||||
|
||||
public static void out(final String str) {
|
||||
System.out.println(var.MLG + str); // is there a better/easier way to do this? I just wanted a lazier way to write "System.out.println(MLG + blah..."
|
||||
}
|
||||
|
||||
/**
|
||||
*/
|
||||
/**
|
||||
* Outputs a formatted string to System.out as a line.
|
||||
*
|
||||
*
|
||||
* @param str
|
||||
* String to display and format
|
||||
* @author Morlok8k
|
||||
*/
|
||||
*//*
|
||||
|
||||
public static void outD(final String str) {
|
||||
System.out.println(var.MLG + "[DEBUG] " + str);
|
||||
}
|
||||
|
||||
/**
|
||||
*/
|
||||
/**
|
||||
* Outputs a string to System.out without a newline.
|
||||
*
|
||||
*
|
||||
* @param str
|
||||
* String to display and format
|
||||
* @author Morlok8k
|
||||
*/
|
||||
*//*
|
||||
|
||||
public static void outP(final String str) {
|
||||
System.out.print(str);
|
||||
}
|
||||
|
||||
/**
|
||||
*/
|
||||
/**
|
||||
* Outputs a formatted string to System.out as a line.
|
||||
*
|
||||
*
|
||||
* @param str
|
||||
* String to display and format
|
||||
* @author Morlok8k
|
||||
*/
|
||||
*//*
|
||||
|
||||
static void outS(final String str) {
|
||||
System.out.println("[Server] " + str);
|
||||
}
|
||||
|
||||
/**
|
||||
*/
|
||||
/**
|
||||
* Makes a dialog box, and outputs a formatted string to System.out as a line.
|
||||
*
|
||||
*
|
||||
* @param msg
|
||||
* Message
|
||||
* @param title
|
||||
* title
|
||||
* @param messageType
|
||||
* JOptionPane messageType
|
||||
*
|
||||
*
|
||||
* @author Morlok8k
|
||||
*/
|
||||
*//*
|
||||
|
||||
public static void msg(final String msg, final String title, final int messageType) {
|
||||
String msgType = "";
|
||||
|
||||
@ -125,3 +145,4 @@ public class Out {
|
||||
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user