add isInCrimson function

4 files changed, 14 insertions, 14 deletions

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/crimson/dojo/ControlTestHelper.java b/src/main/java/de/hysky/skyblocker/skyblock/crimson/dojo/ControlTestHelper.java
index dfc3ae2a..5092b6fe 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/crimson/dojo/ControlTestHelper.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/crimson/dojo/ControlTestHelper.java
@@ -69,7 +69,7 @@ public class ControlTestHelper {
             double updatePercent = (double) (System.currentTimeMillis() - lastUpdate) / 150;
             Vec3d aimPos = correctWitherSkeleton.getEyePos().add(pingOffset.multiply(updatePercent)).add(lastPingOffset.multiply(1 - updatePercent));
             Box targetBox = new Box(aimPos.add(-0.5, -0.5, -0.5), aimPos.add(0.5, 0.5, 0.5));
-            boolean playerLookingAtBox = targetBox.raycast(CLIENT.player.getCameraPosVec(tickDelta),CLIENT.player.getCameraPosVec(tickDelta).add(CLIENT.player.getRotationVec(tickDelta).multiply(30))).isPresent();
+            boolean playerLookingAtBox = targetBox.raycast(CLIENT.player.getCameraPosVec(tickDelta), CLIENT.player.getCameraPosVec(tickDelta).add(CLIENT.player.getRotationVec(tickDelta).multiply(30))).isPresent();
             float[] boxColor = playerLookingAtBox ? Color.GREEN.getColorComponents(new float[]{0, 0, 0}) : Color.LIGHT_GRAY.getColorComponents(new float[]{0, 0, 0});
             RenderHelper.renderOutline(context, targetBox, boxColor, 3, true);
         }
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/crimson/dojo/DojoManager.java b/src/main/java/de/hysky/skyblocker/skyblock/crimson/dojo/DojoManager.java
index 8278f089..02b20e08 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/crimson/dojo/DojoManager.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/crimson/dojo/DojoManager.java
@@ -96,7 +96,7 @@ public class DojoManager {
      * @param overlay is overlay
      */
     private static void onMessage(Text text, Boolean overlay) {
-        if (Utils.getLocation() != Location.CRIMSON_ISLE || overlay) {
+        if (!Utils.isInCrimson() || overlay) {
             return;
         }
         if (Objects.equals(Formatting.strip(text.getString()), START_MESSAGE)) {
@@ -137,7 +137,7 @@ public class DojoManager {
     }
 
     private static void update() {
-        if (Utils.getLocation() != Location.CRIMSON_ISLE || !inArena) {
+        if (!Utils.isInCrimson() || !inArena) {
             return;
         }
          switch (currentChallenge) {
@@ -153,7 +153,7 @@ public class DojoManager {
      * @return if the zombie should glow
      */
     public static boolean shouldGlow(String name) {
-        if (Utils.getLocation() != Location.CRIMSON_ISLE || !inArena) {
+        if (!Utils.isInCrimson() || !inArena) {
             return false;
         }
         return switch (currentChallenge) {
@@ -169,7 +169,7 @@ public class DojoManager {
      * @return if the zombie should glow
      */
     public static int getColor() {
-        if (Utils.getLocation() != Location.CRIMSON_ISLE || !inArena) {
+        if (!Utils.isInCrimson() || !inArena) {
             return 0xf57738;
         }
         return switch (currentChallenge) {
@@ -186,7 +186,7 @@ public class DojoManager {
      * @param state the state of the new block
      */
     public static void onBlockUpdate(BlockPos pos, BlockState state) {
-        if (Utils.getLocation() != Location.CRIMSON_ISLE || !inArena) {
+        if (!Utils.isInCrimson() || !inArena) {
             return;
         }
         switch (currentChallenge) {
@@ -196,7 +196,7 @@ public class DojoManager {
     }
 
     private static void onEntitySpawn(Entity entity, ClientWorld clientWorld) {
-        if (Utils.getLocation() != Location.CRIMSON_ISLE || !inArena || CLIENT == null || CLIENT.player == null) {
+        if (!Utils.isInCrimson() || !inArena || CLIENT == null || CLIENT.player == null) {
             return;
         }
         //check close by
@@ -211,7 +211,7 @@ public class DojoManager {
     }
 
     private static void onEntityDespawn(Entity entity, ClientWorld clientWorld) {
-        if (Utils.getLocation() != Location.CRIMSON_ISLE || !inArena) {
+        if (!Utils.isInCrimson() || !inArena) {
             return;
         }
         switch (currentChallenge) {
@@ -221,7 +221,7 @@ public class DojoManager {
     }
 
     private static ActionResult onEntityAttacked(PlayerEntity playerEntity, World world, Hand hand, Entity entity, EntityHitResult entityHitResult) {
-        if (Utils.getLocation() != Location.CRIMSON_ISLE || !inArena) {
+        if (!Utils.isInCrimson() || !inArena) {
             return ActionResult.PASS;
         }
         if (currentChallenge == DojoChallenges.FORCE) {
@@ -231,7 +231,7 @@ public class DojoManager {
     }
 
     public static void onParticle(ParticleS2CPacket packet) {
-        if (Utils.getLocation() != Location.CRIMSON_ISLE || !inArena) {
+        if (!Utils.isInCrimson() || !inArena) {
             return;
         }
         if (currentChallenge == DojoChallenges.TENACITY) {
@@ -240,7 +240,7 @@ public class DojoManager {
     }
 
     private static void render(WorldRenderContext context) {
-        if (Utils.getLocation() != Location.CRIMSON_ISLE || !inArena) {
+        if (!Utils.isInCrimson() || !inArena) {
             return;
         }
         switch (currentChallenge) {
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/crimson/dojo/StaminaTestHelper.java b/src/main/java/de/hysky/skyblocker/skyblock/crimson/dojo/StaminaTestHelper.java
index d32656e8..afb53243 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/crimson/dojo/StaminaTestHelper.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/crimson/dojo/StaminaTestHelper.java
@@ -192,7 +192,7 @@ public class StaminaTestHelper {
                         //do not check non-air
                         continue;
                     }
-                    boolean top = y == box.maxY - 1|| !CLIENT.world.getBlockState(pos.add(0, 1, 0)).isAir();
+                    boolean top = y == box.maxY - 1 || !CLIENT.world.getBlockState(pos.add(0, 1, 0)).isAir();
                     boolean bottom = !CLIENT.world.getBlockState(pos.add(0, -1, 0)).isAir();
                     boolean left = !CLIENT.world.getBlockState(pos.add(wallDirection)).isAir();
                     boolean right = !CLIENT.world.getBlockState(pos.subtract(wallDirection)).isAir();
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/entity/MobGlow.java b/src/main/java/de/hysky/skyblocker/skyblock/entity/MobGlow.java
index 182fae77..6df7d4d5 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/entity/MobGlow.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/entity/MobGlow.java
@@ -63,7 +63,7 @@ public class MobGlow {
 				case EndermanEntity enderman when Utils.isInTheEnd() && !entity.isInvisible() -> TheEnd.isSpecialZealot(enderman);
 
 				//dojo
-				case ZombieEntity zombie when Utils.getLocation() == Location.CRIMSON_ISLE && DojoManager.inArena -> DojoManager.shouldGlow(getArmourStandName(zombie));
+				case ZombieEntity zombie when Utils.isInCrimson() && DojoManager.inArena -> DojoManager.shouldGlow(getArmourStandName(zombie));
 
 				default -> false;
 			};
@@ -109,7 +109,7 @@ public class MobGlow {
 
 			case EndermanEntity enderman when TheEnd.isSpecialZealot(enderman) -> Formatting.RED.getColorValue();
 			case ArmorStandEntity armorStand when isNukekubiHead(armorStand) -> 0x990099;
-			case ZombieEntity zombie when Utils.getLocation() == Location.CRIMSON_ISLE && DojoManager.inArena -> DojoManager.getColor();
+			case ZombieEntity zombie when Utils.isInCrimson() && DojoManager.inArena -> DojoManager.getColor();
 
 			default -> 0xf57738;
 		};