AstralTransRocketries/MinecraftLandGenerator
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update Commandline

Browse Source
This commit is contained in:
sommerlilie 2018-11-13 19:27:26 +01:00
parent 3a36fe2013
commit 142cc34060
3 changed files with 97 additions and 236 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

185
.idea/workspace.xml generated
View File

@ -2,11 +2,9 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="6303f571-4608-4678-b04c-0c6cb20f921f" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/src/main/java/morlok8k/MinecraftLandGenerator/CommandLineMain.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/MLG-BuildID" beforeDir="false" afterPath="$PROJECT_DIR$/MLG-BuildID" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/morlok8k/MinecraftLandGenerator/Coordinates.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/morlok8k/MinecraftLandGenerator/Coordinates.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/CommandLineMain.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/morlok8k/MinecraftLandGenerator/CommandLineMain.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/morlok8k/MinecraftLandGenerator/Time.java" beforeDir="false" />
</list>
<ignored path="$PROJECT_DIR$/bin/" />
<ignored path="$PROJECT_DIR$/target/" />
@ -38,27 +36,27 @@
<counts>
<entry key="0-SNAPSHOT" value="3" />
<entry key="conf" value="1" />
<entry key="java" value="87" />
<entry key="java" value="90" />
<entry key="xml" value="2" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.open">
<counts>
<entry key="HOCON" value="1" />
<entry key="JAVA" value="87" />
<entry key="JAVA" value="90" />
<entry key="UML" value="3" />
<entry key="XML" value="2" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="java" value="2333" />
<entry key="java" value="2334" />
<entry key="xml" value="19" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="JAVA" value="2333" />
<entry key="JAVA" value="2334" />
<entry key="XML" value="19" />
</counts>
</usages-collector>
@ -70,25 +68,19 @@
<entry file="file://$PROJECT_DIR$/src/main/java/morlok8k/MinecraftLandGenerator/Main.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
<caret line="43" column="13" selection-start-line="43" selection-start-column="13" selection-end-line="43" selection-end-column="13" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<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="801">
<caret line="38" selection-start-line="38" selection-end-line="38" />
</state>
</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/FileWrite.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="801">
<caret line="140" column="22" selection-start-line="140" selection-start-column="22" selection-end-line="140" selection-end-column="22" />
<state relative-caret-position="220">
<caret line="33" column="24" lean-forward="true" selection-start-line="33" selection-start-column="24" selection-end-line="33" selection-end-column="24" />
</state>
</provider>
</entry>
@ -111,12 +103,13 @@
</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/CommandLineMain.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-616">
<caret line="2" column="34" lean-forward="true" selection-start-line="2" selection-start-column="34" selection-end-line="2" selection-end-column="34" />
<state relative-caret-position="220">
<caret line="10" column="20" selection-start-line="10" selection-start-column="20" selection-end-line="10" selection-end-column="20" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#904#905#0" expanded="true" />
<element signature="e#946#947#0" expanded="true" />
</folding>
@ -133,6 +126,18 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/morlok8k/MinecraftLandGenerator/FileRead.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
<caret line="35" column="13" selection-start-line="35" selection-start-column="13" selection-end-line="35" selection-end-column="13" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/morlok8k/MinecraftLandGenerator/DownloadFile.java">
<provider selected="true" editor-type-id="text-editor">
@ -145,8 +150,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/morlok8k/MinecraftLandGenerator/var.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1254">
<caret line="43" column="42" lean-forward="true" selection-start-line="43" selection-start-column="42" selection-end-line="43" selection-end-column="42" />
<state relative-caret-position="264">
<caret line="34" column="6" selection-start-line="34" selection-start-column="6" selection-end-line="34" selection-end-column="6" />
</state>
</provider>
</entry>
@ -233,6 +238,7 @@
<option value="$PROJECT_DIR$/src/main/java/morlok8k/MinecraftLandGenerator/Main.java" />
<option value="$PROJECT_DIR$/src/main/java/morlok8k/MinecraftLandGenerator/Coordinates.java" />
<option value="$PROJECT_DIR$/src/main/java/morlok8k/MinecraftLandGenerator/CommandLineMain.java" />
<option value="$PROJECT_DIR$/src/main/java/morlok8k/MinecraftLandGenerator/var.java" />
</list>
</option>
</component>
@ -331,14 +337,6 @@
<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>
<path>
<item name="MinecraftLandGenerator" type="b2602c69:ProjectViewProjectNode" />
<item name="MinecraftLandGenerator" type="462c0819:PsiDirectoryNode" />
@ -471,7 +469,7 @@
<workItem from="1541964344032" duration="2472000" />
<workItem from="1542023345146" duration="1198000" />
<workItem from="1542129590076" duration="39000" />
<workItem from="1542129672857" duration="3140000" />
<workItem from="1542129672857" duration="3756000" />
</task>
<servers />
</component>
@ -490,11 +488,10 @@
</history-entry>
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="37486000" />
<option name="totallyTimeSpent" value="38102000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="28" width="1920" height="1052" extended-state="6" />
<editor active="true" />
<frame x="0" y="28" width="1920" height="1052" extended-state="7" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49834436" visible="true" weight="0.18803419" />
<window_info id="Structure" order="1" sideWeight="0.50165564" side_tool="true" weight="0.18162394" />
@ -669,13 +666,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/morlok8k/MinecraftLandGenerator/GUI/MLG_GUI.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-167">
<caret line="693" lean-forward="true" selection-start-line="693" selection-end-line="693" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/morlok8k/MinecraftLandGenerator/Setup.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2750">
@ -704,16 +694,6 @@
</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="198">
<caret line="35" column="13" selection-start-line="35" selection-start-column="13" selection-end-line="35" selection-end-column="13" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</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="2002">
@ -721,13 +701,6 @@
</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="176">
<caret line="29" column="27" selection-start-line="29" selection-start-column="27" selection-end-line="29" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="801">
@ -735,13 +708,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/morlok8k/MinecraftLandGenerator/FileWrite.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="801">
<caret line="140" column="22" selection-start-line="140" selection-start-column="22" selection-end-line="140" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/morlok8k/MinecraftLandGenerator/Coordinates.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="22">
@ -749,13 +715,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/morlok8k/MinecraftLandGenerator/DownloadFile.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="33" column="13" selection-start-line="33" selection-start-column="13" selection-end-line="33" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/morlok8k/MinecraftLandGenerator/Misc.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="677">
@ -763,20 +722,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/morlok8k/MinecraftLandGenerator/var.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1254">
<caret line="43" column="42" lean-forward="true" selection-start-line="43" selection-start-column="42" selection-end-line="43" selection-end-column="42" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/MinecraftLandGenerator.conf">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="14" column="17" lean-forward="true" selection-start-line="14" selection-start-column="17" selection-end-line="14" selection-end-column="17" />
</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="1799">
@ -786,15 +731,71 @@
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/morlok8k/MinecraftLandGenerator/CommandLineMain.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-616">
<caret line="2" column="34" lean-forward="true" selection-start-line="2" selection-start-column="34" selection-end-line="2" selection-end-column="34" />
<state relative-caret-position="220">
<caret line="10" column="20" selection-start-line="10" selection-start-column="20" selection-end-line="10" selection-end-column="20" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#904#905#0" expanded="true" />
<element signature="e#946#947#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/morlok8k/MinecraftLandGenerator/GUI/MLG_GUI.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3828">
<caret line="225" column="11" selection-start-line="225" selection-start-column="11" selection-end-line="225" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/MinecraftLandGenerator.conf">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="14" column="17" lean-forward="true" selection-start-line="14" selection-start-column="17" selection-end-line="14" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/morlok8k/MinecraftLandGenerator/var.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
<caret line="34" column="6" selection-start-line="34" selection-start-column="6" selection-end-line="34" selection-end-column="6" />
</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="176">
<caret line="43" column="13" selection-start-line="43" selection-start-column="13" selection-end-line="43" selection-end-column="13" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/morlok8k/MinecraftLandGenerator/DownloadFile.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="33" column="13" selection-start-line="33" selection-start-column="13" selection-end-line="33" selection-end-column="13" />
</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="264">
<caret line="35" column="13" selection-start-line="35" selection-start-column="13" selection-end-line="35" selection-end-column="13" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/morlok8k/MinecraftLandGenerator/FileWrite.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220">
<caret line="33" column="24" lean-forward="true" selection-start-line="33" selection-start-column="24" selection-end-line="33" selection-end-column="24" />
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>

