From edf46d4d289b0cbab6ced6c680e8e0f887ad30a4 Mon Sep 17 00:00:00 2001
From: Alexander01998 <contact.wurstimperium@gmail.com>
Date: Sun, 24 Mar 2024 02:06:40 +0100
Subject: [PATCH] Update Formatter and Clean Up settings for Eclipse 2024-03

---
 codestyle/cleanup.xml                         | 259 +++++++++---------
 codestyle/formatter.xml                       |   3 +
 .../wurstclient/hacks/AutoLibrarianHack.java  |   2 +-
 3 files changed, 135 insertions(+), 129 deletions(-)

diff --git a/codestyle/cleanup.xml b/codestyle/cleanup.xml
index 70a36773..a6aa8d3e 100644
--- a/codestyle/cleanup.xml
+++ b/codestyle/cleanup.xml
@@ -1,144 +1,147 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <profiles version="2">
-    <profile kind="CleanUpProfile" name="Wurst-Imperium 2022-06" version="2">
+    <profile kind="CleanUpProfile" name="Wurst-Imperium" version="2">
+        <setting id="cleanup.array_with_curly" value="true"/>
         <setting id="cleanup.use_autoboxing" value="true"/>
-        <setting id="cleanup.remove_redundant_semicolons" value="true"/>
-        <setting id="cleanup.system_property_file_separator" value="true"/>
-        <setting id="cleanup.objects_equals" value="true"/>
-        <setting id="cleanup.primitive_parsing" value="true"/>
-        <setting id="cleanup.remove_trailing_whitespaces" value="true"/>
-        <setting id="cleanup.remove_unused_private_fields" value="true"/>
-        <setting id="cleanup.try_with_resource" value="true"/>
-        <setting id="cleanup.system_property" value="false"/>
-        <setting id="cleanup.add_missing_nls_tags" value="false"/>
-        <setting id="cleanup.stringbuilder" value="false"/>
-        <setting id="cleanup.push_down_negation" value="false"/>
-        <setting id="cleanup.system_property_path_separator" value="true"/>
-        <setting id="cleanup.use_var" value="false"/>
-        <setting id="cleanup.use_blocks_only_for_return_and_throw" value="false"/>
-        <setting id="cleanup.convert_functional_interfaces" value="true"/>
-        <setting id="cleanup.make_type_abstract_if_missing_method" value="false"/>
-        <setting id="cleanup.remove_private_constructors" value="true"/>
-        <setting id="cleanup.evaluate_nullable" value="true"/>
-        <setting id="cleanup.strictly_equal_or_different" value="false"/>
-        <setting id="cleanup.system_property_boolean" value="true"/>
-        <setting id="cleanup.embedded_if" value="true"/>
-        <setting id="cleanup.join" value="true"/>
-        <setting id="cleanup.return_expression" value="false"/>
-        <setting id="cleanup.remove_unnecessary_casts" value="true"/>
-        <setting id="cleanup.redundant_falling_through_block_end" value="true"/>
         <setting id="cleanup.overridden_assignment_move_decl" value="true"/>
