From e39a80fa3e4f0e81137e1c9825decb52ae4344ff Mon Sep 17 00:00:00 2001 From: olim Date: Tue, 30 Apr 2024 12:34:20 +0100 Subject: add swiftness helper works but for some reason some block updates are not sent to the function so sometimes dose not update --- .../de/hysky/skyblocker/mixins/ClientPlayNetworkHandlerMixin.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/main/java/de/hysky/skyblocker/mixins') diff --git a/src/main/java/de/hysky/skyblocker/mixins/ClientPlayNetworkHandlerMixin.java b/src/main/java/de/hysky/skyblocker/mixins/ClientPlayNetworkHandlerMixin.java index 48389d40..feb5a1cb 100644 --- a/src/main/java/de/hysky/skyblocker/mixins/ClientPlayNetworkHandlerMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixins/ClientPlayNetworkHandlerMixin.java @@ -5,13 +5,14 @@ import com.llamalad7.mixinextras.injector.v2.WrapWithCondition; import com.llamalad7.mixinextras.sugar.Local; import de.hysky.skyblocker.skyblock.CompactDamage; import de.hysky.skyblocker.skyblock.FishingHelper; -import de.hysky.skyblocker.skyblock.chocolatefactory.EggFinder; +import de.hysky.skyblocker.skyblock.crimson.dojo.SwiftnessTestHelper; import de.hysky.skyblocker.skyblock.dungeon.DungeonScore; import de.hysky.skyblocker.skyblock.dungeon.secrets.DungeonManager; import de.hysky.skyblocker.skyblock.end.BeaconHighlighter; import de.hysky.skyblocker.skyblock.end.EnderNodes; import de.hysky.skyblocker.skyblock.end.TheEnd; import de.hysky.skyblocker.skyblock.waypoint.MythologicalRitual; +import de.hysky.skyblocker.utils.Location; import de.hysky.skyblocker.utils.SlayerUtils; import de.hysky.skyblocker.utils.Utils; import net.minecraft.block.Blocks; @@ -49,6 +50,9 @@ public abstract class ClientPlayNetworkHandlerMixin { BeaconHighlighter.beaconPositions.add(packet.getPos()); } } + if (Utils.getLocation() == Location.CRIMSON_ISLE) { + SwiftnessTestHelper.blockUpdate(packet); + } } @Inject(method = "method_37472", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/world/ClientWorld;removeEntity(ILnet/minecraft/entity/Entity$RemovalReason;)V")) -- cgit From b2dff8d0f292b819138a2bb118f318063568e3fe Mon Sep 17 00:00:00 2001 From: olim Date: Tue, 30 Apr 2024 15:26:58 +0100 Subject: add masteryTest helper create helper for the mastery challenge --- .../java/de/hysky/skyblocker/mixins/ClientPlayNetworkHandlerMixin.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/main/java/de/hysky/skyblocker/mixins') diff --git a/src/main/java/de/hysky/skyblocker/mixins/ClientPlayNetworkHandlerMixin.java b/src/main/java/de/hysky/skyblocker/mixins/ClientPlayNetworkHandlerMixin.java index feb5a1cb..b7d505f3 100644 --- a/src/main/java/de/hysky/skyblocker/mixins/ClientPlayNetworkHandlerMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixins/ClientPlayNetworkHandlerMixin.java @@ -5,6 +5,7 @@ import com.llamalad7.mixinextras.injector.v2.WrapWithCondition; import com.llamalad7.mixinextras.sugar.Local; import de.hysky.skyblocker.skyblock.CompactDamage; import de.hysky.skyblocker.skyblock.FishingHelper; +import de.hysky.skyblocker.skyblock.crimson.dojo.DojoManager; import de.hysky.skyblocker.skyblock.crimson.dojo.SwiftnessTestHelper; import de.hysky.skyblocker.skyblock.dungeon.DungeonScore; import de.hysky.skyblocker.skyblock.dungeon.secrets.DungeonManager; @@ -51,7 +52,7 @@ public abstract class ClientPlayNetworkHandlerMixin { } } if (Utils.getLocation() == Location.CRIMSON_ISLE) { - SwiftnessTestHelper.blockUpdate(packet); + DojoManager.onBlockUpdate(packet); } } -- cgit From 18e3b77939d726e2aedfddfda76f488c864bbe94 Mon Sep 17 00:00:00 2001 From: olim Date: Wed, 1 May 2024 16:12:31 +0100 Subject: fix tenacity helper rework tenacity helper to use particals to work out randomness and fix to be mainly accurate --- .../java/de/hysky/skyblocker/mixins/ClientPlayNetworkHandlerMixin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/de/hysky/skyblocker/mixins') diff --git a/src/main/java/de/hysky/skyblocker/mixins/ClientPlayNetworkHandlerMixin.java b/src/main/java/de/hysky/skyblocker/mixins/ClientPlayNetworkHandlerMixin.java index b7d505f3..454d3fb2 100644 --- a/src/main/java/de/hysky/skyblocker/mixins/ClientPlayNetworkHandlerMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixins/ClientPlayNetworkHandlerMixin.java @@ -6,7 +6,6 @@ import com.llamalad7.mixinextras.sugar.Local; import de.hysky.skyblocker.skyblock.CompactDamage; import de.hysky.skyblocker.skyblock.FishingHelper; import de.hysky.skyblocker.skyblock.crimson.dojo.DojoManager; -import de.hysky.skyblocker.skyblock.crimson.dojo.SwiftnessTestHelper; import de.hysky.skyblocker.skyblock.dungeon.DungeonScore; import de.hysky.skyblocker.skyblock.dungeon.secrets.DungeonManager; import de.hysky.skyblocker.skyblock.end.BeaconHighlighter; @@ -102,6 +101,7 @@ public abstract class ClientPlayNetworkHandlerMixin { @Inject(method = "onParticle", at = @At("RETURN")) private void skyblocker$onParticle(ParticleS2CPacket packet, CallbackInfo ci) { MythologicalRitual.onParticle(packet); + DojoManager.onParticle(packet); EnderNodes.onParticle(packet); } -- cgit From 599117db34159eb04cc0ae2eb91b7dc67d9bbd88 Mon Sep 17 00:00:00 2001 From: olim Date: Thu, 2 May 2024 21:57:06 +0100 Subject: make it so all block updates are recived this fixes swiftness and mastery solver --- .../mixins/ClientPlayNetworkHandlerMixin.java | 3 --- .../hysky/skyblocker/mixins/ClientWorldMixin.java | 24 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 src/main/java/de/hysky/skyblocker/mixins/ClientWorldMixin.java (limited to 'src/main/java/de/hysky/skyblocker/mixins') diff --git a/src/main/java/de/hysky/skyblocker/mixins/ClientPlayNetworkHandlerMixin.java b/src/main/java/de/hysky/skyblocker/mixins/ClientPlayNetworkHandlerMixin.java index 454d3fb2..cd0fb0ea 100644 --- a/src/main/java/de/hysky/skyblocker/mixins/ClientPlayNetworkHandlerMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixins/ClientPlayNetworkHandlerMixin.java @@ -50,9 +50,6 @@ public abstract class ClientPlayNetworkHandlerMixin { BeaconHighlighter.beaconPositions.add(packet.getPos()); } } - if (Utils.getLocation() == Location.CRIMSON_ISLE) { - DojoManager.onBlockUpdate(packet); - } } @Inject(method = "method_37472", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/world/ClientWorld;removeEntity(ILnet/minecraft/entity/Entity$RemovalReason;)V")) diff --git a/src/main/java/de/hysky/skyblocker/mixins/ClientWorldMixin.java b/src/main/java/de/hysky/skyblocker/mixins/ClientWorldMixin.java new file mode 100644 index 00000000..ff0b1ae6 --- /dev/null +++ b/src/main/java/de/hysky/skyblocker/mixins/ClientWorldMixin.java @@ -0,0 +1,24 @@ +package de.hysky.skyblocker.mixins; + + +import de.hysky.skyblocker.skyblock.crimson.dojo.DojoManager; +import de.hysky.skyblocker.utils.Location; +import de.hysky.skyblocker.utils.Utils; +import net.minecraft.block.BlockState; +import net.minecraft.client.world.ClientWorld; +import net.minecraft.util.math.BlockPos; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(ClientWorld.class) +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) { + DojoManager.onBlockUpdate(pos.toImmutable(), state); + } + } +} -- cgit From f8a95bc502530f14d6edc08855127a67a5f7cf99 Mon Sep 17 00:00:00 2001 From: olim Date: Fri, 24 May 2024 15:11:23 +0100 Subject: fix import --- .../java/de/hysky/skyblocker/mixins/ClientPlayNetworkHandlerMixin.java | 1 + 1 file changed, 1 insertion(+) (limited to 'src/main/java/de/hysky/skyblocker/mixins') diff --git a/src/main/java/de/hysky/skyblocker/mixins/ClientPlayNetworkHandlerMixin.java b/src/main/java/de/hysky/skyblocker/mixins/ClientPlayNetworkHandlerMixin.java index cd0fb0ea..3797004a 100644 --- a/src/main/java/de/hysky/skyblocker/mixins/ClientPlayNetworkHandlerMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixins/ClientPlayNetworkHandlerMixin.java @@ -5,6 +5,7 @@ import com.llamalad7.mixinextras.injector.v2.WrapWithCondition; import com.llamalad7.mixinextras.sugar.Local; import de.hysky.skyblocker.skyblock.CompactDamage; import de.hysky.skyblocker.skyblock.FishingHelper; +import de.hysky.skyblocker.skyblock.chocolatefactory.EggFinder; import de.hysky.skyblocker.skyblock.crimson.dojo.DojoManager; import de.hysky.skyblocker.skyblock.dungeon.DungeonScore; import de.hysky.skyblocker.skyblock.dungeon.secrets.DungeonManager; -- cgit From 27b242b1d0d40d5b107a09718833400a14395fe1 Mon Sep 17 00:00:00 2001 From: olim Date: Mon, 3 Jun 2024 21:18:55 +0100 Subject: add ping measure and improve mastery mastery now counts down to when to release the bow --- .../hysky/skyblocker/mixins/PingMeasureMixin.java | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 src/main/java/de/hysky/skyblocker/mixins/PingMeasureMixin.java (limited to 'src/main/java/de/hysky/skyblocker/mixins') diff --git a/src/main/java/de/hysky/skyblocker/mixins/PingMeasureMixin.java b/src/main/java/de/hysky/skyblocker/mixins/PingMeasureMixin.java new file mode 100644 index 00000000..0e9c5e13 --- /dev/null +++ b/src/main/java/de/hysky/skyblocker/mixins/PingMeasureMixin.java @@ -0,0 +1,23 @@ +package de.hysky.skyblocker.mixins; + +import de.hysky.skyblocker.skyblock.crimson.dojo.DojoManager; +import de.hysky.skyblocker.utils.Location; +import de.hysky.skyblocker.utils.Utils; +import net.minecraft.client.network.PingMeasurer; +import net.minecraft.network.packet.s2c.query.PingResultS2CPacket; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(PingMeasurer.class) +public class PingMeasureMixin { + + @Inject(method = "onPingResult", at = @At("RETURN")) + private void skyblocker$onPingResult(PingResultS2CPacket packet, CallbackInfo ci) { + if (Utils.getLocation() == Location.CRIMSON_ISLE) { + long ping = System.currentTimeMillis() - packet.startTime(); + DojoManager.onPingResult(ping); + } + } +} -- 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 --- src/main/java/de/hysky/skyblocker/mixins/ClientWorldMixin.java | 2 +- src/main/java/de/hysky/skyblocker/mixins/PingMeasureMixin.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/java/de/hysky/skyblocker/mixins') 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); } -- cgit From 095223a1b5e105b670d785ce1b539db087d61bb1 Mon Sep 17 00:00:00 2001 From: olim Date: Tue, 4 Jun 2024 12:10:30 +0100 Subject: clean imports --- .../java/de/hysky/skyblocker/mixins/ClientPlayNetworkHandlerMixin.java | 1 - src/main/java/de/hysky/skyblocker/mixins/ClientWorldMixin.java | 1 - src/main/java/de/hysky/skyblocker/mixins/PingMeasureMixin.java | 1 - 3 files changed, 3 deletions(-) (limited to 'src/main/java/de/hysky/skyblocker/mixins') diff --git a/src/main/java/de/hysky/skyblocker/mixins/ClientPlayNetworkHandlerMixin.java b/src/main/java/de/hysky/skyblocker/mixins/ClientPlayNetworkHandlerMixin.java index 3797004a..7bbbac81 100644 --- a/src/main/java/de/hysky/skyblocker/mixins/ClientPlayNetworkHandlerMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixins/ClientPlayNetworkHandlerMixin.java @@ -13,7 +13,6 @@ import de.hysky.skyblocker.skyblock.end.BeaconHighlighter; import de.hysky.skyblocker.skyblock.end.EnderNodes; import de.hysky.skyblocker.skyblock.end.TheEnd; import de.hysky.skyblocker.skyblock.waypoint.MythologicalRitual; -import de.hysky.skyblocker.utils.Location; import de.hysky.skyblocker.utils.SlayerUtils; import de.hysky.skyblocker.utils.Utils; import net.minecraft.block.Blocks; diff --git a/src/main/java/de/hysky/skyblocker/mixins/ClientWorldMixin.java b/src/main/java/de/hysky/skyblocker/mixins/ClientWorldMixin.java index 0e1e6881..6c10e5d2 100644 --- a/src/main/java/de/hysky/skyblocker/mixins/ClientWorldMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixins/ClientWorldMixin.java @@ -2,7 +2,6 @@ package de.hysky.skyblocker.mixins; import de.hysky.skyblocker.skyblock.crimson.dojo.DojoManager; -import de.hysky.skyblocker.utils.Location; import de.hysky.skyblocker.utils.Utils; import net.minecraft.block.BlockState; import net.minecraft.client.world.ClientWorld; diff --git a/src/main/java/de/hysky/skyblocker/mixins/PingMeasureMixin.java b/src/main/java/de/hysky/skyblocker/mixins/PingMeasureMixin.java index e87b66f2..e82fc86e 100644 --- a/src/main/java/de/hysky/skyblocker/mixins/PingMeasureMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixins/PingMeasureMixin.java @@ -1,7 +1,6 @@ package de.hysky.skyblocker.mixins; import de.hysky.skyblocker.skyblock.crimson.dojo.DojoManager; -import de.hysky.skyblocker.utils.Location; import de.hysky.skyblocker.utils.Utils; import net.minecraft.client.network.PingMeasurer; import net.minecraft.network.packet.s2c.query.PingResultS2CPacket; -- cgit From 981fe6a917dc966b980b5571d0653986242d84dc Mon Sep 17 00:00:00 2001 From: olim Date: Sun, 23 Jun 2024 17:37:49 +0100 Subject: fix bad use of ping packet --- .../skyblocker/mixins/PingMeasuererMixin.java | 22 ++++++++++++++++++++++ .../hysky/skyblocker/mixins/PingMeasureMixin.java | 22 ---------------------- 2 files changed, 22 insertions(+), 22 deletions(-) create mode 100644 src/main/java/de/hysky/skyblocker/mixins/PingMeasuererMixin.java delete mode 100644 src/main/java/de/hysky/skyblocker/mixins/PingMeasureMixin.java (limited to 'src/main/java/de/hysky/skyblocker/mixins') diff --git a/src/main/java/de/hysky/skyblocker/mixins/PingMeasuererMixin.java b/src/main/java/de/hysky/skyblocker/mixins/PingMeasuererMixin.java new file mode 100644 index 00000000..21ed613f --- /dev/null +++ b/src/main/java/de/hysky/skyblocker/mixins/PingMeasuererMixin.java @@ -0,0 +1,22 @@ +package de.hysky.skyblocker.mixins; + +import com.llamalad7.mixinextras.injector.wrapoperation.Operation; +import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; +import de.hysky.skyblocker.skyblock.crimson.dojo.DojoManager; +import de.hysky.skyblocker.utils.Utils; +import net.minecraft.client.network.PingMeasurer; +import net.minecraft.util.profiler.MultiValueDebugSampleLogImpl; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; + +@Mixin(PingMeasurer.class) +public class PingMeasuererMixin { + + @WrapOperation(method = "onPingResult", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/profiler/MultiValueDebugSampleLogImpl;push(J)V")) + private void skyblocker$onPingResult(MultiValueDebugSampleLogImpl log, long ping, Operation operation) { + if (Utils.isInCrimson()) { + DojoManager.onPingResult(ping); + } + operation.call(new Object[]{log, ping}); + } +} diff --git a/src/main/java/de/hysky/skyblocker/mixins/PingMeasureMixin.java b/src/main/java/de/hysky/skyblocker/mixins/PingMeasureMixin.java deleted file mode 100644 index e82fc86e..00000000 --- a/src/main/java/de/hysky/skyblocker/mixins/PingMeasureMixin.java +++ /dev/null @@ -1,22 +0,0 @@ -package de.hysky.skyblocker.mixins; - -import de.hysky.skyblocker.skyblock.crimson.dojo.DojoManager; -import de.hysky.skyblocker.utils.Utils; -import net.minecraft.client.network.PingMeasurer; -import net.minecraft.network.packet.s2c.query.PingResultS2CPacket; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -@Mixin(PingMeasurer.class) -public class PingMeasureMixin { - - @Inject(method = "onPingResult", at = @At("RETURN")) - private void skyblocker$onPingResult(PingResultS2CPacket packet, CallbackInfo ci) { - if (Utils.isInCrimson()) { - long ping = System.currentTimeMillis() - packet.startTime(); - DojoManager.onPingResult(ping); - } - } -} -- cgit From 8f39b03cd3ff309e82660dd1c997e44ba6c5513c Mon Sep 17 00:00:00 2001 From: olim Date: Fri, 28 Jun 2024 10:33:53 +0100 Subject: clean ping code --- src/main/java/de/hysky/skyblocker/mixins/PingMeasuererMixin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/de/hysky/skyblocker/mixins') diff --git a/src/main/java/de/hysky/skyblocker/mixins/PingMeasuererMixin.java b/src/main/java/de/hysky/skyblocker/mixins/PingMeasuererMixin.java index 21ed613f..803a65ab 100644 --- a/src/main/java/de/hysky/skyblocker/mixins/PingMeasuererMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixins/PingMeasuererMixin.java @@ -17,6 +17,6 @@ public class PingMeasuererMixin { if (Utils.isInCrimson()) { DojoManager.onPingResult(ping); } - operation.call(new Object[]{log, ping}); + operation.call(log, ping); } } -- cgit From 6863c696e9ce34854aabdf0a4e2883e7ea8be0a8 Mon Sep 17 00:00:00 2001 From: olim Date: Wed, 3 Jul 2024 17:45:35 +0100 Subject: clean code and implement requested changes --- .../skyblocker/mixins/PingMeasuererMixin.java | 22 ---------------------- .../hysky/skyblocker/mixins/PingMeasurerMixin.java | 22 ++++++++++++++++++++++ 2 files changed, 22 insertions(+), 22 deletions(-) delete mode 100644 src/main/java/de/hysky/skyblocker/mixins/PingMeasuererMixin.java create mode 100644 src/main/java/de/hysky/skyblocker/mixins/PingMeasurerMixin.java (limited to 'src/main/java/de/hysky/skyblocker/mixins') diff --git a/src/main/java/de/hysky/skyblocker/mixins/PingMeasuererMixin.java b/src/main/java/de/hysky/skyblocker/mixins/PingMeasuererMixin.java deleted file mode 100644 index 803a65ab..00000000 --- a/src/main/java/de/hysky/skyblocker/mixins/PingMeasuererMixin.java +++ /dev/null @@ -1,22 +0,0 @@ -package de.hysky.skyblocker.mixins; - -import com.llamalad7.mixinextras.injector.wrapoperation.Operation; -import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; -import de.hysky.skyblocker.skyblock.crimson.dojo.DojoManager; -import de.hysky.skyblocker.utils.Utils; -import net.minecraft.client.network.PingMeasurer; -import net.minecraft.util.profiler.MultiValueDebugSampleLogImpl; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; - -@Mixin(PingMeasurer.class) -public class PingMeasuererMixin { - - @WrapOperation(method = "onPingResult", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/profiler/MultiValueDebugSampleLogImpl;push(J)V")) - private void skyblocker$onPingResult(MultiValueDebugSampleLogImpl log, long ping, Operation operation) { - if (Utils.isInCrimson()) { - DojoManager.onPingResult(ping); - } - operation.call(log, ping); - } -} diff --git a/src/main/java/de/hysky/skyblocker/mixins/PingMeasurerMixin.java b/src/main/java/de/hysky/skyblocker/mixins/PingMeasurerMixin.java new file mode 100644 index 00000000..a9fae752 --- /dev/null +++ b/src/main/java/de/hysky/skyblocker/mixins/PingMeasurerMixin.java @@ -0,0 +1,22 @@ +package de.hysky.skyblocker.mixins; + +import com.llamalad7.mixinextras.injector.wrapoperation.Operation; +import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; +import de.hysky.skyblocker.skyblock.crimson.dojo.DojoManager; +import de.hysky.skyblocker.utils.Utils; +import net.minecraft.client.network.PingMeasurer; +import net.minecraft.util.profiler.MultiValueDebugSampleLogImpl; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; + +@Mixin(PingMeasurer.class) +public class PingMeasurerMixin { + + @WrapOperation(method = "onPingResult", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/profiler/MultiValueDebugSampleLogImpl;push(J)V")) + private void skyblocker$onPingResult(MultiValueDebugSampleLogImpl log, long ping, Operation operation) { + if (Utils.isInCrimson()) { + DojoManager.onPingResult(ping); + } + operation.call(log, ping); + } +} -- cgit