diff --git a/src/main/java/anticope/rejects/mixin/baritone/MineProcessMixin.java b/src/main/java/anticope/rejects/mixin/baritone/MineProcessMixin.java index c4cd010..d233856 100644 --- a/src/main/java/anticope/rejects/mixin/baritone/MineProcessMixin.java +++ b/src/main/java/anticope/rejects/mixin/baritone/MineProcessMixin.java @@ -20,12 +20,11 @@ import meteordevelopment.meteorclient.systems.modules.Modules; @Mixin(MineProcess.class) public class MineProcessMixin { - private static final String RESCAN_METHOD = "Lbaritone/process/MineProcess;a(Ljava/util/List;Lbaritone/pathing/movement/CalculationContext;)V"; - - @Shadow + + @Shadow(remap = false) private List a; // knownOreLocations - @Inject(method = RESCAN_METHOD, at = @At("HEAD"), cancellable = true, remap = false) + @Inject(method = "a(Ljava/util/List;Lbaritone/pathing/movement/CalculationContext;)V", at = @At("HEAD"), cancellable = true, remap = false) private void onRescan(List already, CalculationContext context, CallbackInfo ci) { OreSim oreSim = Modules.get().get(OreSim.class); if (oreSim == null || !oreSim.baritone()) @@ -34,7 +33,8 @@ public class MineProcessMixin { ci.cancel(); } - @Redirect(method = "a(Lbaritone/pathing/movement/CalculationContext;Lbaritone/api/utils/BlockOptionalMetaLookup;Ljava/util/List;Lnet/minecraft/util/math/BlockPos;)Z", at = @At(value = "INVOKE", target = "Lbaritone/api/utils/BlockOptionalMetaLookup;has(Lnet/minecraft/block/BlockState;)Z"), remap = false) + @Redirect(method = "a(Lbaritone/pathing/movement/CalculationContext;Lbaritone/api/utils/BlockOptionalMetaLookup;Ljava/util/List;Lnet/minecraft/util/math/BlockPos;)Z", + at= @At(value = "INVOKE", target = "Lbaritone/api/utils/BlockOptionalMetaLookup;has(Lnet/minecraft/block/BlockState;)Z")) private static boolean onPruneStream(BlockOptionalMetaLookup instance, BlockState blockState) { OreSim oreSim = Modules.get().get(OreSim.class); if (oreSim == null || !oreSim.baritone()) diff --git a/src/main/java/anticope/rejects/mixin/meteor/GuiRendererAccessor.java b/src/main/java/anticope/rejects/mixin/meteor/GuiRendererAccessor.java index 88ae698..2edba47 100644 --- a/src/main/java/anticope/rejects/mixin/meteor/GuiRendererAccessor.java +++ b/src/main/java/anticope/rejects/mixin/meteor/GuiRendererAccessor.java @@ -7,6 +7,6 @@ import org.spongepowered.asm.mixin.gen.Accessor; @Mixin(GuiRenderer.class) public interface GuiRendererAccessor { - @Accessor("r") + @Accessor(value = "r", remap = false) Renderer2D getRenderer2D(); } diff --git a/src/main/java/anticope/rejects/mixin/meteor/modules/NoRenderAccessor.java b/src/main/java/anticope/rejects/mixin/meteor/modules/NoRenderAccessor.java index b2a61c1..5b2b625 100644 --- a/src/main/java/anticope/rejects/mixin/meteor/modules/NoRenderAccessor.java +++ b/src/main/java/anticope/rejects/mixin/meteor/modules/NoRenderAccessor.java @@ -7,6 +7,6 @@ import org.spongepowered.asm.mixin.gen.Accessor; @Mixin(NoRender.class) public interface NoRenderAccessor { - @Accessor("sgOverlay") + @Accessor(value = "sgOverlay", remap = false) SettingGroup getSgOverlay(); }