Add chocolate factory helper

src/main/java/de/hysky/skyblocker/SkyblockerMod.java

@@ -2,15 +2,16 @@
 
 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;
 import de.hysky.skyblocker.skyblock.chat.ChatRuleAnnouncementScreen;
 import de.hysky.skyblocker.skyblock.chat.ChatRulesHandler;
+import de.hysky.skyblocker.skyblock.chocolatefactory.EggFinder;
+import de.hysky.skyblocker.skyblock.chocolatefactory.TimeTowerReminder;
 import de.hysky.skyblocker.skyblock.crimson.kuudra.Kuudra;
 import de.hysky.skyblocker.skyblock.dungeon.*;
 import de.hysky.skyblocker.skyblock.dungeon.partyfinder.PartyFinderScreen;
@@ -45,10 +46,7 @@
 import de.hysky.skyblocker.skyblock.waypoint.MythologicalRitual;
 import de.hysky.skyblocker.skyblock.waypoint.OrderedWaypoints;
 import de.hysky.skyblocker.skyblock.waypoint.Relics;
-import de.hysky.skyblocker.utils.ApiUtils;
-import de.hysky.skyblocker.utils.NEURepoManager;
-import de.hysky.skyblocker.utils.ProfileUtils;
-import de.hysky.skyblocker.utils.Utils;
+import de.hysky.skyblocker.utils.*;
 import de.hysky.skyblocker.utils.chat.ChatMessageListener;
 import de.hysky.skyblocker.utils.discord.DiscordRPCManager;
 import de.hysky.skyblocker.utils.render.RenderHelper;
@@ -183,6 +181,9 @@ public void onInitializeClient() {
         BeaconHighlighter.init();
         WarpAutocomplete.init();
         MobBoundingBoxes.init();
+        EggFinder.init();
+        TimeTowerReminder.init();
+        SkyblockTime.init();
 
         Scheduler.INSTANCE.scheduleCyclic(Utils::update, 20);
         Scheduler.INSTANCE.scheduleCyclic(DiscordRPCManager::updateDataAndPresence, 200);

src/main/java/de/hysky/skyblocker/config/categories/HelperCategory.java

@@ -2,10 +2,11 @@
 
 import de.hysky.skyblocker.config.ConfigUtils;
 import de.hysky.skyblocker.config.SkyblockerConfig;
-import dev.isxander.yacl3.api.*;
+import de.hysky.skyblocker.utils.waypoint.Waypoint;
 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 net.minecraft.text.Text;
 
@@ -137,6 +138,52 @@ public static ConfigCategory create(SkyblockerConfig defaults, SkyblockerConfig
                                 .build())
                         .build())
 
+                //Chocolate Factory
+                .group(OptionGroup.createBuilder()
+                        .name(Text.translatable("skyblocker.config.helpers.chocolateFactory"))
+                        .collapsed(true)
+                        .option(Option.<Boolean>createBuilder()
+                                .name(Text.translatable("skyblocker.config.helpers.chocolateFactory.enableChocolateFactoryHelper"))
+                                .description(OptionDescription.of(Text.translatable("skyblocker.config.helpers.chocolateFactory.enableChocolateFactoryHelper.@Tooltip")))
+                                .binding(defaults.helpers.chocolateFactory.enableChocolateFactoryHelper,
+                                        () -> config.helpers.chocolateFactory.enableChocolateFactoryHelper,
+                                        newValue -> config.helpers.chocolateFactory.enableChocolateFactoryHelper = newValue)
+                                .controller(ConfigUtils::createBooleanController)
+                                .build())
+                        .option(Option.<Boolean>createBuilder()
+                                .name(Text.translatable("skyblocker.config.helpers.chocolateFactory.enableEggFinder"))
+                                .description(OptionDescription.of(Text.translatable("skyblocker.config.helpers.chocolateFactory.enableEggFinder.@Tooltip")))
+                                .binding(defaults.helpers.chocolateFactory.enableEggFinder,
+                                        () -> config.helpers.chocolateFactory.enableEggFinder,
+                                        newValue -> config.helpers.chocolateFactory.enableEggFinder = newValue)
+                                .controller(ConfigUtils::createBooleanController)
+                                .build())
+                        .option(Option.<Boolean>createBuilder()
+                                .name(Text.translatable("skyblocker.config.helpers.chocolateFactory.sendEggFoundMessages"))
+                                .description(OptionDescription.of(Text.translatable("skyblocker.config.helpers.chocolateFactory.sendEggFoundMessages.@Tooltip")))
+                                .binding(defaults.helpers.chocolateFactory.sendEggFoundMessages,
+                                        () -> config.helpers.chocolateFactory.sendEggFoundMessages,
+                                        newValue -> config.helpers.chocolateFactory.sendEggFoundMessages = newValue)
+                                .controller(ConfigUtils::createBooleanController)
+                                .build())
+                        .option(Option.<Waypoint.Type>createBuilder()
+                                .name(Text.translatable("skyblocker.config.helpers.chocolateFactory.waypointType"))
+                                .description(OptionDescription.of(Text.translatable("skyblocker.config.helpers.chocolateFactory.waypointType.@Tooltip")))
+                                .binding(defaults.helpers.chocolateFactory.waypointType,
+                                        () -> config.helpers.chocolateFactory.waypointType,
+                                        newValue -> config.helpers.chocolateFactory.waypointType = newValue)
+                                .controller(ConfigUtils::createEnumCyclingListController)
+                                .build())
+                        .option(Option.<Boolean>createBuilder()
+                                .name(Text.translatable("skyblocker.config.helpers.chocolateFactory.enableTimeTowerReminder"))
+                                .description(OptionDescription.of(Text.translatable("skyblocker.config.helpers.chocolateFactory.enableTimeTowerReminder.@Tooltip")))
+                                .binding(defaults.helpers.chocolateFactory.enableTimeTowerReminder,
+                                        () -> config.helpers.chocolateFactory.enableTimeTowerReminder,
+                                        newValue -> config.helpers.chocolateFactory.enableTimeTowerReminder = newValue)
+                                .controller(ConfigUtils::createBooleanController)
+                                .build())
+                        .build())
+
                 .build();
     }
 }

