Skip to content

Commit c3a4daf

Browse files
Various code and structure updates.
1 parent ddc659a commit c3a4daf

10 files changed

+76
-25
lines changed

.settings/org.eclipse.jdt.core.prefs

+17-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
eclipse.preferences.version=1
2+
org.eclipse.jdt.core.builder.annotationPath.allLocations=disabled
23
org.eclipse.jdt.core.codeComplete.argumentPrefixes=
34
org.eclipse.jdt.core.codeComplete.argumentSuffixes=
45
org.eclipse.jdt.core.codeComplete.fieldPrefixes=
@@ -15,9 +16,12 @@ org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonN
1516
org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
1617
org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
1718
org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
19+
org.eclipse.jdt.core.compiler.annotation.notowning=org.eclipse.jdt.annotation.NotOwning
1820
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
1921
org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
2022
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
23+
org.eclipse.jdt.core.compiler.annotation.owning=org.eclipse.jdt.annotation.Owning
24+
org.eclipse.jdt.core.compiler.annotation.resourceanalysis=disabled
2125
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
2226
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
2327
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
@@ -51,8 +55,10 @@ org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
5155
org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
5256
org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
5357
org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
58+
org.eclipse.jdt.core.compiler.problem.incompatibleOwningContract=warning
5459
org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
5560
org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
61+
org.eclipse.jdt.core.compiler.problem.insufficientResourceAnalysis=warning
5662
org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
5763
org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
5864
org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
@@ -139,20 +145,21 @@ org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
139145
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
140146
org.eclipse.jdt.core.compiler.release=enabled
141147
org.eclipse.jdt.core.compiler.source=17
148+
org.eclipse.jdt.core.formatter.align_arrows_in_switch_on_columns=false
142149
org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
143150
org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
144151
org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=false
145152
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
146153
org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false
147154
org.eclipse.jdt.core.formatter.align_with_spaces=false
148155
org.eclipse.jdt.core.formatter.alignment_for_additive_operator=0
149-
org.eclipse.jdt.core.formatter.alignment_for_annotations_on_enum_constant=49
150-
org.eclipse.jdt.core.formatter.alignment_for_annotations_on_field=49
151-
org.eclipse.jdt.core.formatter.alignment_for_annotations_on_local_variable=49
152-
org.eclipse.jdt.core.formatter.alignment_for_annotations_on_method=49
153-
org.eclipse.jdt.core.formatter.alignment_for_annotations_on_package=49
156+
org.eclipse.jdt.core.formatter.alignment_for_annotations_on_enum_constant=1
157+
org.eclipse.jdt.core.formatter.alignment_for_annotations_on_field=1
158+
org.eclipse.jdt.core.formatter.alignment_for_annotations_on_local_variable=1
159+
org.eclipse.jdt.core.formatter.alignment_for_annotations_on_method=1
160+
org.eclipse.jdt.core.formatter.alignment_for_annotations_on_package=1
154161
org.eclipse.jdt.core.formatter.alignment_for_annotations_on_parameter=0
155-
org.eclipse.jdt.core.formatter.alignment_for_annotations_on_type=49
162+
org.eclipse.jdt.core.formatter.alignment_for_annotations_on_type=1
156163
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=0
157164
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
158165
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=48
@@ -179,6 +186,7 @@ org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=0
179186
org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
180187
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=0
181188
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=0
189+
org.eclipse.jdt.core.formatter.alignment_for_permitted_types_in_type_declaration=0
182190
org.eclipse.jdt.core.formatter.alignment_for_record_components=0
183191
org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0
184192
org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=85
@@ -215,6 +223,7 @@ org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=nex
215223
org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=next_line
216224
org.eclipse.jdt.core.formatter.brace_position_for_block=next_line
217225
org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
226+
org.eclipse.jdt.core.formatter.brace_position_for_block_in_case_after_arrow=end_of_line
218227
org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
219228
org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line
220229
org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line
@@ -241,6 +250,7 @@ org.eclipse.jdt.core.formatter.comment.indent_tag_description=false
241250
org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=do not insert
242251
org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=do not insert
243252
org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
253+
org.eclipse.jdt.core.formatter.comment.javadoc_do_not_separate_block_tags=false
244254
org.eclipse.jdt.core.formatter.comment.line_length=300
245255
org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
246256
org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
@@ -476,6 +486,7 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_
476486
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
477487
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
478488
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
489+
org.eclipse.jdt.core.formatter.join_line_comments=false
479490
org.eclipse.jdt.core.formatter.join_lines_in_comments=true
480491
org.eclipse.jdt.core.formatter.join_wrapped_lines=true
481492
org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never

.settings/org.eclipse.jdt.ui.prefs

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ cleanup_settings_version=2
6969
eclipse.preferences.version=1
7070
editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
7171
formatter_profile=_L2J-Mobius Formatter
72-
formatter_settings_version=22
72+
formatter_settings_version=23
7373
org.eclipse.jdt.ui.exception.name=e
7474
org.eclipse.jdt.ui.gettersetter.use.is=true
7575
org.eclipse.jdt.ui.ignorelowercasenames=true

