diff --git a/.classpath b/.classpath index 73e6e3b..46f1016 100644 --- a/.classpath +++ b/.classpath @@ -1,7 +1,33 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.gitignore b/.gitignore index 9b387f7..3a3e756 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ *.class *.backup *.*~ +/target/ diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..7aeada8 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml b/.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml new file mode 100644 index 0000000..b770f56 --- /dev/null +++ b/.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_11_1.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_11_1.xml new file mode 100644 index 0000000..c27223f --- /dev/null +++ b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_11_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_jcl_2_11_1.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_jcl_2_11_1.xml new file mode 100644 index 0000000..ed8a54b --- /dev/null +++ b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_jcl_2_11_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..37a2d16 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..d03c67f --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..7576cd1 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,645 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + DEFINITION_ORDER + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1540549639940 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MAVEN + groupId:MinecraftLandGenerator:1.0-SNAPSHOT + + groupId:MinecraftLandGenerator:1.0-SNAPSHOT + commons-logging:commons-logging:jar:1.1.1 + org.apache.logging.log4j:log4j-jcl:jar:2.11.1 + org.apache.logging.log4j:log4j-jcl:jar:2.11.1/commons-logging:commons-logging:jar:1.2 + org.apache.logging.log4j:log4j-jcl:jar:2.11.1/org.apache.logging.log4j:log4j-api:jar:2.11.1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + commons-logging:commons-logging:jar:1.1.1 + + + All + All + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + No facets are configured + + + + + + + + + + + + + + + 1.8 + + + + + + + + MinecraftLandGenerator + + + + + + + + 1.8 + + + + + + + + Maven: commons-logging:commons-logging:1.1.1 + + + + + + + + \ No newline at end of file diff --git a/.project b/.project index a214d23..a43920e 100644 --- a/.project +++ b/.project @@ -10,8 +10,14 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.jdt.core.javanature diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 3ddc2d8..1426f45 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -8,9 +8,9 @@ org.eclipse.jdt.core.circularClasspath=error org.eclipse.jdt.core.classpath.exclusionPatterns=enabled org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -87,7 +87,8 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=16 diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f897a7f --- /dev/null +++ b/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/bin/MLG-BuildID b/MLG-BuildID similarity index 98% rename from bin/MLG-BuildID rename to MLG-BuildID index 0355c6a..2a53b35 100644 --- a/bin/MLG-BuildID +++ b/MLG-BuildID @@ -67,3 +67,4 @@ EC40B0ECC52B37571EE65F780994CEDE=1360299846000# MLG v1.7.3 750641846428072595BB3D7657AC8EB1=1373344097000# MLG v1.7.4 2ADFF46BCF1E77A559E6D9DB9C7586E8=1381398906000# MLG v1.7.5 3223FFFEE274215C50C88372D79B9E5C=1421666774000# MLG v1.7.6 +6BAC4CB261A1F7494D7B9802B7462121=1540554341000# MLG v1.7.7 (Class File, Not .Jar) diff --git a/bin/MinecraftLandGenerator.conf b/MinecraftLandGenerator.conf similarity index 84% rename from bin/MinecraftLandGenerator.conf rename to MinecraftLandGenerator.conf index cbcd889..af668fd 100644 --- a/bin/MinecraftLandGenerator.conf +++ b/MinecraftLandGenerator.conf @@ -1,6 +1,6 @@ -#Minecraft Land Generator Configuration File: Version: 1.7.6 +#Minecraft Land Generator Configuration File: Version: 1.7.7 #Authors: Corrodias, Morlok8k, pr0f1x, jaseg, Gallion -#Auto-Generated: Monday, January 19, 2015 at 3:26 AM, Pacific Standard Time +#Auto-Generated: Friday, October 26, 2018 at 1:45 PM, Central European Summer Time #Line to run server: Java=java -Djava.awt.headless=true -Djline.terminal=jline.UnsupportedTerminal -Duser.language=en -Xms1024m -Xmx1024m -Xincgc -jar minecraft_server.jar nogui diff --git a/MinecraftLandGenerator.iml b/MinecraftLandGenerator.iml new file mode 100644 index 0000000..6bb11a4 --- /dev/null +++ b/MinecraftLandGenerator.iml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/bin/.gitignore b/bin/.gitignore deleted file mode 100644 index aface5c..0000000 --- a/bin/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/morlok8k -/org diff --git a/bin/MinecraftLandGenerator.jar b/bin/MinecraftLandGenerator.jar deleted file mode 100755 index cf6f86d..0000000 Binary files a/bin/MinecraftLandGenerator.jar and /dev/null differ diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..4ea87f6 --- /dev/null +++ b/pom.xml @@ -0,0 +1,23 @@ + + + 4.0.0 + + groupId + MinecraftLandGenerator + 1.0-SNAPSHOT + + + + commons-logging + commons-logging + 1.1.1 + + + org.apache.logging.log4j + log4j-jcl + 2.11.1 + + + \ No newline at end of file diff --git a/src/morlok8k/MinecraftLandGenerator/Arraylist.java b/src/main/java/morlok8k/MinecraftLandGenerator/Arraylist.java similarity index 99% rename from src/morlok8k/MinecraftLandGenerator/Arraylist.java rename to src/main/java/morlok8k/MinecraftLandGenerator/Arraylist.java index 1064551..382a95d 100644 --- a/src/morlok8k/MinecraftLandGenerator/Arraylist.java +++ b/src/main/java/morlok8k/MinecraftLandGenerator/Arraylist.java @@ -38,6 +38,7 @@ public class Arraylist { * @param remove * @return */ + public static ArrayList arrayListRemove(final ArrayList list, final ArrayList remove) { diff --git a/src/morlok8k/MinecraftLandGenerator/Coordinates.java b/src/main/java/morlok8k/MinecraftLandGenerator/Coordinates.java similarity index 100% rename from src/morlok8k/MinecraftLandGenerator/Coordinates.java rename to src/main/java/morlok8k/MinecraftLandGenerator/Coordinates.java diff --git a/src/morlok8k/MinecraftLandGenerator/DownloadFile.java b/src/main/java/morlok8k/MinecraftLandGenerator/DownloadFile.java similarity index 100% rename from src/morlok8k/MinecraftLandGenerator/DownloadFile.java rename to src/main/java/morlok8k/MinecraftLandGenerator/DownloadFile.java diff --git a/src/morlok8k/MinecraftLandGenerator/FileRead.java b/src/main/java/morlok8k/MinecraftLandGenerator/FileRead.java similarity index 100% rename from src/morlok8k/MinecraftLandGenerator/FileRead.java rename to src/main/java/morlok8k/MinecraftLandGenerator/FileRead.java diff --git a/src/morlok8k/MinecraftLandGenerator/FileWrite.java b/src/main/java/morlok8k/MinecraftLandGenerator/FileWrite.java similarity index 100% rename from src/morlok8k/MinecraftLandGenerator/FileWrite.java rename to src/main/java/morlok8k/MinecraftLandGenerator/FileWrite.java diff --git a/src/morlok8k/MinecraftLandGenerator/GUI/MLG_GUI.java b/src/main/java/morlok8k/MinecraftLandGenerator/GUI/MLG_GUI.java similarity index 100% rename from src/morlok8k/MinecraftLandGenerator/GUI/MLG_GUI.java rename to src/main/java/morlok8k/MinecraftLandGenerator/GUI/MLG_GUI.java diff --git a/src/morlok8k/MinecraftLandGenerator/GUI/Start.java b/src/main/java/morlok8k/MinecraftLandGenerator/GUI/Start.java similarity index 100% rename from src/morlok8k/MinecraftLandGenerator/GUI/Start.java rename to src/main/java/morlok8k/MinecraftLandGenerator/GUI/Start.java diff --git a/src/morlok8k/MinecraftLandGenerator/Input_CLI.java b/src/main/java/morlok8k/MinecraftLandGenerator/Input_CLI.java similarity index 100% rename from src/morlok8k/MinecraftLandGenerator/Input_CLI.java rename to src/main/java/morlok8k/MinecraftLandGenerator/Input_CLI.java diff --git a/src/morlok8k/MinecraftLandGenerator/MD5.java b/src/main/java/morlok8k/MinecraftLandGenerator/MD5.java similarity index 100% rename from src/morlok8k/MinecraftLandGenerator/MD5.java rename to src/main/java/morlok8k/MinecraftLandGenerator/MD5.java diff --git a/src/morlok8k/MinecraftLandGenerator/Main.java b/src/main/java/morlok8k/MinecraftLandGenerator/Main.java similarity index 100% rename from src/morlok8k/MinecraftLandGenerator/Main.java rename to src/main/java/morlok8k/MinecraftLandGenerator/Main.java diff --git a/src/morlok8k/MinecraftLandGenerator/Misc.java b/src/main/java/morlok8k/MinecraftLandGenerator/Misc.java similarity index 100% rename from src/morlok8k/MinecraftLandGenerator/Misc.java rename to src/main/java/morlok8k/MinecraftLandGenerator/Misc.java diff --git a/src/morlok8k/MinecraftLandGenerator/Out.java b/src/main/java/morlok8k/MinecraftLandGenerator/Out.java similarity index 100% rename from src/morlok8k/MinecraftLandGenerator/Out.java rename to src/main/java/morlok8k/MinecraftLandGenerator/Out.java diff --git a/src/morlok8k/MinecraftLandGenerator/Readme_and_HelpInfo.java b/src/main/java/morlok8k/MinecraftLandGenerator/Readme_and_HelpInfo.java similarity index 100% rename from src/morlok8k/MinecraftLandGenerator/Readme_and_HelpInfo.java rename to src/main/java/morlok8k/MinecraftLandGenerator/Readme_and_HelpInfo.java diff --git a/src/morlok8k/MinecraftLandGenerator/SelfAware.java b/src/main/java/morlok8k/MinecraftLandGenerator/SelfAware.java similarity index 100% rename from src/morlok8k/MinecraftLandGenerator/SelfAware.java rename to src/main/java/morlok8k/MinecraftLandGenerator/SelfAware.java diff --git a/src/morlok8k/MinecraftLandGenerator/Server.java b/src/main/java/morlok8k/MinecraftLandGenerator/Server.java similarity index 100% rename from src/morlok8k/MinecraftLandGenerator/Server.java rename to src/main/java/morlok8k/MinecraftLandGenerator/Server.java diff --git a/src/morlok8k/MinecraftLandGenerator/Setup.java b/src/main/java/morlok8k/MinecraftLandGenerator/Setup.java similarity index 100% rename from src/morlok8k/MinecraftLandGenerator/Setup.java rename to src/main/java/morlok8k/MinecraftLandGenerator/Setup.java diff --git a/src/morlok8k/MinecraftLandGenerator/SpawnPoint.java b/src/main/java/morlok8k/MinecraftLandGenerator/SpawnPoint.java similarity index 100% rename from src/morlok8k/MinecraftLandGenerator/SpawnPoint.java rename to src/main/java/morlok8k/MinecraftLandGenerator/SpawnPoint.java diff --git a/src/morlok8k/MinecraftLandGenerator/Startup.java b/src/main/java/morlok8k/MinecraftLandGenerator/Startup.java similarity index 100% rename from src/morlok8k/MinecraftLandGenerator/Startup.java rename to src/main/java/morlok8k/MinecraftLandGenerator/Startup.java diff --git a/src/morlok8k/MinecraftLandGenerator/StringArrayParse.java b/src/main/java/morlok8k/MinecraftLandGenerator/StringArrayParse.java similarity index 100% rename from src/morlok8k/MinecraftLandGenerator/StringArrayParse.java rename to src/main/java/morlok8k/MinecraftLandGenerator/StringArrayParse.java diff --git a/src/morlok8k/MinecraftLandGenerator/Time.java b/src/main/java/morlok8k/MinecraftLandGenerator/Time.java similarity index 100% rename from src/morlok8k/MinecraftLandGenerator/Time.java rename to src/main/java/morlok8k/MinecraftLandGenerator/Time.java diff --git a/src/morlok8k/MinecraftLandGenerator/Update.java b/src/main/java/morlok8k/MinecraftLandGenerator/Update.java similarity index 100% rename from src/morlok8k/MinecraftLandGenerator/Update.java rename to src/main/java/morlok8k/MinecraftLandGenerator/Update.java diff --git a/src/morlok8k/MinecraftLandGenerator/var.java b/src/main/java/morlok8k/MinecraftLandGenerator/var.java similarity index 100% rename from src/morlok8k/MinecraftLandGenerator/var.java rename to src/main/java/morlok8k/MinecraftLandGenerator/var.java diff --git a/src/org/w3c/bert_bos/UTF8URL/Unescape.java b/src/main/java/org/w3c/bert_bos/UTF8URL/Unescape.java similarity index 100% rename from src/org/w3c/bert_bos/UTF8URL/Unescape.java rename to src/main/java/org/w3c/bert_bos/UTF8URL/Unescape.java