0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GH-1365 Revert "GH-1365 use the first part of the java version number as the major version - native extraction"

Browse Source 
This reverts commit b437988d7b.
This commit is contained in:
Petr Mrázek
2015-12-30 14:24:56 +01:00
parent b437988d7b
commit 5f57df8110
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
depends/launcher/org/multimc/Utils.java
View File

@@ -31,9 +31,6 @@ import java.util.Enumeration;
import java.util.List;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class Utils
{
@@ -238,11 +235,8 @@ public class Utils
ZipFile zip = new ZipFile(source);
boolean applyHacks = false;
// find the first number in the version string, treat that as the major version
String s = System.getProperty("java.version");
Matcher matcher = Pattern.compile("\\d+").matcher(s);
matcher.find();
int major = Integer.valueOf(matcher.group());
String[] javaVersionElements = System.getProperty("java.version").split("\\.");
int major = Integer.parseInt(javaVersionElements[1]);
if (major >= 8)
{
applyHacks = true;