aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/de/hysky/skyblocker/mixin
diff options
context:
space:
mode:
authorKevinthegreat <92656833+kevinthegreat1@users.noreply.github.com>2024-01-21 12:43:25 -0500
committerakarahdev <endisticbutitsforgit@gmail.com>2024-01-22 20:31:22 -0500
commit77f8cb5c7db674ddb066bf92f84c530e543dbc3e (patch)
tree01a5904de95bb3aecc308d9c9b190d0629b2951b /src/main/java/de/hysky/skyblocker/mixin
parentb5b11b31e2d9ed911c6a740e15160982bcd1f71f (diff)
downloadSkyblocker-77f8cb5c7db674ddb066bf92f84c530e543dbc3e.tar.gz
Skyblocker-77f8cb5c7db674ddb066bf92f84c530e543dbc3e.tar.bz2
Skyblocker-77f8cb5c7db674ddb066bf92f84c530e543dbc3e.zip
guh
Diffstat (limited to 'src/main/java/de/hysky/skyblocker/mixin')
-rw-r--r--src/main/java/de/hysky/skyblocker/mixin/ClientPlayNetworkHandlerMixin.java9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/main/java/de/hysky/skyblocker/mixin/ClientPlayNetworkHandlerMixin.java b/src/main/java/de/hysky/skyblocker/mixin/ClientPlayNetworkHandlerMixin.java
index 738c2165..e1a28262 100644
--- a/src/main/java/de/hysky/skyblocker/mixin/ClientPlayNetworkHandlerMixin.java
+++ b/src/main/java/de/hysky/skyblocker/mixin/ClientPlayNetworkHandlerMixin.java
@@ -3,7 +3,6 @@ package de.hysky.skyblocker.mixin;
import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
import com.llamalad7.mixinextras.injector.WrapWithCondition;
import com.llamalad7.mixinextras.sugar.Local;
-import de.hysky.skyblocker.config.SkyblockerConfig;
import de.hysky.skyblocker.skyblock.FishingHelper;
import de.hysky.skyblocker.skyblock.dungeon.DungeonScore;
import de.hysky.skyblocker.skyblock.dungeon.secrets.DungeonManager;
@@ -11,6 +10,7 @@ import de.hysky.skyblocker.skyblock.end.BeaconHighlighter;
import de.hysky.skyblocker.skyblock.waypoint.MythologicalRitual;
import de.hysky.skyblocker.utils.SlayerUtils;
import de.hysky.skyblocker.utils.Utils;
+import net.minecraft.block.Blocks;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.network.ClientPlayNetworkHandler;
import net.minecraft.entity.Entity;
@@ -37,7 +37,7 @@ public abstract class ClientPlayNetworkHandlerMixin {
FishingHelper.onSound(packet);
}
- @ModifyVariable(method = "onItemPickupAnimation", at = @At(value = "STORE", ordinal = 0))
+ @ModifyVariable(method = "onItemPickupAnimation", at = @At(value = "STORE", ordinal = 0))
private ItemEntity skyblocker$onItemPickup(ItemEntity itemEntity, @Local LivingEntity collector) {
DungeonManager.onItemPickup(itemEntity, collector, collector == MinecraftClient.getInstance().player);
return itemEntity;
@@ -81,12 +81,11 @@ public abstract class ClientPlayNetworkHandlerMixin {
}
@Inject(method = "onBlockUpdate", at = @At("RETURN"))
private void skyblocker$onBlockUpdate(BlockUpdateS2CPacket packet, CallbackInfo ci) {
- if(Utils.isInTheEnd() && SlayerUtils.isInSlayer()) {
+ if (Utils.isInTheEnd() && SlayerUtils.isInSlayer()) {
BeaconHighlighter.beaconPositions.remove(packet.getPos());
- if(packet.getState().toString().contains("minecraft:beacon")) {
+ if (packet.getState().isOf(Blocks.BEACON)) {
BeaconHighlighter.beaconPositions.add(packet.getPos());
}
}
-
}
}