dist/data/structure/45_shield_of_kingdom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<link pattern="EnchantChallengePoint(_Classic(Aden)?)?.dat" file="enchantchallengepoint" version="MasterClass2" />
6868
<link pattern="EnchantedCloakEffectData_Classic.dat" file="enchantedcloakeffect" version="MasterClass" />
6969
<link pattern="EnchantedItemSkills(_Classic(Aden)?)?-[\w]+\.dat" file="enchanteditemskills" version="MasterClass2" />
70-
<link pattern="EnchantedWeaponFlowEffectData(_Classic(Aden)?)?.dat" file="enchantedweaponfloweffectdata" version="Homunculus" />
70+
<link pattern="EnchantedWeaponFlowEffectData(_Classic(Aden)?)?.dat" file="enchantedweaponfloweffectdata" version="ShieldOfKingdom" />
7171
<link pattern="EnchantedHairEffectData(_Classic(Aden)?)?.dat" file="EnchantedHairEffectData" version="PathOfRogue" />
7272
<link pattern="EnchantScrollSet(_Classic(Aden)?)?.dat" file="enchantscrollset" version="AgeOfMagic" />
7373
<link pattern="EnchantStatBonus(_Classic(Aden)?)?.dat" file="enchantstatbonus" version="Ertheia" />
@@ -183,8 +183,8 @@
183183
<link pattern="Recipe(_Classic(Aden)?)?.dat" file="recipe" version="Ertheia" />
184184
<link pattern="recipe-c.dat" file="recipe-c" version="Lindvior" />
185185
<link pattern="relics_collection(_Classic(Aden)?)?-[\w]+\.dat" file="relicscollection" version="Shinemaker" />
186-
<link pattern="relics_main(_Classic(Aden)?)?.dat" file="relicsmain" version="PathOfRogue" />
187-
<link pattern="relics_playdata(_Classic(Aden)?)?.dat" file="relicsplaydata" version="Shinemaker" />
186+
<link pattern="relics_main(_Classic(Aden)?)?.dat" file="relicsmain" version="ShieldOfKingdom" />
187+
<link pattern="relics_playdata(_Classic(Aden)?)?.dat" file="relicsplaydata" version="ShieldOfKingdom" />
188188
<link pattern="ReplaceSkillIcon(_Classic(Aden)?)?.dat" file="replaceskillicon" version="AgeOfMagic" />
189189
<link pattern="RideData(_Classic(Aden)?)?.dat" file="ridedata" version="PathOfRogue" />
190190
<link pattern="sceneplayerdata.dat" file="sceneplayerdata" version="Helios" />

dist/data/structure/dats/enchantedweaponfloweffectdata.xml

+15
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,19 @@
6161
</for>
6262
</for>
6363
</file>
64+
<file pattern="ShieldOfKingdom" isSafePackage="true">
65+
<node name="data" reader="UINT" />
66+
<for name="enchanted_effect" size="#data" hidden="false">
67+
<node name="group_id" reader="UINT" />
68+
<node name="group_name" reader="ASCF" />
69+
<node name="group" reader="UINT" />
70+
<for name="group" size="#group">
71+
<node name="start_enchanted_value" reader="UINT" />
72+
<node name="right_main_flow_effect" reader="MAP_INT" />
73+
<node name="left_main_flow_effect" reader="MAP_INT" />
74+
<node name="right_variation_flow_effect" reader="MAP_INT" />
75+
<node name="left_variation_flow_effect" reader="MAP_INT" />
76+
</for>
77+
</for>
78+
</file>
6479
</list>

dist/data/structure/dats/relicsmain.xml

+21
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,25 @@
3939
<node name="sort_order" reader="UBYTE" />
4040
</for>
4141
</file>
42+
<file pattern="ShieldOfKingdom" isSafePackage="true">
43+
<node name="data" reader="INT" />
44+
<for name="relics_main" size="#data" hidden="false">
45+
<node name="relics_id" reader="USHORT" />
46+
<!-- <node name="basic_prob" reader="USHORT" /> -->
47+
<node name="item_id" reader="UINT" />
48+
<node name="grade" reader="UBYTE" />
49+
<node name="relics_skills" reader="CNTR" />
50+
<for name="skill_id" size="#relics_skills">
51+
<node name="skill_id1" reader="UINT" />
52+
<node name="skill_level" reader="USHORT" />
53+
</for>
54+
<node name="enchanted" reader="CNTR" />
55+
<for name="enchanted" size="#enchanted">
56+
<node name="enchant_level" reader="UBYTE" />
57+
</for>
58+
<node name="npc_id" reader="UINT" />
59+
<node name="level" reader="UBYTE" />
60+
<node name="sort_order" reader="UBYTE" />
61+
</for>
62+
</file>
4263
</list>

dist/data/structure/dats/relicsplaydata.xml

+6
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,10 @@
2424
</for>
2525
</for>
2626
</file>
27+
<file pattern="ShieldOfKingdom" isSafePackage="true">
28+
<node name="data" reader="INT" />
29+
<for name="relics_main" size="#data" hidden="false">
30+
<node name="relics_id" reader="UBYTE" />
31+
</for>
32+
</file>
2733
</list>

