From b700db32f2bccde3b6381d5d28136814c9fe9e37 Mon Sep 17 00:00:00 2001 From: olim Date: Mon, 29 Apr 2024 21:50:44 +0100 Subject: initial commit detection of when the player is in the dojo and the helper for the discipline is implemented --- src/main/java/de/hysky/skyblocker/utils/Utils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/de/hysky/skyblocker/utils/Utils.java') diff --git a/src/main/java/de/hysky/skyblocker/utils/Utils.java b/src/main/java/de/hysky/skyblocker/utils/Utils.java index 84b3cb9e..f383c94a 100644 --- a/src/main/java/de/hysky/skyblocker/utils/Utils.java +++ b/src/main/java/de/hysky/skyblocker/utils/Utils.java @@ -95,7 +95,7 @@ public class Utils { } public static boolean isInDungeons() { - return location == Location.DUNGEON || FabricLoader.getInstance().isDevelopmentEnvironment(); + return location == Location.DUNGEON ; // || FabricLoader.getInstance().isDevelopmentEnvironment() } public static boolean isInCrystalHollows() { -- cgit From 75dbf2677618947320f9421fe9a314e890e7978a Mon Sep 17 00:00:00 2001 From: olim Date: Tue, 4 Jun 2024 12:05:07 +0100 Subject: add isInCrimson function --- .../de/hysky/skyblocker/mixins/ClientWorldMixin.java | 2 +- .../de/hysky/skyblocker/mixins/PingMeasureMixin.java | 2 +- .../skyblock/crimson/dojo/ControlTestHelper.java | 2 +- .../skyblock/crimson/dojo/DojoManager.java | 20 ++++++++++---------- .../skyblock/crimson/dojo/StaminaTestHelper.java | 2 +- .../de/hysky/skyblocker/skyblock/entity/MobGlow.java | 4 ++-- src/main/java/de/hysky/skyblocker/utils/Utils.java | 3 +++ 7 files changed, 19 insertions(+), 16 deletions(-) (limited to 'src/main/java/de/hysky/skyblocker/utils/Utils.java') diff --git a/src/main/java/de/hysky/skyblocker/mixins/ClientWorldMixin.java b/src/main/java/de/hysky/skyblocker/mixins/ClientWorldMixin.java index ff0b1ae6..0e1e6881 100644 --- a/src/main/java/de/hysky/skyblocker/mixins/ClientWorldMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixins/ClientWorldMixin.java @@ -17,7 +17,7 @@ public class ClientWorldMixin { @Inject(method = "handleBlockUpdate", at = @At("RETURN")) private void skyblocker$handleBlockUpdate(BlockPos pos, BlockState state, int flags, CallbackInfo ci) { - if (Utils.getLocation() == Location.CRIMSON_ISLE) { + if (Utils.isInCrimson()) { DojoManager.onBlockUpdate(pos.toImmutable(), state); } } diff --git a/src/main/java/de/hysky/skyblocker/mixins/PingMeasureMixin.java b/src/main/java/de/hysky/skyblocker/mixins/PingMeasureMixin.java index 0e9c5e13..e87b66f2 100644 --- a/src/main/java/de/hysky/skyblocker/mixins/PingMeasureMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixins/PingMeasureMixin.java @@ -15,7 +15,7 @@ public class PingMeasureMixin { @Inject(method = "onPingResult", at = @At("RETURN")) private void skyblocker$onPingResult(PingResultS2CPacket packet, CallbackInfo ci) { - if (Utils.getLocation() == Location.CRIMSON_ISLE) { + if (Utils.isInCrimson()) { long ping = System.currentTimeMillis() - packet.startTime(); DojoManager.onPingResult(ping); } 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; }; diff --git a/src/main/java/de/hysky/skyblocker/utils/Utils.java b/src/main/java/de/hysky/skyblocker/utils/Utils.java index f383c94a..8c8cef57 100644 --- a/src/main/java/de/hysky/skyblocker/utils/Utils.java +++ b/src/main/java/de/hysky/skyblocker/utils/Utils.java @@ -120,6 +120,9 @@ public class Utils { public static boolean isInKuudra() { return location == Location.KUUDRAS_HOLLOW; } + public static boolean isInCrimson() { + return location == Location.CRIMSON_ISLE; + } public static boolean isInModernForagingIsland() { return location == Location.MODERN_FORAGING_ISLAND; -- cgit From 6925e532474c393223023690d708ebe7e5e6bab0 Mon Sep 17 00:00:00 2001 From: olim Date: Mon, 1 Jul 2024 14:27:37 +0100 Subject: fix conflict hopefully --- src/main/java/de/hysky/skyblocker/utils/Utils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/de/hysky/skyblocker/utils/Utils.java') diff --git a/src/main/java/de/hysky/skyblocker/utils/Utils.java b/src/main/java/de/hysky/skyblocker/utils/Utils.java index 8c8cef57..ad0643f2 100644 --- a/src/main/java/de/hysky/skyblocker/utils/Utils.java +++ b/src/main/java/de/hysky/skyblocker/utils/Utils.java @@ -95,7 +95,7 @@ public class Utils { } public static boolean isInDungeons() { - return location == Location.DUNGEON ; // || FabricLoader.getInstance().isDevelopmentEnvironment() + return location == Location.DUNGEON; } public static boolean isInCrystalHollows() { -- cgit