-        <setting id="cleanup.always_use_parentheses_in_expressions" value="false"/>
-        <setting id="cleanup.use_parentheses_in_expressions" value="true"/>
-        <setting id="cleanup.multi_catch" value="true"/>
-        <setting id="cleanup.if_condition" value="true"/>
-        <setting id="cleanup.comparison_statement" value="true"/>
-        <setting id="cleanup.use_this_for_non_static_method_access_only_if_necessary" value="true"/>
-        <setting id="cleanup.use_unboxing" value="true"/>
-        <setting id="cleanup.bitwise_conditional_expression" value="false"/>
-        <setting id="cleanup.remove_trailing_whitespaces_ignore_empty" value="false"/>
-        <setting id="cleanup.instanceof" value="false"/>
-        <setting id="cleanup.correct_indentation" value="true"/>
-        <setting id="cleanup.make_private_fields_final" value="true"/>
-        <setting id="cleanup.boolean_value_rather_than_comparison" value="true"/>
-        <setting id="cleanup.qualify_static_member_accesses_with_declaring_class" value="true"/>
-        <setting id="cleanup.no_string_creation" value="true"/>
-        <setting id="cleanup.add_missing_override_annotations_interface_methods" value="true"/>
-        <setting id="cleanup.substring" value="true"/>
-        <setting id="cleanup.lazy_logical_operator" value="false"/>
-        <setting id="cleanup.remove_unused_method_parameters" value="false"/>
-        <setting id="cleanup.valueof_rather_than_instantiation" value="true"/>
-        <setting id="cleanup.qualify_static_field_accesses_with_declaring_class" value="false"/>
-        <setting id="cleanup.pull_out_if_from_if_else" value="false"/>
-        <setting id="cleanup.use_anonymous_class_creation" value="false"/>
-        <setting id="cleanup.convert_to_enhanced_for_loop_if_loop_var_used" value="false"/>
-        <setting id="cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class" value="true"/>
-        <setting id="cleanup.break_loop" value="false"/>
-        <setting id="cleanup.useless_continue" value="true"/>
-        <setting id="cleanup.instanceof_keyword" value="false"/>
-        <setting id="cleanup.standard_comparison" value="false"/>
-        <setting id="cleanup.format_source_code" value="true"/>
-        <setting id="cleanup.remove_unused_imports" value="true"/>
-        <setting id="cleanup.use_lambda" value="true"/>
-        <setting id="cleanup.map_cloning" value="true"/>
-        <setting id="cleanup.no_super" value="true"/>
-        <setting id="cleanup.extract_increment" value="false"/>
-        <setting id="cleanup.always_use_this_for_non_static_field_access" value="false"/>
-        <setting id="cleanup.add_missing_annotations" value="true"/>
-        <setting id="cleanup.primitive_rather_than_wrapper" value="false"/>
-        <setting id="cleanup.remove_unnecessary_nls_tags" value="true"/>
-        <setting id="cleanup.remove_unused_private_methods" value="true"/>
-        <setting id="cleanup.primitive_serialization" value="true"/>
         <setting id="cleanup.always_use_this_for_non_static_method_access" value="false"/>
-        <setting id="cleanup.qualify_static_member_accesses_through_instances_with_declaring_class" value="true"/>
+        <setting id="cleanup.remove_trailing_whitespaces_ignore_empty" value="false"/>
+        <setting id="cleanup.primitive_comparison" value="true"/>
+        <setting id="cleanup.system_property_file_encoding" value="true"/>
+        <setting id="cleanup.format_source_code_changes_only" value="false"/>
+        <setting id="cleanup.remove_redundant_semicolons" value="true"/>
+        <setting id="cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class" value="true"/>
+        <setting id="cleanup.useless_continue" value="true"/>
+        <setting id="cleanup.remove_redundant_type_arguments" value="true"/>
+        <setting id="cleanup.remove_unused_imports" value="true"/>
+        <setting id="cleanup.break_loop" value="false"/>
+        <setting id="cleanup.pull_up_assignment" value="false"/>
+        <setting id="cleanup.stringbuilder" value="false"/>
+        <setting id="cleanup.no_super" value="true"/>
+        <setting id="cleanup.arrays_fill" value="true"/>
+        <setting id="cleanup.use_lambda" value="true"/>
+        <setting id="cleanup.operand_factorization" value="true"/>
+        <setting id="cleanup.simplify_lambda_expression_and_method_ref" value="true"/>
+        <setting id="cleanup.always_use_blocks" value="false"/>
+        <setting id="cleanup.stringconcat_to_textblock" value="false"/>
+        <setting id="cleanup.sort_members_all" value="false"/>
+        <setting id="cleanup.system_property_path_separator" value="true"/>
+        <setting id="cleanup.instanceof" value="false"/>
+        <setting id="cleanup.add_missing_annotations" value="true"/>
+        <setting id="cleanup.precompile_regex" value="true"/>
+        <setting id="cleanup.always_use_this_for_non_static_field_access" value="false"/>
+        <setting id="cleanup.boolean_literal" value="true"/>
+        <setting id="cleanup.always_use_parentheses_in_expressions" value="false"/>
         <setting id="cleanup.sort_members" value="false"/>
-        <setting id="cleanup.insert_inferred_type_arguments" value="false"/>
-        <setting id="cleanup.add_missing_override_annotations" value="true"/>
+        <setting id="cleanup.remove_unused_method_parameters" value="false"/>
+        <setting id="cleanup.remove_unused_local_variables" value="true"/>
+        <setting id="cleanup.add_missing_deprecated_annotations" value="true"/>
+        <setting id="cleanup.no_string_creation" value="true"/>
+        <setting id="cleanup.use_unboxing" value="true"/>
+        <setting id="cleanup.use_blocks_only_for_return_and_throw" value="false"/>
+        <setting id="cleanup.standard_comparison" value="false"/>
+        <setting id="cleanup.if_condition" value="true"/>
         <setting id="cleanup.system_property_line_separator" value="true"/>
