Clean up small formatting

6 files changed, 99 insertions, 105 deletions

diff --git a/src/main/java/de/hysky/skyblocker/SkyblockerMod.java b/src/main/java/de/hysky/skyblocker/SkyblockerMod.java
index 79f241b8..a57b4177 100644
--- a/src/main/java/de/hysky/skyblocker/SkyblockerMod.java
+++ b/src/main/java/de/hysky/skyblocker/SkyblockerMod.java
@@ -2,10 +2,9 @@ package de.hysky.skyblocker;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-
-import de.hysky.skyblocker.config.datafixer.ConfigDataFixer;
 import de.hysky.skyblocker.config.ImageRepoLoader;
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
+import de.hysky.skyblocker.config.datafixer.ConfigDataFixer;
 import de.hysky.skyblocker.debug.Debug;
 import de.hysky.skyblocker.skyblock.*;
 import de.hysky.skyblocker.skyblock.calculators.CalculatorCommand;
diff --git a/src/main/java/de/hysky/skyblocker/config/categories/HelperCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/HelperCategory.java
index 79bd0d65..9e4935cb 100644
--- a/src/main/java/de/hysky/skyblocker/config/categories/HelperCategory.java
+++ b/src/main/java/de/hysky/skyblocker/config/categories/HelperCategory.java
@@ -3,13 +3,11 @@ package de.hysky.skyblocker.config.categories;
 import de.hysky.skyblocker.config.ConfigUtils;
 import de.hysky.skyblocker.config.SkyblockerConfig;
 import de.hysky.skyblocker.utils.waypoint.Waypoint;
-import dev.isxander.yacl3.api.*;
 import dev.isxander.yacl3.api.ConfigCategory;
 import dev.isxander.yacl3.api.Option;
 import dev.isxander.yacl3.api.OptionDescription;
+import dev.isxander.yacl3.api.OptionGroup;
 import dev.isxander.yacl3.api.controller.FloatFieldControllerBuilder;
-import dev.isxander.yacl3.api.controller.TickBoxControllerBuilder;
-import dev.isxander.yacl3.config.v2.api.autogen.TickBox;
 import net.minecraft.text.Text;
 
 public class HelperCategory {
@@ -184,7 +182,6 @@ public class HelperCategory {
                                         newValue -> config.helpers.chocolateFactory.enableTimeTowerReminder = newValue)
                                 .controller(ConfigUtils::createBooleanController)
                                 .build())
-
                         .build())
 
                 .build();