java/org/l2jmobius/log/ConsoleLogFormatter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public class ConsoleLogFormatter extends Formatter
3131
@Override
3232
public String format(LogRecord record)
3333
{
34-
final StringBuilder output = new StringBuilder(500);
34+
final StringBuilder output = new StringBuilder(128);
3535
StringUtil.append(output, "[", dateFmt.format(new Date(record.getMillis())), "] " + record.getMessage(), System.lineSeparator());
3636

3737
if (record.getThrown() != null)

java/org/l2jmobius/log/FileLogFormatter.java

+4-6
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,18 @@
2323

2424
import org.l2jmobius.util.StringUtil;
2525

26-
/**
27-
* @version $Revision: 1.1.4.1 $ $Date: 2005/03/27 15:30:08 $
28-
*/
2926
public class FileLogFormatter extends Formatter
3027
{
3128
private static final String TAB = "\t";
32-
private final SimpleDateFormat dateFmt = new SimpleDateFormat("yyyy.MM.dd HH:mm:ss,SSS");
29+
30+
private final SimpleDateFormat _dateFormat = new SimpleDateFormat("yyyy.MM.dd HH:mm:ss,SSS");
3331

3432
@Override
3533
public String format(LogRecord record)
3634
{
3735
// Java 1.8
38-
// return StringUtil.concat(dateFmt.format(new Date(record.getMillis())), TAB, record.getLevel().getName(), TAB, String.valueOf(record.getThreadID()), TAB, record.getLoggerName(), TAB, record.getMessage(), System.lineSeparator());
36+
// return StringUtil.concat(_dateFormat.format(new Date(record.getMillis())), TAB, record.getLevel().getName(), TAB, String.valueOf(record.getThreadID()), TAB, record.getLoggerName(), TAB, record.getMessage(), System.lineSeparator());
3937
// Java 16
40-
return StringUtil.concat(dateFmt.format(new Date(record.getMillis())), TAB, record.getLevel().getName(), TAB, String.valueOf(record.getLongThreadID()), TAB, record.getLoggerName(), TAB, record.getMessage(), System.lineSeparator());
38+
return StringUtil.concat(_dateFormat.format(new Date(record.getMillis())), TAB, record.getLevel().getName(), TAB, String.valueOf(record.getLongThreadID()), TAB, record.getLoggerName(), TAB, record.getMessage(), System.lineSeparator());
4139
}
4240
}

java/org/l2jmobius/xml/CryptVersionParser.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ public void parse()
5555
factory.setIgnoringComments(true);
5656
try
5757
{
58-
final Document doc = factory.newDocumentBuilder().parse(def);
59-
for (Node defsNode = doc.getFirstChild(); defsNode != null; defsNode = doc.getNextSibling())
58+
final Document document = factory.newDocumentBuilder().parse(def);
59+
for (Node defsNode = document.getFirstChild(); defsNode != null; defsNode = document.getNextSibling())
6060
{
6161
if (defsNode.getNodeName().equals("keys"))
6262
{

java/org/l2jmobius/xml/DescriptorParser.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ private void parseDefinitions()
7272
factory.setIgnoringComments(true);
7373
try
7474
{
75-
final Document doc = factory.newDocumentBuilder().parse(def);
76-
for (Node defsNode = doc.getFirstChild(); defsNode != null; defsNode = doc.getNextSibling())
75+
final Document document = factory.newDocumentBuilder().parse(def);
76+
for (Node defsNode = document.getFirstChild(); defsNode != null; defsNode = document.getNextSibling())
7777
{
7878
if (defsNode.getNodeName().equals("definitions"))
7979
{
@@ -110,8 +110,8 @@ private void parseEnum(File file)
110110
factory.setValidating(false);
111111
factory.setIgnoringElementContentWhitespace(true);
112112
factory.setIgnoringComments(true);
113-
final Document doc = factory.newDocumentBuilder().parse(file);
114-
for (Node defsNode = doc.getFirstChild(); defsNode != null; defsNode = doc.getNextSibling())
113+
final Document document = factory.newDocumentBuilder().parse(file);
114+
for (Node defsNode = document.getFirstChild(); defsNode != null; defsNode = document.getNextSibling())
115115
{
116116
if (defsNode.getNodeName().equals("list"))
117117
{
@@ -178,8 +178,8 @@ private void parseDescriptor(File file)
178178
factory.setValidating(false);
179179
factory.setIgnoringElementContentWhitespace(true);
180180
factory.setIgnoringComments(true);
181-
final Document doc = factory.newDocumentBuilder().parse(file);
182-
for (Node fileNode0 = doc.getFirstChild(); fileNode0 != null; fileNode0 = doc.getNextSibling())
181+
final Document document = factory.newDocumentBuilder().parse(file);
182+
for (Node fileNode0 = document.getFirstChild(); fileNode0 != null; fileNode0 = document.getNextSibling())
183183
{
184184
if (fileNode0.getNodeName().equalsIgnoreCase("list"))
185185
{

0 commit comments

Comments
 (0)