-        <setting id="cleanup.static_inner_class" value="true"/>
+        <setting id="cleanup.remove_trailing_whitespaces" value="true"/>
+        <setting id="cleanup.map_cloning" value="true"/>
+        <setting id="cleanup.add_serial_version_id" value="false"/>
+        <setting id="cleanup.try_with_resource" value="true"/>
+        <setting id="cleanup.use_this_for_non_static_method_access" value="true"/>
+        <setting id="cleanup.use_this_for_non_static_method_access_only_if_necessary" value="true"/>
+        <setting id="cleanup.single_used_field" value="false"/>
+        <setting id="cleanup.reduce_indentation" value="true"/>
+        <setting id="cleanup.primitive_parsing" value="true"/>
+        <setting id="cleanup.make_local_variable_final" value="false"/>
+        <setting id="cleanup.add_missing_methods" value="true"/>
+        <setting id="cleanup.qualify_static_member_accesses_with_declaring_class" value="true"/>
+        <setting id="cleanup.add_missing_override_annotations" value="true"/>
+        <setting id="cleanup.use_blocks" value="true"/>
+        <setting id="cleanup.multi_catch" value="true"/>
+        <setting id="cleanup.pull_out_if_from_if_else" value="false"/>
+        <setting id="cleanup.collection_cloning" value="true"/>
+        <setting id="cleanup.convert_to_enhanced_for_loop_if_loop_var_used" value="false"/>
+        <setting id="cleanup.make_variable_declarations_final" value="false"/>
+        <setting id="cleanup.redundant_comparator" value="true"/>
+        <setting id="cleanup.remove_unused_private_types" value="true"/>
+        <setting id="cleanup.system_property_boolean" value="true"/>
+        <setting id="cleanup.qualify_static_method_accesses_with_declaring_class" value="false"/>
+        <setting id="cleanup.organize_imports" value="true"/>
+        <setting id="cleanup.lazy_logical_operator" value="false"/>
+        <setting id="cleanup.bitwise_conditional_expression" value="false"/>
         <setting id="cleanup.use_directly_map_method" value="true"/>
         <setting id="cleanup.add_all" value="false"/>
-        <setting id="cleanup.convert_to_enhanced_for_loop" value="true"/>
-        <setting id="cleanup.single_used_field" value="false"/>
-        <setting id="cleanup.collection_cloning" value="true"/>
-        <setting id="cleanup.comparing_on_criteria" value="true"/>
-        <setting id="cleanup.stringbuffer_to_stringbuilder" value="false"/>
-        <setting id="cleanup.do_while_rather_than_while" value="true"/>
-        <setting id="cleanup.remove_unused_private_types" value="true"/>
-        <setting id="cleanup.make_variable_declarations_final" value="false"/>
-        <setting id="cleanup.merge_conditional_blocks" value="false"/>
-        <setting id="cleanup.never_use_parentheses_in_expressions" value="true"/>
-        <setting id="cleanup.use_blocks" value="true"/>
-        <setting id="cleanup.array_with_curly" value="true"/>
-        <setting id="cleanup.remove_unnecessary_array_creation" value="true"/>
-        <setting id="cleanup.add_missing_deprecated_annotations" value="true"/>
-        <setting id="cleanup.operand_factorization" value="true"/>
-        <setting id="cleanup.qualify_static_method_accesses_with_declaring_class" value="false"/>
-        <setting id="cleanup.remove_trailing_whitespaces_all" value="true"/>
-        <setting id="cleanup.convert_to_switch_expressions" value="false"/>
-        <setting id="cleanup.remove_redundant_type_arguments" value="true"/>
-        <setting id="cleanup.number_suffix" value="true"/>
-        <setting id="cleanup.redundant_comparator" value="true"/>
-        <setting id="cleanup.remove_unused_private_members" value="true"/>
-        <setting id="cleanup.never_use_blocks" value="true"/>
-        <setting id="cleanup.organize_imports" value="true"/>
-        <setting id="cleanup.switch" value="false"/>
+        <setting id="cleanup.system_property_file_separator" value="true"/>
+        <setting id="cleanup.qualify_static_field_accesses_with_declaring_class" value="false"/>
         <setting id="cleanup.stringbuilder_for_local_vars" value="true"/>
