Merge pull request #396 from msg-programs/cleanup-2

More cleanup

42 files changed, 190 insertions, 187 deletions

diff --git a/src/main/java/de/hysky/skyblocker/compatibility/MixinPlugin.java b/src/main/java/de/hysky/skyblocker/compatibility/MixinPlugin.java
index 145f7ec4..2475d0d3 100644
--- a/src/main/java/de/hysky/skyblocker/compatibility/MixinPlugin.java
+++ b/src/main/java/de/hysky/skyblocker/compatibility/MixinPlugin.java
@@ -30,14 +30,14 @@ public class MixinPlugin implements IMixinConfigPlugin {
 	public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
 		//OptiFabric Compatibility
 		if (mixinClassName.endsWith("WorldRendererMixin") && OPTIFABRIC_LOADED) return false;
-		
+
 		//YACL#103 Patch
 		if (mixinClassName.endsWith("DoubleFieldControllerMixin") || mixinClassName.endsWith("FloatFieldControllerMixin") || mixinClassName.endsWith("IntegerFieldControllerMixin") || mixinClassName.endsWith("LongFieldControllerMixin") || mixinClassName.endsWith("NumberFieldControllerMixin")) {
 			if (YACL_VERSION.equals("3.2.1+1.20.2")) {
 				LOGGER.info("[Skyblocker] Applying patch for " + targetClassName + " from " + mixinClassName);
 			} else {
 				LOGGER.info("[Skyblocker] Skipping patch on " + targetClassName + " due to an Unknown YACL version being found! Version: {}", YACL_VERSION);
-				
+
 				return false;
 			}
 		}
diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
index 68520cab..b5cf2905 100644
--- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
@@ -552,7 +552,7 @@ public class SkyblockerConfig {
 
 		@SerialEntry
 		public int mapY = 2;
-		
+
 		@SerialEntry
 		public boolean playerSecretsTracker = false;
 
@@ -587,10 +587,10 @@ public class SkyblockerConfig {
 
 		@SerialEntry
 		public boolean noInitSecretWaypoints = false;
-		
+
 		@SerialEntry
 		public Waypoint.Type waypointType = Waypoint.Type.WAYPOINT;
-		
+
 		@SerialEntry
 		public boolean showSecretText = true;
 
@@ -620,10 +620,10 @@ public class SkyblockerConfig {
 
 		@SerialEntry
 		public boolean enableStonkWaypoints = true;
-		
+
 		@SerialEntry
 		public boolean enableAotvWaypoints = true;
-		
+
 		@SerialEntry
 		public boolean enablePearlWaypoints = true;
 
@@ -731,10 +731,10 @@ public class SkyblockerConfig {
 	public static class Rift {
 		@SerialEntry
 		public boolean mirrorverseWaypoints = true;
-		
+
 		@SerialEntry
 		public boolean enigmaSoulWaypoints = false;
-		
+
 		@SerialEntry
 		public boolean highlightFoundEnigmaSouls = true;
 
diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfigManager.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfigManager.java
index 98c83975..875090ed 100644
--- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfigManager.java
+++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfigManager.java
@@ -38,11 +38,11 @@ public class SkyblockerConfigManager {
 						.registerTypeHierarchyAdapter(Identifier.class, new Identifier.Serializer()))
 					.build())
 			.build();
-	
+
 	public static SkyblockerConfig get() {
 		return HANDLER.instance();
 	}
-	
+
 	/**
 	 * This method is caller sensitive and can only be called by the mod initializer,
 	 * this is enforced.
@@ -51,15 +51,15 @@ public class SkyblockerConfigManager {
 		if (StackWalker.getInstance(Option.RETAIN_CLASS_REFERENCE).getCallerClass() != SkyblockerMod.class) {
 			throw new RuntimeException("Skyblocker: Called config init from an illegal place!");
 		}
-		
+
 		HANDLER.load();
 		ClientCommandRegistrationCallback.EVENT.register(((dispatcher, registryAccess) -> dispatcher.register(ClientCommandManager.literal(SkyblockerMod.NAMESPACE).then(optionsLiteral("config")).then(optionsLiteral("options")))));
 	}
-	
+
 	public static void save() {
 		HANDLER.save();
 	}
-	
+
 	public static Screen createGUI(Screen parent) {
 		return YetAnotherConfigLib.create(HANDLER, (defaults, config, builder) -> builder
 				.title(Text.translatable("text.autoconfig.skyblocker.title"))
@@ -72,7 +72,7 @@ public class SkyblockerConfigManager {
 				.category(MessageFilterCategory.create(defaults, config))
 				.category(DiscordRPCCategory.create(defaults, config))).generateScreen(parent);
 	}
-	
+
 	/**
 	 * Registers an options command with the given name. Used for registering both options and config as valid commands.
 	 *
diff --git a/src/main/java/de/hysky/skyblocker/config/categories/DiscordRPCCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/DiscordRPCCategory.java
index fcdc3d8d..907291ca 100644
--- a/src/main/java/de/hysky/skyblocker/config/categories/DiscordRPCCategory.java
+++ b/src/main/java/de/hysky/skyblocker/config/categories/DiscordRPCCategory.java
@@ -13,7 +13,7 @@ public class DiscordRPCCategory {
 	public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig config) {
 		return ConfigCategory.createBuilder()
 				.name(Text.translatable("text.autoconfig.skyblocker.category.richPresence"))
-				
+
 				//Uncategorized Options
 				.option(Option.<Boolean>createBuilder()
 						.name(Text.translatable("text.autoconfig.skyblocker.option.richPresence.enableRichPresence"))
diff --git a/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java
index 02913a28..88350317 100644
--- a/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java
+++ b/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java
@@ -23,7 +23,7 @@ public class DungeonsCategory {
 	public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig config) {
 		return ConfigCategory.createBuilder()
 				.name(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons"))
-				
+
 				//Dungeon Secret Waypoints
 				.group(OptionGroup.createBuilder()
 						.name(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.secretWaypoints"))
@@ -146,7 +146,7 @@ public class DungeonsCategory {
 								.controller(ConfigUtils::createBooleanController)
 								.build())
 						.build())
-				
+
 				.group(OptionGroup.createBuilder()
 						.name(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.dungeonChestProfit"))
 						.collapsed(true)
@@ -212,7 +212,7 @@ public class DungeonsCategory {
 								.controller(EnumDropdownControllerBuilder.getFactory(ConfigUtils.FORMATTING_TO_STRING))
 								.build())
 						.build())
-				
+
 				//Others
 				.option(Option.<Boolean>createBuilder()
 						.name(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.croesusHelper"))
@@ -317,7 +317,7 @@ public class DungeonsCategory {
 								.controller(StringControllerBuilder::create)
 								.build())
 						.build())
-				
+
 				//Terminal Solvers
 				.group(OptionGroup.createBuilder()
 						.name(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.terminals"))
diff --git a/src/main/java/de/hysky/skyblocker/config/categories/DwarvenMinesCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/DwarvenMinesCategory.java
index 719cbd79..80d6485b 100644
--- a/src/main/java/de/hysky/skyblocker/config/categories/DwarvenMinesCategory.java
+++ b/src/main/java/de/hysky/skyblocker/config/categories/DwarvenMinesCategory.java
@@ -16,7 +16,7 @@ public class DwarvenMinesCategory {
 	public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig config) {
 		return ConfigCategory.createBuilder()
 				.name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines"))
-				
+
 				//Uncategorized Options
 				.option(Option.<Boolean>createBuilder()
 						.name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.enableDrillFuel"))
@@ -39,7 +39,7 @@ public class DwarvenMinesCategory {
 								newValue -> config.locations.dwarvenMines.solvePuzzler = newValue)
 						.controller(ConfigUtils::createBooleanController)
 						.build())
-				
+
 				//Dwarven HUD
 				.group(OptionGroup.createBuilder()
 						.name(Text.translatable("text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud"))
diff --git a/src/main/java/de/hysky/skyblocker/config/categories/LocationsCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/LocationsCategory.java
index 5e662fcc..55629a66 100644
--- a/src/main/java/de/hysky/skyblocker/config/categories/LocationsCategory.java
+++ b/src/main/java/de/hysky/skyblocker/config/categories/LocationsCategory.java
@@ -14,7 +14,7 @@ public class LocationsCategory {
 	public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig config) {
 		return ConfigCategory.createBuilder()
 				.name(Text.translatable("text.autoconfig.skyblocker.category.locations"))
-				
+
 				//Barn
 				.group(OptionGroup.createBuilder()
 						.name(Text.translatable("text.autoconfig.skyblocker.option.locations.barn"))
@@ -34,7 +34,7 @@ public class LocationsCategory {
 								.controller(ConfigUtils::createBooleanController)
 								.build())
 						.build())
-				
+
 				//The Rift
 				.group(OptionGroup.createBuilder()
 						.name(Text.translatable("text.autoconfig.skyblocker.option.locations.rift"))
@@ -70,7 +70,7 @@ public class LocationsCategory {
 								.controller(opt -> IntegerSliderControllerBuilder.create(opt).range(0, 5).step(1))
 								.build())
 						.build())
-				
+
 				//Spider's Den
 				.group(OptionGroup.createBuilder()
 						.name(Text.translatable("text.autoconfig.skyblocker.option.locations.spidersDen"))
diff --git a/src/main/java/de/hysky/skyblocker/config/categories/MessageFilterCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/MessageFilterCategory.java
index ba76a903..f9032c27 100644
--- a/src/main/java/de/hysky/skyblocker/config/categories/MessageFilterCategory.java
+++ b/src/main/java/de/hysky/skyblocker/config/categories/MessageFilterCategory.java
@@ -13,7 +13,7 @@ public class MessageFilterCategory {
 	public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig config) {
 		return ConfigCategory.createBuilder()
 				.name(Text.translatable("text.autoconfig.skyblocker.category.messages"))
-				
+
 				//Uncategorized Options
 				.option(Option.<ChatFilterResult>createBuilder()
 						.name(Text.translatable("text.autoconfig.skyblocker.option.messages.hideAbility"))
diff --git a/src/main/java/de/hysky/skyblocker/config/categories/QuickNavigationCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/QuickNavigationCategory.java
index 775a0ae1..e2684115 100644
--- a/src/main/java/de/hysky/skyblocker/config/categories/QuickNavigationCategory.java
+++ b/src/main/java/de/hysky/skyblocker/config/categories/QuickNavigationCategory.java
@@ -14,7 +14,7 @@ public class QuickNavigationCategory {
 	public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig config) {
 		return ConfigCategory.createBuilder()
 				.name(Text.translatable("text.autoconfig.skyblocker.category.quickNav"))
-				
+
 				//Toggle
 				.option(Option.<Boolean>createBuilder()
 						.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.enableQuickNav"))
@@ -23,7 +23,7 @@ public class QuickNavigationCategory {
 								newValue -> config.quickNav.enableQuickNav = newValue)
 						.controller(ConfigUtils::createBooleanController)
 						.build())
-				
+
 				//Button 1
 				.group(OptionGroup.createBuilder()
 						.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button", 1))
@@ -71,7 +71,7 @@ public class QuickNavigationCategory {
 								.controller(StringControllerBuilder::create)
 								.build())
 						.build())
-				
+
 				//Button 2
 				.group(OptionGroup.createBuilder()
 						.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button", 2))
@@ -119,7 +119,7 @@ public class QuickNavigationCategory {
 								.controller(StringControllerBuilder::create)
 								.build())
 						.build())
-				
+
 				//Button 3
 				.group(OptionGroup.createBuilder()
 						.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button", 3))
@@ -167,7 +167,7 @@ public class QuickNavigationCategory {
 								.controller(StringControllerBuilder::create)
 								.build())
 						.build())
-				
+
 				//Button 4
 				.group(OptionGroup.createBuilder()
 						.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button", 4))
@@ -215,7 +215,7 @@ public class QuickNavigationCategory {
 								.controller(StringControllerBuilder::create)
 								.build())
 						.build())
-				
+
 				//Button 5
 				.group(OptionGroup.createBuilder()
 						.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button", 5))
@@ -263,7 +263,7 @@ public class QuickNavigationCategory {
 								.controller(StringControllerBuilder::create)
 								.build())
 						.build())
-				
+
 				//Button 6
 				.group(OptionGroup.createBuilder()
 						.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button", 6))
@@ -311,7 +311,7 @@ public class QuickNavigationCategory {
 								.controller(StringControllerBuilder::create)
 								.build())
 						.build())
-				
+
 				//Button 7
 				.group(OptionGroup.createBuilder()
 						.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button", 7))
@@ -359,7 +359,7 @@ public class QuickNavigationCategory {
 								.controller(StringControllerBuilder::create)
 								.build())
 						.build())
-				
+
 				//Button 8
 				.group(OptionGroup.createBuilder()
 						.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button", 8))
@@ -407,7 +407,7 @@ public class QuickNavigationCategory {
 								.controller(StringControllerBuilder::create)
 								.build())
 						.build())
-				
+
 				//Button 9
 				.group(OptionGroup.createBuilder()
 						.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button", 9))
@@ -455,7 +455,7 @@ public class QuickNavigationCategory {
 								.controller(StringControllerBuilder::create)
 								.build())
 						.build())
-				
+
 				//Button 10
 				.group(OptionGroup.createBuilder()
 						.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button", 10))
@@ -503,7 +503,7 @@ public class QuickNavigationCategory {
 								.controller(StringControllerBuilder::create)
 								.build())
 						.build())
-				
+
 				//Button 11
 				.group(OptionGroup.createBuilder()
 						.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button", 11))
@@ -551,7 +551,7 @@ public class QuickNavigationCategory {
 								.controller(StringControllerBuilder::create)
 								.build())
 						.build())
-				
+
 				//Button 12
 				.group(OptionGroup.createBuilder()
 						.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button", 12))
@@ -599,7 +599,7 @@ public class QuickNavigationCategory {
 								.controller(StringControllerBuilder::create)
 								.build())
 						.build())
-				
+
 				.build();
 	}
 }
diff --git a/src/main/java/de/hysky/skyblocker/config/categories/SlayersCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/SlayersCategory.java
index 2d8b1332..7df95172 100644
--- a/src/main/java/de/hysky/skyblocker/config/categories/SlayersCategory.java
+++ b/src/main/java/de/hysky/skyblocker/config/categories/SlayersCategory.java
@@ -16,7 +16,7 @@ public class SlayersCategory {
 	public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig config) {
 		return ConfigCategory.createBuilder()
 				.name(Text.translatable("text.autoconfig.skyblocker.category.slayer"))
-				
+
 				//Vampire Slayer
 				.group(OptionGroup.createBuilder()
 						.name(Text.translatable("text.autoconfig.skyblocker.option.slayer.vampireSlayer"))
@@ -110,7 +110,7 @@ public class SlayersCategory {
 								.controller(opt -> IntegerSliderControllerBuilder.create(opt).range(1, 10).step(1))
 								.build())
 						.build())
-				
+
 				.build();
 	}
 }
diff --git a/src/main/java/de/hysky/skyblocker/mixin/SocialInteractionsPlayerListWidgetMixin.java b/src/main/java/de/hysky/skyblocker/mixin/SocialInteractionsPlayerListWidgetMixin.java
index 3a60bfbb..cad7cf38 100644
--- a/src/main/java/de/hysky/skyblocker/mixin/SocialInteractionsPlayerListWidgetMixin.java
+++ b/src/main/java/de/hysky/skyblocker/mixin/SocialInteractionsPlayerListWidgetMixin.java
@@ -18,7 +18,7 @@ public class SocialInteractionsPlayerListWidgetMixin {
 	@WrapOperation(method = "setPlayers", at = @At(value = "INVOKE", target = "Ljava/util/Map;put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;", remap = false))
 	private Object skyblocker$hideInvalidPlayers(Map<Object, Object> map, Object uuid, Object entry, Operation<Object> operation) {
 		if (Utils.isOnSkyblock() && !((SocialInteractionsPlayerListEntry) entry).getName().matches("[A-Za-z0-9_]+")) return null;
-		
+
 		return operation.call(map, uuid, entry);
 	}
 }
diff --git a/src/main/java/de/hysky/skyblocker/mixin/YggdrasilServicesKeyInfoMixin.java b/src/main/java/de/hysky/skyblocker/mixin/YggdrasilServicesKeyInfoMixin.java
index d38e40cc..3c2bbc9a 100644
--- a/src/main/java/de/hysky/skyblocker/mixin/YggdrasilServicesKeyInfoMixin.java
+++ b/src/main/java/de/hysky/skyblocker/mixin/YggdrasilServicesKeyInfoMixin.java
@@ -51,7 +51,7 @@ public class YggdrasilServicesKeyInfoMixin {
             throw e;
         }
     }
-    
+
     @WrapOperation(method = "validateProperty", remap = false, at = @At(value = "INVOKE", target = "org/slf4j/Logger.error(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V", remap = false))
     private void skyblocker$dontLogFailedSignatureValidation(Logger logger, String message, Object property, Object exception, Operation<Void> operation) {
         if (!Utils.isOnHypixel()) operation.call(logger, message, property, exception);
diff --git a/src/main/java/de/hysky/skyblocker/mixin/yacl/FloatFieldControllerMixin.java b/src/main/java/de/hysky/skyblocker/mixin/yacl/FloatFieldControllerMixin.java
index d67993c2..3a82c92a 100644
--- a/src/main/java/de/hysky/skyblocker/mixin/yacl/FloatFieldControllerMixin.java
+++ b/src/main/java/de/hysky/skyblocker/mixin/yacl/FloatFieldControllerMixin.java
@@ -15,7 +15,7 @@ import net.minecraft.text.Text;
 public abstract class FloatFieldControllerMixin extends NumberFieldController<Float> {
 	private static final NumberFormat NUMBER_FORMAT = NumberFormat.getInstance();
 
-	
+
 	public FloatFieldControllerMixin(Option<Float> option, Function<Float, Text> displayFormatter) {
 		super(option, displayFormatter);
 	}
diff --git a/src/main/java/de/hysky/skyblocker/mixin/yacl/IntegerFieldControllerMixin.java b/src/main/java/de/hysky/skyblocker/mixin/yacl/IntegerFieldControllerMixin.java
index b95cbef7..51dd4890 100644
--- a/src/main/java/de/hysky/skyblocker/mixin/yacl/IntegerFieldControllerMixin.java
+++ b/src/main/java/de/hysky/skyblocker/mixin/yacl/IntegerFieldControllerMixin.java
@@ -14,16 +14,16 @@ import net.minecraft.text.Text;
 @Mixin(value = IntegerFieldController.class, remap = false)
 public abstract class IntegerFieldControllerMixin extends NumberFieldController<Integer> {
 	private static final NumberFormat NUMBER_FORMAT = NumberFormat.getInstance();
-	
+
 	public IntegerFieldControllerMixin(Option<Integer> option, Function<Integer, Text> displayFormatter) {
 		super(option, displayFormatter);
 	}
-	
+
 	@Overwrite
 	public String getString() {
 		return NUMBER_FORMAT.format(option().pendingValue());
 	}
-	
+
 	@Overwrite
 	public boolean isInputValid(String input) {
 		return super.isInputValid(input);
diff --git a/src/main/java/de/hysky/skyblocker/mixin/yacl/LongFieldControllerMixin.java b/src/main/java/de/hysky/skyblocker/mixin/yacl/LongFieldControllerMixin.java
index 99871e2e..f744c310 100644
--- a/src/main/java/de/hysky/skyblocker/mixin/yacl/LongFieldControllerMixin.java
+++ b/src/main/java/de/hysky/skyblocker/mixin/yacl/LongFieldControllerMixin.java
@@ -14,16 +14,16 @@ import net.minecraft.text.Text;
 @Mixin(value = LongFieldController.class, remap = false)
 public abstract class LongFieldControllerMixin extends NumberFieldController<Long> {
 	private static final NumberFormat NUMBER_FORMAT = NumberFormat.getInstance();
-	
+
 	public LongFieldControllerMixin(Option<Long> option, Function<Long, Text> displayFormatter) {
 		super(option, displayFormatter);
 	}
-	
+
 	@Overwrite
 	public String getString() {
 		return NUMBER_FORMAT.format(option().pendingValue());
 	}
-	
+
 	@Overwrite
 	public boolean isInputValid(String input) {
 		return super.isInputValid(input);
diff --git a/src/main/java/de/hysky/skyblocker/mixin/yacl/NumberFieldControllerMixin.java b/src/main/java/de/hysky/skyblocker/mixin/yacl/NumberFieldControllerMixin.java
index 17a99cfd..010f9a26 100644
--- a/src/main/java/de/hysky/skyblocker/mixin/yacl/NumberFieldControllerMixin.java
+++ b/src/main/java/de/hysky/skyblocker/mixin/yacl/NumberFieldControllerMixin.java
@@ -17,7 +17,7 @@ import net.minecraft.util.math.MathHelper;
 public abstract class NumberFieldControllerMixin<T extends Number> implements ISliderController<T> {
 	private static final NumberFormat NUMBER_FORMAT = NumberFormat.getInstance();
 	private static final DecimalFormatSymbols DECIMAL_FORMAT_SYMBOLS = DecimalFormatSymbols.getInstance();