8
src/main/java/morlok8k/MinecraftLandGenerator/CommandLineMain.java
View File

@ -8,7 +8,7 @@ import picocli.CommandLine.Command;
import picocli.CommandLine.HelpCommand;
import java.nio.file.Path;
@Command(name = "mgl", subcommands = {
@Command(name = "mlg", subcommands = {
HelpCommand.class})
public class CommandLineMain implements Runnable{
@ -24,13 +24,13 @@ public class CommandLineMain implements Runnable{
@Parameters(index = "2", description = "path to the directory in which the server runs")
private Path serverPath;
@Option(names = "-i", description = "override the iteration spawn offset increment")
@Option(names = "-i", description = "override the iteration spawn offset increment", defaultValue = "380", showDefaultValue = CommandLine.Help.Visibility.ALWAYS)
private int increment = 380;
@Option(names = "-i", description = "set the X offset to generate land around")
@Option(names = {"--x-offset", "-xoff"}, description = "set the X offset to generate land around")
private int xOffset = 0;
@Option(names = "-i", description = "set the Z offset to generate land around")
@Option(names = {"--y-offset", "-yoff"}, description = "set the Z offset to generate land around")
private int zOffset = 0;

140
src/main/java/morlok8k/MinecraftLandGenerator/Time.java
View File

@ -1,140 +0,0 @@
/*
#######################################################################
# DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE #
# Version 2, December 2004 #
# #
# Copyright (C) 2004 Sam Hocevar <sam@hocevar.net> #
# #
# Everyone is permitted to copy and distribute verbatim or modified #
# copies of this license document, and changing it is allowed as long #
# as the name is changed. #
# #
# DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE #
# TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION #
# #
# 0. You just DO WHAT THE FUCK YOU WANT TO. #
# #
#######################################################################
*//*
package morlok8k.MinecraftLandGenerator;
*/
/**
*
* @author morlok8k
*//*
public class Time {
*/
/* *//*
*/
/**
* Returns the time in a readable format given a time in Millis.
*
* @param timeMillis
* @author Morlok8k
* @return String of Readable Time
*//*
*/
/*
public static String displayTime(final long timeMillis) {
final long seconds = timeMillis / 1000;
final long minutes = seconds / 60;
final long hours = minutes / 60;
final long days = hours / 24;
final long years = days / 365;
String took =
(years > 0 ? String.format("%d " + ((years) == 1 ? "Year, " : "Years, "), years)
: "")
+ (days > 0 ? String.format("%d "
+ ((days % 365) == 1 ? "Day, " : "Days, "), days % 365) : "")
+ (hours > 0 ? String.format("%d "
+ ((hours % 24) == 1 ? "Hour, " : "Hours, "), hours % 24) : "")
+ (minutes > 0 ? String.format("%d "
+ ((minutes % 60) == 1 ? "Minute, " : "Minutes, "), minutes % 60)
: "")
+ String.format("%d " + ((seconds % 60) == 1 ? "Second" : "Seconds"),
seconds % 60);
if (!(var.verbose)) {
final int commaFirst = took.indexOf(",");
final int commaSecond = took.substring((commaFirst + 1), took.length()).indexOf(",");
int end = (commaFirst + 1 + commaSecond);
if (commaSecond == -1) {
end = commaFirst;
}
if (commaFirst == -1) {
end = took.length();
}
took = took.substring(0, end);
}
took = took.trim();
return (took);
}
*//*
*/
/**
* Returns the time in a readable format between two points of time given in Millis.
*
* @param startTimeMillis
* @param endTimeMillis
* @author Morlok8k
* @return String of Readable Time
*//*
*/
/*
public static String displayTime(final long startTimeMillis, final long endTimeMillis) {
final long millis = (endTimeMillis - startTimeMillis);
//I just duplicated displayTime to have a start & end times, because it just made things simpler to code.
return (Time.displayTime(millis));
}*//*
*/
/**
* waits ten seconds. outputs 10%, 20%, etc after each second.
*
* @param output
* @author Morlok8k
*//*
public static void waitTenSec(final boolean output) {
if (var.dontWait) { return; } //Don't wait!
if (output) {
log.infoP(var.MLG); //here we wait 10 sec.
}
int count = 0;
while (count <= 100) {
if (output) {
log.infoP(count + "% ");
}
try {
Thread.sleep(1000);
} catch (final InterruptedException e) {
e.printStackTrace();
}
count += 10;
}
if (output) {
log.infoP(var.newLine);
}
return;
}
}
*/