-        <setting id="cleanup.make_parameters_final" value="false"/>
-        <setting id="cleanup.ternary_operator" value="true"/>
-        <setting id="cleanup.controlflow_merge" value="false"/>
-        <setting id="cleanup.unreachable_block" value="false"/>
-        <setting id="cleanup.always_use_blocks" value="false"/>
-        <setting id="cleanup.add_serial_version_id" value="false"/>
-        <setting id="cleanup.stringconcat_to_textblock" value="false"/>
-        <setting id="cleanup.invert_equals" value="false"/>
-        <setting id="cleanup.use_string_is_blank" value="true"/>
-        <setting id="cleanup.remove_unused_local_variables" value="true"/>
-        <setting id="cleanup.remove_redundant_modifiers" value="false"/>
-        <setting id="cleanup.system_property_file_encoding" value="true"/>
-        <setting id="cleanup.sort_members_all" value="false"/>
-        <setting id="cleanup.double_negation" value="true"/>
-        <setting id="cleanup.format_source_code_changes_only" value="false"/>
-        <setting id="cleanup.arrays_fill" value="true"/>
         <setting id="cleanup.add_generated_serial_version_id" value="true"/>
-        <setting id="cleanup.plain_replacement" value="true"/>
-        <setting id="cleanup.precompile_regex" value="true"/>
+        <setting id="cleanup.controlflow_merge" value="false"/>
+        <setting id="cleanup.primitive_serialization" value="true"/>
+        <setting id="cleanup.comparing_on_criteria" value="true"/>
+        <setting id="cleanup.do_while_rather_than_while" value="true"/>
+        <setting id="cleanup.comparison_statement" value="true"/>
+        <setting id="cleanup.extract_increment" value="false"/>
+        <setting id="cleanup.stringbuffer_to_stringbuilder" value="false"/>
+        <setting id="cleanup.insert_inferred_type_arguments" value="false"/>
+        <setting id="cleanup.make_private_fields_final" value="true"/>
         <setting id="cleanup.useless_return" value="true"/>
-        <setting id="cleanup.simplify_lambda_expression_and_method_ref" value="true"/>
-        <setting id="cleanup.unlooped_while" value="true"/>
-        <setting id="cleanup.make_local_variable_final" value="false"/>
-        <setting id="cleanup.pull_up_assignment" value="false"/>
-        <setting id="cleanup.overridden_assignment" value="false"/>
-        <setting id="cleanup.else_if" value="true"/>
-        <setting id="cleanup.reduce_indentation" value="true"/>
-        <setting id="cleanup.use_this_for_non_static_method_access" value="true"/>
-        <setting id="cleanup.use_this_for_non_static_field_access" value="true"/>
+        <setting id="cleanup.instanceof_keyword" value="false"/>
         <setting id="cleanup.use_this_for_non_static_field_access_only_if_necessary" value="true"/>
-        <setting id="cleanup.hash" value="true"/>
-        <setting id="cleanup.boolean_literal" value="true"/>
-        <setting id="cleanup.add_default_serial_version_id" value="false"/>
-        <setting id="cleanup.add_missing_methods" value="true"/>
-        <setting id="cleanup.primitive_comparison" value="true"/>
+        <setting id="cleanup.remove_trailing_whitespaces_all" value="true"/>
         <setting id="cleanup.one_if_rather_than_duplicate_blocks_that_fall_through" value="false"/>
