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

Updated to Java 17.

Browse Source
This commit is contained in:
MobiusDevelopment 2021-10-13 21:39:56 +00:00
parent a47d1bf797
commit cdbc38c32b
213 changed files with 1072 additions and 758 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_1.0_Ertheia/.classpath
View File

@ -1,6 +1,6 @@
<?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-15">
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
<attributes>
<attribute name="module" value="true"/>
</attributes>

12
L2J_Mobius_1.0_Ertheia/.settings/org.eclipse.jdt.core.prefs
View File

@ -20,9 +20,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
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=15
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=15
org.eclipse.jdt.core.compiler.compliance=17
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@ -137,8 +137,8 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
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=15
org.eclipse.jdt.core.compiler.release=enabled
org.eclipse.jdt.core.compiler.source=17
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
@ -152,7 +152,6 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=0
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=0
org.eclipse.jdt.core.formatter.alignment_for_assignment=4
org.eclipse.jdt.core.formatter.alignment_for_binary_expression=0
org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=0
org.eclipse.jdt.core.formatter.alignment_for_compact_if=0
org.eclipse.jdt.core.formatter.alignment_for_compact_loops=0
@ -282,7 +281,6 @@ org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default=insert
org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=do not insert
@ -356,7 +354,6 @@ org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case=insert
org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default=insert
org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
@ -515,7 +512,6 @@ org.eclipse.jdt.core.formatter.use_on_off_tags=true
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false
org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true
org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true

6
L2J_Mobius_1.0_Ertheia/build.xml
View File

@ -52,8 +52,8 @@
</not>
</condition>
</fail>
<available classname="java.util.stream.Stream" property="JDK15.present" />
<fail unless="JDK15.present" message="Java 15 is required. But your version is Java ${ant.java.version} and probably JDK is not installed." />
<available classname="java.util.stream.Stream" property="JDK17.present" />
<fail unless="JDK17.present" message="Java 17 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.">
@ -62,7 +62,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="15" target="15" encoding="UTF-8" />
<javac srcdir="${src}" classpathref="classpath" destdir="${build.bin}" compiler="modern" debug="true" debuglevel="lines,vars,source" includeantruntime="false" source="17" target="17" encoding="UTF-8" />
</target>
<target name="jar" depends="compile" description="Create the jar files.">

43
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java vendored
View File

