lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Proper support for OpenJDK 12.

Browse Source
This commit is contained in:
MobiusDevelopment
2019-07-25 12:52:34 +00:00
parent a30408352f
commit 1d1c08fbd7
130 changed files with 286 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
L2J_Mobius_Classic_2.4_SecretOfEmpire/.classpath
View File

@@ -1,12 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-10">
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-12">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="dist/libs/HikariCP-3.2.0.jar"/>
<classpathentry kind="lib" path="dist/libs/JavaC.jar"/>
<classpathentry kind="lib" path="dist/libs/mariadb-java-client-2.3.0.jar"/>
<classpathentry kind="lib" path="dist/libs/netty-all-4.1.28.Final.jar"/>
<classpathentry kind="lib" path="dist/libs/slf4j-api-1.7.25.jar"/>

8
L2J_Mobius_Classic_2.4_SecretOfEmpire/.settings/org.eclipse.jdt.core.prefs
View File

@@ -17,9 +17,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=10
org.eclipse.jdt.core.compiler.codegen.targetPlatform=12
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=10
org.eclipse.jdt.core.compiler.compliance=12
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -34,6 +34,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -90,6 +91,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -123,7 +125,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=10
org.eclipse.jdt.core.compiler.source=12
org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

6
L2J_Mobius_Classic_2.4_SecretOfEmpire/build.xml
View File

@@ -51,8 +51,8 @@
</not>
</condition>
</fail>
<available classname="java.util.stream.Stream" property="JDK10.present" />
<fail unless="JDK10.present" message="Java 10 is required. But your version is Java ${ant.java.version} and probably JDK is not installed." />
<available classname="java.util.stream.Stream" property="JDK12.present" />
<fail unless="JDK12.present" message="Java 12 is required. But your version is Java ${ant.java.version} and probably JDK is not installed." />
</target>
<target name="init" depends="checkRequirements" description="Create the output directories.">
@@ -61,7 +61,7 @@
</target>
<target name="compile" depends="init" description="Compile the source.">
<javac srcdir="${src}" classpathref="classpath" destdir="${build.bin}" compiler="modern" debug="true" debuglevel="lines,vars,source" includeantruntime="false" source="10" target="10" encoding="UTF-8" />
<javac srcdir="${src}" classpathref="classpath" destdir="${build.bin}" compiler="modern" debug="true" debuglevel="lines,vars,source" includeantruntime="false" source="12" target="12" encoding="UTF-8" />
</target>
<target name="jar" depends="compile" description="Create the jar files.">

2
L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/java.cfg vendored
View File

@@ -1 +1 @@
-server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=org.l2jmobius.log.ServerLogManager -Dorg.slf4j.simpleLogger.log.com.zaxxer.hikari=error -XX:+AggressiveOpts -Xnoclassgc -XX:+CMSParallelRemarkEnabled -XX:SurvivorRatio=8 -Xmx4g -Xms2g -Xmn1g
-server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=org.l2jmobius.log.ServerLogManager -Dorg.slf4j.simpleLogger.log.com.zaxxer.hikari=error -Xnoclassgc -XX:+CMSParallelRemarkEnabled -XX:SurvivorRatio=8 -Xmx4g -Xms2g -Xmn1g

BIN
L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/libs/JavaC.jar vendored
View File

Binary file not shown.

6
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/scripting/java/JavaExecutionContext.java
View File

@@ -30,9 +30,9 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.logging.Logger;
import org.openjavac.tools.Diagnostic;
import org.openjavac.tools.DiagnosticCollector;
import org.openjavac.tools.JavaFileObject;
import javax.tools.Diagnostic;
import javax.tools.DiagnosticCollector;
import javax.tools.JavaFileObject;
import org.l2jmobius.gameserver.scripting.annotations.Disabled;

6
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/scripting/java/JavaScriptingEngine.java
View File

@@ -23,8 +23,8 @@ import java.util.Map.Entry;
import java.util.Properties;
import java.util.logging.Logger;
import org.openjavac.tools.JavaCompiler;
import org.openjavac.tools.javac.api.JavacTool;
import javax.tools.JavaCompiler;
import javax.tools.ToolProvider;
/**
* @author Mobius
@@ -34,7 +34,7 @@ public class JavaScriptingEngine
private static final Logger LOGGER = Logger.getLogger(JavaScriptingEngine.class.getName());
private final static Map<String, String> _properties = new HashMap<>();
private final static JavaCompiler _compiler = JavacTool.create();
private final static JavaCompiler _compiler = ToolProvider.getSystemJavaCompiler();
public JavaScriptingEngine()
{

8
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java
View File

@@ -24,10 +24,10 @@ import java.util.Iterator;
import java.util.LinkedList;
import java.util.Set;
import org.openjavac.tools.FileObject;
import org.openjavac.tools.JavaFileObject;
import org.openjavac.tools.JavaFileObject.Kind;
import org.openjavac.tools.StandardJavaFileManager;
import javax.tools.FileObject;
import javax.tools.JavaFileObject;
import javax.tools.JavaFileObject.Kind;
import javax.tools.StandardJavaFileManager;
/**
* @author HorridoJoho

3
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/scripting/java/ScriptingOutputFileObject.java
View File

@@ -26,8 +26,7 @@ import java.nio.file.Path;
import javax.lang.model.element.Modifier;
import javax.lang.model.element.NestingKind;
import org.openjavac.tools.JavaFileObject;
import javax.tools.JavaFileObject;
/**
* @author HorridoJoho

2
L2J_Mobius_Classic_2.4_SecretOfEmpire/readme.txt
View File

@@ -2,7 +2,7 @@ L2J-Mobius Secret of Empire
Client: https://drive.google.com/uc?id=1pukdKmUvpSxdeCcBDmWKW3wXLY-fy4Y4&export=download
Geodata: http://www.mediafire.com/file/urs2uvjnwltk7ub/L2J_Mobius_Classic_2.2_Antharas_Geodata.zip
JDK: http://www.mediafire.com/file/514ah8a77dk5j7a/jdk-10.0.2_windows-x64_bin.exe
JDK: https://www.mediafire.com/file/k25pt0umuf16uoh/openjdk-12.0.2_windows-x64_bin.zip
Saviors: https://eu.4game.com/lineage2classic/play/saviors/
-Classic packet compatibility