+        <setting id="cleanup.valueof_rather_than_instantiation" value="true"/>
+        <setting id="cleanup.plain_replacement" value="true"/>
+        <setting id="cleanup.remove_unnecessary_array_creation" value="true"/>
+        <setting id="cleanup.remove_private_constructors" value="true"/>
+        <setting id="cleanup.make_parameters_final" value="false"/>
+        <setting id="cleanup.substring" value="true"/>
+        <setting id="cleanup.ternary_operator" value="true"/>
+        <setting id="cleanup.replace_deprecated_calls" value="false"/>
+        <setting id="cleanup.merge_conditional_blocks" value="false"/>
+        <setting id="cleanup.return_expression" value="false"/>
+        <setting id="cleanup.system_property" value="false"/>
+        <setting id="cleanup.unlooped_while" value="true"/>
+        <setting id="cleanup.convert_to_enhanced_for_loop" value="true"/>
+        <setting id="cleanup.remove_unused_private_fields" value="true"/>
+        <setting id="cleanup.never_use_blocks" value="true"/>
+        <setting id="cleanup.remove_redundant_modifiers" value="false"/>
+        <setting id="cleanup.unreachable_block" value="false"/>
+        <setting id="cleanup.redundant_falling_through_block_end" value="true"/>
+        <setting id="cleanup.switch" value="false"/>
+        <setting id="cleanup.also_simplify_lambda" value="true"/>
+        <setting id="cleanup.number_suffix" value="true"/>
+        <setting id="cleanup.remove_unnecessary_nls_tags" value="true"/>
+        <setting id="cleanup.convert_to_switch_expressions" value="false"/>
+        <setting id="cleanup.use_this_for_non_static_field_access" value="true"/>
+        <setting id="cleanup.static_inner_class" value="true"/>
+        <setting id="cleanup.use_string_is_blank" value="true"/>
+        <setting id="cleanup.add_missing_nls_tags" value="false"/>
+        <setting id="cleanup.qualify_static_member_accesses_through_instances_with_declaring_class" value="true"/>
+        <setting id="cleanup.remove_unnecessary_casts" value="true"/>
+        <setting id="cleanup.objects_equals" value="true"/>
+        <setting id="cleanup.convert_functional_interfaces" value="true"/>
+        <setting id="cleanup.format_source_code" value="true"/>
+        <setting id="cleanup.else_if" value="true"/>
+        <setting id="cleanup.boolean_value_rather_than_comparison" value="true"/>
+        <setting id="cleanup.add_default_serial_version_id" value="false"/>
+        <setting id="cleanup.remove_unused_private_methods" value="true"/>
+        <setting id="cleanup.make_type_abstract_if_missing_method" value="false"/>
+        <setting id="cleanup.join" value="true"/>
+        <setting id="cleanup.embedded_if" value="true"/>
+        <setting id="cleanup.use_anonymous_class_creation" value="false"/>
+        <setting id="cleanup.invert_equals" value="false"/>
+        <setting id="cleanup.add_missing_override_annotations_interface_methods" value="true"/>
+        <setting id="cleanup.remove_unused_private_members" value="true"/>
+        <setting id="cleanup.strictly_equal_or_different" value="false"/>
+        <setting id="cleanup.never_use_parentheses_in_expressions" value="true"/>
+        <setting id="cleanup.push_down_negation" value="false"/>
+        <setting id="cleanup.evaluate_nullable" value="true"/>
+        <setting id="cleanup.use_parentheses_in_expressions" value="true"/>
+        <setting id="cleanup.hash" value="true"/>
+        <setting id="cleanup.stringconcat_stringbuffer_stringbuilder" value="false"/>
+        <setting id="cleanup.double_negation" value="true"/>
+        <setting id="cleanup.overridden_assignment" value="false"/>
+        <setting id="cleanup.primitive_rather_than_wrapper" value="false"/>
+        <setting id="cleanup.correct_indentation" value="true"/>
+        <setting id="cleanup.use_var" value="false"/>
     </profile>
 </profiles>
diff --git a/codestyle/formatter.xml b/codestyle/formatter.xml
index b44984ad..3c2ecb64 100644
--- a/codestyle/formatter.xml
+++ b/codestyle/formatter.xml
@@ -200,6 +200,7 @@
         <setting id="org.eclipse.jdt.core.formatter.wrap_before_additive_operator" value="true"/>
         <setting id="org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line" value="false"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case_after_arrow" value="next_line"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow" value="insert"/>
@@ -280,6 +281,7 @@
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_relational_operator" value="0"/>
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
         <setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.align_arrows_in_switch_on_columns" value="false"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_additive_operator" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
@@ -310,6 +312,7 @@
         <setting id="org.eclipse.jdt.core.formatter.wrap_before_conditional_operator" value="true"/>
         <setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="false"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.join_line_comments" value="false"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_shift_operator" value="0"/>
         <setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
diff --git a/src/main/java/net/wurstclient/hacks/AutoLibrarianHack.java b/src/main/java/net/wurstclient/hacks/AutoLibrarianHack.java
index ed5a4d5c..034069d8 100644
--- a/src/main/java/net/wurstclient/hacks/AutoLibrarianHack.java
+++ b/src/main/java/net/wurstclient/hacks/AutoLibrarianHack.java
@@ -423,7 +423,7 @@ public final class AutoLibrarianHack extends Hack
 		for(TradeOffer tradeOffer : tradeOffers)
 		{
 			ItemStack stack = tradeOffer.getSellItem();
-			if(!(stack.getItem() instanceof EnchantedBookItem book))
+			if(!(stack.getItem() instanceof EnchantedBookItem))
 				continue;
 			
 			Set<Entry<RegistryEntry<Enchantment>>> enchantmentLevelMap =