@ -120,7 +120,8 @@ public class WyvernManager extends AbstractNpcAI
private boolean isOwnerClan(Npc npc, PlayerInstance player)
{
switch (MANAGERS.get(npc.getId()))
final ManagerType type = MANAGERS.get(npc.getId());
switch (type)
{
case CASTLE:
{
@ -156,7 +157,8 @@ public class WyvernManager extends AbstractNpcAI
private boolean isInSiege(Npc npc)
{
switch (MANAGERS.get(npc.getId()))
final ManagerType type = MANAGERS.get(npc.getId());
switch (type)
{
case CASTLE:
{
@ -175,7 +177,8 @@ public class WyvernManager extends AbstractNpcAI
private String getResidenceName(Npc npc)
{
switch (MANAGERS.get(npc.getId()))
final ManagerType type = MANAGERS.get(npc.getId());
switch (type)
{
case CASTLE:
{
@ -222,19 +225,24 @@ public class WyvernManager extends AbstractNpcAI
{
htmltext = replaceAll(npc, player);
}
else if (MANAGERS.get(npc.getId()) == ManagerType.CASTLE)
{
htmltext = "wyvernmanager-dusk.html";
}
else
{
htmltext = replaceAll(npc, player);
final ManagerType type = MANAGERS.get(npc.getId());
if (type == ManagerType.CASTLE)
{
htmltext = "wyvernmanager-dusk.html";
}
else
{
htmltext = replaceAll(npc, player);
}
}
break;
}
case "Help":
{
htmltext = MANAGERS.get(npc.getId()) == ManagerType.CASTLE ? replacePart(player, "wyvernmanager-03.html") : replacePart(player, "wyvernmanager-03b.html");
final ManagerType type = MANAGERS.get(npc.getId());
htmltext = type == ManagerType.CASTLE ? replacePart(player, "wyvernmanager-03.html") : replacePart(player, "wyvernmanager-03b.html");
break;
}
case "RideWyvern":
@ -246,7 +254,8 @@ public class WyvernManager extends AbstractNpcAI
player.sendMessage("You cannot summon wyvern while in siege.");
return null;
}
if (MANAGERS.get(npc.getId()) == ManagerType.CASTLE)
final ManagerType type = MANAGERS.get(npc.getId());
if (type == ManagerType.CASTLE)
{
htmltext = "wyvernmanager-dusk.html";
}
@ -277,13 +286,17 @@ public class WyvernManager extends AbstractNpcAI
{
htmltext = replaceAll(npc, player);
}
else if (MANAGERS.get(npc.getId()) == ManagerType.CASTLE)
{
htmltext = "wyvernmanager-dusk.html";
}
else
{
htmltext = replaceAll(npc, player);
final ManagerType type = MANAGERS.get(npc.getId());
if (type == ManagerType.CASTLE)
{
htmltext = "wyvernmanager-dusk.html";
}
else
{
htmltext = replaceAll(npc, player);
}
}
return htmltext;
}

3
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java vendored
View File

@ -35,7 +35,8 @@ public class OpBlinkSkillCondition implements ISkillCondition
public OpBlinkSkillCondition(StatSet params)
{
switch (params.getEnum("direction", Position.class))
final Position position = params.getEnum("direction", Position.class);
switch (position)
{
case BACK:
{

2
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java
View File

@ -57,7 +57,7 @@ public class Forum
private boolean _loaded = false;
/**
* Creates new instance of Forum. When you create new forum, use {@link org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager# addForum(org.l2jmobius.gameserver.communitybbs.BB.Forum)} to add forum to the forums manager.
* Creates new instance of Forum. When you create new forum, use {@link org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager#addForum(org.l2jmobius.gameserver.communitybbs.BB.Forum)} to add forum to the forums manager.
* @param forumId
* @param fParent
*/

5
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java
View File

@ -43,10 +43,11 @@ public class ConditionHasResidence extends Condition
return false;
}
boolean test = false;
final StatSet params = getParameters();
final int id = params.getInt("id");
boolean test = false;
switch (params.getEnum("type", ResidenceType.class))
final ResidenceType type = params.getEnum("type", ResidenceType.class);
switch (type)
{
case CASTLE:
{

5
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/log/formatter/FileLogFormatter.java
View File

@ -35,6 +35,9 @@ public class FileLogFormatter extends Formatter
@Override
public String format(LogRecord record)
{
return StringUtil.concat(dateFmt.format(new Date(record.getMillis())), TAB, record.getLevel().getName(), TAB, String.valueOf(record.getThreadID()), TAB, record.getLoggerName(), TAB, record.getMessage(), Config.EOL);
// Java 1.8
// return StringUtil.concat(dateFmt.format(new Date(record.getMillis())), TAB, record.getLevel().getName(), TAB, String.valueOf(record.getThreadID()), TAB, record.getLoggerName(), TAB, record.getMessage(), Config.EOL);
// Java 16
return StringUtil.concat(dateFmt.format(new Date(record.getMillis())), TAB, record.getLevel().getName(), TAB, String.valueOf(record.getLongThreadID()), TAB, record.getLoggerName(), TAB, record.getMessage(), Config.EOL);
}
}

5
L2J_Mobius_1.0_Ertheia/readme.txt
View File

@ -5,8 +5,9 @@ Use mega downloader to download https://megadownloader.en.softonic.com/
System: https://mega.nz/#!s8lghARA!f7Hi1Yx5JWrNjT3kMRaGK_StI1Tnrxnhia8kaG8edSs
JDK: http://www.mediafire.com/file/cgh3zupv80qdwv4/bellsoft-jdk15.0.2%252B10-windows-amd64.msi
Eclipse: http://www.mediafire.com/file/h0gmazpv9hm6gjp/eclipse-java-2020-12-R-win32-x86_64.zip
JDK: https://www.mediafire.com/file/7n2v2ws8281knej/bellsoft-jdk17%252B35-windows-amd64.msi
XAMPP: https://www.mediafire.com/file/hkehxpyjn81ybsw/xampp-windows-x64-8.0.11-2-VS16-installer.exe
Eclipse: https://www.mediafire.com/file/rspmpv0hzid20hx/eclipse-java-2021-09-R-win32-x86_64_JDK17.zip
Geodata: http://www.mediafire.com/file/pzykzq2vpy4po2u/L2J_Mobius_1.0_Ertheia_Geodata.zip

2
L2J_Mobius_2.5_Underground/.classpath
View File

@ -1,6 +1,6 @@
<?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-15">
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
<attributes>
<attribute name="module" value="true"/>
</attributes>

12
L2J_Mobius_2.5_Underground/.settings/org.eclipse.jdt.core.prefs
View File

@ -20,9 +20,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
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=15
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=15
org.eclipse.jdt.core.compiler.compliance=17
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@ -137,8 +137,8 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
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=15
org.eclipse.jdt.core.compiler.release=enabled
org.eclipse.jdt.core.compiler.source=17
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
@ -152,7 +152,6 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=0
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=0
org.eclipse.jdt.core.formatter.alignment_for_assignment=4
org.eclipse.jdt.core.formatter.alignment_for_binary_expression=0
org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=0
org.eclipse.jdt.core.formatter.alignment_for_compact_if=0
org.eclipse.jdt.core.formatter.alignment_for_compact_loops=0
@ -282,7 +281,6 @@ org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default=insert
org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=do not insert
@ -356,7 +354,6 @@ org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case=insert
org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default=insert
org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
@ -515,7 +512,6 @@ org.eclipse.jdt.core.formatter.use_on_off_tags=true
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false
org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true
org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true

6
L2J_Mobius_2.5_Underground/build.xml
View File

@ -52,8 +52,8 @@
</not>
</condition>
</fail>
<available classname="java.util.stream.Stream" property="JDK15.present" />
<fail unless="JDK15.present" message="Java 15 is required. But your version is Java ${ant.java.version} and probably JDK is not installed." />
<available classname="java.util.stream.Stream" property="JDK17.present" />
<fail unless="JDK17.present" message="Java 17 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.">
@ -62,7 +62,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="15" target="15" encoding="UTF-8" />
<javac srcdir="${src}" classpathref="classpath" destdir="${build.bin}" compiler="modern" debug="true" debuglevel="lines,vars,source" includeantruntime="false" source="17" target="17" encoding="UTF-8" />
</target>
<target name="jar" depends="compile" description="Create the jar files.">

43
L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java vendored
View File

@ -120,7 +120,8 @@ public class WyvernManager extends AbstractNpcAI
private boolean isOwnerClan(Npc npc, PlayerInstance player)
{
switch (MANAGERS.get(npc.getId()))
final ManagerType type = MANAGERS.get(npc.getId());
switch (type)
{
case CASTLE:
{
@ -156,7 +157,8 @@ public class WyvernManager extends AbstractNpcAI
private boolean isInSiege(Npc npc)
{
switch (MANAGERS.get(npc.getId()))
final ManagerType type = MANAGERS.get(npc.getId());
switch (type)
{
case CASTLE:
{
@ -175,7 +177,8 @@ public class WyvernManager extends AbstractNpcAI
private String getResidenceName(Npc npc)
{
switch (MANAGERS.get(npc.getId()))
final ManagerType type = MANAGERS.get(npc.getId());
switch (type)
{
case CASTLE:
{
@ -222,19 +225,24 @@ public class WyvernManager extends AbstractNpcAI
{
htmltext = replaceAll(npc, player);
}
else if (MANAGERS.get(npc.getId()) == ManagerType.CASTLE)
{
htmltext = "wyvernmanager-dusk.html";
}
else
{
htmltext = replaceAll(npc, player);
final ManagerType type = MANAGERS.get(npc.getId());
if (type == ManagerType.CASTLE)
{
htmltext = "wyvernmanager-dusk.html";
}
else
{
htmltext = replaceAll(npc, player);
}
}
break;
}
case "Help":
{
htmltext = MANAGERS.get(npc.getId()) == ManagerType.CASTLE ? replacePart(player, "wyvernmanager-03.html") : replacePart(player, "wyvernmanager-03b.html");
final ManagerType type = MANAGERS.get(npc.getId());
htmltext = type == ManagerType.CASTLE ? replacePart(player, "wyvernmanager-03.html") : replacePart(player, "wyvernmanager-03b.html");
break;
}
case "RideWyvern":
@ -246,7 +254,8 @@ public class WyvernManager extends AbstractNpcAI
player.sendMessage("You cannot summon wyvern while in siege.");
return null;
}
if (MANAGERS.get(npc.getId()) == ManagerType.CASTLE)
final ManagerType type = MANAGERS.get(npc.getId());
if (type == ManagerType.CASTLE)
{
htmltext = "wyvernmanager-dusk.html";
}
@ -277,13 +286,17 @@ public class WyvernManager extends AbstractNpcAI
{
htmltext = replaceAll(npc, player);
}
else if (MANAGERS.get(npc.getId()) == ManagerType.CASTLE)
{
htmltext = "wyvernmanager-dusk.html";
}
else
{
htmltext = replaceAll(npc, player);
final ManagerType type = MANAGERS.get(npc.getId());
if (type == ManagerType.CASTLE)
{
htmltext = "wyvernmanager-dusk.html";
}
else
{
htmltext = replaceAll(npc, player);
}
}
return htmltext;
}

3
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java vendored
View File

@ -35,7 +35,8 @@ public class OpBlinkSkillCondition implements ISkillCondition
public OpBlinkSkillCondition(StatSet params)
{
switch (params.getEnum("direction", Position.class))
final Position position = params.getEnum("direction", Position.class);
switch (position)
{
case BACK:
{

2
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java
View File

@ -57,7 +57,7 @@ public class Forum
private boolean _loaded = false;
/**
* Creates new instance of Forum. When you create new forum, use {@link org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager# addForum(org.l2jmobius.gameserver.communitybbs.BB.Forum)} to add forum to the forums manager.
* Creates new instance of Forum. When you create new forum, use {@link org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager#addForum(org.l2jmobius.gameserver.communitybbs.BB.Forum)} to add forum to the forums manager.
* @param forumId
* @param fParent
*/

5
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java
View File

@ -43,10 +43,11 @@ public class ConditionHasResidence extends Condition
return false;
}
boolean test = false;
final StatSet params = getParameters();
final int id = params.getInt("id");
boolean test = false;
switch (params.getEnum("type", ResidenceType.class))
final ResidenceType type = params.getEnum("type", ResidenceType.class);
switch (type)
{
case CASTLE:
{

5
L2J_Mobius_2.5_Underground/java/org/l2jmobius/log/formatter/FileLogFormatter.java
View File

@ -35,6 +35,9 @@ public class FileLogFormatter extends Formatter
@Override
public String format(LogRecord record)
{
return StringUtil.concat(dateFmt.format(new Date(record.getMillis())), TAB, record.getLevel().getName(), TAB, String.valueOf(record.getThreadID()), TAB, record.getLoggerName(), TAB, record.getMessage(), Config.EOL);
// Java 1.8
// return StringUtil.concat(dateFmt.format(new Date(record.getMillis())), TAB, record.getLevel().getName(), TAB, String.valueOf(record.getThreadID()), TAB, record.getLoggerName(), TAB, record.getMessage(), Config.EOL);
// Java 16
return StringUtil.concat(dateFmt.format(new Date(record.getMillis())), TAB, record.getLevel().getName(), TAB, String.valueOf(record.getLongThreadID()), TAB, record.getLoggerName(), TAB, record.getMessage(), Config.EOL);
}
}

5
L2J_Mobius_2.5_Underground/readme.txt
View File

@ -4,8 +4,9 @@ Client: https://drive.google.com/uc?id=0Bz1qNvCniabUMDhOd3RpUzBNSW8&export=downl
Mirror: https://mega.nz/#!h1FXyByZ!XmyZBtk4qSOlKb435rx7X372_NreN1PTH8l7A4lNCoo
System: https://mega.nz/#!Rx1SCIBC!W5pM7xljB_6UwXaHp_aW8sqY1SJXp5LFa121YGRrb74
JDK: http://www.mediafire.com/file/cgh3zupv80qdwv4/bellsoft-jdk15.0.2%252B10-windows-amd64.msi
Eclipse: http://www.mediafire.com/file/h0gmazpv9hm6gjp/eclipse-java-2020-12-R-win32-x86_64.zip
JDK: https://www.mediafire.com/file/7n2v2ws8281knej/bellsoft-jdk17%252B35-windows-amd64.msi
XAMPP: https://www.mediafire.com/file/hkehxpyjn81ybsw/xampp-windows-x64-8.0.11-2-VS16-installer.exe
Eclipse: https://www.mediafire.com/file/rspmpv0hzid20hx/eclipse-java-2021-09-R-win32-x86_64_JDK17.zip
Geodata: http://www.mediafire.com/file/jme7lm3imhu97m5/L2J_Mobius_2.5_Underground_Geodata.zip

2
L2J_Mobius_3.0_Helios/.classpath
View File

@ -1,6 +1,6 @@
<?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-15">
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
<attributes>
<attribute name="module" value="true"/>
</attributes>

12
L2J_Mobius_3.0_Helios/.settings/org.eclipse.jdt.core.prefs
View File

@ -20,9 +20,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
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=15
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=15
org.eclipse.jdt.core.compiler.compliance=17
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@ -137,8 +137,8 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
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=15
org.eclipse.jdt.core.compiler.release=enabled
org.eclipse.jdt.core.compiler.source=17
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
@ -152,7 +152,6 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=0
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=0
org.eclipse.jdt.core.formatter.alignment_for_assignment=4
org.eclipse.jdt.core.formatter.alignment_for_binary_expression=0
org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=0
org.eclipse.jdt.core.formatter.alignment_for_compact_if=0
org.eclipse.jdt.core.formatter.alignment_for_compact_loops=0
@ -282,7 +281,6 @@ org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default=insert
org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=do not insert
@ -356,7 +354,6 @@ org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case=insert
org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default=insert
org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
@ -515,7 +512,6 @@ org.eclipse.jdt.core.formatter.use_on_off_tags=true
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false
org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true
org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true

6
L2J_Mobius_3.0_Helios/build.xml
View File

@ -52,8 +52,8 @@
</not>
</condition>
</fail>
<available classname="java.util.stream.Stream" property="JDK15.present" />
<fail unless="JDK15.present" message="Java 15 is required. But your version is Java ${ant.java.version} and probably JDK is not installed." />
<available classname="java.util.stream.Stream" property="JDK17.present" />
<fail unless="JDK17.present" message="Java 17 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.">
@ -62,7 +62,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="15" target="15" encoding="UTF-8" />
<javac srcdir="${src}" classpathref="classpath" destdir="${build.bin}" compiler="modern" debug="true" debuglevel="lines,vars,source" includeantruntime="false" source="17" target="17" encoding="UTF-8" />
</target>
<target name="jar" depends="compile" description="Create the jar files.">

43
L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java vendored
View File

@ -120,7 +120,8 @@ public class WyvernManager extends AbstractNpcAI
private boolean isOwnerClan(Npc npc, PlayerInstance player)
{
switch (MANAGERS.get(npc.getId()))
final ManagerType type = MANAGERS.get(npc.getId());
switch (type)
{
case CASTLE:
{
@ -156,7 +157,8 @@ public class WyvernManager extends AbstractNpcAI
private boolean isInSiege(Npc npc)
{
switch (MANAGERS.get(npc.getId()))
final ManagerType type = MANAGERS.get(npc.getId());
switch (type)
{
case CASTLE:
{
@ -175,7 +177,8 @@ public class WyvernManager extends AbstractNpcAI
private String getResidenceName(Npc npc)
{
switch (MANAGERS.get(npc.getId()))
final ManagerType type = MANAGERS.get(npc.getId());
switch (type)
{
case CASTLE:
{
@ -222,19 +225,24 @@ public class WyvernManager extends AbstractNpcAI
{
htmltext = replaceAll(npc, player);
}
else if (MANAGERS.get(npc.getId()) == ManagerType.CASTLE)
{
htmltext = "wyvernmanager-dusk.html";
}
else
{
htmltext = replaceAll(npc, player);
final ManagerType type = MANAGERS.get(npc.getId());
if (type == ManagerType.CASTLE)
{
htmltext = "wyvernmanager-dusk.html";
}
else
{
htmltext = replaceAll(npc, player);
}
}
break;
}
case "Help":
{
htmltext = MANAGERS.get(npc.getId()) == ManagerType.CASTLE ? replacePart(player, "wyvernmanager-03.html") : replacePart(player, "wyvernmanager-03b.html");
final ManagerType type = MANAGERS.get(npc.getId());
htmltext = type == ManagerType.CASTLE ? replacePart(player, "wyvernmanager-03.html") : replacePart(player, "wyvernmanager-03b.html");
break;
}
case "RideWyvern":
@ -246,7 +254,8 @@ public class WyvernManager extends AbstractNpcAI
player.sendMessage("You cannot summon wyvern while in siege.");
return null;
}
if (MANAGERS.get(npc.getId()) == ManagerType.CASTLE)
final ManagerType type = MANAGERS.get(npc.getId());
if (type == ManagerType.CASTLE)
{
htmltext = "wyvernmanager-dusk.html";
}
@ -277,13 +286,17 @@ public class WyvernManager extends AbstractNpcAI
{
htmltext = replaceAll(npc, player);
}
else if (MANAGERS.get(npc.getId()) == ManagerType.CASTLE)
{
htmltext = "wyvernmanager-dusk.html";
}
else
{
htmltext = replaceAll(npc, player);
final ManagerType type = MANAGERS.get(npc.getId());
if (type == ManagerType.CASTLE)
{
htmltext = "wyvernmanager-dusk.html";
}
else
{
htmltext = replaceAll(npc, player);
}
}
return htmltext;
}

3
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java vendored
View File

@ -35,7 +35,8 @@ public class OpBlinkSkillCondition implements ISkillCondition
public OpBlinkSkillCondition(StatSet params)
{
switch (params.getEnum("direction", Position.class))
final Position position = params.getEnum("direction", Position.class);
switch (position)
{
case BACK:
{

2
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java
View File

@ -57,7 +57,7 @@ public class Forum
private boolean _loaded = false;
/**
* Creates new instance of Forum. When you create new forum, use {@link org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager# addForum(org.l2jmobius.gameserver.communitybbs.BB.Forum)} to add forum to the forums manager.
* Creates new instance of Forum. When you create new forum, use {@link org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager#addForum(org.l2jmobius.gameserver.communitybbs.BB.Forum)} to add forum to the forums manager.
* @param forumId
* @param fParent
*/

5
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java
View File

@ -43,10 +43,11 @@ public class ConditionHasResidence extends Condition
return false;
}
boolean test = false;
final StatSet params = getParameters();
final int id = params.getInt("id");
boolean test = false;
switch (params.getEnum("type", ResidenceType.class))
final ResidenceType type = params.getEnum("type", ResidenceType.class);
switch (type)
{
case CASTLE:
{

5
L2J_Mobius_3.0_Helios/java/org/l2jmobius/log/formatter/FileLogFormatter.java
View File

@ -35,6 +35,9 @@ public class FileLogFormatter extends Formatter
@Override
public String format(LogRecord record)
{
return StringUtil.concat(dateFmt.format(new Date(record.getMillis())), TAB, record.getLevel().getName(), TAB, String.valueOf(record.getThreadID()), TAB, record.getLoggerName(), TAB, record.getMessage(), Config.EOL);
// Java 1.8
// return StringUtil.concat(dateFmt.format(new Date(record.getMillis())), TAB, record.getLevel().getName(), TAB, String.valueOf(record.getThreadID()), TAB, record.getLoggerName(), TAB, record.getMessage(), Config.EOL);
// Java 16
return StringUtil.concat(dateFmt.format(new Date(record.getMillis())), TAB, record.getLevel().getName(), TAB, String.valueOf(record.getLongThreadID()), TAB, record.getLoggerName(), TAB, record.getMessage(), Config.EOL);
}
}

5
L2J_Mobius_3.0_Helios/readme.txt
View File

@ -4,8 +4,9 @@ Client: https://drive.google.com/uc?id=0B_wJFNF_2fcJTE5oVm96emtlSlE&export=downl
Mirror: https://mega.nz/#!Uo9TTCSQ!JDstscgcLFY3GeM3Q6j8nUq7jpixzqIV1Gl4z2ob0eA
System: https://mega.nz/#!Fp8QBYYD!jLmMH7wisNk198-A7AYqhA1VMDru_OXpJbunXpBh4ww
JDK: http://www.mediafire.com/file/cgh3zupv80qdwv4/bellsoft-jdk15.0.2%252B10-windows-amd64.msi
Eclipse: http://www.mediafire.com/file/h0gmazpv9hm6gjp/eclipse-java-2020-12-R-win32-x86_64.zip
JDK: https://www.mediafire.com/file/7n2v2ws8281knej/bellsoft-jdk17%252B35-windows-amd64.msi
XAMPP: https://www.mediafire.com/file/hkehxpyjn81ybsw/xampp-windows-x64-8.0.11-2-VS16-installer.exe
Eclipse: https://www.mediafire.com/file/rspmpv0hzid20hx/eclipse-java-2021-09-R-win32-x86_64_JDK17.zip
Geodata: http://www.mediafire.com/file/sviy5wsbdcgf5ve/L2J_Mobius_3.0_Helios_Geodata.zip

2
L2J_Mobius_4.0_GrandCrusade/.classpath
View File

@ -1,6 +1,6 @@
<?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-15">
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
<attributes>
<attribute name="module" value="true"/>
</attributes>

12
L2J_Mobius_4.0_GrandCrusade/.settings/org.eclipse.jdt.core.prefs
View File

@ -20,9 +20,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
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=15
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=15
org.eclipse.jdt.core.compiler.compliance=17
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@ -137,8 +137,8 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
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=15
org.eclipse.jdt.core.compiler.release=enabled
org.eclipse.jdt.core.compiler.source=17
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
@ -152,7 +152,6 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=0
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=0
org.eclipse.jdt.core.formatter.alignment_for_assignment=4
org.eclipse.jdt.core.formatter.alignment_for_binary_expression=0
org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=0
org.eclipse.jdt.core.formatter.alignment_for_compact_if=0
org.eclipse.jdt.core.formatter.alignment_for_compact_loops=0
@ -282,7 +281,6 @@ org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default=insert
org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=do not insert
@ -356,7 +354,6 @@ org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case=insert
org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default=insert
org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
@ -515,7 +512,6 @@ org.eclipse.jdt.core.formatter.use_on_off_tags=true
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false
org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true
org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true

6
L2J_Mobius_4.0_GrandCrusade/build.xml
View File

@ -52,8 +52,8 @@
</not>
</condition>
</fail>
<available classname="java.util.stream.Stream" property="JDK15.present" />
<fail unless="JDK15.present" message="Java 15 is required. But your version is Java ${ant.java.version} and probably JDK is not installed." />
<available classname="java.util.stream.Stream" property="JDK17.present" />
<fail unless="JDK17.present" message="Java 17 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.">
@ -62,7 +62,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="15" target="15" encoding="UTF-8" />
<javac srcdir="${src}" classpathref="classpath" destdir="${build.bin}" compiler="modern" debug="true" debuglevel="lines,vars,source" includeantruntime="false" source="17" target="17" encoding="UTF-8" />
</target>
<target name="jar" depends="compile" description="Create the jar files.">

43
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java vendored
View File

@ -120,7 +120,8 @@ public class WyvernManager extends AbstractNpcAI
private boolean isOwnerClan(Npc npc, PlayerInstance player)
{
switch (MANAGERS.get(npc.getId()))
final ManagerType type = MANAGERS.get(npc.getId());
switch (type)
{
case CASTLE:
{
@ -156,7 +157,8 @@ public class WyvernManager extends AbstractNpcAI
private boolean isInSiege(Npc npc)
{
switch (MANAGERS.get(npc.getId()))
final ManagerType type = MANAGERS.get(npc.getId());
switch (type)
{
case CASTLE:
{
@ -175,7 +177,8 @@ public class WyvernManager extends AbstractNpcAI
private String getResidenceName(Npc npc)
{
switch (MANAGERS.get(npc.getId()))
final ManagerType type = MANAGERS.get(npc.getId());
switch (type)
{
case CASTLE:
{
@ -222,19 +225,24 @@ public class WyvernManager extends AbstractNpcAI
{
htmltext = replaceAll(npc, player);
}
else if (MANAGERS.get(npc.getId()) == ManagerType.CASTLE)
{
htmltext = "wyvernmanager-dusk.html";
}
else
{
htmltext = replaceAll(npc, player);
final ManagerType type = MANAGERS.get(npc.getId());
if (type == ManagerType.CASTLE)
{
htmltext = "wyvernmanager-dusk.html";
}
else
{
htmltext = replaceAll(npc, player);
}
}
break;
}
case "Help":
{
htmltext = MANAGERS.get(npc.getId()) == ManagerType.CASTLE ? replacePart(player, "wyvernmanager-03.html") : replacePart(player, "wyvernmanager-03b.html");
final ManagerType type = MANAGERS.get(npc.getId());
htmltext = type == ManagerType.CASTLE ? replacePart(player, "wyvernmanager-03.html") : replacePart(player, "wyvernmanager-03b.html");
break;
}
case "RideWyvern":
@ -246,7 +254,8 @@ public class WyvernManager extends AbstractNpcAI
player.sendMessage("You cannot summon wyvern while in siege.");
return null;
}
if (MANAGERS.get(npc.getId()) == ManagerType.CASTLE)
final ManagerType type = MANAGERS.get(npc.getId());
if (type == ManagerType.CASTLE)
{
htmltext = "wyvernmanager-dusk.html";
}
@ -277,13 +286,17 @@ public class WyvernManager extends AbstractNpcAI
{
htmltext = replaceAll(npc, player);
}
else if (MANAGERS.get(npc.getId()) == ManagerType.CASTLE)
{
htmltext = "wyvernmanager-dusk.html";
}
else
{
htmltext = replaceAll(npc, player);
final ManagerType type = MANAGERS.get(npc.getId());
if (type == ManagerType.CASTLE)
{
htmltext = "wyvernmanager-dusk.html";
}
else
{
htmltext = replaceAll(npc, player);
}
}
return htmltext;
}

3
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java vendored
View File

@ -35,7 +35,8 @@ public class OpBlinkSkillCondition implements ISkillCondition
public OpBlinkSkillCondition(StatSet params)
{
switch (params.getEnum("direction", Position.class))
final Position position = params.getEnum("direction", Position.class);
switch (position)
{
case BACK:
{

2
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java
View File

@ -57,7 +57,7 @@ public class Forum
private boolean _loaded = false;
/**
* Creates new instance of Forum. When you create new forum, use {@link org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager# addForum(org.l2jmobius.gameserver.communitybbs.BB.Forum)} to add forum to the forums manager.
* Creates new instance of Forum. When you create new forum, use {@link org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager#addForum(org.l2jmobius.gameserver.communitybbs.BB.Forum)} to add forum to the forums manager.
* @param forumId
* @param fParent
*/

5
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java
View File

@ -43,10 +43,11 @@ public class ConditionHasResidence extends Condition
return false;
}
boolean test = false;
final StatSet params = getParameters();
final int id = params.getInt("id");
boolean test = false;
switch (params.getEnum("type", ResidenceType.class))
final ResidenceType type = params.getEnum("type", ResidenceType.class);
switch (type)
{
case CASTLE:
{

5
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/log/formatter/FileLogFormatter.java
View File

@ -35,6 +35,9 @@ public class FileLogFormatter extends Formatter
@Override
public String format(LogRecord record)
{
return StringUtil.concat(dateFmt.format(new Date(record.getMillis())), TAB, record.getLevel().getName(), TAB, String.valueOf(record.getThreadID()), TAB, record.getLoggerName(), TAB, record.getMessage(), Config.EOL);
// Java 1.8
// return StringUtil.concat(dateFmt.format(new Date(record.getMillis())), TAB, record.getLevel().getName(), TAB, String.valueOf(record.getThreadID()), TAB, record.getLoggerName(), TAB, record.getMessage(), Config.EOL);
// Java 16
return StringUtil.concat(dateFmt.format(new Date(record.getMillis())), TAB, record.getLevel().getName(), TAB, String.valueOf(record.getLongThreadID()), TAB, record.getLoggerName(), TAB, record.getMessage(), Config.EOL);
}
}

5
L2J_Mobius_4.0_GrandCrusade/readme.txt
View File

@ -4,8 +4,9 @@ Client: https://drive.google.com/uc?id=1MA8eTpTZHblC9Iki4xXdWWbS4HGednDq&export=
Mirror: https://mega.nz/#!0eB0RIZS!RGm506vctH72n7H9tCNpepWfIfs1AvFB5NkcsNcMYA4
System: https://mega.nz/#!Fk0SAK6L!v3JSzKN6QuNzINgel0wp7zXovh0DOYzqxcm7etQOSLI
JDK: http://www.mediafire.com/file/cgh3zupv80qdwv4/bellsoft-jdk15.0.2%252B10-windows-amd64.msi
Eclipse: http://www.mediafire.com/file/h0gmazpv9hm6gjp/eclipse-java-2020-12-R-win32-x86_64.zip
JDK: https://www.mediafire.com/file/7n2v2ws8281knej/bellsoft-jdk17%252B35-windows-amd64.msi
XAMPP: https://www.mediafire.com/file/hkehxpyjn81ybsw/xampp-windows-x64-8.0.11-2-VS16-installer.exe
Eclipse: https://www.mediafire.com/file/rspmpv0hzid20hx/eclipse-java-2021-09-R-win32-x86_64_JDK17.zip
Geodata: http://www.mediafire.com/file/3wru8ll42xoqzn4/L2J_Mobius_4.0_GrandCrusade_Geodata.zip

2
L2J_Mobius_5.0_Salvation/.classpath
View File

@ -1,6 +1,6 @@
<?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-15">
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
<attributes>
<attribute name="module" value="true"/>
</attributes>

12
L2J_Mobius_5.0_Salvation/.settings/org.eclipse.jdt.core.prefs
View File

@ -20,9 +20,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
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=15
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=15
org.eclipse.jdt.core.compiler.compliance=17
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@ -137,8 +137,8 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
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=15
org.eclipse.jdt.core.compiler.release=enabled
org.eclipse.jdt.core.compiler.source=17
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
@ -152,7 +152,6 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=0
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=0
org.eclipse.jdt.core.formatter.alignment_for_assignment=4
org.eclipse.jdt.core.formatter.alignment_for_binary_expression=0
org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=0
org.eclipse.jdt.core.formatter.alignment_for_compact_if=0
org.eclipse.jdt.core.formatter.alignment_for_compact_loops=0
@ -282,7 +281,6 @@ org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default=insert
org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=do not insert
@ -356,7 +354,6 @@ org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case=insert
org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default=insert
org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
@ -515,7 +512,6 @@ org.eclipse.jdt.core.formatter.use_on_off_tags=true
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false
org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true
org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true

6
L2J_Mobius_5.0_Salvation/build.xml
View File

@ -52,8 +52,8 @@
</not>
</condition>
</fail>
<available classname="java.util.stream.Stream" property="JDK15.present" />
<fail unless="JDK15.present" message="Java 15 is required. But your version is Java ${ant.java.version} and probably JDK is not installed." />
<available classname="java.util.stream.Stream" property="JDK17.present" />
<fail unless="JDK17.present" message="Java 17 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.">
@ -62,7 +62,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="15" target="15" encoding="UTF-8" />
<javac srcdir="${src}" classpathref="classpath" destdir="${build.bin}" compiler="modern" debug="true" debuglevel="lines,vars,source" includeantruntime="false" source="17" target="17" encoding="UTF-8" />
</target>
<target name="jar" depends="compile" description="Create the jar files.">

43
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java vendored
View File

@ -120,7 +120,8 @@ public class WyvernManager extends AbstractNpcAI
private boolean isOwnerClan(Npc npc, PlayerInstance player)
{
switch (MANAGERS.get(npc.getId()))
final ManagerType type = MANAGERS.get(npc.getId());
switch (type)
{
case CASTLE:
{
@ -156,7 +157,8 @@ public class WyvernManager extends AbstractNpcAI
private boolean isInSiege(Npc npc)
{
switch (MANAGERS.get(npc.getId()))
final ManagerType type = MANAGERS.get(npc.getId());
switch (type)
{
case CASTLE:
{
@ -175,7 +177,8 @@ public class WyvernManager extends AbstractNpcAI
private String getResidenceName(Npc npc)
{
switch (MANAGERS.get(npc.getId()))
final ManagerType type = MANAGERS.get(npc.getId());
switch (type)
{
case CASTLE:
{
@ -222,19 +225,24 @@ public class WyvernManager extends AbstractNpcAI
{
htmltext = replaceAll(npc, player);
}
else if (MANAGERS.get(npc.getId()) == ManagerType.CASTLE)
{
htmltext = "wyvernmanager-dusk.html";
}
else
{
htmltext = replaceAll(npc, player);
final ManagerType type = MANAGERS.get(npc.getId());
if (type == ManagerType.CASTLE)
{
htmltext = "wyvernmanager-dusk.html";
}
else
{
htmltext = replaceAll(npc, player);
}
}
break;
}
case "Help":
{
htmltext = MANAGERS.get(npc.getId()) == ManagerType.CASTLE ? replacePart(player, "wyvernmanager-03.html") : replacePart(player, "wyvernmanager-03b.html");
final ManagerType type = MANAGERS.get(npc.getId());
htmltext = type == ManagerType.CASTLE ? replacePart(player, "wyvernmanager-03.html") : replacePart(player, "wyvernmanager-03b.html");
break;
}
case "RideWyvern":
@ -246,7 +254,8 @@ public class WyvernManager extends AbstractNpcAI
player.sendMessage("You cannot summon wyvern while in siege.");
return null;
}
if (MANAGERS.get(npc.getId()) == ManagerType.CASTLE)
final ManagerType type = MANAGERS.get(npc.getId());
if (type == ManagerType.CASTLE)
{
htmltext = "wyvernmanager-dusk.html";
}
@ -277,13 +286,17 @@ public class WyvernManager extends AbstractNpcAI
{
htmltext = replaceAll(npc, player);
}
else if (MANAGERS.get(npc.getId()) == ManagerType.CASTLE)
{
htmltext = "wyvernmanager-dusk.html";
}
else
{
htmltext = replaceAll(npc, player);
final ManagerType type = MANAGERS.get(npc.getId());
if (type == ManagerType.CASTLE)
{
htmltext = "wyvernmanager-dusk.html";
}
else
{
htmltext = replaceAll(npc, player);
}
}
return htmltext;
}

3
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java vendored
View File

@ -35,7 +35,8 @@ public class OpBlinkSkillCondition implements ISkillCondition
public OpBlinkSkillCondition(StatSet params)
{
switch (params.getEnum("direction", Position.class))
final Position position = params.getEnum("direction", Position.class);
switch (position)
{
case BACK:
{

2
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java
View File

@ -57,7 +57,7 @@ public class Forum
private boolean _loaded = false;
/**
* Creates new instance of Forum. When you create new forum, use {@link org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager# addForum(org.l2jmobius.gameserver.communitybbs.BB.Forum)} to add forum to the forums manager.
* Creates new instance of Forum. When you create new forum, use {@link org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager#addForum(org.l2jmobius.gameserver.communitybbs.BB.Forum)} to add forum to the forums manager.
* @param forumId
* @param fParent
*/

5
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java
View File

@ -43,10 +43,11 @@ public class ConditionHasResidence extends Condition
return false;
}
boolean test = false;
final StatSet params = getParameters();
final int id = params.getInt("id");
boolean test = false;
switch (params.getEnum("type", ResidenceType.class))
final ResidenceType type = params.getEnum("type", ResidenceType.class);
switch (type)
{
case CASTLE:
{

5
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/log/formatter/FileLogFormatter.java
View File

@ -35,6 +35,9 @@ public class FileLogFormatter extends Formatter
@Override
public String format(LogRecord record)
{
return StringUtil.concat(dateFmt.format(new Date(record.getMillis())), TAB, record.getLevel().getName(), TAB, String.valueOf(record.getThreadID()), TAB, record.getLoggerName(), TAB, record.getMessage(), Config.EOL);
// Java 1.8
// return StringUtil.concat(dateFmt.format(new Date(record.getMillis())), TAB, record.getLevel().getName(), TAB, String.valueOf(record.getThreadID()), TAB, record.getLoggerName(), TAB, record.getMessage(), Config.EOL);
// Java 16
return StringUtil.concat(dateFmt.format(new Date(record.getMillis())), TAB, record.getLevel().getName(), TAB, String.valueOf(record.getLongThreadID()), TAB, record.getLoggerName(), TAB, record.getMessage(), Config.EOL);
}
}

5
L2J_Mobius_5.0_Salvation/readme.txt
View File

@ -5,8 +5,9 @@ Use mega downloader to download https://megadownloader.en.softonic.com/
System: https://mega.nz/#!ZgtSUQKR!CNGdlcf2TRiDKvH8NJowEQUfafoJyzsv-g2SM9kpOB4
JDK: http://www.mediafire.com/file/cgh3zupv80qdwv4/bellsoft-jdk15.0.2%252B10-windows-amd64.msi
Eclipse: http://www.mediafire.com/file/h0gmazpv9hm6gjp/eclipse-java-2020-12-R-win32-x86_64.zip
JDK: https://www.mediafire.com/file/7n2v2ws8281knej/bellsoft-jdk17%252B35-windows-amd64.msi
XAMPP: https://www.mediafire.com/file/hkehxpyjn81ybsw/xampp-windows-x64-8.0.11-2-VS16-installer.exe
Eclipse: https://www.mediafire.com/file/rspmpv0hzid20hx/eclipse-java-2021-09-R-win32-x86_64_JDK17.zip
Geodata: http://www.mediafire.com/file/arc7w3cbiukz0wj/L2J_Mobius_5.0_Salvation_Geodata.zip

2
L2J_Mobius_5.5_EtinasFate/.classpath
View File

@ -1,6 +1,6 @@
<?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-15">
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
<attributes>
<attribute name="module" value="true"/>
</attributes>

12
L2J_Mobius_5.5_EtinasFate/.settings/org.eclipse.jdt.core.prefs
View File

@ -20,9 +20,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
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=15
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=15
org.eclipse.jdt.core.compiler.compliance=17
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@ -137,8 +137,8 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
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=15
org.eclipse.jdt.core.compiler.release=enabled
org.eclipse.jdt.core.compiler.source=17
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
@ -152,7 +152,6 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=0
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=0
org.eclipse.jdt.core.formatter.alignment_for_assignment=4
org.eclipse.jdt.core.formatter.alignment_for_binary_expression=0
org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=0
org.eclipse.jdt.core.formatter.alignment_for_compact_if=0
org.eclipse.jdt.core.formatter.alignment_for_compact_loops=0
@ -282,7 +281,6 @@ org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default=insert
org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=do not insert
@ -356,7 +354,6 @@ org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case=insert
org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default=insert
org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
@ -515,7 +512,6 @@ org.eclipse.jdt.core.formatter.use_on_off_tags=true
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false
org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true
org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true

6
L2J_Mobius_5.5_EtinasFate/build.xml
View File

@ -52,8 +52,8 @@
</not>
</condition>
</fail>
<available classname="java.util.stream.Stream" property="JDK15.present" />
<fail unless="JDK15.present" message="Java 15 is required. But your version is Java ${ant.java.version} and probably JDK is not installed." />
<available classname="java.util.stream.Stream" property="JDK17.present" />
<fail unless="JDK17.present" message="Java 17 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.">
@ -62,7 +62,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="15" target="15" encoding="UTF-8" />
<javac srcdir="${src}" classpathref="classpath" destdir="${build.bin}" compiler="modern" debug="true" debuglevel="lines,vars,source" includeantruntime="false" source="17" target="17" encoding="UTF-8" />
</target>
<target name="jar" depends="compile" description="Create the jar files.">

43
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java vendored
View File

@ -120,7 +120,8 @@ public class WyvernManager extends AbstractNpcAI
private boolean isOwnerClan(Npc npc, PlayerInstance player)
{
switch (MANAGERS.get(npc.getId()))
final ManagerType type = MANAGERS.get(npc.getId());
switch (type)
{
case CASTLE:
{
@ -156,7 +157,8 @@ public class WyvernManager extends AbstractNpcAI
private boolean isInSiege(Npc npc)
{
switch (MANAGERS.get(npc.getId()))
final ManagerType type = MANAGERS.get(npc.getId());
switch (type)
{
case CASTLE:
{
@ -175,7 +177,8 @@ public class WyvernManager extends AbstractNpcAI
private String getResidenceName(Npc npc)
{
switch (MANAGERS.get(npc.getId()))
final ManagerType type = MANAGERS.get(npc.getId());
switch (type)
{
case CASTLE:
{
@ -222,19 +225,24 @@ public class WyvernManager extends AbstractNpcAI
{
htmltext = replaceAll(npc, player);
}
else if (MANAGERS.get(npc.getId()) == ManagerType.CASTLE)
{
htmltext = "wyvernmanager-dusk.html";
}
else
{
htmltext = replaceAll(npc, player);
final ManagerType type = MANAGERS.get(npc.getId());
if (type == ManagerType.CASTLE)
{
htmltext = "wyvernmanager-dusk.html";
}
else
{
htmltext = replaceAll(npc, player);
}
}
break;
}
case "Help":
{
htmltext = MANAGERS.get(npc.getId()) == ManagerType.CASTLE ? replacePart(player, "wyvernmanager-03.html") : replacePart(player, "wyvernmanager-03b.html");
final ManagerType type = MANAGERS.get(npc.getId());
htmltext = type == ManagerType.CASTLE ? replacePart(player, "wyvernmanager-03.html") : replacePart(player, "wyvernmanager-03b.html");
break;
}
case "RideWyvern":
@ -246,7 +254,8 @@ public class WyvernManager extends AbstractNpcAI
player.sendMessage("You cannot summon wyvern while in siege.");
return null;
}
if (MANAGERS.get(npc.getId()) == ManagerType.CASTLE)
final ManagerType type = MANAGERS.get(npc.getId());
if (type == ManagerType.CASTLE)
{
htmltext = "wyvernmanager-dusk.html";
}
@ -277,13 +286,17 @@ public class WyvernManager extends AbstractNpcAI
{
htmltext = replaceAll(npc, player);
}
else if (MANAGERS.get(npc.getId()) == ManagerType.CASTLE)
{
htmltext = "wyvernmanager-dusk.html";
}
else
{
htmltext = replaceAll(npc, player);
final ManagerType type = MANAGERS.get(npc.getId());
if (type == ManagerType.CASTLE)
{
htmltext = "wyvernmanager-dusk.html";
}
else
{
htmltext = replaceAll(npc, player);
}
}
return htmltext;
}

3
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java vendored
View File

@ -35,7 +35,8 @@ public class OpBlinkSkillCondition implements ISkillCondition
public OpBlinkSkillCondition(StatSet params)
{
switch (params.getEnum("direction", Position.class))
final Position position = params.getEnum("direction", Position.class);
switch (position)
{
case BACK:
{

2
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java
View File

@ -57,7 +57,7 @@ public class Forum
private boolean _loaded = false;
/**
* Creates new instance of Forum. When you create new forum, use {@link org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager# addForum(org.l2jmobius.gameserver.communitybbs.BB.Forum)} to add forum to the forums manager.
* Creates new instance of Forum. When you create new forum, use {@link org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager#addForum(org.l2jmobius.gameserver.communitybbs.BB.Forum)} to add forum to the forums manager.
* @param forumId
* @param fParent
*/

5
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java
View File

@ -43,10 +43,11 @@ public class ConditionHasResidence extends Condition
return false;
}
boolean test = false;
final StatSet params = getParameters();
final int id = params.getInt("id");
boolean test = false;
switch (params.getEnum("type", ResidenceType.class))
final ResidenceType type = params.getEnum("type", ResidenceType.class);
switch (type)
{
case CASTLE:
{

5
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/log/formatter/FileLogFormatter.java
View File

@ -35,6 +35,9 @@ public class FileLogFormatter extends Formatter
@Override
public String format(LogRecord record)
{
return StringUtil.concat(dateFmt.format(new Date(record.getMillis())), TAB, record.getLevel().getName(), TAB, String.valueOf(record.getThreadID()), TAB, record.getLoggerName(), TAB, record.getMessage(), Config.EOL);
// Java 1.8
// return StringUtil.concat(dateFmt.format(new Date(record.getMillis())), TAB, record.getLevel().getName(), TAB, String.valueOf(record.getThreadID()), TAB, record.getLoggerName(), TAB, record.getMessage(), Config.EOL);
// Java 16
return StringUtil.concat(dateFmt.format(new Date(record.getMillis())), TAB, record.getLevel().getName(), TAB, String.valueOf(record.getLongThreadID()), TAB, record.getLoggerName(), TAB, record.getMessage(), Config.EOL);
}
}

5
L2J_Mobius_5.5_EtinasFate/readme.txt
View File

@ -3,8 +3,9 @@ L2J-Mobius Etina's Fate
Client: https://drive.google.com/uc?id=1L4hcPsh5T3TOf_LcePonnMeQvcDm9DDV&export=download
System: https://mega.nz/#!B10W0QSR!xon-5i8Z8g5-VoJPTt16leYVIVV8GosQE_OSH1j7pnM
JDK: http://www.mediafire.com/file/cgh3zupv80qdwv4/bellsoft-jdk15.0.2%252B10-windows-amd64.msi
Eclipse: http://www.mediafire.com/file/h0gmazpv9hm6gjp/eclipse-java-2020-12-R-win32-x86_64.zip
JDK: https://www.mediafire.com/file/7n2v2ws8281knej/bellsoft-jdk17%252B35-windows-amd64.msi
XAMPP: https://www.mediafire.com/file/hkehxpyjn81ybsw/xampp-windows-x64-8.0.11-2-VS16-installer.exe
Eclipse: https://www.mediafire.com/file/rspmpv0hzid20hx/eclipse-java-2021-09-R-win32-x86_64_JDK17.zip
Geodata: http://www.mediafire.com/file/3cjttcj5ij8fsxl/L2J_Mobius_5.5_EtinasFate_Geodata.zip

2
L2J_Mobius_6.0_Fafurion/.classpath
View File

@ -1,6 +1,6 @@
<?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-15">
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
<attributes>
<attribute name="module" value="true"/>
</attributes>

12
L2J_Mobius_6.0_Fafurion/.settings/org.eclipse.jdt.core.prefs
View File

@ -20,9 +20,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
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=15
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=15
org.eclipse.jdt.core.compiler.compliance=17
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@ -137,8 +137,8 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
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=15
org.eclipse.jdt.core.compiler.release=enabled
org.eclipse.jdt.core.compiler.source=17
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
@ -152,7 +152,6 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=0
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=0
org.eclipse.jdt.core.formatter.alignment_for_assignment=4
org.eclipse.jdt.core.formatter.alignment_for_binary_expression=0
org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=0
org.eclipse.jdt.core.formatter.alignment_for_compact_if=0
org.eclipse.jdt.core.formatter.alignment_for_compact_loops=0
@ -282,7 +281,6 @@ org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default=insert
org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=do not insert
@ -356,7 +354,6 @@ org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case=insert
org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default=insert
org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
@ -515,7 +512,6 @@ org.eclipse.jdt.core.formatter.use_on_off_tags=true
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false
org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true
org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true

6
L2J_Mobius_6.0_Fafurion/build.xml
View File

@ -52,8 +52,8 @@
</not>
</condition>
</fail>
<available classname="java.util.stream.Stream" property="JDK15.present" />
<fail unless="JDK15.present" message="Java 15 is required. But your version is Java ${ant.java.version} and probably JDK is not installed." />
<available classname="java.util.stream.Stream" property="JDK17.present" />
<fail unless="JDK17.present" message="Java 17 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.">
@ -62,7 +62,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="15" target="15" encoding="UTF-8" />
<javac srcdir="${src}" classpathref="classpath" destdir="${build.bin}" compiler="modern" debug="true" debuglevel="lines,vars,source" includeantruntime="false" source="17" target="17" encoding="UTF-8" />
</target>
<target name="jar" depends="compile" description="Create the jar files.">

43
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java vendored
View File

@ -120,7 +120,8 @@ public class WyvernManager extends AbstractNpcAI
private boolean isOwnerClan(Npc npc, PlayerInstance player)
{
switch (MANAGERS.get(npc.getId()))
final ManagerType type = MANAGERS.get(npc.getId());
switch (type)
{
case CASTLE:
{
@ -156,7 +157,8 @@ public class WyvernManager extends AbstractNpcAI
private boolean isInSiege(Npc npc)
{
switch (MANAGERS.get(npc.getId()))
final ManagerType type = MANAGERS.get(npc.getId());
switch (type)
{
case CASTLE:
{
@ -175,7 +177,8 @@ public class WyvernManager extends AbstractNpcAI
private String getResidenceName(Npc npc)
{
switch (MANAGERS.get(npc.getId()))
final ManagerType type = MANAGERS.get(npc.getId());
switch (type)
{
case CASTLE:
{
@ -222,19 +225,24 @@ public class WyvernManager extends AbstractNpcAI
{
htmltext = replaceAll(npc, player);
}
else if (MANAGERS.get(npc.getId()) == ManagerType.CASTLE)
{
htmltext = "wyvernmanager-dusk.html";
}
else
{
htmltext = replaceAll(npc, player);
final ManagerType type = MANAGERS.get(npc.getId());
if (type == ManagerType.CASTLE)
{
htmltext = "wyvernmanager-dusk.html";
}
else
{
htmltext = replaceAll(npc, player);
}
}
break;
}
case "Help":
{
htmltext = MANAGERS.get(npc.getId()) == ManagerType.CASTLE ? replacePart(player, "wyvernmanager-03.html") : replacePart(player, "wyvernmanager-03b.html");
final ManagerType type = MANAGERS.get(npc.getId());
htmltext = type == ManagerType.CASTLE ? replacePart(player, "wyvernmanager-03.html") : replacePart(player, "wyvernmanager-03b.html");
break;
}
case "RideWyvern":
@ -246,7 +254,8 @@ public class WyvernManager extends AbstractNpcAI
player.sendMessage("You cannot summon wyvern while in siege.");
return null;
}
if (MANAGERS.get(npc.getId()) == ManagerType.CASTLE)
final ManagerType type = MANAGERS.get(npc.getId());
if (type == ManagerType.CASTLE)
{
htmltext = "wyvernmanager-dusk.html";
}
@ -277,13 +286,17 @@ public class WyvernManager extends AbstractNpcAI
{
htmltext = replaceAll(npc, player);
}
else if (MANAGERS.get(npc.getId()) == ManagerType.CASTLE)
{
htmltext = "wyvernmanager-dusk.html";
}
else
{
htmltext = replaceAll(npc, player);
final ManagerType type = MANAGERS.get(npc.getId());
if (type == ManagerType.CASTLE)
{
htmltext = "wyvernmanager-dusk.html";
}
else
{
htmltext = replaceAll(npc, player);
}
}
return htmltext;
}

3
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java vendored
View File

@ -35,7 +35,8 @@ public class OpBlinkSkillCondition implements ISkillCondition
public OpBlinkSkillCondition(StatSet params)
{
switch (params.getEnum("direction", Position.class))
final Position position = params.getEnum("direction", Position.class);
switch (position)
{
case BACK:
{

2
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java
View File

@ -57,7 +57,7 @@ public class Forum
private boolean _loaded = false;
/**
* Creates new instance of Forum. When you create new forum, use {@link org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager# addForum(org.l2jmobius.gameserver.communitybbs.BB.Forum)} to add forum to the forums manager.
* Creates new instance of Forum. When you create new forum, use {@link org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager#addForum(org.l2jmobius.gameserver.communitybbs.BB.Forum)} to add forum to the forums manager.
* @param forumId
* @param fParent
*/

5
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java
View File

@ -43,10 +43,11 @@ public class ConditionHasResidence extends Condition
return false;
}
boolean test = false;
final StatSet params = getParameters();
final int id = params.getInt("id");
boolean test = false;
switch (params.getEnum("type", ResidenceType.class))
final ResidenceType type = params.getEnum("type", ResidenceType.class);
switch (type)
{
case CASTLE:
{

5
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/log/formatter/FileLogFormatter.java
View File

@ -35,6 +35,9 @@ public class FileLogFormatter extends Formatter
@Override
public String format(LogRecord record)
{
return StringUtil.concat(dateFmt.format(new Date(record.getMillis())), TAB, record.getLevel().getName(), TAB, String.valueOf(record.getThreadID()), TAB, record.getLoggerName(), TAB, record.getMessage(), Config.EOL);
// Java 1.8
// return StringUtil.concat(dateFmt.format(new Date(record.getMillis())), TAB, record.getLevel().getName(), TAB, String.valueOf(record.getThreadID()), TAB, record.getLoggerName(), TAB, record.getMessage(), Config.EOL);
// Java 16
return StringUtil.concat(dateFmt.format(new Date(record.getMillis())), TAB, record.getLevel().getName(), TAB, String.valueOf(record.getLongThreadID()), TAB, record.getLoggerName(), TAB, record.getMessage(), Config.EOL);
}
}

5
L2J_Mobius_6.0_Fafurion/readme.txt
View File

@ -6,8 +6,9 @@ Use mega downloader to download https://megadownloader.en.softonic.com/
Client mirror 2: https://drive.google.com/uc?id=1yeYwrQEIcmAz5Ha1R05c3QgntRPy9y0V&export=download
System: https://mega.nz/#!xolCkYjD!TpdBo8SwYpPYJN86H_r5AxZljTZAfyj-o2H9cfy2bNc
JDK: http://www.mediafire.com/file/cgh3zupv80qdwv4/bellsoft-jdk15.0.2%252B10-windows-amd64.msi
Eclipse: http://www.mediafire.com/file/h0gmazpv9hm6gjp/eclipse-java-2020-12-R-win32-x86_64.zip
JDK: https://www.mediafire.com/file/7n2v2ws8281knej/bellsoft-jdk17%252B35-windows-amd64.msi
XAMPP: https://www.mediafire.com/file/hkehxpyjn81ybsw/xampp-windows-x64-8.0.11-2-VS16-installer.exe
Eclipse: https://www.mediafire.com/file/rspmpv0hzid20hx/eclipse-java-2021-09-R-win32-x86_64_JDK17.zip
Geodata: http://www.mediafire.com/file/dcpw8w5u60alw14/L2J_Mobius_6.0_Fafurion_Geodata.zip

2
L2J_Mobius_7.0_PreludeOfWar/.classpath
View File

@ -1,6 +1,6 @@
<?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-15">
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
<attributes>
<attribute name="module" value="true"/>
</attributes>

12
L2J_Mobius_7.0_PreludeOfWar/.settings/org.eclipse.jdt.core.prefs
View File

@ -20,9 +20,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
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=15
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=15
org.eclipse.jdt.core.compiler.compliance=17
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@ -137,8 +137,8 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
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=15
org.eclipse.jdt.core.compiler.release=enabled
org.eclipse.jdt.core.compiler.source=17
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
@ -152,7 +152,6 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=0
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=0
org.eclipse.jdt.core.formatter.alignment_for_assignment=4
org.eclipse.jdt.core.formatter.alignment_for_binary_expression=0
org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=0
org.eclipse.jdt.core.formatter.alignment_for_compact_if=0
org.eclipse.jdt.core.formatter.alignment_for_compact_loops=0
@ -282,7 +281,6 @@ org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default=insert
org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=do not insert
@ -356,7 +354,6 @@ org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case=insert
org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default=insert
org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
@ -515,7 +512,6 @@ org.eclipse.jdt.core.formatter.use_on_off_tags=true
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false
org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true
org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true

6
L2J_Mobius_7.0_PreludeOfWar/build.xml
View File

@ -52,8 +52,8 @@
</not>
</condition>
</fail>
<available classname="java.util.stream.Stream" property="JDK15.present" />
<fail unless="JDK15.present" message="Java 15 is required. But your version is Java ${ant.java.version} and probably JDK is not installed." />
<available classname="java.util.stream.Stream" property="JDK17.present" />
<fail unless="JDK17.present" message="Java 17 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.">
@ -62,7 +62,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="15" target="15" encoding="UTF-8" />
<javac srcdir="${src}" classpathref="classpath" destdir="${build.bin}" compiler="modern" debug="true" debuglevel="lines,vars,source" includeantruntime="false" source="17" target="17" encoding="UTF-8" />
</target>
<target name="jar" depends="compile" description="Create the jar files.">

43
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java vendored
View File

@ -120,7 +120,8 @@ public class WyvernManager extends AbstractNpcAI
private boolean isOwnerClan(Npc npc, PlayerInstance player)
{
switch (MANAGERS.get(npc.getId()))
final ManagerType type = MANAGERS.get(npc.getId());
switch (type)
{
case CASTLE:
{
@ -156,7 +157,8 @@ public class WyvernManager extends AbstractNpcAI
private boolean isInSiege(Npc npc)
{
switch (MANAGERS.get(npc.getId()))
final ManagerType type = MANAGERS.get(npc.getId());
switch (type)
{
case CASTLE:
{
@ -175,7 +177,8 @@ public class WyvernManager extends AbstractNpcAI
private String getResidenceName(Npc npc)
{
switch (MANAGERS.get(npc.getId()))
final ManagerType type = MANAGERS.get(npc.getId());
switch (type)
{
case CASTLE:
{
@ -222,19 +225,24 @@ public class WyvernManager extends AbstractNpcAI
{
htmltext = replaceAll(npc, player);
}
else if (MANAGERS.get(npc.getId()) == ManagerType.CASTLE)
{
htmltext = "wyvernmanager-dusk.html";
}
else
{
htmltext = replaceAll(npc, player);
final ManagerType type = MANAGERS.get(npc.getId());
if (type == ManagerType.CASTLE)
{
htmltext = "wyvernmanager-dusk.html";
}
else
{
htmltext = replaceAll(npc, player);
}
}
break;
}
case "Help":
{
htmltext = MANAGERS.get(npc.getId()) == ManagerType.CASTLE ? replacePart(player, "wyvernmanager-03.html") : replacePart(player, "wyvernmanager-03b.html");
final ManagerType type = MANAGERS.get(npc.getId());
htmltext = type == ManagerType.CASTLE ? replacePart(player, "wyvernmanager-03.html") : replacePart(player, "wyvernmanager-03b.html");
break;
}
case "RideWyvern":
@ -246,7 +254,8 @@ public class WyvernManager extends AbstractNpcAI
player.sendMessage("You cannot summon wyvern while in siege.");
return null;
}
if (MANAGERS.get(npc.getId()) == ManagerType.CASTLE)
final ManagerType type = MANAGERS.get(npc.getId());
if (type == ManagerType.CASTLE)
{
htmltext = "wyvernmanager-dusk.html";
}
@ -277,13 +286,17 @@ public class WyvernManager extends AbstractNpcAI
{
htmltext = replaceAll(npc, player);
}
else if (MANAGERS.get(npc.getId()) == ManagerType.CASTLE)
{
htmltext = "wyvernmanager-dusk.html";
}
else
{
htmltext = replaceAll(npc, player);
final ManagerType type = MANAGERS.get(npc.getId());
if (type == ManagerType.CASTLE)
{
htmltext = "wyvernmanager-dusk.html";
}
else
{
htmltext = replaceAll(npc, player);
}
}
return htmltext;
}

3
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java vendored
View File

@ -35,7 +35,8 @@ public class OpBlinkSkillCondition implements ISkillCondition
public OpBlinkSkillCondition(StatSet params)
{
switch (params.getEnum("direction", Position.class))
final Position position = params.getEnum("direction", Position.class);
switch (position)
{
case BACK:
{

2
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java
View File

@ -57,7 +57,7 @@ public class Forum
private boolean _loaded = false;
/**
* Creates new instance of Forum. When you create new forum, use {@link org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager# addForum(org.l2jmobius.gameserver.communitybbs.BB.Forum)} to add forum to the forums manager.
* Creates new instance of Forum. When you create new forum, use {@link org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager#addForum(org.l2jmobius.gameserver.communitybbs.BB.Forum)} to add forum to the forums manager.
* @param forumId
* @param fParent
*/

5
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java
View File

@ -43,10 +43,11 @@ public class ConditionHasResidence extends Condition
return false;
}
boolean test = false;
final StatSet params = getParameters();
final int id = params.getInt("id");
boolean test = false;
switch (params.getEnum("type", ResidenceType.class))
final ResidenceType type = params.getEnum("type", ResidenceType.class);
switch (type)
{
case CASTLE:
{

5
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/log/formatter/FileLogFormatter.java
View File

@ -35,6 +35,9 @@ public class FileLogFormatter extends Formatter
@Override
public String format(LogRecord record)
{
return StringUtil.concat(dateFmt.format(new Date(record.getMillis())), TAB, record.getLevel().getName(), TAB, String.valueOf(record.getThreadID()), TAB, record.getLoggerName(), TAB, record.getMessage(), Config.EOL);
// Java 1.8
// return StringUtil.concat(dateFmt.format(new Date(record.getMillis())), TAB, record.getLevel().getName(), TAB, String.valueOf(record.getThreadID()), TAB, record.getLoggerName(), TAB, record.getMessage(), Config.EOL);
// Java 16
return StringUtil.concat(dateFmt.format(new Date(record.getMillis())), TAB, record.getLevel().getName(), TAB, String.valueOf(record.getLongThreadID()), TAB, record.getLoggerName(), TAB, record.getMessage(), Config.EOL);
}
}

5
L2J_Mobius_7.0_PreludeOfWar/readme.txt
View File

@ -3,8 +3,9 @@ Client Mirror 1: https://drive.google.com/uc?id=1rXtgV9l67b5lBeK_wmCKITE1DQ7EgEJ
Client Mirror 2: https://drive.google.com/uc?id=1IugZjcpS5n9_EJPLCecB3H_tLmVlqo2L&export=download
System: https://mega.nz/#!98likSra!vP3uaDwJs8oiY5q60UzBSXAbgNELWX_dycWb98Mz96U
JDK: http://www.mediafire.com/file/cgh3zupv80qdwv4/bellsoft-jdk15.0.2%252B10-windows-amd64.msi
Eclipse: http://www.mediafire.com/file/h0gmazpv9hm6gjp/eclipse-java-2020-12-R-win32-x86_64.zip
JDK: https://www.mediafire.com/file/7n2v2ws8281knej/bellsoft-jdk17%252B35-windows-amd64.msi
XAMPP: https://www.mediafire.com/file/hkehxpyjn81ybsw/xampp-windows-x64-8.0.11-2-VS16-installer.exe
Eclipse: https://www.mediafire.com/file/rspmpv0hzid20hx/eclipse-java-2021-09-R-win32-x86_64_JDK17.zip
Geodata: http://www.mediafire.com/file/94ekkgj1xmr5rb1/L2J_Mobius_7.0_PreludeOfWar_Geodata.zip

2
L2J_Mobius_8.2_Homunculus/.classpath
View File

@ -1,6 +1,6 @@
<?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-15">
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
<attributes>
<attribute name="module" value="true"/>
</attributes>

12
L2J_Mobius_8.2_Homunculus/.settings/org.eclipse.jdt.core.prefs
View File

@ -20,9 +20,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
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=15
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=15
org.eclipse.jdt.core.compiler.compliance=17
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@ -137,8 +137,8 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
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=15
org.eclipse.jdt.core.compiler.release=enabled
org.eclipse.jdt.core.compiler.source=17
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
@ -152,7 +152,6 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=0
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=0
org.eclipse.jdt.core.formatter.alignment_for_assignment=4
org.eclipse.jdt.core.formatter.alignment_for_binary_expression=0
org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=0
org.eclipse.jdt.core.formatter.alignment_for_compact_if=0
org.eclipse.jdt.core.formatter.alignment_for_compact_loops=0
@ -282,7 +281,6 @@ org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default=insert
org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=do not insert
@ -356,7 +354,6 @@ org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case=insert
org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default=insert
org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
@ -515,7 +512,6 @@ org.eclipse.jdt.core.formatter.use_on_off_tags=true
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false
org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true
org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true

6
L2J_Mobius_8.2_Homunculus/build.xml
View File

@ -52,8 +52,8 @@
</not>
</condition>
</fail>
<available classname="java.util.stream.Stream" property="JDK15.present" />
<fail unless="JDK15.present" message="Java 15 is required. But your version is Java ${ant.java.version} and probably JDK is not installed." />
<available classname="java.util.stream.Stream" property="JDK17.present" />
<fail unless="JDK17.present" message="Java 17 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.">
@ -62,7 +62,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="15" target="15" encoding="UTF-8" />
<javac srcdir="${src}" classpathref="classpath" destdir="${build.bin}" compiler="modern" debug="true" debuglevel="lines,vars,source" includeantruntime="false" source="17" target="17" encoding="UTF-8" />
</target>
<target name="jar" depends="compile" description="Create the jar files.">

43
L2J_Mobius_8.2_Homunculus/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java vendored
View File

@ -120,7 +120,8 @@ public class WyvernManager extends AbstractNpcAI
private boolean isOwnerClan(Npc npc, PlayerInstance player)
{
switch (MANAGERS.get(npc.getId()))
final ManagerType type = MANAGERS.get(npc.getId());
switch (type)
{
case CASTLE:
{
@ -156,7 +157,8 @@ public class WyvernManager extends AbstractNpcAI
private boolean isInSiege(Npc npc)
{
switch (MANAGERS.get(npc.getId()))
final ManagerType type = MANAGERS.get(npc.getId());
switch (type)
{
case CASTLE:
{
@ -175,7 +177,8 @@ public class WyvernManager extends AbstractNpcAI
private String getResidenceName(Npc npc)
{
switch (MANAGERS.get(npc.getId()))
final ManagerType type = MANAGERS.get(npc.getId());
switch (type)
{
case CASTLE:
{
@ -222,19 +225,24 @@ public class WyvernManager extends AbstractNpcAI
{
htmltext = replaceAll(npc, player);
}
else if (MANAGERS.get(npc.getId()) == ManagerType.CASTLE)
{
htmltext = "wyvernmanager-dusk.html";
}
else
{
htmltext = replaceAll(npc, player);
final ManagerType type = MANAGERS.get(npc.getId());
if (type == ManagerType.CASTLE)
{
htmltext = "wyvernmanager-dusk.html";
}
else
{
htmltext = replaceAll(npc, player);
}
}
break;
}
case "Help":
{
htmltext = MANAGERS.get(npc.getId()) == ManagerType.CASTLE ? replacePart(player, "wyvernmanager-03.html") : replacePart(player, "wyvernmanager-03b.html");
final ManagerType type = MANAGERS.get(npc.getId());
htmltext = type == ManagerType.CASTLE ? replacePart(player, "wyvernmanager-03.html") : replacePart(player, "wyvernmanager-03b.html");
break;
}
case "RideWyvern":
@ -246,7 +254,8 @@ public class WyvernManager extends AbstractNpcAI
player.sendMessage("You cannot summon wyvern while in siege.");
return null;
}
if (MANAGERS.get(npc.getId()) == ManagerType.CASTLE)
final ManagerType type = MANAGERS.get(npc.getId());
if (type == ManagerType.CASTLE)
{
htmltext = "wyvernmanager-dusk.html";
}
@ -277,13 +286,17 @@ public class WyvernManager extends AbstractNpcAI
{
htmltext = replaceAll(npc, player);
}
else if (MANAGERS.get(npc.getId()) == ManagerType.CASTLE)
{
htmltext = "wyvernmanager-dusk.html";
}
else
{
htmltext = replaceAll(npc, player);
final ManagerType type = MANAGERS.get(npc.getId());
if (type == ManagerType.CASTLE)
{
htmltext = "wyvernmanager-dusk.html";
}
else
{
htmltext = replaceAll(npc, player);
}
}
return htmltext;
}

3
L2J_Mobius_8.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java vendored
View File

@ -35,7 +35,8 @@ public class OpBlinkSkillCondition implements ISkillCondition
public OpBlinkSkillCondition(StatSet params)
{
switch (params.getEnum("direction", Position.class))
final Position position = params.getEnum("direction", Position.class);
switch (position)
{
case BACK:
{

2
L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java
View File

@ -57,7 +57,7 @@ public class Forum
private boolean _loaded = false;
/**
* Creates new instance of Forum. When you create new forum, use {@link org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager# addForum(org.l2jmobius.gameserver.communitybbs.BB.Forum)} to add forum to the forums manager.
* Creates new instance of Forum. When you create new forum, use {@link org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager#addForum(org.l2jmobius.gameserver.communitybbs.BB.Forum)} to add forum to the forums manager.
* @param forumId
* @param fParent
*/

5
L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java
View File

@ -43,10 +43,11 @@ public class ConditionHasResidence extends Condition
return false;
}
boolean test = false;
final StatSet params = getParameters();
final int id = params.getInt("id");
boolean test = false;
switch (params.getEnum("type", ResidenceType.class))
final ResidenceType type = params.getEnum("type", ResidenceType.class);
switch (type)
{
case CASTLE:
{

5
L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/log/formatter/FileLogFormatter.java
View File

@ -35,6 +35,9 @@ public class FileLogFormatter extends Formatter
@Override
public String format(LogRecord record)
{
return StringUtil.concat(dateFmt.format(new Date(record.getMillis())), TAB, record.getLevel().getName(), TAB, String.valueOf(record.getThreadID()), TAB, record.getLoggerName(), TAB, record.getMessage(), Config.EOL);
// Java 1.8
// return StringUtil.concat(dateFmt.format(new Date(record.getMillis())), TAB, record.getLevel().getName(), TAB, String.valueOf(record.getThreadID()), TAB, record.getLoggerName(), TAB, record.getMessage(), Config.EOL);
// Java 16
return StringUtil.concat(dateFmt.format(new Date(record.getMillis())), TAB, record.getLevel().getName(), TAB, String.valueOf(record.getLongThreadID()), TAB, record.getLoggerName(), TAB, record.getMessage(), Config.EOL);
}
}

5
L2J_Mobius_8.2_Homunculus/readme.txt
View File

@ -2,8 +2,9 @@ L2J-Mobius Homunculus
Client: https://drive.google.com/u/0/uc?id=1Xlk2uzmxveJtrvaWXmZ6wBVFjd6E-ws7&export=download
System: https://mega.nz/file/xl1njaTY#BdVHadGs9bTDyrDE3QgBGvAqkmqSqPtn8hLpcCil1Fs
JDK: http://www.mediafire.com/file/cgh3zupv80qdwv4/bellsoft-jdk15.0.2%252B10-windows-amd64.msi
Eclipse: http://www.mediafire.com/file/h0gmazpv9hm6gjp/eclipse-java-2020-12-R-win32-x86_64.zip
JDK: https://www.mediafire.com/file/7n2v2ws8281knej/bellsoft-jdk17%252B35-windows-amd64.msi
XAMPP: https://www.mediafire.com/file/hkehxpyjn81ybsw/xampp-windows-x64-8.0.11-2-VS16-installer.exe
Eclipse: https://www.mediafire.com/file/rspmpv0hzid20hx/eclipse-java-2021-09-R-win32-x86_64_JDK17.zip
Geodata: http://www.mediafire.com/file/muw8zo6v7cl7ujt/L2J_Mobius_8.2_Homunculus_Geodata.zip

2
L2J_Mobius_9.2_ReturnOfTheQueenAnt/.classpath
View File

@ -1,6 +1,6 @@
<?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-15">
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
<attributes>
<attribute name="module" value="true"/>
</attributes>

12
L2J_Mobius_9.2_ReturnOfTheQueenAnt/.settings/org.eclipse.jdt.core.prefs
View File

@ -20,9 +20,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
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=15
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=15
org.eclipse.jdt.core.compiler.compliance=17
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@ -137,8 +137,8 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
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=15
org.eclipse.jdt.core.compiler.release=enabled
org.eclipse.jdt.core.compiler.source=17
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
@ -152,7 +152,6 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=0
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=0
org.eclipse.jdt.core.formatter.alignment_for_assignment=4
org.eclipse.jdt.core.formatter.alignment_for_binary_expression=0
org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=0
org.eclipse.jdt.core.formatter.alignment_for_compact_if=0
org.eclipse.jdt.core.formatter.alignment_for_compact_loops=0
@ -282,7 +281,6 @@ org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default=insert
org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=do not insert
@ -356,7 +354,6 @@ org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case=insert
org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default=insert
org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
@ -515,7 +512,6 @@ org.eclipse.jdt.core.formatter.use_on_off_tags=true
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false
org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true
org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true

6
L2J_Mobius_9.2_ReturnOfTheQueenAnt/build.xml
View File

@ -52,8 +52,8 @@
</not>
</condition>
</fail>
<available classname="java.util.stream.Stream" property="JDK15.present" />
<fail unless="JDK15.present" message="Java 15 is required. But your version is Java ${ant.java.version} and probably JDK is not installed." />
<available classname="java.util.stream.Stream" property="JDK17.present" />
<fail unless="JDK17.present" message="Java 17 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.">
@ -62,7 +62,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="15" target="15" encoding="UTF-8" />
<javac srcdir="${src}" classpathref="classpath" destdir="${build.bin}" compiler="modern" debug="true" debuglevel="lines,vars,source" includeantruntime="false" source="17" target="17" encoding="UTF-8" />
</target>
<target name="jar" depends="compile" description="Create the jar files.">

43
L2J_Mobius_9.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java vendored
View File

@ -120,7 +120,8 @@ public class WyvernManager extends AbstractNpcAI
private boolean isOwnerClan(Npc npc, PlayerInstance player)
{
switch (MANAGERS.get(npc.getId()))
final ManagerType type = MANAGERS.get(npc.getId());
switch (type)
{
case CASTLE:
{
@ -156,7 +157,8 @@ public class WyvernManager extends AbstractNpcAI
private boolean isInSiege(Npc npc)
{
switch (MANAGERS.get(npc.getId()))
final ManagerType type = MANAGERS.get(npc.getId());
switch (type)
{
case CASTLE:
{
@ -175,7 +177,8 @@ public class WyvernManager extends AbstractNpcAI
private String getResidenceName(Npc npc)
{
switch (MANAGERS.get(npc.getId()))
final ManagerType type = MANAGERS.get(npc.getId());
switch (type)
{
case CASTLE:
{
@ -222,19 +225,24 @@ public class WyvernManager extends AbstractNpcAI
{
htmltext = replaceAll(npc, player);
}
else if (MANAGERS.get(npc.getId()) == ManagerType.CASTLE)
{
htmltext = "wyvernmanager-dusk.html";
}
else
{
htmltext = replaceAll(npc, player);
final ManagerType type = MANAGERS.get(npc.getId());
if (type == ManagerType.CASTLE)
{
htmltext = "wyvernmanager-dusk.html";
}
else
{
htmltext = replaceAll(npc, player);
}
}
break;
}
case "Help":
{
htmltext = MANAGERS.get(npc.getId()) == ManagerType.CASTLE ? replacePart(player, "wyvernmanager-03.html") : replacePart(player, "wyvernmanager-03b.html");
final ManagerType type = MANAGERS.get(npc.getId());
htmltext = type == ManagerType.CASTLE ? replacePart(player, "wyvernmanager-03.html") : replacePart(player, "wyvernmanager-03b.html");
break;
}
case "RideWyvern":
@ -246,7 +254,8 @@ public class WyvernManager extends AbstractNpcAI
player.sendMessage("You cannot summon wyvern while in siege.");
return null;
}
if (MANAGERS.get(npc.getId()) == ManagerType.CASTLE)
final ManagerType type = MANAGERS.get(npc.getId());
if (type == ManagerType.CASTLE)
{
htmltext = "wyvernmanager-dusk.html";
}
@ -277,13 +286,17 @@ public class WyvernManager extends AbstractNpcAI
{
htmltext = replaceAll(npc, player);
}
else if (MANAGERS.get(npc.getId()) == ManagerType.CASTLE)
{
htmltext = "wyvernmanager-dusk.html";
}
else
{
htmltext = replaceAll(npc, player);
final ManagerType type = MANAGERS.get(npc.getId());
if (type == ManagerType.CASTLE)
{
htmltext = "wyvernmanager-dusk.html";
}
else
{
htmltext = replaceAll(npc, player);
}
}
return htmltext;
}

3
L2J_Mobius_9.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java vendored
View File

@ -35,7 +35,8 @@ public class OpBlinkSkillCondition implements ISkillCondition
public OpBlinkSkillCondition(StatSet params)
{
switch (params.getEnum("direction", Position.class))
final Position position = params.getEnum("direction", Position.class);
switch (position)
{
case BACK:
{

2
L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java
View File

@ -57,7 +57,7 @@ public class Forum
private boolean _loaded = false;
/**
* Creates new instance of Forum. When you create new forum, use {@link org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager# addForum(org.l2jmobius.gameserver.communitybbs.BB.Forum)} to add forum to the forums manager.
* Creates new instance of Forum. When you create new forum, use {@link org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager#addForum(org.l2jmobius.gameserver.communitybbs.BB.Forum)} to add forum to the forums manager.
* @param forumId
* @param fParent
*/

5
L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java
View File

@ -43,10 +43,11 @@ public class ConditionHasResidence extends Condition
return false;
}
boolean test = false;
final StatSet params = getParameters();
final int id = params.getInt("id");
boolean test = false;
switch (params.getEnum("type", ResidenceType.class))
final ResidenceType type = params.getEnum("type", ResidenceType.class);
switch (type)
{
case CASTLE:
{

5
L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/log/formatter/FileLogFormatter.java
View File

@ -35,6 +35,9 @@ public class FileLogFormatter extends Formatter
@Override
public String format(LogRecord record)
{
return StringUtil.concat(dateFmt.format(new Date(record.getMillis())), TAB, record.getLevel().getName(), TAB, String.valueOf(record.getThreadID()), TAB, record.getLoggerName(), TAB, record.getMessage(), Config.EOL);
// Java 1.8
// return StringUtil.concat(dateFmt.format(new Date(record.getMillis())), TAB, record.getLevel().getName(), TAB, String.valueOf(record.getThreadID()), TAB, record.getLoggerName(), TAB, record.getMessage(), Config.EOL);
// Java 16
return StringUtil.concat(dateFmt.format(new Date(record.getMillis())), TAB, record.getLevel().getName(), TAB, String.valueOf(record.getLongThreadID()), TAB, record.getLoggerName(), TAB, record.getMessage(), Config.EOL);
}
}

5
L2J_Mobius_9.2_ReturnOfTheQueenAnt/readme.txt
View File

@ -2,8 +2,9 @@ L2J-Mobius Return of the Queen Ant Chapter 2
Client: https://drive.google.com/u/0/uc?id=1wvBeoNFljviXafRBRey8McnEdVF-z0fK&export=download
System: https://mega.nz/file/o4sSWCDS#62_BEm7U-kKFwxAeVPkJl7lhn5Za4JiiPkcMvMeNDqg
JDK: http://www.mediafire.com/file/cgh3zupv80qdwv4/bellsoft-jdk15.0.2%252B10-windows-amd64.msi
Eclipse: http://www.mediafire.com/file/h0gmazpv9hm6gjp/eclipse-java-2020-12-R-win32-x86_64.zip
JDK: https://www.mediafire.com/file/7n2v2ws8281knej/bellsoft-jdk17%252B35-windows-amd64.msi
XAMPP: https://www.mediafire.com/file/hkehxpyjn81ybsw/xampp-windows-x64-8.0.11-2-VS16-installer.exe
Eclipse: https://www.mediafire.com/file/rspmpv0hzid20hx/eclipse-java-2021-09-R-win32-x86_64_JDK17.zip
Geodata: https://www.mediafire.com/file/wz1b8ko7h971fq8/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Geodata.zip

2
L2J_Mobius_C1_HarbingersOfWar/.classpath
View File

@ -1,6 +1,6 @@
<?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-15">
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
<attributes>
<attribute name="module" value="true"/>
</attributes>

12
L2J_Mobius_C1_HarbingersOfWar/.settings/org.eclipse.jdt.core.prefs
View File

@ -20,9 +20,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
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=15
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=15
org.eclipse.jdt.core.compiler.compliance=17
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@ -137,8 +137,8 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
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=15
org.eclipse.jdt.core.compiler.release=enabled
org.eclipse.jdt.core.compiler.source=17
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
@ -152,7 +152,6 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=0
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=0
org.eclipse.jdt.core.formatter.alignment_for_assignment=4
org.eclipse.jdt.core.formatter.alignment_for_binary_expression=0
org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=0
org.eclipse.jdt.core.formatter.alignment_for_compact_if=0
org.eclipse.jdt.core.formatter.alignment_for_compact_loops=0
@ -282,7 +281,6 @@ org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default=insert
org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=do not insert
@ -356,7 +354,6 @@ org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case=insert
org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default=insert
org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
@ -515,7 +512,6 @@ org.eclipse.jdt.core.formatter.use_on_off_tags=true
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false
org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true
org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true

6
L2J_Mobius_C1_HarbingersOfWar/build.xml
View File

@ -32,8 +32,8 @@
</not>
</condition>
</fail>
<available classname="java.util.stream.Stream" property="JDK15.present" />
<fail unless="JDK15.present" message="Java 15 is required. But your version is Java ${ant.java.version} and probably JDK is not installed." />
<available classname="java.util.stream.Stream" property="JDK17.present" />
<fail unless="JDK17.present" message="Java 17 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.">
@ -42,7 +42,7 @@
</target>
<target name="compile" depends="init" description="Compile the source.">
<javac srcdir="${src}" destdir="${build.bin}" compiler="modern" debug="true" debuglevel="lines,vars,source" includeantruntime="false" source="15" target="15" encoding="UTF-8" />
<javac srcdir="${src}" destdir="${build.bin}" compiler="modern" debug="true" debuglevel="lines,vars,source" includeantruntime="false" source="17" target="17" encoding="UTF-8" />
</target>
<target name="jar" depends="compile" description="Create the jar files.">

2
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/log/formatter/FileLogFormatter.java
View File

@ -38,7 +38,7 @@ public class FileLogFormatter extends Formatter
final StringJoiner sj = new StringJoiner("\t", "", Config.EOL);
sj.add(dateFormat.format(new Date(record.getMillis())));
sj.add(record.getLevel().getName());
sj.add(String.valueOf(record.getThreadID()));
sj.add(String.valueOf(record.getLongThreadID()));
sj.add(record.getLoggerName());
sj.add(record.getMessage());
return sj.toString();

4
L2J_Mobius_C1_HarbingersOfWar/readme.txt
View File

@ -3,7 +3,7 @@ L2J-Mobius Harbringers of War
Client: https://mega.nz/#!Y01jxYrR!JvKWdxg5-Oc0pFvKouOdwToqQnEG1yBtfHmnm7zG7ZQ
System: https://mega.nz/#!Igt2TaqJ!nOS9UjNg8Mof7nUvmxN5V1TwYpU151UkyZVuG47TrwU
JDK: http://www.mediafire.com/file/cgh3zupv80qdwv4/bellsoft-jdk15.0.2%252B10-windows-amd64.msi
Eclipse: http://www.mediafire.com/file/h0gmazpv9hm6gjp/eclipse-java-2020-12-R-win32-x86_64.zip
JDK: https://www.mediafire.com/file/7n2v2ws8281knej/bellsoft-jdk17%252B35-windows-amd64.msi
Eclipse: https://www.mediafire.com/file/rspmpv0hzid20hx/eclipse-java-2021-09-R-win32-x86_64_JDK17.zip
Totally fun project!

2
L2J_Mobius_C4_ScionsOfDestiny/.classpath
View File

@ -1,6 +1,6 @@
<?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-15">
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
<attributes>
<attribute name="module" value="true"/>
</attributes>

12
L2J_Mobius_C4_ScionsOfDestiny/.settings/org.eclipse.jdt.core.prefs
View File

@ -20,9 +20,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
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=15
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=15
org.eclipse.jdt.core.compiler.compliance=17
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@ -137,8 +137,8 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
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=15
org.eclipse.jdt.core.compiler.release=enabled
org.eclipse.jdt.core.compiler.source=17
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
@ -152,7 +152,6 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=0
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=0
org.eclipse.jdt.core.formatter.alignment_for_assignment=4
org.eclipse.jdt.core.formatter.alignment_for_binary_expression=0
org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=0
org.eclipse.jdt.core.formatter.alignment_for_compact_if=0
org.eclipse.jdt.core.formatter.alignment_for_compact_loops=0
@ -282,7 +281,6 @@ org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default=insert
org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=do not insert
@ -356,7 +354,6 @@ org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case=insert
org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default=insert
org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
@ -515,7 +512,6 @@ org.eclipse.jdt.core.formatter.use_on_off_tags=true
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false
org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true
org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true

6
L2J_Mobius_C4_ScionsOfDestiny/build.xml
View File

@ -52,8 +52,8 @@
</not>
</condition>
</fail>
<available classname="java.util.stream.Stream" property="JDK15.present" />
<fail unless="JDK15.present" message="Java 15 is required. But your version is Java ${ant.java.version} and probably JDK is not installed." />
<available classname="java.util.stream.Stream" property="JDK17.present" />
<fail unless="JDK17.present" message="Java 17 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.">
@ -62,7 +62,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="15" target="15" encoding="UTF-8" />
<javac srcdir="${src}" classpathref="classpath" destdir="${build.bin}" compiler="modern" debug="true" debuglevel="lines,vars,source" includeantruntime="false" source="17" target="17" encoding="UTF-8" />
</target>
<target name="jar" depends="compile" description="Create the jar files.">

5
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/log/formatter/FileLogFormatter.java
View File

@ -35,6 +35,9 @@ public class FileLogFormatter extends Formatter
@Override
public String format(LogRecord record)
{
return StringUtil.concat(dateFmt.format(new Date(record.getMillis())), TAB, record.getLevel().getName(), TAB, String.valueOf(record.getThreadID()), TAB, record.getLoggerName(), TAB, record.getMessage(), Config.EOL);
// Java 1.8
// return StringUtil.concat(dateFmt.format(new Date(record.getMillis())), TAB, record.getLevel().getName(), TAB, String.valueOf(record.getThreadID()), TAB, record.getLoggerName(), TAB, record.getMessage(), Config.EOL);
// Java 16
return StringUtil.concat(dateFmt.format(new Date(record.getMillis())), TAB, record.getLevel().getName(), TAB, String.valueOf(record.getLongThreadID()), TAB, record.getLoggerName(), TAB, record.getMessage(), Config.EOL);
}
}

5
L2J_Mobius_C4_ScionsOfDestiny/readme.txt
View File

@ -4,8 +4,9 @@ Base idea is to use C6 branch for C4 client.
Client: https://mega.nz/file/dwcyga6Q#70bMDfvuQ6aiQEA_aI7JrPn66NzIZ289iZ0QfJj5MmE
System: https://mega.nz/file/c09XTS7Y#MoIzoOZ8q-aAiKuE4XzB4JpJU67Eql61SHD4VhqP9Mw
JDK: http://www.mediafire.com/file/cgh3zupv80qdwv4/bellsoft-jdk15.0.2%252B10-windows-amd64.msi
Eclipse: http://www.mediafire.com/file/h0gmazpv9hm6gjp/eclipse-java-2020-12-R-win32-x86_64.zip
JDK: https://www.mediafire.com/file/7n2v2ws8281knej/bellsoft-jdk17%252B35-windows-amd64.msi
XAMPP: https://www.mediafire.com/file/hkehxpyjn81ybsw/xampp-windows-x64-8.0.11-2-VS16-installer.exe
Eclipse: https://www.mediafire.com/file/rspmpv0hzid20hx/eclipse-java-2021-09-R-win32-x86_64_JDK17.zip
Geodata: http://www.mediafire.com/file/q0j6uawuq5fjo0k/L2J_Mobius_C4_ScionsOfDestiny_Geodata.zip

Some files were not shown because too many files have changed in this diff Show More