Add MythologicalRitual

3 files changed, 21 insertions, 1 deletions

diff --git a/src/main/java/de/hysky/skyblocker/SkyblockerMod.java b/src/main/java/de/hysky/skyblocker/SkyblockerMod.java
index 115f90ec..6cdb507f 100644
--- a/src/main/java/de/hysky/skyblocker/SkyblockerMod.java
+++ b/src/main/java/de/hysky/skyblocker/SkyblockerMod.java
@@ -3,6 +3,7 @@ package de.hysky.skyblocker;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import de.hysky.skyblocker.skyblock.*;
+import de.hysky.skyblocker.skyblock.diana.MythologicalRitual;
 import de.hysky.skyblocker.skyblock.dungeon.*;
 import de.hysky.skyblocker.skyblock.dungeon.secrets.DungeonSecrets;
 import de.hysky.skyblocker.skyblock.item.*;
@@ -76,6 +77,7 @@ public class SkyblockerMod implements ClientModInitializer {
         WikiLookup.init();
         FairySouls.init();
         Relics.init();
+        MythologicalRitual.init();
         BackpackPreview.init();
         QuickNav.init();
         ItemCooldowns.init();
diff --git a/src/main/java/de/hysky/skyblocker/mixin/ClientPlayNetworkHandlerMixin.java b/src/main/java/de/hysky/skyblocker/mixin/ClientPlayNetworkHandlerMixin.java
index fff534b2..f8f71512 100644
--- a/src/main/java/de/hysky/skyblocker/mixin/ClientPlayNetworkHandlerMixin.java
+++ b/src/main/java/de/hysky/skyblocker/mixin/ClientPlayNetworkHandlerMixin.java
@@ -2,14 +2,16 @@ package de.hysky.skyblocker.mixin;
 
 import com.llamalad7.mixinextras.injector.WrapWithCondition;
 import com.llamalad7.mixinextras.sugar.Local;
-import de.hysky.skyblocker.skyblock.dungeon.secrets.DungeonSecrets;
 import dev.cbyrne.betterinject.annotations.Inject;
 import de.hysky.skyblocker.skyblock.FishingHelper;
+import de.hysky.skyblocker.skyblock.diana.MythologicalRitual;
+import de.hysky.skyblocker.skyblock.dungeon.secrets.DungeonSecrets;
 import de.hysky.skyblocker.utils.Utils;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.ClientPlayNetworkHandler;
 import net.minecraft.entity.ItemEntity;
 import net.minecraft.entity.LivingEntity;
+import net.minecraft.network.packet.s2c.play.ParticleS2CPacket;
 import net.minecraft.network.packet.s2c.play.PlaySoundS2CPacket;
 import org.slf4j.Logger;
 import org.spongepowered.asm.mixin.Mixin;
@@ -45,4 +47,9 @@ public abstract class ClientPlayNetworkHandlerMixin {
     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) {
+        MythologicalRitual.onParticle(packet);
+    }
 }
diff --git a/src/main/java/de/hysky/skyblocker/utils/Utils.java b/src/main/java/de/hysky/skyblocker/utils/Utils.java
index c1b4223f..bbfd1101 100644
--- a/src/main/java/de/hysky/skyblocker/utils/Utils.java
+++ b/src/main/java/de/hysky/skyblocker/utils/Utils.java
@@ -19,6 +19,7 @@ import net.minecraft.client.network.PlayerListEntry;
 import net.minecraft.scoreboard.*;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
+import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -40,10 +41,15 @@ public class Utils {
      * The following fields store data returned from /locraw: {@link #profile}, {@link #server}, {@link #gameType}, {@link #locationRaw}, and {@link #map}.
      */
     @SuppressWarnings("JavadocDeclaration")
+    @NotNull
     private static String profile = "";
+    @NotNull
     private static String server = "";
+    @NotNull
     private static String gameType = "";
+    @NotNull
     private static String locationRaw = "";
+    @NotNull
     private static String map = "";
     private static long clientWorldJoinTime = 0;
     private static boolean sentLocRaw = false;
@@ -78,6 +84,7 @@ public class Utils {
     /**
      * @return the profile parsed from the player list.
      */
+    @NotNull
     public static String getProfile() {
         return profile;
     }
@@ -85,6 +92,7 @@ public class Utils {
     /**
      * @return the server parsed from /locraw.
      */
+    @NotNull
     public static String getServer() {
         return server;
     }
@@ -92,6 +100,7 @@ public class Utils {
     /**
      * @return the game type parsed from /locraw.
      */
+    @NotNull
     public static String getGameType() {
         return gameType;
     }
@@ -99,6 +108,7 @@ public class Utils {
     /**
      * @return the location raw parsed from /locraw.
      */
+    @NotNull
     public static String getLocationRaw() {
         return locationRaw;
     }
@@ -106,6 +116,7 @@ public class Utils {
     /**
      * @return the map parsed from /locraw.
      */
+    @NotNull
     public static String getMap() {
         return map;
     }