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

fix baritone in oresim and remove autoez

Browse Source
This commit is contained in:
C10udburst
2022-03-06 15:04:07 +01:00
parent aeb0964da1
commit aae6d16899
5 changed files with 20 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,12 +5,15 @@ import java.util.List;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.Redirect;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.At;
import net.minecraft.block.BlockState;
import net.minecraft.util.math.BlockPos;
import anticope.rejects.modules.OreSim;
import baritone.api.utils.BlockOptionalMetaLookup;
import baritone.pathing.movement.CalculationContext;
import baritone.process.MineProcess;
import meteordevelopment.meteorclient.systems.modules.Modules;
@@ -20,13 +23,22 @@ public class MineProcessMixin {
private static final String RESCAN_METHOD = "Lbaritone/process/MineProcess;a(Ljava/util/List;Lbaritone/pathing/movement/CalculationContext;)V";
@Shadow
private List<BlockPos> a; //knownOreLocations
private List<BlockPos> a; // knownOreLocations
@Inject(method = RESCAN_METHOD, at=@At("HEAD"), cancellable = true, remap = false)
@Inject(method = RESCAN_METHOD, at = @At("HEAD"), cancellable = true, remap = false)
private void onRescan(List<BlockPos> already, CalculationContext context, CallbackInfo ci) {
OreSim oreSim = Modules.get().get(OreSim.class);
if (oreSim == null || !oreSim.baritone.get()) return;
if (oreSim == null || !oreSim.baritone())
return;
a = oreSim.oreGoals;
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)
private static boolean onPruneStream(BlockOptionalMetaLookup instance, BlockState blockState) {
OreSim oreSim = Modules.get().get(OreSim.class);
if (oreSim == null || !oreSim.baritone())
return instance.has(blockState);
return !blockState.isAir();
}
}