diff --git a/src/main/java/de/hysky/skyblocker/mixins/ClientPlayNetworkHandlerMixin.java b/src/main/java/de/hysky/skyblocker/mixins/ClientPlayNetworkHandlerMixin.java
index bc555e6b..48389d40 100644
--- a/src/main/java/de/hysky/skyblocker/mixins/ClientPlayNetworkHandlerMixin.java
+++ b/src/main/java/de/hysky/skyblocker/mixins/ClientPlayNetworkHandlerMixin.java
@@ -34,95 +34,95 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(ClientPlayNetworkHandler.class)
 public abstract class ClientPlayNetworkHandlerMixin {
-	@Shadow
-	private ClientWorld world;
-
-	@Shadow
-	@Final
-	private static Logger LOGGER;
-
-	@Inject(method = "onBlockUpdate", at = @At("RETURN"))
-	private void skyblocker$onBlockUpdate(BlockUpdateS2CPacket packet, CallbackInfo ci) {
-		if (Utils.isInTheEnd() && SlayerUtils.isInSlayer()) {
-			BeaconHighlighter.beaconPositions.remove(packet.getPos());
-			if (packet.getState().isOf(Blocks.BEACON)) {
-				BeaconHighlighter.beaconPositions.add(packet.getPos());
-			}
-		}
-	}
-
-	@Inject(method = "method_37472", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/world/ClientWorld;removeEntity(ILnet/minecraft/entity/Entity$RemovalReason;)V"))
-	private void skyblocker$onItemDestroy(int entityId, CallbackInfo ci) {
-		if (world.getEntityById(entityId) instanceof ItemEntity itemEntity) {
-			DungeonManager.onItemPickup(itemEntity);
-		}
-	}
-
-	@ModifyVariable(method = "onItemPickupAnimation", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/world/ClientWorld;removeEntity(ILnet/minecraft/entity/Entity$RemovalReason;)V", ordinal = 0))
-	private ItemEntity skyblocker$onItemPickup(ItemEntity itemEntity) {
-		DungeonManager.onItemPickup(itemEntity);
-		return itemEntity;
-	}
-
-	@WrapWithCondition(method = "onEntityPassengersSet", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;)V", remap = false))
-	private boolean skyblocker$cancelEntityPassengersWarning(Logger instance, String msg) {
-		return !Utils.isOnHypixel();
-	}
-
-	@WrapWithCondition(method = "onPlayerList", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V", remap = false))
-	private boolean skyblocker$cancelPlayerListWarning(Logger instance, String format, Object arg1, Object arg2) {
-		return !Utils.isOnHypixel();
-	}
-
-	@Inject(method = "onPlaySound", at = @At("RETURN"))
-	private void skyblocker$onPlaySound(PlaySoundS2CPacket packet, CallbackInfo ci) {
-		FishingHelper.onSound(packet);
-	}
-
-	@WrapWithCondition(method = "warnOnUnknownPayload", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;Ljava/lang/Object;)V", remap = false))
-	private boolean skyblocker$dropBadlionPacketWarnings(Logger instance, String message, Object identifier) {
-		return !(Utils.isOnHypixel() && ((Identifier) identifier).getNamespace().equals("badlion"));
-	}
-
-	@WrapWithCondition(method = {"onScoreboardScoreUpdate", "onScoreboardScoreReset"}, at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;Ljava/lang/Object;)V", remap = false))
-	private boolean skyblocker$cancelUnknownScoreboardObjectiveWarnings(Logger instance, String message, Object objectiveName) {
-		return !Utils.isOnHypixel();
-	}
-
-	@WrapWithCondition(method = "onTeam", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;[Ljava/lang/Object;)V", remap = false))
-	private boolean skyblocker$cancelTeamWarning(Logger instance, String format, Object... arg) {
-		return !Utils.isOnHypixel();
-	}
-
-	@Inject(method = "onParticle", at = @At("RETURN"))
-	private void skyblocker$onParticle(ParticleS2CPacket packet, CallbackInfo ci) {
-		MythologicalRitual.onParticle(packet);
-		EnderNodes.onParticle(packet);
-	}
-
-	@ModifyExpressionValue(method = "onEntityStatus", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/packet/s2c/play/EntityStatusS2CPacket;getEntity(Lnet/minecraft/world/World;)Lnet/minecraft/entity/Entity;"))
-	private Entity skyblocker$onEntityDeath(Entity entity, @Local(argsOnly = true) EntityStatusS2CPacket packet) {
-		if (packet.getStatus() == EntityStatuses.PLAY_DEATH_SOUND_OR_ADD_PROJECTILE_HIT_PARTICLES) {
-			DungeonScore.handleEntityDeath(entity);
-			TheEnd.onEntityDeath(entity);
-		}
-		return entity;
-	}
-
-	@Inject(method = "onEntityTrackerUpdate", at = @At("TAIL"))
-	private void skyblocker$onEntityTrackerUpdate(EntityTrackerUpdateS2CPacket packet, CallbackInfo ci, @Local Entity entity) {
-		if (!(entity instanceof ArmorStandEntity armorStandEntity)) return;
-
-		EggFinder.checkIfEgg(armorStandEntity);
-		try { //Prevent packet handling fails if something goes wrong so that entity trackers still update, just without compact damage numbers
+    @Shadow
+    private ClientWorld world;
+
+    @Shadow
+    @Final
+    private static Logger LOGGER;
+
+    @Inject(method = "onBlockUpdate", at = @At("RETURN"))
+    private void skyblocker$onBlockUpdate(BlockUpdateS2CPacket packet, CallbackInfo ci) {
+        if (Utils.isInTheEnd() && SlayerUtils.isInSlayer()) {
+            BeaconHighlighter.beaconPositions.remove(packet.getPos());
+            if (packet.getState().isOf(Blocks.BEACON)) {
+                BeaconHighlighter.beaconPositions.add(packet.getPos());
+            }
+        }
+    }
+
+    @Inject(method = "method_37472", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/world/ClientWorld;removeEntity(ILnet/minecraft/entity/Entity$RemovalReason;)V"))
+    private void skyblocker$onItemDestroy(int entityId, CallbackInfo ci) {
+        if (world.getEntityById(entityId) instanceof ItemEntity itemEntity) {
+            DungeonManager.onItemPickup(itemEntity);
+        }
+    }
+
+    @ModifyVariable(method = "onItemPickupAnimation", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/world/ClientWorld;removeEntity(ILnet/minecraft/entity/Entity$RemovalReason;)V", ordinal = 0))
+    private ItemEntity skyblocker$onItemPickup(ItemEntity itemEntity) {
+        DungeonManager.onItemPickup(itemEntity);
+        return itemEntity;
+    }
+
+    @WrapWithCondition(method = "onEntityPassengersSet", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;)V", remap = false))
+    private boolean skyblocker$cancelEntityPassengersWarning(Logger instance, String msg) {
+        return !Utils.isOnHypixel();
+    }
+
+    @WrapWithCondition(method = "onPlayerList", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V", remap = false))
+    private boolean skyblocker$cancelPlayerListWarning(Logger instance, String format, Object arg1, Object arg2) {
+        return !Utils.isOnHypixel();
+    }
+
+    @Inject(method = "onPlaySound", at = @At("RETURN"))
+    private void skyblocker$onPlaySound(PlaySoundS2CPacket packet, CallbackInfo ci) {
+        FishingHelper.onSound(packet);
+    }
+
+    @WrapWithCondition(method = "warnOnUnknownPayload", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;Ljava/lang/Object;)V", remap = false))
+    private boolean skyblocker$dropBadlionPacketWarnings(Logger instance, String message, Object identifier) {
+        return !(Utils.isOnHypixel() && ((Identifier) identifier).getNamespace().equals("badlion"));
+    }
+
+    @WrapWithCondition(method = {"onScoreboardScoreUpdate", "onScoreboardScoreReset"}, at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;Ljava/lang/Object;)V", remap = false))
+    private boolean skyblocker$cancelUnknownScoreboardObjectiveWarnings(Logger instance, String message, Object objectiveName) {
+        return !Utils.isOnHypixel();
+    }
+
+    @WrapWithCondition(method = "onTeam", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;warn(Ljava/lang/String;[Ljava/lang/Object;)V", remap = false))
+    private boolean skyblocker$cancelTeamWarning(Logger instance, String format, Object... arg) {
+        return !Utils.isOnHypixel();
+    }
+
+    @Inject(method = "onParticle", at = @At("RETURN"))
+    private void skyblocker$onParticle(ParticleS2CPacket packet, CallbackInfo ci) {
+        MythologicalRitual.onParticle(packet);
+        EnderNodes.onParticle(packet);
+    }
+
+    @ModifyExpressionValue(method = "onEntityStatus", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/packet/s2c/play/EntityStatusS2CPacket;getEntity(Lnet/minecraft/world/World;)Lnet/minecraft/entity/Entity;"))
+    private Entity skyblocker$onEntityDeath(Entity entity, @Local(argsOnly = true) EntityStatusS2CPacket packet) {
+        if (packet.getStatus() == EntityStatuses.PLAY_DEATH_SOUND_OR_ADD_PROJECTILE_HIT_PARTICLES) {
+            DungeonScore.handleEntityDeath(entity);
+            TheEnd.onEntityDeath(entity);
+        }
+        return entity;
+    }
+
+    @Inject(method = "onEntityTrackerUpdate", at = @At("TAIL"))
+    private void skyblocker$onEntityTrackerUpdate(EntityTrackerUpdateS2CPacket packet, CallbackInfo ci, @Local Entity entity) {
+        if (!(entity instanceof ArmorStandEntity armorStandEntity)) return;
+
+        EggFinder.checkIfEgg(armorStandEntity);
+        try { //Prevent packet handling fails if something goes wrong so that entity trackers still update, just without compact damage numbers
             CompactDamage.compactDamage(armorStandEntity);
-		} catch (Exception e) {
-			LOGGER.error("[Skyblocker Compact Damage] Failed to compact damage number", e);
-		}
-	}
-
-	@Inject(method = "onEntityEquipmentUpdate", at = @At(value = "TAIL"))
-	private void skyblocker$onEntityEquip(EntityEquipmentUpdateS2CPacket packet, CallbackInfo ci, @Local Entity entity) {
-		EggFinder.checkIfEgg(entity);
-	}
+        } catch (Exception e) {
+            LOGGER.error("[Skyblocker Compact Damage] Failed to compact damage number", e);
+        }
+    }
+
+    @Inject(method = "onEntityEquipmentUpdate", at = @At(value = "TAIL"))
+    private void skyblocker$onEntityEquip(EntityEquipmentUpdateS2CPacket packet, CallbackInfo ci, @Local Entity entity) {
+        EggFinder.checkIfEgg(entity);
+    }
 }
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/chocolatefactory/ChocolateFactorySolver.java b/src/main/java/de/hysky/skyblocker/skyblock/chocolatefactory/ChocolateFactorySolver.java
index 306d09ee..33bf7b11 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/chocolatefactory/ChocolateFactorySolver.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/chocolatefactory/ChocolateFactorySolver.java
@@ -6,7 +6,7 @@ import de.hysky.skyblocker.utils.ItemUtils;
 import de.hysky.skyblocker.utils.RegexUtils;
 import de.hysky.skyblocker.utils.render.gui.ColorHighlight;
 import de.hysky.skyblocker.utils.render.gui.ContainerSolver;
-import it.unimi.dsi.fastutil.ints.*;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.objects.ObjectArrayList;
 import net.fabricmc.fabric.api.client.item.v1.ItemTooltipCallback;
 import net.minecraft.client.MinecraftClient;
@@ -24,7 +24,6 @@ import org.apache.commons.lang3.math.NumberUtils;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
 import java.util.*;
-import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -156,7 +155,7 @@ public class ChocolateFactorySolver extends ContainerSolver {
 		}
 		//Rabbits
 		else if (stack.isOf(Items.PLAYER_HEAD)) {
-			shouldAddLine = addRabbitStatsToLore(lines, stack) || shouldAddLine ;
+			shouldAddLine = addRabbitStatsToLore(lines, stack) || shouldAddLine;
 		}
 
 		//This is an ArrayList, so this operation is probably not very efficient, but logically it's pretty much the only way I can think of
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java
index 70586d89..8c083e25 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java
@@ -2,7 +2,6 @@ package de.hysky.skyblocker.skyblock.item.tooltip;
 
 import com.google.gson.JsonObject;
 import de.hysky.skyblocker.SkyblockerMod;
-import de.hysky.skyblocker.config.SkyblockerConfig;
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
 import de.hysky.skyblocker.config.configs.GeneralConfig;
 import de.hysky.skyblocker.skyblock.item.MuseumItemCache;
@@ -395,13 +394,13 @@ public class ItemTooltip {
     }
 
     //This is static to not create a new text object for each line in every item
-    private static final Text bumpyLine = Text.literal("-----------------").formatted(Formatting.DARK_GRAY, Formatting.STRIKETHROUGH);
+    private static final Text BUMPY_LINE = Text.literal("-----------------").formatted(Formatting.DARK_GRAY, Formatting.STRIKETHROUGH);
 
     private static void smoothenLines(List<Text> lines) {
         for (int i = 0; i < lines.size(); i++) {
             List<Text> lineSiblings = lines.get(i).getSiblings();
             //Compare the first sibling rather than the whole object as the style of the root object can change while visually staying the same
-            if (lineSiblings.size() == 1 && lineSiblings.getFirst().equals(bumpyLine)) {
+            if (lineSiblings.size() == 1 && lineSiblings.getFirst().equals(BUMPY_LINE)) {
                 lines.set(i, createSmoothLine());
             }
         }
diff --git a/src/main/java/de/hysky/skyblocker/utils/SkyblockTime.java b/src/main/java/de/hysky/skyblocker/utils/SkyblockTime.java
index 36db4ef3..5a6074e1 100644
--- a/src/main/java/de/hysky/skyblocker/utils/SkyblockTime.java
+++ b/src/main/java/de/hysky/skyblocker/utils/SkyblockTime.java
@@ -45,17 +45,17 @@ public class SkyblockTime {
 		skyblockSeason.set(Season.values()[getSkyblockMonth() / 3]);
 		skyblockMonth.set(Month.values()[getSkyblockMonth()]);
 		skyblockDay.set(getSkyblockDay());
-		LOGGER.info("[Skyblocker Time] Skyblock time updated to Year {}, Season {}, Month {}, Day {}",skyblockYear.get(), skyblockSeason.get(), skyblockMonth.get(), skyblockDay.get());
+		LOGGER.info("[Skyblocker Time] Skyblock time updated to Year {}, Season {}, Month {}, Day {}", skyblockYear.get(), skyblockSeason.get(), skyblockMonth.get(), skyblockDay.get());
 	}
 
 	public enum Season {
-		SPRING, SUMMER, FALL, WINTER;
+		SPRING, SUMMER, FALL, WINTER
 	}
 
 	public enum Month {
 		EARLY_SPRING, SPRING, LATE_SPRING,
 		EARLY_SUMMER, SUMMER, LATE_SUMMER,
 		EARLY_FALL, FALL, LATE_FALL,
-		EARLY_WINTER, WINTER, LATE_WINTER;
+		EARLY_WINTER, WINTER, LATE_WINTER
 	}
 }