Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-07-02 23:20:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make Java 8 detection work on Java 9

Browse Source 
Closes #393.
This commit is contained in:
Kenzie Togami 2017-08-16 16:39:37 -07:00
parent 6c6e1b4ce2
commit d6aa1ad509
No known key found for this signature in database
GPG Key ID: 5D200B325E157A81
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java
View File

@ -48,7 +48,7 @@ import com.sk89q.worldedit.regions.CylinderRegion;
import com.sk89q.worldedit.regions.Polygonal2DRegion; import com.sk89q.worldedit.regions.Polygonal2DRegion;
import com.sk89q.worldedit.regions.Region; import com.sk89q.worldedit.regions.Region;
import com.sk89q.worldedit.regions.RegionSelector; import com.sk89q.worldedit.regions.RegionSelector;
import com.sk89q.worldedit.util.Java8Detector; import com.sk89q.worldedit.util.Java7Detector;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.command.Command; import org.bukkit.command.Command;
@ -121,7 +121,7 @@ public class WorldEditPlugin extends JavaPlugin implements TabCompleter {
loadAdapter(); // Need an adapter to work with special blocks with NBT data loadAdapter(); // Need an adapter to work with special blocks with NBT data
// Check Java version // Check Java version
Java8Detector.notifyIfNot8(); Java7Detector.notifyIfNot8();
} }
private void loadConfig() { private void loadConfig() {

22
worldedit-core/src/main/java/com/sk89q/worldedit/util/Java8Detector.java → worldedit-core/src/main/java/com/sk89q/worldedit/util/Java7Detector.java
View File

@ -18,21 +18,21 @@
*/ */
package com.sk89q.worldedit.util; package com.sk89q.worldedit.util;
import com.google.common.base.Joiner;
import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.WorldEdit;
public final class Java8Detector { public final class Java7Detector {
public static void notifyIfNot8() { public static void notifyIfNot8() {
String[] ver = System.getProperty("java.version").split("\\."); int major = -1;
int major = Integer.parseInt(ver[1]); try {
if (major <= 7) { String[] ver = System.getProperty("java.version").split("\\.");
// Implicitly java 7 because we compile against 7, so this won't major = Integer.parseInt(ver[1]);
// even launch on 6. } catch (Exception ignored) {
}
if (major == 7) {
WorldEdit.logger.warning( WorldEdit.logger.warning(
"WorldEdit has detected you are using Java 7" "WorldEdit has detected you are using Java 7.");
+ " (based on detected version "
+ Joiner.on('.').join(ver) + ").");
WorldEdit.logger.warning( WorldEdit.logger.warning(
"WorldEdit will stop supporting Java less than version 8 in the future," "WorldEdit will stop supporting Java less than version 8 in the future,"
+ " due to Java 7 being EOL since April 2015." + " due to Java 7 being EOL since April 2015."
@ -40,7 +40,7 @@ public final class Java8Detector {
} }
} }
private Java8Detector() { private Java7Detector() {
} }
} }

1
worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeWorldEdit.java
View File

@ -30,7 +30,6 @@ import com.sk89q.worldedit.event.platform.PlatformReadyEvent;
import com.sk89q.worldedit.extension.platform.Platform; import com.sk89q.worldedit.extension.platform.Platform;
import com.sk89q.worldedit.forge.net.LeftClickAirEventMessage; import com.sk89q.worldedit.forge.net.LeftClickAirEventMessage;
import com.sk89q.worldedit.internal.LocalWorldAdapter; import com.sk89q.worldedit.internal.LocalWorldAdapter;
import com.sk89q.worldedit.util.Java8Detector;
import java.io.File; import java.io.File;
import java.util.Map; import java.util.Map;