Merge pull request #194 from mircokroon/java-version

Java version

.github/workflows/build.yml

@@ -9,7 +9,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v1
         with:
-          java-version: '8'
+          java-version: '16'
           java-package: jdk+fx
       - run: |
           mvn package -DskipTests

.gitignore

@@ -14,3 +14,5 @@ cache/
 *.dat
 
 *.mca
+
+dependency-reduced-pom.xml

README.md

@@ -16,7 +16,7 @@ Cross-platform jar (GUI & commandline): [world-downloader.jar](https://github.co
 <img src="https://i.imgur.com/nSM6mLw.png" width="50%" title="Example of the GUI showing previously downloaded chunks as white squares, chunks sent from the downloader to the client to extend the render distance in normal colours, and chunks sent by server directly to the client in red.">
 
 ### Requirements
-- Java 16 or higher (Java 8 works for versions up to 1.16.5)
+- Java 16 or higher
 - Minecraft version 1.12.2+ // 1.13.2+ // 1.14.1+ // 1.15.2+ // 1.16.2+ // 1.17+
 
 ### Basic usage

pom.xml

@@ -9,7 +9,7 @@
     <version>1.0.0.0</version>
     <packaging>jar</packaging>
     <properties>
-        <java.version>8</java.version>
+        <java.version>16</java.version>
         <java.version.max>16</java.version.max>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
@@ -22,6 +22,13 @@
         </repository>
     </repositories>
 
+    <pluginRepositories>
+        <pluginRepository>
+            <id>maven-snapshots</id>
+            <url>https://repository.apache.org/content/repositories/snapshots/</url>
+        </pluginRepository>
+    </pluginRepositories>
+
     <build>
         <plugins>
             <plugin>
@@ -36,7 +43,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.4</version>
+                <version>3.3.0-SNAPSHOT</version>
                 <configuration>
                     <minimizeJar>true</minimizeJar>
                     <filters>
@@ -93,7 +100,7 @@
             <plugin>
                 <groupId>com.akathist.maven.plugins.launch4j</groupId>
                 <artifactId>launch4j-maven-plugin</artifactId>
-                <version>2.1.1</version>
+                <version>2.1.2</version>
                 <executions>
                     <execution>
                         <id>l4j-gui</id>
@@ -111,6 +118,11 @@
                             </classPath>
                             <icon>src/main/resources/ui/icon/icon.ico</icon>
                             <jre>
+                                <!--
+                                    Include a few possible paths for the correct Java Runtime, including Minecraft's
+                                    own Java runtime.
+                                  -->
+                                <path>%JAVA_HOME%;%PATH%;C:\Program Files (x86)\Minecraft Launcher\runtime\jre-x64\bin</path>
                                 <minVersion>${java.version}</minVersion>
                                 <initialHeapSize>256</initialHeapSize>
                                 <maxHeapSize>2048</maxHeapSize>

src/main/java/proxy/auth/AuthDetailsFromProcess.java

@@ -109,15 +109,11 @@ private List<String> findCandidateProcessUnix() throws IOException {
         BufferedReader input = new BufferedReader(new InputStreamReader(p.getInputStream()));
 
         List<String> res = new ArrayList<>();
-        int index = -1;
+
         String line;
         while ((line = input.readLine()) != null) {
-            if (index == -1) {
-                index = line.indexOf("CMD");
-            }
-
             if (line.contains("java") && line.contains("--accessToken")) {
-                res.add(line.substring(index));
+                res.add(line);
             }
         }
         input.close();