morpheus/Meteor-Rejects
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

fix crash (forgot to remap)

Browse Source
This commit is contained in:
C10udburst
2022-03-06 15:53:13 +01:00
parent aae6d16899
commit 853d85afd5
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/anticope/rejects/mixin/baritone/MineProcessMixin.java
View File

@@ -20,12 +20,11 @@ import meteordevelopment.meteorclient.systems.modules.Modules;
@Mixin(MineProcess.class) @Mixin(MineProcess.class)
public class MineProcessMixin { public class MineProcessMixin {
private static final String RESCAN_METHOD = "Lbaritone/process/MineProcess;a(Ljava/util/List;Lbaritone/pathing/movement/CalculationContext;)V";
@Shadow(remap = false)
@Shadow
private List<BlockPos> a; // knownOreLocations private List<BlockPos> 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<BlockPos> already, CalculationContext context, CallbackInfo ci) { private void onRescan(List<BlockPos> already, CalculationContext context, CallbackInfo ci) {
OreSim oreSim = Modules.get().get(OreSim.class); OreSim oreSim = Modules.get().get(OreSim.class);
if (oreSim == null || !oreSim.baritone()) if (oreSim == null || !oreSim.baritone())
@@ -34,7 +33,8 @@ public class MineProcessMixin {
ci.cancel(); 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) { private static boolean onPruneStream(BlockOptionalMetaLookup instance, BlockState blockState) {
OreSim oreSim = Modules.get().get(OreSim.class); OreSim oreSim = Modules.get().get(OreSim.class);
if (oreSim == null || !oreSim.baritone()) if (oreSim == null || !oreSim.baritone())

2
src/main/java/anticope/rejects/mixin/meteor/GuiRendererAccessor.java
View File

@@ -7,6 +7,6 @@ import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(GuiRenderer.class) @Mixin(GuiRenderer.class)
public interface GuiRendererAccessor { public interface GuiRendererAccessor {
@Accessor("r") @Accessor(value = "r", remap = false)
Renderer2D getRenderer2D(); Renderer2D getRenderer2D();
} }

2
src/main/java/anticope/rejects/mixin/meteor/modules/NoRenderAccessor.java
View File

@@ -7,6 +7,6 @@ import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(NoRender.class) @Mixin(NoRender.class)
public interface NoRenderAccessor { public interface NoRenderAccessor {
@Accessor("sgOverlay") @Accessor(value = "sgOverlay", remap = false)
SettingGroup getSgOverlay(); SettingGroup getSgOverlay();
} }