From cdbc38c32b97da0f781cf08510e028731f27a15f Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Wed, 13 Oct 2021 21:39:56 +0000 Subject: [PATCH] Updated to Java 17. --- L2J_Mobius_1.0_Ertheia/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 12 ++---- L2J_Mobius_1.0_Ertheia/build.xml | 6 +-- .../others/WyvernManager/WyvernManager.java | 43 ++++++++++++------- .../OpBlinkSkillCondition.java | 3 +- .../gameserver/communitybbs/BB/Forum.java | 2 +- .../conditions/ConditionHasResidence.java | 5 ++- .../log/formatter/FileLogFormatter.java | 5 ++- L2J_Mobius_1.0_Ertheia/readme.txt | 5 ++- L2J_Mobius_2.5_Underground/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 12 ++---- L2J_Mobius_2.5_Underground/build.xml | 6 +-- .../others/WyvernManager/WyvernManager.java | 43 ++++++++++++------- .../OpBlinkSkillCondition.java | 3 +- .../gameserver/communitybbs/BB/Forum.java | 2 +- .../conditions/ConditionHasResidence.java | 5 ++- .../log/formatter/FileLogFormatter.java | 5 ++- L2J_Mobius_2.5_Underground/readme.txt | 5 ++- L2J_Mobius_3.0_Helios/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 12 ++---- L2J_Mobius_3.0_Helios/build.xml | 6 +-- .../others/WyvernManager/WyvernManager.java | 43 ++++++++++++------- .../OpBlinkSkillCondition.java | 3 +- .../gameserver/communitybbs/BB/Forum.java | 2 +- .../conditions/ConditionHasResidence.java | 5 ++- .../log/formatter/FileLogFormatter.java | 5 ++- L2J_Mobius_3.0_Helios/readme.txt | 5 ++- L2J_Mobius_4.0_GrandCrusade/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 12 ++---- L2J_Mobius_4.0_GrandCrusade/build.xml | 6 +-- .../others/WyvernManager/WyvernManager.java | 43 ++++++++++++------- .../OpBlinkSkillCondition.java | 3 +- .../gameserver/communitybbs/BB/Forum.java | 2 +- .../conditions/ConditionHasResidence.java | 5 ++- .../log/formatter/FileLogFormatter.java | 5 ++- L2J_Mobius_4.0_GrandCrusade/readme.txt | 5 ++- L2J_Mobius_5.0_Salvation/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 12 ++---- L2J_Mobius_5.0_Salvation/build.xml | 6 +-- .../others/WyvernManager/WyvernManager.java | 43 ++++++++++++------- .../OpBlinkSkillCondition.java | 3 +- .../gameserver/communitybbs/BB/Forum.java | 2 +- .../conditions/ConditionHasResidence.java | 5 ++- .../log/formatter/FileLogFormatter.java | 5 ++- L2J_Mobius_5.0_Salvation/readme.txt | 5 ++- L2J_Mobius_5.5_EtinasFate/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 12 ++---- L2J_Mobius_5.5_EtinasFate/build.xml | 6 +-- .../others/WyvernManager/WyvernManager.java | 43 ++++++++++++------- .../OpBlinkSkillCondition.java | 3 +- .../gameserver/communitybbs/BB/Forum.java | 2 +- .../conditions/ConditionHasResidence.java | 5 ++- .../log/formatter/FileLogFormatter.java | 5 ++- L2J_Mobius_5.5_EtinasFate/readme.txt | 5 ++- L2J_Mobius_6.0_Fafurion/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 12 ++---- L2J_Mobius_6.0_Fafurion/build.xml | 6 +-- .../others/WyvernManager/WyvernManager.java | 43 ++++++++++++------- .../OpBlinkSkillCondition.java | 3 +- .../gameserver/communitybbs/BB/Forum.java | 2 +- .../conditions/ConditionHasResidence.java | 5 ++- .../log/formatter/FileLogFormatter.java | 5 ++- L2J_Mobius_6.0_Fafurion/readme.txt | 5 ++- L2J_Mobius_7.0_PreludeOfWar/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 12 ++---- L2J_Mobius_7.0_PreludeOfWar/build.xml | 6 +-- .../others/WyvernManager/WyvernManager.java | 43 ++++++++++++------- .../OpBlinkSkillCondition.java | 3 +- .../gameserver/communitybbs/BB/Forum.java | 2 +- .../conditions/ConditionHasResidence.java | 5 ++- .../log/formatter/FileLogFormatter.java | 5 ++- L2J_Mobius_7.0_PreludeOfWar/readme.txt | 5 ++- L2J_Mobius_8.2_Homunculus/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 12 ++---- L2J_Mobius_8.2_Homunculus/build.xml | 6 +-- .../others/WyvernManager/WyvernManager.java | 43 ++++++++++++------- .../OpBlinkSkillCondition.java | 3 +- .../gameserver/communitybbs/BB/Forum.java | 2 +- .../conditions/ConditionHasResidence.java | 5 ++- .../log/formatter/FileLogFormatter.java | 5 ++- L2J_Mobius_8.2_Homunculus/readme.txt | 5 ++- L2J_Mobius_9.2_ReturnOfTheQueenAnt/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 12 ++---- L2J_Mobius_9.2_ReturnOfTheQueenAnt/build.xml | 6 +-- .../others/WyvernManager/WyvernManager.java | 43 ++++++++++++------- .../OpBlinkSkillCondition.java | 3 +- .../gameserver/communitybbs/BB/Forum.java | 2 +- .../conditions/ConditionHasResidence.java | 5 ++- .../log/formatter/FileLogFormatter.java | 5 ++- L2J_Mobius_9.2_ReturnOfTheQueenAnt/readme.txt | 5 ++- L2J_Mobius_C1_HarbingersOfWar/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 12 ++---- L2J_Mobius_C1_HarbingersOfWar/build.xml | 6 +-- .../log/formatter/FileLogFormatter.java | 2 +- L2J_Mobius_C1_HarbingersOfWar/readme.txt | 4 +- L2J_Mobius_C4_ScionsOfDestiny/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 12 ++---- L2J_Mobius_C4_ScionsOfDestiny/build.xml | 6 +-- .../log/formatter/FileLogFormatter.java | 5 ++- L2J_Mobius_C4_ScionsOfDestiny/readme.txt | 5 ++- L2J_Mobius_C6_Interlude/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 12 ++---- L2J_Mobius_C6_Interlude/build.xml | 6 +-- .../log/formatter/FileLogFormatter.java | 5 ++- L2J_Mobius_C6_Interlude/readme.txt | 5 ++- L2J_Mobius_CT_2.4_Epilogue/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 12 ++---- L2J_Mobius_CT_2.4_Epilogue/build.xml | 6 +-- .../others/WyvernManager/WyvernManager.java | 32 +++++++++----- .../FirstClassTransferTalk.java | 3 +- .../gameserver/communitybbs/BB/Forum.java | 2 +- .../gameserver/data/NpcPersonalAIData.java | 3 +- .../log/formatter/FileLogFormatter.java | 5 ++- L2J_Mobius_CT_2.4_Epilogue/readme.txt | 5 ++- L2J_Mobius_CT_2.6_HighFive/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 12 ++---- L2J_Mobius_CT_2.6_HighFive/build.xml | 6 +-- .../others/WyvernManager/WyvernManager.java | 32 +++++++++----- .../FirstClassTransferTalk.java | 3 +- .../gameserver/communitybbs/BB/Forum.java | 2 +- .../gameserver/data/NpcPersonalAIData.java | 3 +- .../log/formatter/FileLogFormatter.java | 5 ++- L2J_Mobius_CT_2.6_HighFive/readme.txt | 5 ++- L2J_Mobius_Classic_2.0_Saviors/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 12 ++---- L2J_Mobius_Classic_2.0_Saviors/build.xml | 6 +-- .../others/WyvernManager/WyvernManager.java | 43 ++++++++++++------- .../OpBlinkSkillCondition.java | 3 +- .../FirstClassTransferTalk.java | 3 +- .../gameserver/communitybbs/BB/Forum.java | 2 +- .../conditions/ConditionHasResidence.java | 5 ++- .../log/formatter/FileLogFormatter.java | 5 ++- L2J_Mobius_Classic_2.0_Saviors/readme.txt | 5 ++- L2J_Mobius_Classic_2.1_Zaken/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 12 ++---- L2J_Mobius_Classic_2.1_Zaken/build.xml | 6 +-- .../others/WyvernManager/WyvernManager.java | 43 ++++++++++++------- .../OpBlinkSkillCondition.java | 3 +- .../FirstClassTransferTalk.java | 3 +- .../gameserver/communitybbs/BB/Forum.java | 2 +- .../conditions/ConditionHasResidence.java | 5 ++- .../log/formatter/FileLogFormatter.java | 5 ++- L2J_Mobius_Classic_2.1_Zaken/readme.txt | 5 ++- L2J_Mobius_Classic_2.2_Antharas/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 12 ++---- L2J_Mobius_Classic_2.2_Antharas/build.xml | 6 +-- .../others/WyvernManager/WyvernManager.java | 43 ++++++++++++------- .../OpBlinkSkillCondition.java | 3 +- .../FirstClassTransferTalk.java | 3 +- .../gameserver/communitybbs/BB/Forum.java | 2 +- .../conditions/ConditionHasResidence.java | 5 ++- .../log/formatter/FileLogFormatter.java | 5 ++- L2J_Mobius_Classic_2.2_Antharas/readme.txt | 5 ++- L2J_Mobius_Classic_2.3_SevenSigns/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 12 ++---- L2J_Mobius_Classic_2.3_SevenSigns/build.xml | 6 +-- .../others/WyvernManager/WyvernManager.java | 43 ++++++++++++------- .../OpBlinkSkillCondition.java | 3 +- .../FirstClassTransferTalk.java | 3 +- .../gameserver/communitybbs/BB/Forum.java | 2 +- .../conditions/ConditionHasResidence.java | 5 ++- .../log/formatter/FileLogFormatter.java | 5 ++- L2J_Mobius_Classic_2.3_SevenSigns/readme.txt | 5 ++- .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 12 ++---- .../build.xml | 6 +-- .../others/WyvernManager/WyvernManager.java | 43 ++++++++++++------- .../OpBlinkSkillCondition.java | 3 +- .../FirstClassTransferTalk.java | 3 +- .../gameserver/communitybbs/BB/Forum.java | 2 +- .../conditions/ConditionHasResidence.java | 5 ++- .../log/formatter/FileLogFormatter.java | 5 ++- .../readme.txt | 5 ++- L2J_Mobius_Classic_3.0_TheKamael/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 12 ++---- L2J_Mobius_Classic_3.0_TheKamael/build.xml | 6 +-- .../others/WyvernManager/WyvernManager.java | 43 ++++++++++++------- .../OpBlinkSkillCondition.java | 3 +- .../FirstClassTransferTalk.java | 3 +- .../gameserver/communitybbs/BB/Forum.java | 2 +- .../conditions/ConditionHasResidence.java | 5 ++- .../log/formatter/FileLogFormatter.java | 5 ++- L2J_Mobius_Classic_3.0_TheKamael/readme.txt | 5 ++- L2J_Mobius_Classic_Interlude/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 12 ++---- L2J_Mobius_Classic_Interlude/build.xml | 6 +-- .../others/WyvernManager/WyvernManager.java | 43 ++++++++++++------- .../OpBlinkSkillCondition.java | 3 +- .../FirstClassTransferTalk.java | 3 +- .../gameserver/communitybbs/BB/Forum.java | 2 +- .../conditions/ConditionHasResidence.java | 5 ++- .../log/formatter/FileLogFormatter.java | 5 ++- L2J_Mobius_Classic_Interlude/readme.txt | 5 ++- .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 12 ++---- .../build.xml | 6 +-- .../others/WyvernManager/WyvernManager.java | 43 ++++++++++++------- .../OpBlinkSkillCondition.java | 3 +- .../FirstClassTransferTalk.java | 3 +- .../gameserver/communitybbs/BB/Forum.java | 2 +- .../conditions/ConditionHasResidence.java | 5 ++- .../log/formatter/FileLogFormatter.java | 5 ++- .../readme.txt | 5 ++- L2J_Mobius_Essence_5.2_FrostLord/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 12 ++---- L2J_Mobius_Essence_5.2_FrostLord/build.xml | 6 +-- .../others/WyvernManager/WyvernManager.java | 43 ++++++++++++------- .../OpBlinkSkillCondition.java | 3 +- .../FirstClassTransferTalk.java | 3 +- .../gameserver/communitybbs/BB/Forum.java | 2 +- .../conditions/ConditionHasResidence.java | 5 ++- .../log/formatter/FileLogFormatter.java | 5 ++- L2J_Mobius_Essence_5.2_FrostLord/readme.txt | 5 ++- 213 files changed, 1072 insertions(+), 758 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/.classpath b/L2J_Mobius_1.0_Ertheia/.classpath index 2a81446a6c..dbd09bbafe 100644 --- a/L2J_Mobius_1.0_Ertheia/.classpath +++ b/L2J_Mobius_1.0_Ertheia/.classpath @@ -1,6 +1,6 @@ - + diff --git a/L2J_Mobius_1.0_Ertheia/.settings/org.eclipse.jdt.core.prefs b/L2J_Mobius_1.0_Ertheia/.settings/org.eclipse.jdt.core.prefs index f59235caf4..65b5e60af1 100644 --- a/L2J_Mobius_1.0_Ertheia/.settings/org.eclipse.jdt.core.prefs +++ b/L2J_Mobius_1.0_Ertheia/.settings/org.eclipse.jdt.core.prefs @@ -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 diff --git a/L2J_Mobius_1.0_Ertheia/build.xml b/L2J_Mobius_1.0_Ertheia/build.xml index 8ebc020c17..2295d4b7ba 100644 --- a/L2J_Mobius_1.0_Ertheia/build.xml +++ b/L2J_Mobius_1.0_Ertheia/build.xml @@ -52,8 +52,8 @@ - - + + @@ -62,7 +62,7 @@ - + diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java index 3eeeafb2cd..bc282b2f64 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java @@ -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; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java index cd5be7df9a..72d2cb5288 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java @@ -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: { diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java index f4ab8eea82..6c830bb685 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java @@ -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 */ diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java index 50346454fc..87d7c825ec 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java @@ -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: { diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/log/formatter/FileLogFormatter.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/log/formatter/FileLogFormatter.java index b42e2fe119..19c35005de 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/log/formatter/FileLogFormatter.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/log/formatter/FileLogFormatter.java @@ -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); } } diff --git a/L2J_Mobius_1.0_Ertheia/readme.txt b/L2J_Mobius_1.0_Ertheia/readme.txt index b93cbd653f..0e7d332ca3 100644 --- a/L2J_Mobius_1.0_Ertheia/readme.txt +++ b/L2J_Mobius_1.0_Ertheia/readme.txt @@ -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 diff --git a/L2J_Mobius_2.5_Underground/.classpath b/L2J_Mobius_2.5_Underground/.classpath index 2a81446a6c..dbd09bbafe 100644 --- a/L2J_Mobius_2.5_Underground/.classpath +++ b/L2J_Mobius_2.5_Underground/.classpath @@ -1,6 +1,6 @@ - + diff --git a/L2J_Mobius_2.5_Underground/.settings/org.eclipse.jdt.core.prefs b/L2J_Mobius_2.5_Underground/.settings/org.eclipse.jdt.core.prefs index f59235caf4..65b5e60af1 100644 --- a/L2J_Mobius_2.5_Underground/.settings/org.eclipse.jdt.core.prefs +++ b/L2J_Mobius_2.5_Underground/.settings/org.eclipse.jdt.core.prefs @@ -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 diff --git a/L2J_Mobius_2.5_Underground/build.xml b/L2J_Mobius_2.5_Underground/build.xml index 17e7126c6d..ee66513caa 100644 --- a/L2J_Mobius_2.5_Underground/build.xml +++ b/L2J_Mobius_2.5_Underground/build.xml @@ -52,8 +52,8 @@ - - + + @@ -62,7 +62,7 @@ - + diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java index 3eeeafb2cd..bc282b2f64 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java @@ -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; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java index cd5be7df9a..72d2cb5288 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java @@ -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: { diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java index f4ab8eea82..6c830bb685 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java @@ -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 */ diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java index 50346454fc..87d7c825ec 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java @@ -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: { diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/log/formatter/FileLogFormatter.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/log/formatter/FileLogFormatter.java index b42e2fe119..19c35005de 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/log/formatter/FileLogFormatter.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/log/formatter/FileLogFormatter.java @@ -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); } } diff --git a/L2J_Mobius_2.5_Underground/readme.txt b/L2J_Mobius_2.5_Underground/readme.txt index 25fe9b9bb9..54b2538182 100644 --- a/L2J_Mobius_2.5_Underground/readme.txt +++ b/L2J_Mobius_2.5_Underground/readme.txt @@ -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 diff --git a/L2J_Mobius_3.0_Helios/.classpath b/L2J_Mobius_3.0_Helios/.classpath index 2a81446a6c..dbd09bbafe 100644 --- a/L2J_Mobius_3.0_Helios/.classpath +++ b/L2J_Mobius_3.0_Helios/.classpath @@ -1,6 +1,6 @@ - + diff --git a/L2J_Mobius_3.0_Helios/.settings/org.eclipse.jdt.core.prefs b/L2J_Mobius_3.0_Helios/.settings/org.eclipse.jdt.core.prefs index f59235caf4..65b5e60af1 100644 --- a/L2J_Mobius_3.0_Helios/.settings/org.eclipse.jdt.core.prefs +++ b/L2J_Mobius_3.0_Helios/.settings/org.eclipse.jdt.core.prefs @@ -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 diff --git a/L2J_Mobius_3.0_Helios/build.xml b/L2J_Mobius_3.0_Helios/build.xml index 203b2261f6..d6509526ff 100644 --- a/L2J_Mobius_3.0_Helios/build.xml +++ b/L2J_Mobius_3.0_Helios/build.xml @@ -52,8 +52,8 @@ - - + + @@ -62,7 +62,7 @@ - + diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java index 3eeeafb2cd..bc282b2f64 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java @@ -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; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java index cd5be7df9a..72d2cb5288 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java @@ -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: { diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java index f4ab8eea82..6c830bb685 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java @@ -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 */ diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java index 50346454fc..87d7c825ec 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java @@ -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: { diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/log/formatter/FileLogFormatter.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/log/formatter/FileLogFormatter.java index b42e2fe119..19c35005de 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/log/formatter/FileLogFormatter.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/log/formatter/FileLogFormatter.java @@ -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); } } diff --git a/L2J_Mobius_3.0_Helios/readme.txt b/L2J_Mobius_3.0_Helios/readme.txt index 136fa5f120..f44c8b5a43 100644 --- a/L2J_Mobius_3.0_Helios/readme.txt +++ b/L2J_Mobius_3.0_Helios/readme.txt @@ -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 diff --git a/L2J_Mobius_4.0_GrandCrusade/.classpath b/L2J_Mobius_4.0_GrandCrusade/.classpath index 2a81446a6c..dbd09bbafe 100644 --- a/L2J_Mobius_4.0_GrandCrusade/.classpath +++ b/L2J_Mobius_4.0_GrandCrusade/.classpath @@ -1,6 +1,6 @@ - + diff --git a/L2J_Mobius_4.0_GrandCrusade/.settings/org.eclipse.jdt.core.prefs b/L2J_Mobius_4.0_GrandCrusade/.settings/org.eclipse.jdt.core.prefs index f59235caf4..65b5e60af1 100644 --- a/L2J_Mobius_4.0_GrandCrusade/.settings/org.eclipse.jdt.core.prefs +++ b/L2J_Mobius_4.0_GrandCrusade/.settings/org.eclipse.jdt.core.prefs @@ -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 diff --git a/L2J_Mobius_4.0_GrandCrusade/build.xml b/L2J_Mobius_4.0_GrandCrusade/build.xml index 9943b9ec95..de2d1d5cfa 100644 --- a/L2J_Mobius_4.0_GrandCrusade/build.xml +++ b/L2J_Mobius_4.0_GrandCrusade/build.xml @@ -52,8 +52,8 @@ - - + + @@ -62,7 +62,7 @@ - + diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java index 3eeeafb2cd..bc282b2f64 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java @@ -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; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java index cd5be7df9a..72d2cb5288 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java @@ -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: { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java index f4ab8eea82..6c830bb685 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java @@ -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 */ diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java index 50346454fc..87d7c825ec 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java @@ -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: { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/log/formatter/FileLogFormatter.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/log/formatter/FileLogFormatter.java index b42e2fe119..19c35005de 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/log/formatter/FileLogFormatter.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/log/formatter/FileLogFormatter.java @@ -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); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/readme.txt b/L2J_Mobius_4.0_GrandCrusade/readme.txt index b4fb3965e5..803b8353c7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/readme.txt +++ b/L2J_Mobius_4.0_GrandCrusade/readme.txt @@ -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 diff --git a/L2J_Mobius_5.0_Salvation/.classpath b/L2J_Mobius_5.0_Salvation/.classpath index 2a81446a6c..dbd09bbafe 100644 --- a/L2J_Mobius_5.0_Salvation/.classpath +++ b/L2J_Mobius_5.0_Salvation/.classpath @@ -1,6 +1,6 @@ - + diff --git a/L2J_Mobius_5.0_Salvation/.settings/org.eclipse.jdt.core.prefs b/L2J_Mobius_5.0_Salvation/.settings/org.eclipse.jdt.core.prefs index f59235caf4..65b5e60af1 100644 --- a/L2J_Mobius_5.0_Salvation/.settings/org.eclipse.jdt.core.prefs +++ b/L2J_Mobius_5.0_Salvation/.settings/org.eclipse.jdt.core.prefs @@ -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 diff --git a/L2J_Mobius_5.0_Salvation/build.xml b/L2J_Mobius_5.0_Salvation/build.xml index 939592457d..02a1971c33 100644 --- a/L2J_Mobius_5.0_Salvation/build.xml +++ b/L2J_Mobius_5.0_Salvation/build.xml @@ -52,8 +52,8 @@ - - + + @@ -62,7 +62,7 @@ - + diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java index 3eeeafb2cd..bc282b2f64 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java @@ -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; } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java index cd5be7df9a..72d2cb5288 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java @@ -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: { diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java index f4ab8eea82..6c830bb685 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java @@ -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 */ diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java index 50346454fc..87d7c825ec 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java @@ -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: { diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/log/formatter/FileLogFormatter.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/log/formatter/FileLogFormatter.java index b42e2fe119..19c35005de 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/log/formatter/FileLogFormatter.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/log/formatter/FileLogFormatter.java @@ -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); } } diff --git a/L2J_Mobius_5.0_Salvation/readme.txt b/L2J_Mobius_5.0_Salvation/readme.txt index 32ed73ba1d..2537ebe0a0 100644 --- a/L2J_Mobius_5.0_Salvation/readme.txt +++ b/L2J_Mobius_5.0_Salvation/readme.txt @@ -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 diff --git a/L2J_Mobius_5.5_EtinasFate/.classpath b/L2J_Mobius_5.5_EtinasFate/.classpath index 2a81446a6c..dbd09bbafe 100644 --- a/L2J_Mobius_5.5_EtinasFate/.classpath +++ b/L2J_Mobius_5.5_EtinasFate/.classpath @@ -1,6 +1,6 @@ - + diff --git a/L2J_Mobius_5.5_EtinasFate/.settings/org.eclipse.jdt.core.prefs b/L2J_Mobius_5.5_EtinasFate/.settings/org.eclipse.jdt.core.prefs index f59235caf4..65b5e60af1 100644 --- a/L2J_Mobius_5.5_EtinasFate/.settings/org.eclipse.jdt.core.prefs +++ b/L2J_Mobius_5.5_EtinasFate/.settings/org.eclipse.jdt.core.prefs @@ -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 diff --git a/L2J_Mobius_5.5_EtinasFate/build.xml b/L2J_Mobius_5.5_EtinasFate/build.xml index 52b761fa4a..e682f35c30 100644 --- a/L2J_Mobius_5.5_EtinasFate/build.xml +++ b/L2J_Mobius_5.5_EtinasFate/build.xml @@ -52,8 +52,8 @@ - - + + @@ -62,7 +62,7 @@ - + diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java index 3eeeafb2cd..bc282b2f64 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java @@ -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; } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java index cd5be7df9a..72d2cb5288 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java @@ -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: { diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java index f4ab8eea82..6c830bb685 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java @@ -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 */ diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java index 50346454fc..87d7c825ec 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java @@ -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: { diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/log/formatter/FileLogFormatter.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/log/formatter/FileLogFormatter.java index b42e2fe119..19c35005de 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/log/formatter/FileLogFormatter.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/log/formatter/FileLogFormatter.java @@ -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); } } diff --git a/L2J_Mobius_5.5_EtinasFate/readme.txt b/L2J_Mobius_5.5_EtinasFate/readme.txt index 129be44258..4c74165304 100644 --- a/L2J_Mobius_5.5_EtinasFate/readme.txt +++ b/L2J_Mobius_5.5_EtinasFate/readme.txt @@ -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 diff --git a/L2J_Mobius_6.0_Fafurion/.classpath b/L2J_Mobius_6.0_Fafurion/.classpath index 2a81446a6c..dbd09bbafe 100644 --- a/L2J_Mobius_6.0_Fafurion/.classpath +++ b/L2J_Mobius_6.0_Fafurion/.classpath @@ -1,6 +1,6 @@ - + diff --git a/L2J_Mobius_6.0_Fafurion/.settings/org.eclipse.jdt.core.prefs b/L2J_Mobius_6.0_Fafurion/.settings/org.eclipse.jdt.core.prefs index f59235caf4..65b5e60af1 100644 --- a/L2J_Mobius_6.0_Fafurion/.settings/org.eclipse.jdt.core.prefs +++ b/L2J_Mobius_6.0_Fafurion/.settings/org.eclipse.jdt.core.prefs @@ -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 diff --git a/L2J_Mobius_6.0_Fafurion/build.xml b/L2J_Mobius_6.0_Fafurion/build.xml index 3fa7859328..fd838a3785 100644 --- a/L2J_Mobius_6.0_Fafurion/build.xml +++ b/L2J_Mobius_6.0_Fafurion/build.xml @@ -52,8 +52,8 @@ - - + + @@ -62,7 +62,7 @@ - + diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java index 3eeeafb2cd..bc282b2f64 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java @@ -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; } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java index cd5be7df9a..72d2cb5288 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java @@ -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: { diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java index f4ab8eea82..6c830bb685 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java @@ -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 */ diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java index 50346454fc..87d7c825ec 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java @@ -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: { diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/log/formatter/FileLogFormatter.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/log/formatter/FileLogFormatter.java index b42e2fe119..19c35005de 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/log/formatter/FileLogFormatter.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/log/formatter/FileLogFormatter.java @@ -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); } } diff --git a/L2J_Mobius_6.0_Fafurion/readme.txt b/L2J_Mobius_6.0_Fafurion/readme.txt index 2de47111c6..b3393f9e87 100644 --- a/L2J_Mobius_6.0_Fafurion/readme.txt +++ b/L2J_Mobius_6.0_Fafurion/readme.txt @@ -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 diff --git a/L2J_Mobius_7.0_PreludeOfWar/.classpath b/L2J_Mobius_7.0_PreludeOfWar/.classpath index 2a81446a6c..dbd09bbafe 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/.classpath +++ b/L2J_Mobius_7.0_PreludeOfWar/.classpath @@ -1,6 +1,6 @@ - + diff --git a/L2J_Mobius_7.0_PreludeOfWar/.settings/org.eclipse.jdt.core.prefs b/L2J_Mobius_7.0_PreludeOfWar/.settings/org.eclipse.jdt.core.prefs index f59235caf4..65b5e60af1 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/.settings/org.eclipse.jdt.core.prefs +++ b/L2J_Mobius_7.0_PreludeOfWar/.settings/org.eclipse.jdt.core.prefs @@ -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 diff --git a/L2J_Mobius_7.0_PreludeOfWar/build.xml b/L2J_Mobius_7.0_PreludeOfWar/build.xml index 39aa3fa916..bda1d8c1d8 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/build.xml +++ b/L2J_Mobius_7.0_PreludeOfWar/build.xml @@ -52,8 +52,8 @@ - - + + @@ -62,7 +62,7 @@ - + diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java index 3eeeafb2cd..bc282b2f64 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java @@ -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; } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java index cd5be7df9a..72d2cb5288 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java @@ -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: { diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java index f4ab8eea82..6c830bb685 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java @@ -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 */ diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java index 50346454fc..87d7c825ec 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java @@ -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: { diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/log/formatter/FileLogFormatter.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/log/formatter/FileLogFormatter.java index b42e2fe119..19c35005de 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/log/formatter/FileLogFormatter.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/log/formatter/FileLogFormatter.java @@ -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); } } diff --git a/L2J_Mobius_7.0_PreludeOfWar/readme.txt b/L2J_Mobius_7.0_PreludeOfWar/readme.txt index e8bca15590..b74d123831 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/readme.txt +++ b/L2J_Mobius_7.0_PreludeOfWar/readme.txt @@ -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 diff --git a/L2J_Mobius_8.2_Homunculus/.classpath b/L2J_Mobius_8.2_Homunculus/.classpath index 2a81446a6c..dbd09bbafe 100644 --- a/L2J_Mobius_8.2_Homunculus/.classpath +++ b/L2J_Mobius_8.2_Homunculus/.classpath @@ -1,6 +1,6 @@ - + diff --git a/L2J_Mobius_8.2_Homunculus/.settings/org.eclipse.jdt.core.prefs b/L2J_Mobius_8.2_Homunculus/.settings/org.eclipse.jdt.core.prefs index f59235caf4..65b5e60af1 100644 --- a/L2J_Mobius_8.2_Homunculus/.settings/org.eclipse.jdt.core.prefs +++ b/L2J_Mobius_8.2_Homunculus/.settings/org.eclipse.jdt.core.prefs @@ -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 diff --git a/L2J_Mobius_8.2_Homunculus/build.xml b/L2J_Mobius_8.2_Homunculus/build.xml index 9a5456ba4f..93a9823a82 100644 --- a/L2J_Mobius_8.2_Homunculus/build.xml +++ b/L2J_Mobius_8.2_Homunculus/build.xml @@ -52,8 +52,8 @@ - - + + @@ -62,7 +62,7 @@ - + diff --git a/L2J_Mobius_8.2_Homunculus/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_8.2_Homunculus/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java index 3eeeafb2cd..bc282b2f64 100644 --- a/L2J_Mobius_8.2_Homunculus/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java +++ b/L2J_Mobius_8.2_Homunculus/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java @@ -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; } diff --git a/L2J_Mobius_8.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java b/L2J_Mobius_8.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java index cd5be7df9a..72d2cb5288 100644 --- a/L2J_Mobius_8.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java +++ b/L2J_Mobius_8.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java @@ -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: { diff --git a/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java b/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java index f4ab8eea82..6c830bb685 100644 --- a/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java +++ b/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java @@ -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 */ diff --git a/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java b/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java index 50346454fc..87d7c825ec 100644 --- a/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java +++ b/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java @@ -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: { diff --git a/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/log/formatter/FileLogFormatter.java b/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/log/formatter/FileLogFormatter.java index b42e2fe119..19c35005de 100644 --- a/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/log/formatter/FileLogFormatter.java +++ b/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/log/formatter/FileLogFormatter.java @@ -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); } } diff --git a/L2J_Mobius_8.2_Homunculus/readme.txt b/L2J_Mobius_8.2_Homunculus/readme.txt index 8e3f826c70..1f5aaa8ebf 100644 --- a/L2J_Mobius_8.2_Homunculus/readme.txt +++ b/L2J_Mobius_8.2_Homunculus/readme.txt @@ -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 diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/.classpath b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/.classpath index 2a81446a6c..dbd09bbafe 100644 --- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/.classpath +++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/.classpath @@ -1,6 +1,6 @@ - + diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/.settings/org.eclipse.jdt.core.prefs b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/.settings/org.eclipse.jdt.core.prefs index f59235caf4..65b5e60af1 100644 --- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/.settings/org.eclipse.jdt.core.prefs +++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/.settings/org.eclipse.jdt.core.prefs @@ -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 diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/build.xml b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/build.xml index df224d9c32..0f9c884b74 100644 --- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/build.xml +++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/build.xml @@ -52,8 +52,8 @@ - - + + @@ -62,7 +62,7 @@ - + diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java index 3eeeafb2cd..bc282b2f64 100644 --- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java +++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java @@ -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; } diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java index cd5be7df9a..72d2cb5288 100644 --- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java +++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java @@ -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: { diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java index f4ab8eea82..6c830bb685 100644 --- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java +++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java @@ -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 */ diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java index 50346454fc..87d7c825ec 100644 --- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java +++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java @@ -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: { diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/log/formatter/FileLogFormatter.java b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/log/formatter/FileLogFormatter.java index b42e2fe119..19c35005de 100644 --- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/log/formatter/FileLogFormatter.java +++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/log/formatter/FileLogFormatter.java @@ -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); } } diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/readme.txt b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/readme.txt index 0dba94cc03..0a18d88aef 100644 --- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/readme.txt +++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/readme.txt @@ -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 diff --git a/L2J_Mobius_C1_HarbingersOfWar/.classpath b/L2J_Mobius_C1_HarbingersOfWar/.classpath index c72ba8207b..0a37c5160a 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/.classpath +++ b/L2J_Mobius_C1_HarbingersOfWar/.classpath @@ -1,6 +1,6 @@ - + diff --git a/L2J_Mobius_C1_HarbingersOfWar/.settings/org.eclipse.jdt.core.prefs b/L2J_Mobius_C1_HarbingersOfWar/.settings/org.eclipse.jdt.core.prefs index f59235caf4..65b5e60af1 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/.settings/org.eclipse.jdt.core.prefs +++ b/L2J_Mobius_C1_HarbingersOfWar/.settings/org.eclipse.jdt.core.prefs @@ -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 diff --git a/L2J_Mobius_C1_HarbingersOfWar/build.xml b/L2J_Mobius_C1_HarbingersOfWar/build.xml index 5c4dea64d3..efa5b6e8a6 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/build.xml +++ b/L2J_Mobius_C1_HarbingersOfWar/build.xml @@ -32,8 +32,8 @@ - - + + @@ -42,7 +42,7 @@ - + diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/log/formatter/FileLogFormatter.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/log/formatter/FileLogFormatter.java index 860c50cb6a..811258ca10 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/log/formatter/FileLogFormatter.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/log/formatter/FileLogFormatter.java @@ -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(); diff --git a/L2J_Mobius_C1_HarbingersOfWar/readme.txt b/L2J_Mobius_C1_HarbingersOfWar/readme.txt index 3722a761d0..c618e052b5 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/readme.txt +++ b/L2J_Mobius_C1_HarbingersOfWar/readme.txt @@ -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! \ No newline at end of file diff --git a/L2J_Mobius_C4_ScionsOfDestiny/.classpath b/L2J_Mobius_C4_ScionsOfDestiny/.classpath index 36387954d8..4f40749f29 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/.classpath +++ b/L2J_Mobius_C4_ScionsOfDestiny/.classpath @@ -1,6 +1,6 @@ - + diff --git a/L2J_Mobius_C4_ScionsOfDestiny/.settings/org.eclipse.jdt.core.prefs b/L2J_Mobius_C4_ScionsOfDestiny/.settings/org.eclipse.jdt.core.prefs index f59235caf4..65b5e60af1 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/.settings/org.eclipse.jdt.core.prefs +++ b/L2J_Mobius_C4_ScionsOfDestiny/.settings/org.eclipse.jdt.core.prefs @@ -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 diff --git a/L2J_Mobius_C4_ScionsOfDestiny/build.xml b/L2J_Mobius_C4_ScionsOfDestiny/build.xml index bef9749dd3..045abee077 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/build.xml +++ b/L2J_Mobius_C4_ScionsOfDestiny/build.xml @@ -52,8 +52,8 @@ - - + + @@ -62,7 +62,7 @@ - + diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/log/formatter/FileLogFormatter.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/log/formatter/FileLogFormatter.java index b42e2fe119..19c35005de 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/log/formatter/FileLogFormatter.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/log/formatter/FileLogFormatter.java @@ -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); } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/readme.txt b/L2J_Mobius_C4_ScionsOfDestiny/readme.txt index 8fe3b39178..834187d24c 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/readme.txt +++ b/L2J_Mobius_C4_ScionsOfDestiny/readme.txt @@ -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 diff --git a/L2J_Mobius_C6_Interlude/.classpath b/L2J_Mobius_C6_Interlude/.classpath index 36387954d8..4f40749f29 100644 --- a/L2J_Mobius_C6_Interlude/.classpath +++ b/L2J_Mobius_C6_Interlude/.classpath @@ -1,6 +1,6 @@ - + diff --git a/L2J_Mobius_C6_Interlude/.settings/org.eclipse.jdt.core.prefs b/L2J_Mobius_C6_Interlude/.settings/org.eclipse.jdt.core.prefs index f59235caf4..65b5e60af1 100644 --- a/L2J_Mobius_C6_Interlude/.settings/org.eclipse.jdt.core.prefs +++ b/L2J_Mobius_C6_Interlude/.settings/org.eclipse.jdt.core.prefs @@ -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 diff --git a/L2J_Mobius_C6_Interlude/build.xml b/L2J_Mobius_C6_Interlude/build.xml index 7c2a291366..22b434b0b1 100644 --- a/L2J_Mobius_C6_Interlude/build.xml +++ b/L2J_Mobius_C6_Interlude/build.xml @@ -52,8 +52,8 @@ - - + + @@ -62,7 +62,7 @@ - + diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/log/formatter/FileLogFormatter.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/log/formatter/FileLogFormatter.java index b42e2fe119..19c35005de 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/log/formatter/FileLogFormatter.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/log/formatter/FileLogFormatter.java @@ -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); } } diff --git a/L2J_Mobius_C6_Interlude/readme.txt b/L2J_Mobius_C6_Interlude/readme.txt index 7a228ea7f1..dc1a9fc067 100644 --- a/L2J_Mobius_C6_Interlude/readme.txt +++ b/L2J_Mobius_C6_Interlude/readme.txt @@ -3,8 +3,9 @@ L2J-Mobius Interlude Client: https://drive.google.com/uc?id=1LcKCQTbRXJvteJcuvc_rnX8i2gT1fcHB&export=download System: https://mega.nz/#!t49wiKgZ!PzVAcxcg2o8gRkAiMjH7CUO6lKrBG27npg2JPL1uEq8 -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/4k2pi3qa8rqt299/L2J_Mobius_C6_Interlude_Geodata.zip diff --git a/L2J_Mobius_CT_2.4_Epilogue/.classpath b/L2J_Mobius_CT_2.4_Epilogue/.classpath index 36387954d8..4f40749f29 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/.classpath +++ b/L2J_Mobius_CT_2.4_Epilogue/.classpath @@ -1,6 +1,6 @@ - + diff --git a/L2J_Mobius_CT_2.4_Epilogue/.settings/org.eclipse.jdt.core.prefs b/L2J_Mobius_CT_2.4_Epilogue/.settings/org.eclipse.jdt.core.prefs index f59235caf4..65b5e60af1 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/.settings/org.eclipse.jdt.core.prefs +++ b/L2J_Mobius_CT_2.4_Epilogue/.settings/org.eclipse.jdt.core.prefs @@ -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 diff --git a/L2J_Mobius_CT_2.4_Epilogue/build.xml b/L2J_Mobius_CT_2.4_Epilogue/build.xml index 6d51270021..4046f2bc55 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/build.xml +++ b/L2J_Mobius_CT_2.4_Epilogue/build.xml @@ -52,8 +52,8 @@ - - + + @@ -62,7 +62,7 @@ - + diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java index 1700d51135..0dd9420c7e 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java @@ -126,7 +126,8 @@ public class WyvernManager extends AbstractNpcAI { return false; } - switch (MANAGERS.get(npc.getId())) + final ManagerType type = MANAGERS.get(npc.getId()); + switch (type) { case CASTLE: { @@ -162,7 +163,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: { @@ -186,7 +188,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: { @@ -233,19 +236,24 @@ public class WyvernManager extends AbstractNpcAI { htmltext = replaceAll(npc, player); } - else if ((MANAGERS.get(npc.getId()) == ManagerType.CASTLE) && SevenSigns.getInstance().isSealValidationPeriod() && (SevenSigns.getInstance().getSealOwner(SevenSigns.SEAL_STRIFE) == SevenSigns.CABAL_DUSK)) - { - htmltext = "wyvernmanager-dusk.html"; - } else { - htmltext = replaceAll(npc, player); + final ManagerType type = MANAGERS.get(npc.getId()); + if ((type == ManagerType.CASTLE) && SevenSigns.getInstance().isSealValidationPeriod() && (SevenSigns.getInstance().getSealOwner(SevenSigns.SEAL_STRIFE) == SevenSigns.CABAL_DUSK)) + { + 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": @@ -257,7 +265,8 @@ public class WyvernManager extends AbstractNpcAI player.sendMessage("You cannot summon wyvern while in siege."); return null; } - if ((MANAGERS.get(npc.getId()) == ManagerType.CASTLE) && SevenSigns.getInstance().isSealValidationPeriod() && ((SevenSigns.getInstance()).getSealOwner(SevenSigns.SEAL_STRIFE) == SevenSigns.CABAL_DUSK)) + final ManagerType type = MANAGERS.get(npc.getId()); + if ((type == ManagerType.CASTLE) && SevenSigns.getInstance().isSealValidationPeriod() && ((SevenSigns.getInstance()).getSealOwner(SevenSigns.SEAL_STRIFE) == SevenSigns.CABAL_DUSK)) { htmltext = "wyvernmanager-dusk.html"; } @@ -292,7 +301,8 @@ public class WyvernManager extends AbstractNpcAI } else { - if ((MANAGERS.get(npc.getId()) == ManagerType.CASTLE) && SevenSigns.getInstance().isSealValidationPeriod() && (SevenSigns.getInstance().getSealOwner(SevenSigns.SEAL_STRIFE) == SevenSigns.CABAL_DUSK)) + final ManagerType type = MANAGERS.get(npc.getId()); + if ((type == ManagerType.CASTLE) && SevenSigns.getInstance().isSealValidationPeriod() && (SevenSigns.getInstance().getSealOwner(SevenSigns.SEAL_STRIFE) == SevenSigns.CABAL_DUSK)) { htmltext = "wyvernmanager-dusk.html"; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java index 67ab57824a..9dbcf2a091 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java @@ -76,7 +76,8 @@ public class FirstClassTransferTalk extends AbstractNpcAI return htmltext += "no.html"; } - switch (MASTERS.get(npc.getId())) + final Race race = MASTERS.get(npc.getId()); + switch (race) { case HUMAN: { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java index f4ab8eea82..6c830bb685 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java @@ -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 */ diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/NpcPersonalAIData.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/NpcPersonalAIData.java index c65482d4c9..17151ce711 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/NpcPersonalAIData.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/NpcPersonalAIData.java @@ -98,7 +98,8 @@ public class NpcPersonalAIData // for (String key : map.keySet()) for (Entry entry : map.entrySet()) { - switch (entry.getKey()) + final String key = entry.getKey(); + switch (key) { case "disableRandomAnimation": { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/log/formatter/FileLogFormatter.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/log/formatter/FileLogFormatter.java index b42e2fe119..19c35005de 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/log/formatter/FileLogFormatter.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/log/formatter/FileLogFormatter.java @@ -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); } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/readme.txt b/L2J_Mobius_CT_2.4_Epilogue/readme.txt index 259b961b79..0d56af863c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/readme.txt +++ b/L2J_Mobius_CT_2.4_Epilogue/readme.txt @@ -3,8 +3,9 @@ L2J-Mobius Epilogue Client: https://drive.google.com/uc?id=0BxcFDPsm5786MHpWQmR5Ym96VXc&export=download System: https://mega.nz/#!ppkUFIJQ!oat-UGQsf2liToQu19nCljGO5BAUInwfzln-ERBBB28 -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/q515p4hl6j0ivxm/L2J_Mobius_CT_2.4_Epilogue_Geodata.zip diff --git a/L2J_Mobius_CT_2.6_HighFive/.classpath b/L2J_Mobius_CT_2.6_HighFive/.classpath index 36387954d8..4f40749f29 100644 --- a/L2J_Mobius_CT_2.6_HighFive/.classpath +++ b/L2J_Mobius_CT_2.6_HighFive/.classpath @@ -1,6 +1,6 @@ - + diff --git a/L2J_Mobius_CT_2.6_HighFive/.settings/org.eclipse.jdt.core.prefs b/L2J_Mobius_CT_2.6_HighFive/.settings/org.eclipse.jdt.core.prefs index f59235caf4..65b5e60af1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/.settings/org.eclipse.jdt.core.prefs +++ b/L2J_Mobius_CT_2.6_HighFive/.settings/org.eclipse.jdt.core.prefs @@ -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 diff --git a/L2J_Mobius_CT_2.6_HighFive/build.xml b/L2J_Mobius_CT_2.6_HighFive/build.xml index 6ef91de3ea..b42c28317f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/build.xml +++ b/L2J_Mobius_CT_2.6_HighFive/build.xml @@ -52,8 +52,8 @@ - - + + @@ -62,7 +62,7 @@ - + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java index 1700d51135..0dd9420c7e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java @@ -126,7 +126,8 @@ public class WyvernManager extends AbstractNpcAI { return false; } - switch (MANAGERS.get(npc.getId())) + final ManagerType type = MANAGERS.get(npc.getId()); + switch (type) { case CASTLE: { @@ -162,7 +163,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: { @@ -186,7 +188,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: { @@ -233,19 +236,24 @@ public class WyvernManager extends AbstractNpcAI { htmltext = replaceAll(npc, player); } - else if ((MANAGERS.get(npc.getId()) == ManagerType.CASTLE) && SevenSigns.getInstance().isSealValidationPeriod() && (SevenSigns.getInstance().getSealOwner(SevenSigns.SEAL_STRIFE) == SevenSigns.CABAL_DUSK)) - { - htmltext = "wyvernmanager-dusk.html"; - } else { - htmltext = replaceAll(npc, player); + final ManagerType type = MANAGERS.get(npc.getId()); + if ((type == ManagerType.CASTLE) && SevenSigns.getInstance().isSealValidationPeriod() && (SevenSigns.getInstance().getSealOwner(SevenSigns.SEAL_STRIFE) == SevenSigns.CABAL_DUSK)) + { + 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": @@ -257,7 +265,8 @@ public class WyvernManager extends AbstractNpcAI player.sendMessage("You cannot summon wyvern while in siege."); return null; } - if ((MANAGERS.get(npc.getId()) == ManagerType.CASTLE) && SevenSigns.getInstance().isSealValidationPeriod() && ((SevenSigns.getInstance()).getSealOwner(SevenSigns.SEAL_STRIFE) == SevenSigns.CABAL_DUSK)) + final ManagerType type = MANAGERS.get(npc.getId()); + if ((type == ManagerType.CASTLE) && SevenSigns.getInstance().isSealValidationPeriod() && ((SevenSigns.getInstance()).getSealOwner(SevenSigns.SEAL_STRIFE) == SevenSigns.CABAL_DUSK)) { htmltext = "wyvernmanager-dusk.html"; } @@ -292,7 +301,8 @@ public class WyvernManager extends AbstractNpcAI } else { - if ((MANAGERS.get(npc.getId()) == ManagerType.CASTLE) && SevenSigns.getInstance().isSealValidationPeriod() && (SevenSigns.getInstance().getSealOwner(SevenSigns.SEAL_STRIFE) == SevenSigns.CABAL_DUSK)) + final ManagerType type = MANAGERS.get(npc.getId()); + if ((type == ManagerType.CASTLE) && SevenSigns.getInstance().isSealValidationPeriod() && (SevenSigns.getInstance().getSealOwner(SevenSigns.SEAL_STRIFE) == SevenSigns.CABAL_DUSK)) { htmltext = "wyvernmanager-dusk.html"; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java index 67ab57824a..9dbcf2a091 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java @@ -76,7 +76,8 @@ public class FirstClassTransferTalk extends AbstractNpcAI return htmltext += "no.html"; } - switch (MASTERS.get(npc.getId())) + final Race race = MASTERS.get(npc.getId()); + switch (race) { case HUMAN: { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java index f4ab8eea82..6c830bb685 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java @@ -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 */ diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/NpcPersonalAIData.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/NpcPersonalAIData.java index c65482d4c9..17151ce711 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/NpcPersonalAIData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/NpcPersonalAIData.java @@ -98,7 +98,8 @@ public class NpcPersonalAIData // for (String key : map.keySet()) for (Entry entry : map.entrySet()) { - switch (entry.getKey()) + final String key = entry.getKey(); + switch (key) { case "disableRandomAnimation": { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/log/formatter/FileLogFormatter.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/log/formatter/FileLogFormatter.java index b42e2fe119..19c35005de 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/log/formatter/FileLogFormatter.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/log/formatter/FileLogFormatter.java @@ -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); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/readme.txt b/L2J_Mobius_CT_2.6_HighFive/readme.txt index c72efbf35d..9f2dc8f51b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/readme.txt +++ b/L2J_Mobius_CT_2.6_HighFive/readme.txt @@ -4,8 +4,9 @@ Client mirror 1: https://cloud.mail.ru/public/8GTQ/NzhxB6dHq Client mirror 2: https://mega.nz/#!BZVjgI7L!bIJp-VpomuUGkqUZSGBE-VUXs_eLEpX21s_IaIM6g8E System: https://mega.nz/file/B5sVlTgJ#a19JJWZ7llbAZF9XnU91Z98ZbO_Rb56s9AvQ_QyDz-c -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/92t2tdjni4rux06/L2J_Mobius_CT_2.6_HighFive_Geodata.zip diff --git a/L2J_Mobius_Classic_2.0_Saviors/.classpath b/L2J_Mobius_Classic_2.0_Saviors/.classpath index 2a81446a6c..dbd09bbafe 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/.classpath +++ b/L2J_Mobius_Classic_2.0_Saviors/.classpath @@ -1,6 +1,6 @@ - + diff --git a/L2J_Mobius_Classic_2.0_Saviors/.settings/org.eclipse.jdt.core.prefs b/L2J_Mobius_Classic_2.0_Saviors/.settings/org.eclipse.jdt.core.prefs index f59235caf4..65b5e60af1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/.settings/org.eclipse.jdt.core.prefs +++ b/L2J_Mobius_Classic_2.0_Saviors/.settings/org.eclipse.jdt.core.prefs @@ -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 diff --git a/L2J_Mobius_Classic_2.0_Saviors/build.xml b/L2J_Mobius_Classic_2.0_Saviors/build.xml index 012fd179d5..81bdcc5983 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/build.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/build.xml @@ -52,8 +52,8 @@ - - + + @@ -62,7 +62,7 @@ - + diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java index 843f8d178b..d25cdcd5d8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java @@ -98,7 +98,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: { @@ -134,7 +135,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: { @@ -153,7 +155,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: { @@ -200,19 +203,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": @@ -224,7 +232,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"; } @@ -255,13 +264,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; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java index cd5be7df9a..72d2cb5288 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java @@ -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: { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java index 121ab1373e..23bb8f2314 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java @@ -67,7 +67,8 @@ public class FirstClassTransferTalk extends AbstractNpcAI return htmltext += "no.html"; } - switch (MASTERS.get(npc.getId())) + final Race race = MASTERS.get(npc.getId()); + switch (race) { case HUMAN: { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java index f4ab8eea82..6c830bb685 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java @@ -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 */ diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java index 50346454fc..87d7c825ec 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java @@ -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: { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/log/formatter/FileLogFormatter.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/log/formatter/FileLogFormatter.java index b42e2fe119..19c35005de 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/log/formatter/FileLogFormatter.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/log/formatter/FileLogFormatter.java @@ -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); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/readme.txt b/L2J_Mobius_Classic_2.0_Saviors/readme.txt index 894ef9162a..b7e87dd4ec 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/readme.txt +++ b/L2J_Mobius_Classic_2.0_Saviors/readme.txt @@ -3,8 +3,9 @@ L2J-Mobius Classic Saviors Client: https://drive.google.com/uc?id=0B0Pl9EOrFIjuSVNPXzRpRFRZWlk&export=download 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/jstiuq52oq0h3wk/L2J_Mobius_Classic_2.0_Saviors_Geodata.zip diff --git a/L2J_Mobius_Classic_2.1_Zaken/.classpath b/L2J_Mobius_Classic_2.1_Zaken/.classpath index 2a81446a6c..dbd09bbafe 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/.classpath +++ b/L2J_Mobius_Classic_2.1_Zaken/.classpath @@ -1,6 +1,6 @@ - + diff --git a/L2J_Mobius_Classic_2.1_Zaken/.settings/org.eclipse.jdt.core.prefs b/L2J_Mobius_Classic_2.1_Zaken/.settings/org.eclipse.jdt.core.prefs index f59235caf4..65b5e60af1 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/.settings/org.eclipse.jdt.core.prefs +++ b/L2J_Mobius_Classic_2.1_Zaken/.settings/org.eclipse.jdt.core.prefs @@ -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 diff --git a/L2J_Mobius_Classic_2.1_Zaken/build.xml b/L2J_Mobius_Classic_2.1_Zaken/build.xml index c8a9ae7877..a7f23327d2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/build.xml +++ b/L2J_Mobius_Classic_2.1_Zaken/build.xml @@ -52,8 +52,8 @@ - - + + @@ -62,7 +62,7 @@ - + diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java index 843f8d178b..d25cdcd5d8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java @@ -98,7 +98,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: { @@ -134,7 +135,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: { @@ -153,7 +155,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: { @@ -200,19 +203,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": @@ -224,7 +232,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"; } @@ -255,13 +264,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; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java index cd5be7df9a..72d2cb5288 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java @@ -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: { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java index 121ab1373e..23bb8f2314 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java @@ -67,7 +67,8 @@ public class FirstClassTransferTalk extends AbstractNpcAI return htmltext += "no.html"; } - switch (MASTERS.get(npc.getId())) + final Race race = MASTERS.get(npc.getId()); + switch (race) { case HUMAN: { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java index f4ab8eea82..6c830bb685 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java @@ -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 */ diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java index 50346454fc..87d7c825ec 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java @@ -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: { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/log/formatter/FileLogFormatter.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/log/formatter/FileLogFormatter.java index b42e2fe119..19c35005de 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/log/formatter/FileLogFormatter.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/log/formatter/FileLogFormatter.java @@ -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); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/readme.txt b/L2J_Mobius_Classic_2.1_Zaken/readme.txt index c133440650..c73769081e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/readme.txt +++ b/L2J_Mobius_Classic_2.1_Zaken/readme.txt @@ -3,8 +3,9 @@ L2J-Mobius Classic Zaken Client: https://drive.google.com/uc?id=1_kioRKR5FTOmINAtUQe0KCxrvPzY18Nd&export=download System: https://mega.nz/#!os8HRShC!5JbEmWEugMyssgE-lWgBxJj_zC63gXX-ogBh-A3arX8 -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/38yzztwmmdq0r07/L2J_Mobius_Classic_2.1_Zaken_Geodata.zip diff --git a/L2J_Mobius_Classic_2.2_Antharas/.classpath b/L2J_Mobius_Classic_2.2_Antharas/.classpath index 2a81446a6c..dbd09bbafe 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/.classpath +++ b/L2J_Mobius_Classic_2.2_Antharas/.classpath @@ -1,6 +1,6 @@ - + diff --git a/L2J_Mobius_Classic_2.2_Antharas/.settings/org.eclipse.jdt.core.prefs b/L2J_Mobius_Classic_2.2_Antharas/.settings/org.eclipse.jdt.core.prefs index f59235caf4..65b5e60af1 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/.settings/org.eclipse.jdt.core.prefs +++ b/L2J_Mobius_Classic_2.2_Antharas/.settings/org.eclipse.jdt.core.prefs @@ -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 diff --git a/L2J_Mobius_Classic_2.2_Antharas/build.xml b/L2J_Mobius_Classic_2.2_Antharas/build.xml index e9e497b618..9d12307bed 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/build.xml +++ b/L2J_Mobius_Classic_2.2_Antharas/build.xml @@ -52,8 +52,8 @@ - - + + @@ -62,7 +62,7 @@ - + diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java index 843f8d178b..d25cdcd5d8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java @@ -98,7 +98,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: { @@ -134,7 +135,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: { @@ -153,7 +155,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: { @@ -200,19 +203,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": @@ -224,7 +232,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"; } @@ -255,13 +264,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; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java index cd5be7df9a..72d2cb5288 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java @@ -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: { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java index 121ab1373e..23bb8f2314 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java @@ -67,7 +67,8 @@ public class FirstClassTransferTalk extends AbstractNpcAI return htmltext += "no.html"; } - switch (MASTERS.get(npc.getId())) + final Race race = MASTERS.get(npc.getId()); + switch (race) { case HUMAN: { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java index f4ab8eea82..6c830bb685 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java @@ -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 */ diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java index 50346454fc..87d7c825ec 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java @@ -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: { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/log/formatter/FileLogFormatter.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/log/formatter/FileLogFormatter.java index b42e2fe119..19c35005de 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/log/formatter/FileLogFormatter.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/log/formatter/FileLogFormatter.java @@ -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); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/readme.txt b/L2J_Mobius_Classic_2.2_Antharas/readme.txt index cba5041175..62eb358d51 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/readme.txt +++ b/L2J_Mobius_Classic_2.2_Antharas/readme.txt @@ -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/zzpl37z8nqzj7mj/L2J_Mobius_Classic_2.2_Antharas_Geodata.zip diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/.classpath b/L2J_Mobius_Classic_2.3_SevenSigns/.classpath index 2a81446a6c..dbd09bbafe 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/.classpath +++ b/L2J_Mobius_Classic_2.3_SevenSigns/.classpath @@ -1,6 +1,6 @@ - + diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/.settings/org.eclipse.jdt.core.prefs b/L2J_Mobius_Classic_2.3_SevenSigns/.settings/org.eclipse.jdt.core.prefs index f59235caf4..65b5e60af1 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/.settings/org.eclipse.jdt.core.prefs +++ b/L2J_Mobius_Classic_2.3_SevenSigns/.settings/org.eclipse.jdt.core.prefs @@ -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 diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/build.xml b/L2J_Mobius_Classic_2.3_SevenSigns/build.xml index a39cb57152..ca7719108d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/build.xml +++ b/L2J_Mobius_Classic_2.3_SevenSigns/build.xml @@ -52,8 +52,8 @@ - - + + @@ -62,7 +62,7 @@ - + diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java index 843f8d178b..d25cdcd5d8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java @@ -98,7 +98,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: { @@ -134,7 +135,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: { @@ -153,7 +155,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: { @@ -200,19 +203,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": @@ -224,7 +232,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"; } @@ -255,13 +264,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; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java index cd5be7df9a..72d2cb5288 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java @@ -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: { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java index 121ab1373e..23bb8f2314 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java @@ -67,7 +67,8 @@ public class FirstClassTransferTalk extends AbstractNpcAI return htmltext += "no.html"; } - switch (MASTERS.get(npc.getId())) + final Race race = MASTERS.get(npc.getId()); + switch (race) { case HUMAN: { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java index f4ab8eea82..6c830bb685 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java @@ -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 */ diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java index 50346454fc..87d7c825ec 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java @@ -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: { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/log/formatter/FileLogFormatter.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/log/formatter/FileLogFormatter.java index b42e2fe119..19c35005de 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/log/formatter/FileLogFormatter.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/log/formatter/FileLogFormatter.java @@ -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); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/readme.txt b/L2J_Mobius_Classic_2.3_SevenSigns/readme.txt index eb83b47843..07cc35f952 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/readme.txt +++ b/L2J_Mobius_Classic_2.3_SevenSigns/readme.txt @@ -3,8 +3,9 @@ L2J-Mobius Classic Seven Signs 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/i0irxa6tda1np71/L2J_Mobius_Classic_2.3_SevenSigns_Geodata.zip diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/.classpath b/L2J_Mobius_Classic_2.4_SecretOfEmpire/.classpath index 2a81446a6c..dbd09bbafe 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/.classpath +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/.classpath @@ -1,6 +1,6 @@ - + diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/.settings/org.eclipse.jdt.core.prefs b/L2J_Mobius_Classic_2.4_SecretOfEmpire/.settings/org.eclipse.jdt.core.prefs index f59235caf4..65b5e60af1 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/.settings/org.eclipse.jdt.core.prefs +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/.settings/org.eclipse.jdt.core.prefs @@ -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 diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/build.xml b/L2J_Mobius_Classic_2.4_SecretOfEmpire/build.xml index f9d6300300..053d3b257d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/build.xml +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/build.xml @@ -52,8 +52,8 @@ - - + + @@ -62,7 +62,7 @@ - + diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java index 843f8d178b..d25cdcd5d8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java @@ -98,7 +98,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: { @@ -134,7 +135,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: { @@ -153,7 +155,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: { @@ -200,19 +203,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": @@ -224,7 +232,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"; } @@ -255,13 +264,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; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java index cd5be7df9a..72d2cb5288 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java @@ -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: { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java index 121ab1373e..23bb8f2314 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java @@ -67,7 +67,8 @@ public class FirstClassTransferTalk extends AbstractNpcAI return htmltext += "no.html"; } - switch (MASTERS.get(npc.getId())) + final Race race = MASTERS.get(npc.getId()); + switch (race) { case HUMAN: { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java index f4ab8eea82..6c830bb685 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java @@ -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 */ diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java index 50346454fc..87d7c825ec 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java @@ -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: { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/log/formatter/FileLogFormatter.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/log/formatter/FileLogFormatter.java index b42e2fe119..19c35005de 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/log/formatter/FileLogFormatter.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/log/formatter/FileLogFormatter.java @@ -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); } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/readme.txt b/L2J_Mobius_Classic_2.4_SecretOfEmpire/readme.txt index cb6e2466a8..beea6c5148 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/readme.txt +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/readme.txt @@ -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/0lcde1bxjg7bayz/L2J_Mobius_Classic_2.4_SecretOfEmpire_Geodata.zip diff --git a/L2J_Mobius_Classic_3.0_TheKamael/.classpath b/L2J_Mobius_Classic_3.0_TheKamael/.classpath index 2a81446a6c..dbd09bbafe 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/.classpath +++ b/L2J_Mobius_Classic_3.0_TheKamael/.classpath @@ -1,6 +1,6 @@ - + diff --git a/L2J_Mobius_Classic_3.0_TheKamael/.settings/org.eclipse.jdt.core.prefs b/L2J_Mobius_Classic_3.0_TheKamael/.settings/org.eclipse.jdt.core.prefs index f59235caf4..65b5e60af1 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/.settings/org.eclipse.jdt.core.prefs +++ b/L2J_Mobius_Classic_3.0_TheKamael/.settings/org.eclipse.jdt.core.prefs @@ -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 diff --git a/L2J_Mobius_Classic_3.0_TheKamael/build.xml b/L2J_Mobius_Classic_3.0_TheKamael/build.xml index 5c18eec25b..86f16549bf 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/build.xml +++ b/L2J_Mobius_Classic_3.0_TheKamael/build.xml @@ -52,8 +52,8 @@ - - + + @@ -62,7 +62,7 @@ - + diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java index 843f8d178b..d25cdcd5d8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java @@ -98,7 +98,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: { @@ -134,7 +135,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: { @@ -153,7 +155,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: { @@ -200,19 +203,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": @@ -224,7 +232,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"; } @@ -255,13 +264,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; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java index cd5be7df9a..72d2cb5288 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java @@ -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: { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java index 121ab1373e..23bb8f2314 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java @@ -67,7 +67,8 @@ public class FirstClassTransferTalk extends AbstractNpcAI return htmltext += "no.html"; } - switch (MASTERS.get(npc.getId())) + final Race race = MASTERS.get(npc.getId()); + switch (race) { case HUMAN: { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java index f4ab8eea82..6c830bb685 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java @@ -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 */ diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java index 50346454fc..87d7c825ec 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java @@ -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: { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/log/formatter/FileLogFormatter.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/log/formatter/FileLogFormatter.java index b42e2fe119..19c35005de 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/log/formatter/FileLogFormatter.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/log/formatter/FileLogFormatter.java @@ -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); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/readme.txt b/L2J_Mobius_Classic_3.0_TheKamael/readme.txt index 22d9d38943..0bedeaa832 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/readme.txt +++ b/L2J_Mobius_Classic_3.0_TheKamael/readme.txt @@ -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/67p627w8qmalsbs/L2J_Mobius_Classic_3.0_TheKamael_Geodata.zip diff --git a/L2J_Mobius_Classic_Interlude/.classpath b/L2J_Mobius_Classic_Interlude/.classpath index 2a81446a6c..dbd09bbafe 100644 --- a/L2J_Mobius_Classic_Interlude/.classpath +++ b/L2J_Mobius_Classic_Interlude/.classpath @@ -1,6 +1,6 @@ - + diff --git a/L2J_Mobius_Classic_Interlude/.settings/org.eclipse.jdt.core.prefs b/L2J_Mobius_Classic_Interlude/.settings/org.eclipse.jdt.core.prefs index f59235caf4..65b5e60af1 100644 --- a/L2J_Mobius_Classic_Interlude/.settings/org.eclipse.jdt.core.prefs +++ b/L2J_Mobius_Classic_Interlude/.settings/org.eclipse.jdt.core.prefs @@ -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 diff --git a/L2J_Mobius_Classic_Interlude/build.xml b/L2J_Mobius_Classic_Interlude/build.xml index d48c1e9297..3e0107dcf9 100644 --- a/L2J_Mobius_Classic_Interlude/build.xml +++ b/L2J_Mobius_Classic_Interlude/build.xml @@ -52,8 +52,8 @@ - - + + @@ -62,7 +62,7 @@ - + diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java index 843f8d178b..d25cdcd5d8 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java @@ -98,7 +98,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: { @@ -134,7 +135,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: { @@ -153,7 +155,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: { @@ -200,19 +203,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": @@ -224,7 +232,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"; } @@ -255,13 +264,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; } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java index cd5be7df9a..72d2cb5288 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java @@ -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: { diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java index 121ab1373e..23bb8f2314 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java @@ -67,7 +67,8 @@ public class FirstClassTransferTalk extends AbstractNpcAI return htmltext += "no.html"; } - switch (MASTERS.get(npc.getId())) + final Race race = MASTERS.get(npc.getId()); + switch (race) { case HUMAN: { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java index f4ab8eea82..6c830bb685 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java @@ -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 */ diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java index 50346454fc..87d7c825ec 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java @@ -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: { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/log/formatter/FileLogFormatter.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/log/formatter/FileLogFormatter.java index b42e2fe119..19c35005de 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/log/formatter/FileLogFormatter.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/log/formatter/FileLogFormatter.java @@ -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); } } diff --git a/L2J_Mobius_Classic_Interlude/readme.txt b/L2J_Mobius_Classic_Interlude/readme.txt index 38b6188e08..3133e90aa0 100644 --- a/L2J_Mobius_Classic_Interlude/readme.txt +++ b/L2J_Mobius_Classic_Interlude/readme.txt @@ -3,8 +3,9 @@ L2J-Mobius Classic Interlude Client: https://drive.google.com/u/0/uc?id=1mWvvdTC611lTqF1OU8cKgUiSqnZ3DhOT&export=download System: https://www.mediafire.com/file/669nqj7u0hqbtf2/L2J_Mobius_Classic_Interlude_System_v12.zip -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/9huhlj0ehyas458/L2J_Mobius_Classic_Interlude_Geodata.zip diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/.classpath b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/.classpath index 2a81446a6c..dbd09bbafe 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/.classpath +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/.classpath @@ -1,6 +1,6 @@ - + diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/.settings/org.eclipse.jdt.core.prefs b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/.settings/org.eclipse.jdt.core.prefs index f59235caf4..65b5e60af1 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/.settings/org.eclipse.jdt.core.prefs +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/.settings/org.eclipse.jdt.core.prefs @@ -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 diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/build.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/build.xml index 2991ff1225..b83f5ee3a3 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/build.xml +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/build.xml @@ -52,8 +52,8 @@ - - + + @@ -62,7 +62,7 @@ - + diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java index 843f8d178b..d25cdcd5d8 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java @@ -98,7 +98,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: { @@ -134,7 +135,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: { @@ -153,7 +155,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: { @@ -200,19 +203,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": @@ -224,7 +232,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"; } @@ -255,13 +264,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; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java index cd5be7df9a..72d2cb5288 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java @@ -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: { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java index 121ab1373e..23bb8f2314 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java @@ -67,7 +67,8 @@ public class FirstClassTransferTalk extends AbstractNpcAI return htmltext += "no.html"; } - switch (MASTERS.get(npc.getId())) + final Race race = MASTERS.get(npc.getId()); + switch (race) { case HUMAN: { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java index f4ab8eea82..6c830bb685 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java @@ -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 */ diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java index 50346454fc..87d7c825ec 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java @@ -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: { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/log/formatter/FileLogFormatter.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/log/formatter/FileLogFormatter.java index b42e2fe119..19c35005de 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/log/formatter/FileLogFormatter.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/log/formatter/FileLogFormatter.java @@ -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); } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/readme.txt b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/readme.txt index 5e83a5d301..07431f6e97 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/readme.txt +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/readme.txt @@ -2,8 +2,9 @@ L2J-Mobius Dwelling of Spirits 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/ctithbrur1cevrd/L2J_Mobius_Essence_4.2_DwellingOfSpirits_Geodata.zip diff --git a/L2J_Mobius_Essence_5.2_FrostLord/.classpath b/L2J_Mobius_Essence_5.2_FrostLord/.classpath index 2a81446a6c..dbd09bbafe 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/.classpath +++ b/L2J_Mobius_Essence_5.2_FrostLord/.classpath @@ -1,6 +1,6 @@ - + diff --git a/L2J_Mobius_Essence_5.2_FrostLord/.settings/org.eclipse.jdt.core.prefs b/L2J_Mobius_Essence_5.2_FrostLord/.settings/org.eclipse.jdt.core.prefs index f59235caf4..65b5e60af1 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/.settings/org.eclipse.jdt.core.prefs +++ b/L2J_Mobius_Essence_5.2_FrostLord/.settings/org.eclipse.jdt.core.prefs @@ -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 diff --git a/L2J_Mobius_Essence_5.2_FrostLord/build.xml b/L2J_Mobius_Essence_5.2_FrostLord/build.xml index 6209497faf..b921d4f216 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/build.xml +++ b/L2J_Mobius_Essence_5.2_FrostLord/build.xml @@ -52,8 +52,8 @@ - - + + @@ -62,7 +62,7 @@ - + diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java index 843f8d178b..d25cdcd5d8 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java @@ -98,7 +98,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: { @@ -134,7 +135,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: { @@ -153,7 +155,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: { @@ -200,19 +203,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": @@ -224,7 +232,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"; } @@ -255,13 +264,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; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java index cd5be7df9a..72d2cb5288 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java @@ -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: { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java index 121ab1373e..23bb8f2314 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/village_master/FirstClassTransferTalk/FirstClassTransferTalk.java @@ -67,7 +67,8 @@ public class FirstClassTransferTalk extends AbstractNpcAI return htmltext += "no.html"; } - switch (MASTERS.get(npc.getId())) + final Race race = MASTERS.get(npc.getId()); + switch (race) { case HUMAN: { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java index f4ab8eea82..6c830bb685 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/communitybbs/BB/Forum.java @@ -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 */ diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java index 50346454fc..87d7c825ec 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/instancezone/conditions/ConditionHasResidence.java @@ -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: { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/log/formatter/FileLogFormatter.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/log/formatter/FileLogFormatter.java index b42e2fe119..19c35005de 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/log/formatter/FileLogFormatter.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/log/formatter/FileLogFormatter.java @@ -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); } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/readme.txt b/L2J_Mobius_Essence_5.2_FrostLord/readme.txt index 5a83a8a1f0..3ddc9ea674 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/readme.txt +++ b/L2J_Mobius_Essence_5.2_FrostLord/readme.txt @@ -2,8 +2,9 @@ L2J-Mobius Frost Lord Client: https://drive.google.com/u/0/uc?id=1wvBeoNFljviXafRBRey8McnEdVF-z0fK&export=download System: https://mega.nz/file/p4VViajQ#8wtYL65IeCNymkt9zHV10aMit-NplvcnKqSfnno2_XA -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/npdya1ozjl5td9m/L2J_Mobius_Essence_5.2_FrostLord_Geodata.zip