src/main/java/de/hysky/skyblocker/config/configs/HelperConfig.java

@@ -1,5 +1,6 @@
 package de.hysky.skyblocker.config.configs;
 
+import de.hysky.skyblocker.utils.waypoint.Waypoint;
 import dev.isxander.yacl3.config.v2.api.SerialEntry;
 
 public class HelperConfig {
@@ -19,6 +20,9 @@ public class HelperConfig {
     @SerialEntry
     public FairySouls fairySouls = new FairySouls();
 
+    @SerialEntry
+    public ChocolateFactory chocolateFactory = new ChocolateFactory();
+
     public static class MythologicalRitual {
         @SerialEntry
         public boolean enableMythologicalRitualHelper = true;
@@ -62,4 +66,21 @@ public static class FairySouls {
         @SerialEntry
         public boolean highlightOnlyNearbySouls = false;
     }
+
+    public static class ChocolateFactory {
+        @SerialEntry
+        public boolean enableChocolateFactoryHelper = true;
+
+        @SerialEntry
+        public boolean enableEggFinder = true;
+
+        @SerialEntry
+        public boolean sendEggFoundMessages = true;
+
+        @SerialEntry
+        public Waypoint.Type waypointType = Waypoint.Type.WAYPOINT;
+
+        @SerialEntry
+        public boolean enableTimeTowerReminder = true;
+    }
 }

src/main/java/de/hysky/skyblocker/debug/Debug.java

@@ -83,9 +83,7 @@ private static LiteralArgumentBuilder<FabricClientCommandSource> dumpArmorStandH
 						Iterable<ItemStack> equippedItems = armorStand.getEquippedItems();
 
 						for (ItemStack stack : equippedItems) {
-							String texture = ItemUtils.getHeadTexture(stack);
-
-							if (!texture.isEmpty()) context.getSource().sendFeedback(Text.of(texture));
+							ItemUtils.getHeadTextureOptional(stack).ifPresent(texture -> context.getSource().sendFeedback(Text.of(texture)));
 						}
 					}
 

src/main/java/de/hysky/skyblocker/mixins/ClientPlayNetworkHandlerMixin.java

@@ -3,9 +3,9 @@
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
 import com.llamalad7.mixinextras.sugar.Local;
-import de.hysky.skyblocker.config.SkyblockerConfigManager;
 import de.hysky.skyblocker.skyblock.CompactDamage;
 import de.hysky.skyblocker.skyblock.FishingHelper;
+import de.hysky.skyblocker.skyblock.chocolatefactory.EggFinder;
 import de.hysky.skyblocker.skyblock.dungeon.DungeonScore;
 import de.hysky.skyblocker.skyblock.dungeon.secrets.DungeonManager;
 import de.hysky.skyblocker.skyblock.end.BeaconHighlighter;
@@ -84,7 +84,7 @@ public abstract class ClientPlayNetworkHandlerMixin {
         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))
+    @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();
     }
@@ -111,11 +111,18 @@ public abstract class ClientPlayNetworkHandlerMixin {
 
     @Inject(method = "onEntityTrackerUpdate", at = @At("TAIL"))
     private void skyblocker$onEntityTrackerUpdate(EntityTrackerUpdateS2CPacket packet, CallbackInfo ci, @Local Entity entity) {
-        if (!SkyblockerConfigManager.get().uiAndVisuals.compactDamage.enabled || !(entity instanceof ArmorStandEntity armorStandEntity)) return;
+        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);
+    }
 }

src/main/java/de/hysky/skyblocker/skyblock/CompactDamage.java

@@ -19,6 +19,7 @@ private CompactDamage() {
 	}
 
 	public static void compactDamage(ArmorStandEntity entity) {
+		if (!SkyblockerConfigManager.get().uiAndVisuals.compactDamage.enabled) return;
 		if (!entity.isInvisible() || !entity.hasCustomName() || !entity.isCustomNameVisible()) return;
 		Text customName = entity.getCustomName();
 		String customNameStringified = customName.getString();