Compare commits
19 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 606e9bf97c | |||
| 47ae75a9d6 | |||
| b3ba129fc5 | |||
| 746b7b5c88 | |||
| db2f6ec78d | |||
| 96bcabff8b | |||
| 0a1fe857dc | |||
| 49aaa55172 | |||
| e03e251541 | |||
| f5380881f4 | |||
| a022778fb6 | |||
| 8543a99fba | |||
| 997888fe85 | |||
| 2d2030ecdf | |||
| a3dec3a47e | |||
| eb348120d9 | |||
| 27cb708d40 | |||
| 36bbe430d4 | |||
| 80952e091d |
+3
-3
@@ -16,7 +16,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
group 'baritone'
|
group 'baritone'
|
||||||
version '1.4.4'
|
version '1.5.1'
|
||||||
|
|
||||||
buildscript {
|
buildscript {
|
||||||
repositories {
|
repositories {
|
||||||
@@ -82,7 +82,7 @@ task sourceJar(type: Jar, dependsOn: classes) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
minecraft {
|
minecraft {
|
||||||
mappings channel: 'snapshot', version: '20190814-1.14.3'
|
mappings channel: 'snapshot', version: '20200213-1.15.1'
|
||||||
reobfMappings 'notch'
|
reobfMappings 'notch'
|
||||||
|
|
||||||
runs {
|
runs {
|
||||||
@@ -138,7 +138,7 @@ repositories {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
minecraft 'com.github.ImpactDevelopment:Vanilla:1.14.4'
|
minecraft 'com.github.ImpactDevelopment:Vanilla:1.15.2'
|
||||||
|
|
||||||
runtime launchCompile('net.minecraft:launchwrapper:1.12') {
|
runtime launchCompile('net.minecraft:launchwrapper:1.12') {
|
||||||
exclude module: 'lwjgl'
|
exclude module: 'lwjgl'
|
||||||
|
|||||||
@@ -30,8 +30,8 @@ import java.awt.*;
|
|||||||
import java.lang.reflect.Field;
|
import java.lang.reflect.Field;
|
||||||
import java.lang.reflect.ParameterizedType;
|
import java.lang.reflect.ParameterizedType;
|
||||||
import java.lang.reflect.Type;
|
import java.lang.reflect.Type;
|
||||||
import java.util.*;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.*;
|
||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -958,6 +958,11 @@ public final class Settings {
|
|||||||
*/
|
*/
|
||||||
public final Setting<Consumer<ITextComponent>> logger = new Setting<>(Minecraft.getInstance().ingameGUI.getChatGUI()::printChatMessage);
|
public final Setting<Consumer<ITextComponent>> logger = new Setting<>(Minecraft.getInstance().ingameGUI.getChatGUI()::printChatMessage);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Print out ALL command exceptions as a stack trace to stdout, even simple syntax errors
|
||||||
|
*/
|
||||||
|
public final Setting<Boolean> verboseCommandExceptions = new Setting<>(false);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The size of the box that is rendered when the current goal is a GoalYLevel
|
* The size of the box that is rendered when the current goal is a GoalYLevel
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -17,6 +17,9 @@
|
|||||||
|
|
||||||
package baritone.api.event.events;
|
package baritone.api.event.events;
|
||||||
|
|
||||||
|
import com.mojang.blaze3d.matrix.MatrixStack;
|
||||||
|
import net.minecraft.client.renderer.Matrix4f;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Brady
|
* @author Brady
|
||||||
* @since 8/5/2018
|
* @since 8/5/2018
|
||||||
@@ -28,8 +31,13 @@ public final class RenderEvent {
|
|||||||
*/
|
*/
|
||||||
private final float partialTicks;
|
private final float partialTicks;
|
||||||
|
|
||||||
public RenderEvent(float partialTicks) {
|
private final Matrix4f projectionMatrix;
|
||||||
|
private final MatrixStack modelViewStack;
|
||||||
|
|
||||||
|
public RenderEvent(float partialTicks, MatrixStack modelViewStack, Matrix4f projectionMatrix) {
|
||||||
this.partialTicks = partialTicks;
|
this.partialTicks = partialTicks;
|
||||||
|
this.modelViewStack = modelViewStack;
|
||||||
|
this.projectionMatrix = projectionMatrix;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -38,4 +46,12 @@ public final class RenderEvent {
|
|||||||
public final float getPartialTicks() {
|
public final float getPartialTicks() {
|
||||||
return this.partialTicks;
|
return this.partialTicks;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public MatrixStack getModelViewStack() {
|
||||||
|
return this.modelViewStack;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Matrix4f getProjectionMatrix() {
|
||||||
|
return this.projectionMatrix;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,14 +20,14 @@ package baritone.api.utils;
|
|||||||
import baritone.api.utils.accessor.IItemStack;
|
import baritone.api.utils.accessor.IItemStack;
|
||||||
import com.google.common.collect.ImmutableSet;
|
import com.google.common.collect.ImmutableSet;
|
||||||
import io.netty.util.concurrent.ThreadPerTaskExecutor;
|
import io.netty.util.concurrent.ThreadPerTaskExecutor;
|
||||||
import net.minecraft.block.*;
|
import net.minecraft.block.Block;
|
||||||
|
import net.minecraft.block.BlockState;
|
||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.resources.*;
|
import net.minecraft.resources.*;
|
||||||
import net.minecraft.util.ResourceLocation;
|
import net.minecraft.util.ResourceLocation;
|
||||||
import net.minecraft.util.Unit;
|
import net.minecraft.util.Unit;
|
||||||
import net.minecraft.util.math.BlockPos;
|
import net.minecraft.util.math.BlockPos;
|
||||||
import net.minecraft.util.registry.Registry;
|
|
||||||
import net.minecraft.world.storage.loot.*;
|
import net.minecraft.world.storage.loot.*;
|
||||||
|
|
||||||
import javax.annotation.Nonnull;
|
import javax.annotation.Nonnull;
|
||||||
@@ -46,6 +46,7 @@ public final class BlockOptionalMeta {
|
|||||||
private final ImmutableSet<Integer> stackHashes;
|
private final ImmutableSet<Integer> stackHashes;
|
||||||
private static final Pattern pattern = Pattern.compile("^(.+?)(?::(\\d+))?$");
|
private static final Pattern pattern = Pattern.compile("^(.+?)(?::(\\d+))?$");
|
||||||
private static LootTableManager manager;
|
private static LootTableManager manager;
|
||||||
|
private static LootPredicateManager predicate = new LootPredicateManager();
|
||||||
private static Map<Block, List<Item>> drops = new HashMap<>();
|
private static Map<Block, List<Item>> drops = new HashMap<>();
|
||||||
|
|
||||||
public BlockOptionalMeta(@Nonnull Block block) {
|
public BlockOptionalMeta(@Nonnull Block block) {
|
||||||
@@ -64,13 +65,7 @@ public final class BlockOptionalMeta {
|
|||||||
|
|
||||||
MatchResult matchResult = matcher.toMatchResult();
|
MatchResult matchResult = matcher.toMatchResult();
|
||||||
|
|
||||||
ResourceLocation id = new ResourceLocation(matchResult.group(1));
|
block = BlockUtils.stringToBlockRequired(matchResult.group(1));
|
||||||
|
|
||||||
if (!Registry.BLOCK.containsKey(id)) {
|
|
||||||
throw new IllegalArgumentException("Invalid block ID");
|
|
||||||
}
|
|
||||||
|
|
||||||
block = Registry.BLOCK.getValue(id).orElse(null);
|
|
||||||
blockstates = getStates(block);
|
blockstates = getStates(block);
|
||||||
stateHashes = getStateHashes(blockstates);
|
stateHashes = getStateHashes(blockstates);
|
||||||
stackHashes = getStackHashes(blockstates);
|
stackHashes = getStackHashes(blockstates);
|
||||||
@@ -143,7 +138,7 @@ public final class BlockOptionalMeta {
|
|||||||
rpl.reloadPacksFromFinders();
|
rpl.reloadPacksFromFinders();
|
||||||
IResourcePack thePack = ((ResourcePackInfo) rpl.getAllPacks().iterator().next()).getResourcePack();
|
IResourcePack thePack = ((ResourcePackInfo) rpl.getAllPacks().iterator().next()).getResourcePack();
|
||||||
IReloadableResourceManager resourceManager = new SimpleReloadableResourceManager(ResourcePackType.SERVER_DATA, null);
|
IReloadableResourceManager resourceManager = new SimpleReloadableResourceManager(ResourcePackType.SERVER_DATA, null);
|
||||||
manager = new LootTableManager();
|
manager = new LootTableManager(predicate);
|
||||||
resourceManager.addReloadListener(manager);
|
resourceManager.addReloadListener(manager);
|
||||||
try {
|
try {
|
||||||
resourceManager.reloadResourcesAndThen(new ThreadPerTaskExecutor(Thread::new), new ThreadPerTaskExecutor(Thread::new), Collections.singletonList(thePack), CompletableFuture.completedFuture(Unit.INSTANCE)).get();
|
resourceManager.reloadResourcesAndThen(new ThreadPerTaskExecutor(Thread::new), new ThreadPerTaskExecutor(Thread::new), Collections.singletonList(thePack), CompletableFuture.completedFuture(Unit.INSTANCE)).get();
|
||||||
@@ -154,6 +149,10 @@ public final class BlockOptionalMeta {
|
|||||||
return manager;
|
return manager;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static LootPredicateManager getPredicateManager() {
|
||||||
|
return predicate;
|
||||||
|
}
|
||||||
|
|
||||||
private static synchronized List<Item> drops(Block b) {
|
private static synchronized List<Item> drops(Block b) {
|
||||||
return drops.computeIfAbsent(b, block -> {
|
return drops.computeIfAbsent(b, block -> {
|
||||||
ResourceLocation lootTableLocation = block.getLootTable();
|
ResourceLocation lootTableLocation = block.getLootTable();
|
||||||
|
|||||||
@@ -56,7 +56,7 @@ public interface IPlayerContext {
|
|||||||
|
|
||||||
default BetterBlockPos playerFeet() {
|
default BetterBlockPos playerFeet() {
|
||||||
// TODO find a better way to deal with soul sand!!!!!
|
// TODO find a better way to deal with soul sand!!!!!
|
||||||
BetterBlockPos feet = new BetterBlockPos(player().posX, player().posY + 0.1251, player().posZ);
|
BetterBlockPos feet = new BetterBlockPos(player().getPositionVec().x, player().getPositionVec().y + 0.1251, player().getPositionVec().z);
|
||||||
|
|
||||||
// sometimes when calling this from another thread or while world is null, it'll throw a NullPointerException
|
// sometimes when calling this from another thread or while world is null, it'll throw a NullPointerException
|
||||||
// that causes the game to immediately crash
|
// that causes the game to immediately crash
|
||||||
@@ -76,11 +76,11 @@ public interface IPlayerContext {
|
|||||||
}
|
}
|
||||||
|
|
||||||
default Vec3d playerFeetAsVec() {
|
default Vec3d playerFeetAsVec() {
|
||||||
return new Vec3d(player().posX, player().posY, player().posZ);
|
return new Vec3d(player().getPositionVec().x, player().getPositionVec().y, player().getPositionVec().z);
|
||||||
}
|
}
|
||||||
|
|
||||||
default Vec3d playerHead() {
|
default Vec3d playerHead() {
|
||||||
return new Vec3d(player().posX, player().posY + player().getEyeHeight(), player().posZ);
|
return new Vec3d(player().getPositionVec().x, player().getPositionVec().y + player().getEyeHeight(), player().getPositionVec().z);
|
||||||
}
|
}
|
||||||
|
|
||||||
default Rotation playerRotations() {
|
default Rotation playerRotations() {
|
||||||
|
|||||||
@@ -105,7 +105,7 @@ public final class VecUtils {
|
|||||||
* @see #getBlockPosCenter(BlockPos)
|
* @see #getBlockPosCenter(BlockPos)
|
||||||
*/
|
*/
|
||||||
public static double entityDistanceToCenter(Entity entity, BlockPos pos) {
|
public static double entityDistanceToCenter(Entity entity, BlockPos pos) {
|
||||||
return distanceToCenter(pos, entity.posX, entity.posY, entity.posZ);
|
return distanceToCenter(pos, entity.getPositionVec().x, entity.getPositionVec().y, entity.getPositionVec().z);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -118,6 +118,6 @@ public final class VecUtils {
|
|||||||
* @see #getBlockPosCenter(BlockPos)
|
* @see #getBlockPosCenter(BlockPos)
|
||||||
*/
|
*/
|
||||||
public static double entityFlatDistanceToCenter(Entity entity, BlockPos pos) {
|
public static double entityFlatDistanceToCenter(Entity entity, BlockPos pos) {
|
||||||
return distanceToCenter(pos, entity.posX, pos.getY() + 0.5, entity.posZ);
|
return distanceToCenter(pos, entity.getPositionVec().x, pos.getY() + 0.5, entity.getPositionVec().z);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+18
-17
@@ -22,7 +22,7 @@ import baritone.api.event.events.TabCompleteEvent;
|
|||||||
import com.mojang.brigadier.context.StringRange;
|
import com.mojang.brigadier.context.StringRange;
|
||||||
import com.mojang.brigadier.suggestion.Suggestion;
|
import com.mojang.brigadier.suggestion.Suggestion;
|
||||||
import com.mojang.brigadier.suggestion.Suggestions;
|
import com.mojang.brigadier.suggestion.Suggestions;
|
||||||
import net.minecraft.client.gui.screen.ChatScreen;
|
import net.minecraft.client.gui.CommandSuggestionHelper;
|
||||||
import net.minecraft.client.gui.widget.TextFieldWidget;
|
import net.minecraft.client.gui.widget.TextFieldWidget;
|
||||||
import org.spongepowered.asm.mixin.Final;
|
import org.spongepowered.asm.mixin.Final;
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
@@ -40,27 +40,28 @@ import java.util.stream.Stream;
|
|||||||
* @author Brady
|
* @author Brady
|
||||||
* @since 10/9/2019
|
* @since 10/9/2019
|
||||||
*/
|
*/
|
||||||
@Mixin(ChatScreen.class)
|
@Mixin(CommandSuggestionHelper.class)
|
||||||
public class MixinChatScreen {
|
public class MixinCommandSuggestionHelper {
|
||||||
|
|
||||||
@Shadow
|
|
||||||
protected TextFieldWidget inputField;
|
|
||||||
|
|
||||||
@Shadow
|
@Shadow
|
||||||
@Final
|
@Final
|
||||||
protected List<String> commandUsage;
|
private TextFieldWidget field_228095_d_;
|
||||||
|
|
||||||
@Shadow
|
@Shadow
|
||||||
private CompletableFuture<Suggestions> pendingSuggestions;
|
@Final
|
||||||
|
private List<String> field_228103_l_;
|
||||||
|
|
||||||
|
@Shadow
|
||||||
|
private CompletableFuture<Suggestions> field_228107_p_;
|
||||||
|
|
||||||
@Inject(
|
@Inject(
|
||||||
method = "updateSuggestion",
|
method = "func_228111_a_",
|
||||||
at = @At("HEAD"),
|
at = @At("HEAD"),
|
||||||
cancellable = true
|
cancellable = true
|
||||||
)
|
)
|
||||||
private void preUpdateSuggestion(CallbackInfo ci) {
|
private void preUpdateSuggestion(CallbackInfo ci) {
|
||||||
// Anything that is present in the input text before the cursor position
|
// Anything that is present in the input text before the cursor position
|
||||||
String prefix = this.inputField.getText().substring(0, Math.min(this.inputField.getText().length(), this.inputField.getCursorPosition()));
|
String prefix = this.field_228095_d_.getText().substring(0, Math.min(this.field_228095_d_.getText().length(), this.field_228095_d_.getCursorPosition()));
|
||||||
|
|
||||||
TabCompleteEvent event = new TabCompleteEvent(prefix);
|
TabCompleteEvent event = new TabCompleteEvent(prefix);
|
||||||
BaritoneAPI.getProvider().getPrimaryBaritone().getGameEventHandler().onPreTabComplete(event);
|
BaritoneAPI.getProvider().getPrimaryBaritone().getGameEventHandler().onPreTabComplete(event);
|
||||||
@@ -74,14 +75,14 @@ public class MixinChatScreen {
|
|||||||
ci.cancel();
|
ci.cancel();
|
||||||
|
|
||||||
// TODO: Support populating the command usage
|
// TODO: Support populating the command usage
|
||||||
this.commandUsage.clear();
|
this.field_228103_l_.clear();
|
||||||
|
|
||||||
if (event.completions.length == 0) {
|
if (event.completions.length == 0) {
|
||||||
this.pendingSuggestions = Suggestions.empty();
|
this.field_228107_p_ = Suggestions.empty();
|
||||||
} else {
|
} else {
|
||||||
int offset = this.inputField.getText().endsWith(" ")
|
int offset = this.field_228095_d_.getText().endsWith(" ")
|
||||||
? this.inputField.getCursorPosition()
|
? this.field_228095_d_.getCursorPosition()
|
||||||
: this.inputField.getText().lastIndexOf(" ") + 1; // If there is no space this is still 0 haha yes
|
: this.field_228095_d_.getText().lastIndexOf(" ") + 1; // If there is no space this is still 0 haha yes
|
||||||
|
|
||||||
List<Suggestion> suggestionList = Stream.of(event.completions)
|
List<Suggestion> suggestionList = Stream.of(event.completions)
|
||||||
.map(s -> new Suggestion(StringRange.between(offset, offset + s.length()), s))
|
.map(s -> new Suggestion(StringRange.between(offset, offset + s.length()), s))
|
||||||
@@ -91,8 +92,8 @@ public class MixinChatScreen {
|
|||||||
StringRange.between(offset, offset + suggestionList.stream().mapToInt(s -> s.getText().length()).max().orElse(0)),
|
StringRange.between(offset, offset + suggestionList.stream().mapToInt(s -> s.getText().length()).max().orElse(0)),
|
||||||
suggestionList);
|
suggestionList);
|
||||||
|
|
||||||
this.pendingSuggestions = new CompletableFuture<>();
|
this.field_228107_p_ = new CompletableFuture<>();
|
||||||
this.pendingSuggestions.complete(suggestions);
|
this.field_228107_p_.complete(suggestions);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -20,29 +20,23 @@ package baritone.launch.mixins;
|
|||||||
import baritone.utils.accessor.IEntityRenderManager;
|
import baritone.utils.accessor.IEntityRenderManager;
|
||||||
import net.minecraft.client.renderer.entity.EntityRendererManager;
|
import net.minecraft.client.renderer.entity.EntityRendererManager;
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
import org.spongepowered.asm.mixin.Shadow;
|
|
||||||
|
|
||||||
@Mixin(EntityRendererManager.class)
|
@Mixin(EntityRendererManager.class)
|
||||||
public class MixinEntityRenderManager implements IEntityRenderManager {
|
public class MixinEntityRenderManager implements IEntityRenderManager {
|
||||||
@Shadow
|
|
||||||
private double renderPosX;
|
|
||||||
@Shadow
|
|
||||||
private double renderPosY;
|
|
||||||
@Shadow
|
|
||||||
private double renderPosZ;
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public double renderPosX() {
|
public double renderPosX() {
|
||||||
return renderPosX;
|
return ((EntityRendererManager) (Object) this).info.getProjectedView().x;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public double renderPosY() {
|
public double renderPosY() {
|
||||||
return renderPosY;
|
return ((EntityRendererManager) (Object) this).info.getProjectedView().y;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public double renderPosZ() {
|
public double renderPosZ() {
|
||||||
return renderPosZ;
|
return ((EntityRendererManager) (Object) this).info.getProjectedView().z;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,6 +21,7 @@ import baritone.api.utils.BlockOptionalMeta;
|
|||||||
import net.minecraft.server.MinecraftServer;
|
import net.minecraft.server.MinecraftServer;
|
||||||
import net.minecraft.world.server.ServerWorld;
|
import net.minecraft.world.server.ServerWorld;
|
||||||
import net.minecraft.world.storage.loot.LootContext;
|
import net.minecraft.world.storage.loot.LootContext;
|
||||||
|
import net.minecraft.world.storage.loot.LootPredicateManager;
|
||||||
import net.minecraft.world.storage.loot.LootTableManager;
|
import net.minecraft.world.storage.loot.LootTableManager;
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
import org.spongepowered.asm.mixin.injection.At;
|
||||||
@@ -56,4 +57,18 @@ public class MixinLootContext {
|
|||||||
}
|
}
|
||||||
return server.getLootTableManager();
|
return server.getLootTableManager();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Redirect(
|
||||||
|
method = "build",
|
||||||
|
at = @At(
|
||||||
|
value = "INVOKE",
|
||||||
|
target = "net/minecraft/server/MinecraftServer.func_229736_aP_()Lnet/minecraft/world/storage/loot/LootPredicateManager;"
|
||||||
|
)
|
||||||
|
)
|
||||||
|
private LootPredicateManager getLootPredicateManager(MinecraftServer server) {
|
||||||
|
if (server == null) {
|
||||||
|
return BlockOptionalMeta.getPredicateManager();
|
||||||
|
}
|
||||||
|
return server.func_229736_aP_();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,7 +19,6 @@ package baritone.launch.mixins;
|
|||||||
|
|
||||||
import baritone.api.BaritoneAPI;
|
import baritone.api.BaritoneAPI;
|
||||||
import baritone.api.IBaritone;
|
import baritone.api.IBaritone;
|
||||||
import baritone.api.event.events.BlockInteractEvent;
|
|
||||||
import baritone.api.event.events.TickEvent;
|
import baritone.api.event.events.TickEvent;
|
||||||
import baritone.api.event.events.WorldEvent;
|
import baritone.api.event.events.WorldEvent;
|
||||||
import baritone.api.event.events.type.EventState;
|
import baritone.api.event.events.type.EventState;
|
||||||
@@ -28,10 +27,6 @@ import net.minecraft.client.Minecraft;
|
|||||||
import net.minecraft.client.entity.player.ClientPlayerEntity;
|
import net.minecraft.client.entity.player.ClientPlayerEntity;
|
||||||
import net.minecraft.client.gui.screen.Screen;
|
import net.minecraft.client.gui.screen.Screen;
|
||||||
import net.minecraft.client.world.ClientWorld;
|
import net.minecraft.client.world.ClientWorld;
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
import net.minecraft.util.ActionResultType;
|
|
||||||
import net.minecraft.util.Hand;
|
|
||||||
import net.minecraft.util.math.BlockRayTraceResult;
|
|
||||||
import org.spongepowered.asm.lib.Opcodes;
|
import org.spongepowered.asm.lib.Opcodes;
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
import org.spongepowered.asm.mixin.Shadow;
|
import org.spongepowered.asm.mixin.Shadow;
|
||||||
@@ -39,7 +34,6 @@ import org.spongepowered.asm.mixin.injection.At;
|
|||||||
import org.spongepowered.asm.mixin.injection.Inject;
|
import org.spongepowered.asm.mixin.injection.Inject;
|
||||||
import org.spongepowered.asm.mixin.injection.Redirect;
|
import org.spongepowered.asm.mixin.injection.Redirect;
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||||
import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
|
|
||||||
|
|
||||||
import java.util.function.BiFunction;
|
import java.util.function.BiFunction;
|
||||||
|
|
||||||
@@ -56,7 +50,7 @@ public class MixinMinecraft {
|
|||||||
public ClientWorld world;
|
public ClientWorld world;
|
||||||
|
|
||||||
@Inject(
|
@Inject(
|
||||||
method = "init",
|
method = "<init>",
|
||||||
at = @At("RETURN")
|
at = @At("RETURN")
|
||||||
)
|
)
|
||||||
private void postInit(CallbackInfo ci) {
|
private void postInit(CallbackInfo ci) {
|
||||||
@@ -64,11 +58,8 @@ public class MixinMinecraft {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Inject(
|
@Inject(
|
||||||
method = "init",
|
method = "startTimerHackThread",
|
||||||
at = @At(
|
at = @At("HEAD")
|
||||||
value = "INVOKE",
|
|
||||||
target = "net/minecraft/client/Minecraft.startTimerHackThread()V"
|
|
||||||
)
|
|
||||||
)
|
)
|
||||||
private void preInit(CallbackInfo ci) {
|
private void preInit(CallbackInfo ci) {
|
||||||
BaritoneAutoTest.INSTANCE.onPreInit();
|
BaritoneAutoTest.INSTANCE.onPreInit();
|
||||||
@@ -148,16 +139,24 @@ public class MixinMinecraft {
|
|||||||
return (BaritoneAPI.getProvider().getPrimaryBaritone().getPathingBehavior().getCurrent() != null && player != null) || screen.passEvents;
|
return (BaritoneAPI.getProvider().getPrimaryBaritone().getPathingBehavior().getCurrent() != null && player != null) || screen.passEvents;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Inject(
|
// TODO
|
||||||
|
// FIXME
|
||||||
|
// bradyfix
|
||||||
|
// i cant mixin
|
||||||
|
// lol
|
||||||
|
// https://discordapp.com/channels/208753003996512258/503692253881958400/674760939681349652
|
||||||
|
// https://discordapp.com/channels/208753003996512258/503692253881958400/674756457966862376
|
||||||
|
/*@Inject(
|
||||||
method = "rightClickMouse",
|
method = "rightClickMouse",
|
||||||
at = @At(
|
at = @At(
|
||||||
value = "INVOKE",
|
value = "INVOKE",
|
||||||
target = "net/minecraft/client/entity/player/ClientPlayerEntity.swingArm(Lnet/minecraft/util/Hand;)V"
|
target = "net/minecraft/client/entity/player/ClientPlayerEntity.swingArm(Lnet/minecraft/util/Hand;)V",
|
||||||
|
ordinal = 1
|
||||||
),
|
),
|
||||||
locals = LocalCapture.CAPTURE_FAILHARD
|
locals = LocalCapture.CAPTURE_FAILHARD
|
||||||
)
|
)
|
||||||
private void onBlockUse(CallbackInfo ci, Hand var1[], int var2, int var3, Hand enumhand, ItemStack itemstack, BlockRayTraceResult raytrace, int i, ActionResultType enumactionresult) {
|
private void onBlockUse(CallbackInfo ci, Hand var1[], int var2, int var3, Hand enumhand, ItemStack itemstack, EntityRayTraceResult rt, Entity ent, ActionResultType art, BlockRayTraceResult raytrace, int i, ActionResultType enumactionresult) {
|
||||||
// rightClickMouse is only for the main player
|
// rightClickMouse is only for the main player
|
||||||
BaritoneAPI.getProvider().getPrimaryBaritone().getGameEventHandler().onBlockInteract(new BlockInteractEvent(raytrace.getPos(), BlockInteractEvent.Type.USE));
|
BaritoneAPI.getProvider().getPrimaryBaritone().getGameEventHandler().onBlockInteract(new BlockInteractEvent(raytrace.getPos(), BlockInteractEvent.Type.USE));
|
||||||
}
|
}*/
|
||||||
}
|
}
|
||||||
|
|||||||
+6
-6
@@ -18,22 +18,22 @@
|
|||||||
package baritone.launch.mixins;
|
package baritone.launch.mixins;
|
||||||
|
|
||||||
import baritone.utils.accessor.IBitArray;
|
import baritone.utils.accessor.IBitArray;
|
||||||
import baritone.utils.accessor.IBlockStateContainer;
|
import baritone.utils.accessor.IPalettedContainer;
|
||||||
import net.minecraft.block.BlockState;
|
import net.minecraft.block.BlockState;
|
||||||
import net.minecraft.util.BitArray;
|
import net.minecraft.util.BitArray;
|
||||||
import net.minecraft.world.chunk.BlockStateContainer;
|
import net.minecraft.util.palette.IPalette;
|
||||||
import net.minecraft.world.chunk.IBlockStatePalette;
|
import net.minecraft.util.palette.PalettedContainer;
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
import org.spongepowered.asm.mixin.Shadow;
|
import org.spongepowered.asm.mixin.Shadow;
|
||||||
|
|
||||||
@Mixin(BlockStateContainer.class)
|
@Mixin(PalettedContainer.class)
|
||||||
public abstract class MixinBlockStateContainer implements IBlockStateContainer {
|
public abstract class MixinPalettedContainer implements IPalettedContainer {
|
||||||
|
|
||||||
@Shadow
|
@Shadow
|
||||||
protected BitArray storage;
|
protected BitArray storage;
|
||||||
|
|
||||||
@Shadow
|
@Shadow
|
||||||
protected IBlockStatePalette<BlockState> palette;
|
protected IPalette<BlockState> palette;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public BlockState getAtPalette(int index) {
|
public BlockState getAtPalette(int index) {
|
||||||
+14
-11
@@ -20,26 +20,29 @@ package baritone.launch.mixins;
|
|||||||
import baritone.api.BaritoneAPI;
|
import baritone.api.BaritoneAPI;
|
||||||
import baritone.api.IBaritone;
|
import baritone.api.IBaritone;
|
||||||
import baritone.api.event.events.RenderEvent;
|
import baritone.api.event.events.RenderEvent;
|
||||||
import net.minecraft.client.renderer.GameRenderer;
|
import com.mojang.blaze3d.matrix.MatrixStack;
|
||||||
|
import net.minecraft.client.renderer.*;
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
import org.spongepowered.asm.mixin.injection.At;
|
||||||
import org.spongepowered.asm.mixin.injection.Inject;
|
import org.spongepowered.asm.mixin.injection.Inject;
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||||
|
import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
|
||||||
|
|
||||||
@Mixin(GameRenderer.class)
|
/**
|
||||||
public class MixinGameRenderer {
|
* @author Brady
|
||||||
|
* @since 2/13/2020
|
||||||
|
*/
|
||||||
|
@Mixin(WorldRenderer.class)
|
||||||
|
public class MixinWorldRenderer {
|
||||||
|
|
||||||
@Inject(
|
@Inject(
|
||||||
method = "updateCameraAndRender(FJ)V",
|
method = "updateCameraAndRender",
|
||||||
at = @At(
|
at = @At("RETURN"),
|
||||||
value = "INVOKE_STRING",
|
locals = LocalCapture.CAPTURE_FAILSOFT
|
||||||
target = "Lnet/minecraft/profiler/IProfiler;endStartSection(Ljava/lang/String;)V",
|
|
||||||
args = {"ldc=hand"}
|
|
||||||
)
|
|
||||||
)
|
)
|
||||||
private void renderWorldPass(float partialTicks, long finishTimeNano, CallbackInfo ci) {
|
private void onStartHand(MatrixStack matrixStackIn, float partialTicks, long finishTimeNano, boolean drawBlockOutline, ActiveRenderInfo activeRenderInfoIn, GameRenderer gameRendererIn, LightTexture lightmapIn, Matrix4f projectionIn, CallbackInfo ci) {
|
||||||
for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
|
for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) {
|
||||||
ibaritone.getGameEventHandler().onRenderPass(new RenderEvent(partialTicks));
|
ibaritone.getGameEventHandler().onRenderPass(new RenderEvent(partialTicks, matrixStackIn, projectionIn));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -9,21 +9,21 @@
|
|||||||
},
|
},
|
||||||
"client": [
|
"client": [
|
||||||
"MixinBitArray",
|
"MixinBitArray",
|
||||||
"MixinBlockStateContainer",
|
|
||||||
"MixinChatScreen",
|
|
||||||
"MixinChunkArray",
|
"MixinChunkArray",
|
||||||
"MixinClientChunkProvider",
|
"MixinClientChunkProvider",
|
||||||
"MixinClientPlayerEntity",
|
"MixinClientPlayerEntity",
|
||||||
"MixinClientPlayNetHandler",
|
"MixinClientPlayNetHandler",
|
||||||
|
"MixinCommandSuggestionHelper",
|
||||||
"MixinEntity",
|
"MixinEntity",
|
||||||
"MixinEntityRenderManager",
|
"MixinEntityRenderManager",
|
||||||
"MixinGameRenderer",
|
|
||||||
"MixinItemStack",
|
"MixinItemStack",
|
||||||
"MixinLivingEntity",
|
"MixinLivingEntity",
|
||||||
"MixinLootContext",
|
"MixinLootContext",
|
||||||
"MixinMinecraft",
|
"MixinMinecraft",
|
||||||
"MixinNetworkManager",
|
"MixinNetworkManager",
|
||||||
|
"MixinPalettedContainer",
|
||||||
"MixinPlayerController",
|
"MixinPlayerController",
|
||||||
"MixinScreen"
|
"MixinScreen",
|
||||||
|
"MixinWorldRenderer"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@@ -137,7 +137,7 @@ public final class InventoryBehavior extends Behavior {
|
|||||||
|
|
||||||
public boolean selectThrowawayForLocation(boolean select, int x, int y, int z) {
|
public boolean selectThrowawayForLocation(boolean select, int x, int y, int z) {
|
||||||
BlockState maybe = baritone.getBuilderProcess().placeAt(x, y, z, baritone.bsi.get0(x, y, z));
|
BlockState maybe = baritone.getBuilderProcess().placeAt(x, y, z, baritone.bsi.get0(x, y, z));
|
||||||
if (maybe != null && throwaway(select, stack -> stack.getItem() instanceof BlockItem && maybe.equals(((BlockItem) stack.getItem()).getBlock().getStateForPlacement(new BlockItemUseContext(new ItemUseContext(ctx.world(), ctx.player(), Hand.MAIN_HAND, stack, new BlockRayTraceResult(new Vec3d(ctx.player().posX, ctx.player().posY, ctx.player().posZ), Direction.UP, ctx.playerFeet(), false)) {}))))) {
|
if (maybe != null && throwaway(select, stack -> stack.getItem() instanceof BlockItem && maybe.equals(((BlockItem) stack.getItem()).getBlock().getStateForPlacement(new BlockItemUseContext(new ItemUseContext(ctx.world(), ctx.player(), Hand.MAIN_HAND, stack, new BlockRayTraceResult(new Vec3d(ctx.player().getPositionVec().x, ctx.player().getPositionVec().y, ctx.player().getPositionVec().z), Direction.UP, ctx.playerFeet(), false)) {}))))) {
|
||||||
return true; // gotem
|
return true; // gotem
|
||||||
}
|
}
|
||||||
if (maybe != null && throwaway(select, stack -> stack.getItem() instanceof BlockItem && ((BlockItem) stack.getItem()).getBlock().equals(maybe.getBlock()))) {
|
if (maybe != null && throwaway(select, stack -> stack.getItem() instanceof BlockItem && ((BlockItem) stack.getItem()).getBlock().equals(maybe.getBlock()))) {
|
||||||
|
|||||||
@@ -381,8 +381,8 @@ public final class PathingBehavior extends Behavior implements IPathingBehavior,
|
|||||||
BetterBlockPos feet = ctx.playerFeet();
|
BetterBlockPos feet = ctx.playerFeet();
|
||||||
if (!MovementHelper.canWalkOn(ctx, feet.down())) {
|
if (!MovementHelper.canWalkOn(ctx, feet.down())) {
|
||||||
if (ctx.player().onGround) {
|
if (ctx.player().onGround) {
|
||||||
double playerX = ctx.player().posX;
|
double playerX = ctx.player().getPositionVec().x;
|
||||||
double playerZ = ctx.player().posZ;
|
double playerZ = ctx.player().getPositionVec().z;
|
||||||
ArrayList<BetterBlockPos> closest = new ArrayList<>();
|
ArrayList<BetterBlockPos> closest = new ArrayList<>();
|
||||||
for (int dx = -1; dx <= 1; dx++) {
|
for (int dx = -1; dx <= 1; dx++) {
|
||||||
for (int dz = -1; dz <= 1; dz++) {
|
for (int dz = -1; dz <= 1; dz++) {
|
||||||
|
|||||||
+2
-2
@@ -23,7 +23,7 @@ import baritone.utils.pathing.PathingBlockType;
|
|||||||
import net.minecraft.block.*;
|
import net.minecraft.block.*;
|
||||||
import net.minecraft.util.math.BlockPos;
|
import net.minecraft.util.math.BlockPos;
|
||||||
import net.minecraft.util.math.Vec3d;
|
import net.minecraft.util.math.Vec3d;
|
||||||
import net.minecraft.world.chunk.BlockStateContainer;
|
import net.minecraft.util.palette.PalettedContainer;
|
||||||
import net.minecraft.world.chunk.Chunk;
|
import net.minecraft.world.chunk.Chunk;
|
||||||
import net.minecraft.world.chunk.ChunkSection;
|
import net.minecraft.world.chunk.ChunkSection;
|
||||||
|
|
||||||
@@ -59,7 +59,7 @@ public final class ChunkPacker {
|
|||||||
// since a bitset is initialized to all zero, and air is saved as zeros
|
// since a bitset is initialized to all zero, and air is saved as zeros
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
BlockStateContainer<BlockState> bsc = extendedblockstorage.getData();
|
PalettedContainer<BlockState> bsc = extendedblockstorage.getData();
|
||||||
int yReal = y0 << 4;
|
int yReal = y0 << 4;
|
||||||
// the mapping of BlockStateContainer.getIndex from xyz to index is y << 8 | z << 4 | x;
|
// the mapping of BlockStateContainer.getIndex from xyz to index is y << 8 | z << 4 | x;
|
||||||
// for better cache locality, iterate in that order
|
// for better cache locality, iterate in that order
|
||||||
|
|||||||
+2
-3
@@ -22,7 +22,7 @@ import baritone.api.cache.IWorldScanner;
|
|||||||
import baritone.api.utils.BetterBlockPos;
|
import baritone.api.utils.BetterBlockPos;
|
||||||
import baritone.api.utils.BlockOptionalMetaLookup;
|
import baritone.api.utils.BlockOptionalMetaLookup;
|
||||||
import baritone.api.utils.IPlayerContext;
|
import baritone.api.utils.IPlayerContext;
|
||||||
import baritone.utils.accessor.IBlockStateContainer;
|
import baritone.utils.accessor.IPalettedContainer;
|
||||||
import net.minecraft.block.BlockState;
|
import net.minecraft.block.BlockState;
|
||||||
import net.minecraft.client.multiplayer.ClientChunkProvider;
|
import net.minecraft.client.multiplayer.ClientChunkProvider;
|
||||||
import net.minecraft.util.math.BlockPos;
|
import net.minecraft.util.math.BlockPos;
|
||||||
@@ -30,7 +30,6 @@ import net.minecraft.util.math.ChunkPos;
|
|||||||
import net.minecraft.world.chunk.AbstractChunkProvider;
|
import net.minecraft.world.chunk.AbstractChunkProvider;
|
||||||
import net.minecraft.world.chunk.Chunk;
|
import net.minecraft.world.chunk.Chunk;
|
||||||
import net.minecraft.world.chunk.ChunkSection;
|
import net.minecraft.world.chunk.ChunkSection;
|
||||||
import net.minecraft.world.chunk.IChunk;
|
|
||||||
|
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.stream.IntStream;
|
import java.util.stream.IntStream;
|
||||||
@@ -156,7 +155,7 @@ public enum WorldScanner implements IWorldScanner {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
int yReal = y0 << 4;
|
int yReal = y0 << 4;
|
||||||
IBlockStateContainer bsc = (IBlockStateContainer) section.getData();
|
IPalettedContainer bsc = (IPalettedContainer) section.getData();
|
||||||
// storageArray uses an optimized algorithm that's faster than getAt
|
// storageArray uses an optimized algorithm that's faster than getAt
|
||||||
// creating this array and then using getAtPalette is faster than even getFast(int index)
|
// creating this array and then using getAtPalette is faster than even getFast(int index)
|
||||||
int[] storage = bsc.storageArray();
|
int[] storage = bsc.storageArray();
|
||||||
|
|||||||
@@ -17,7 +17,9 @@
|
|||||||
|
|
||||||
package baritone.command.argument;
|
package baritone.command.argument;
|
||||||
|
|
||||||
|
import baritone.Baritone;
|
||||||
import baritone.api.IBaritone;
|
import baritone.api.IBaritone;
|
||||||
|
import baritone.api.command.argument.IArgConsumer;
|
||||||
import baritone.api.command.argument.ICommandArgument;
|
import baritone.api.command.argument.ICommandArgument;
|
||||||
import baritone.api.command.datatypes.IDatatype;
|
import baritone.api.command.datatypes.IDatatype;
|
||||||
import baritone.api.command.datatypes.IDatatypeContext;
|
import baritone.api.command.datatypes.IDatatypeContext;
|
||||||
@@ -27,7 +29,6 @@ import baritone.api.command.exception.CommandException;
|
|||||||
import baritone.api.command.exception.CommandInvalidTypeException;
|
import baritone.api.command.exception.CommandInvalidTypeException;
|
||||||
import baritone.api.command.exception.CommandNotEnoughArgumentsException;
|
import baritone.api.command.exception.CommandNotEnoughArgumentsException;
|
||||||
import baritone.api.command.exception.CommandTooManyArgumentsException;
|
import baritone.api.command.exception.CommandTooManyArgumentsException;
|
||||||
import baritone.api.command.argument.IArgConsumer;
|
|
||||||
import baritone.api.command.manager.ICommandManager;
|
import baritone.api.command.manager.ICommandManager;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
@@ -316,6 +317,9 @@ public class ArgConsumer implements IArgConsumer {
|
|||||||
try {
|
try {
|
||||||
return datatype.apply(this.context, original);
|
return datatype.apply(this.context, original);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
|
if (Baritone.settings().verboseCommandExceptions.value) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
throw new CommandInvalidTypeException(hasAny() ? peek() : consumed(), datatype.getClass().getSimpleName(), e);
|
throw new CommandInvalidTypeException(hasAny() ? peek() : consumed(), datatype.getClass().getSimpleName(), e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -345,6 +349,9 @@ public class ArgConsumer implements IArgConsumer {
|
|||||||
try {
|
try {
|
||||||
return datatype.get(this.context);
|
return datatype.get(this.context);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
|
if (Baritone.settings().verboseCommandExceptions.value) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
throw new CommandInvalidTypeException(hasAny() ? peek() : consumed(), datatype.getClass().getSimpleName(), e);
|
throw new CommandInvalidTypeException(hasAny() ? peek() : consumed(), datatype.getClass().getSimpleName(), e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -68,7 +68,7 @@ public class SelCommand extends Command {
|
|||||||
float lineWidth = Baritone.settings().selectionLineWidth.value;
|
float lineWidth = Baritone.settings().selectionLineWidth.value;
|
||||||
boolean ignoreDepth = Baritone.settings().renderSelectionIgnoreDepth.value;
|
boolean ignoreDepth = Baritone.settings().renderSelectionIgnoreDepth.value;
|
||||||
IRenderer.startLines(color, opacity, lineWidth, ignoreDepth);
|
IRenderer.startLines(color, opacity, lineWidth, ignoreDepth);
|
||||||
IRenderer.drawAABB(new AxisAlignedBB(pos1, pos1.add(1, 1, 1)));
|
IRenderer.drawAABB(event.getModelViewStack(), new AxisAlignedBB(pos1, pos1.add(1, 1, 1)));
|
||||||
IRenderer.endLines(ignoreDepth);
|
IRenderer.endLines(ignoreDepth);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -91,7 +91,7 @@ public interface MovementHelper extends ActionCosts, Helper {
|
|||||||
if (block instanceof AirBlock) { // early return for most common case
|
if (block instanceof AirBlock) { // early return for most common case
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if (block == Blocks.FIRE || block == Blocks.TRIPWIRE || block == Blocks.COBWEB || block == Blocks.END_PORTAL || block == Blocks.COCOA || block instanceof AbstractSkullBlock || block == Blocks.BUBBLE_COLUMN || block instanceof ShulkerBoxBlock || block instanceof SlabBlock || block instanceof TrapDoorBlock) {
|
if (block == Blocks.FIRE || block == Blocks.TRIPWIRE || block == Blocks.COBWEB || block == Blocks.END_PORTAL || block == Blocks.COCOA || block instanceof AbstractSkullBlock || block == Blocks.BUBBLE_COLUMN || block instanceof ShulkerBoxBlock || block instanceof SlabBlock || block instanceof TrapDoorBlock || block == Blocks.HONEY_BLOCK) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (Baritone.settings().blocksToAvoid.value.contains(block)) {
|
if (Baritone.settings().blocksToAvoid.value.contains(block)) {
|
||||||
@@ -295,7 +295,7 @@ public interface MovementHelper extends ActionCosts, Helper {
|
|||||||
*/
|
*/
|
||||||
static boolean canWalkOn(BlockStateInterface bsi, int x, int y, int z, BlockState state) {
|
static boolean canWalkOn(BlockStateInterface bsi, int x, int y, int z, BlockState state) {
|
||||||
Block block = state.getBlock();
|
Block block = state.getBlock();
|
||||||
if (block instanceof AirBlock || block == Blocks.MAGMA_BLOCK || block == Blocks.BUBBLE_COLUMN) {
|
if (block instanceof AirBlock || block == Blocks.MAGMA_BLOCK || block == Blocks.BUBBLE_COLUMN || block == Blocks.HONEY_BLOCK) {
|
||||||
// early return for most common case (air)
|
// early return for most common case (air)
|
||||||
// plus magma, which is a normal cube but it hurts you
|
// plus magma, which is a normal cube but it hurts you
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
@@ -176,7 +176,7 @@ public class MovementAscend extends Movement {
|
|||||||
ticksWithoutPlacement++;
|
ticksWithoutPlacement++;
|
||||||
if (MovementHelper.attemptToPlaceABlock(state, baritone, dest.down(), false) == PlaceResult.READY_TO_PLACE) {
|
if (MovementHelper.attemptToPlaceABlock(state, baritone, dest.down(), false) == PlaceResult.READY_TO_PLACE) {
|
||||||
state.setInput(Input.SNEAK, true);
|
state.setInput(Input.SNEAK, true);
|
||||||
if (ctx.player().isSneaking()) {
|
if (ctx.player().isCrouching()) {
|
||||||
state.setInput(Input.CLICK_RIGHT, true);
|
state.setInput(Input.CLICK_RIGHT, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -199,8 +199,8 @@ public class MovementAscend extends Movement {
|
|||||||
|
|
||||||
int xAxis = Math.abs(src.getX() - dest.getX()); // either 0 or 1
|
int xAxis = Math.abs(src.getX() - dest.getX()); // either 0 or 1
|
||||||
int zAxis = Math.abs(src.getZ() - dest.getZ()); // either 0 or 1
|
int zAxis = Math.abs(src.getZ() - dest.getZ()); // either 0 or 1
|
||||||
double flatDistToNext = xAxis * Math.abs((dest.getX() + 0.5D) - ctx.player().posX) + zAxis * Math.abs((dest.getZ() + 0.5D) - ctx.player().posZ);
|
double flatDistToNext = xAxis * Math.abs((dest.getX() + 0.5D) - ctx.player().getPositionVec().x) + zAxis * Math.abs((dest.getZ() + 0.5D) - ctx.player().getPositionVec().z);
|
||||||
double sideDist = zAxis * Math.abs((dest.getX() + 0.5D) - ctx.player().posX) + xAxis * Math.abs((dest.getZ() + 0.5D) - ctx.player().posZ);
|
double sideDist = zAxis * Math.abs((dest.getX() + 0.5D) - ctx.player().getPositionVec().x) + xAxis * Math.abs((dest.getZ() + 0.5D) - ctx.player().getPositionVec().z);
|
||||||
|
|
||||||
double lateralMotion = xAxis * ctx.player().getMotion().z + zAxis * ctx.player().getMotion().x;
|
double lateralMotion = xAxis * ctx.player().getMotion().z + zAxis * ctx.player().getMotion().x;
|
||||||
if (Math.abs(lateralMotion) > 0.1) {
|
if (Math.abs(lateralMotion) > 0.1) {
|
||||||
|
|||||||
@@ -212,11 +212,11 @@ public class MovementDescend extends Movement {
|
|||||||
|
|
||||||
BlockPos playerFeet = ctx.playerFeet();
|
BlockPos playerFeet = ctx.playerFeet();
|
||||||
BlockPos fakeDest = new BlockPos(dest.getX() * 2 - src.getX(), dest.getY(), dest.getZ() * 2 - src.getZ());
|
BlockPos fakeDest = new BlockPos(dest.getX() * 2 - src.getX(), dest.getY(), dest.getZ() * 2 - src.getZ());
|
||||||
if ((playerFeet.equals(dest) || playerFeet.equals(fakeDest)) && (MovementHelper.isLiquid(ctx, dest) || ctx.player().posY - dest.getY() < 0.5)) { // lilypads
|
if ((playerFeet.equals(dest) || playerFeet.equals(fakeDest)) && (MovementHelper.isLiquid(ctx, dest) || ctx.player().getPositionVec().y - dest.getY() < 0.5)) { // lilypads
|
||||||
// Wait until we're actually on the ground before saying we're done because sometimes we continue to fall if the next action starts immediately
|
// Wait until we're actually on the ground before saying we're done because sometimes we continue to fall if the next action starts immediately
|
||||||
return state.setStatus(MovementStatus.SUCCESS);
|
return state.setStatus(MovementStatus.SUCCESS);
|
||||||
/* else {
|
/* else {
|
||||||
// System.out.println(player().posY + " " + playerFeet.getY() + " " + (player().posY - playerFeet.getY()));
|
// System.out.println(player().getPositionVec().y + " " + playerFeet.getY() + " " + (player().getPositionVec().y - playerFeet.getY()));
|
||||||
}*/
|
}*/
|
||||||
}
|
}
|
||||||
if (safeMode()) {
|
if (safeMode()) {
|
||||||
@@ -231,11 +231,11 @@ public class MovementDescend extends Movement {
|
|||||||
)).setInput(Input.MOVE_FORWARD, true);
|
)).setInput(Input.MOVE_FORWARD, true);
|
||||||
return state;
|
return state;
|
||||||
}
|
}
|
||||||
double diffX = ctx.player().posX - (dest.getX() + 0.5);
|
double diffX = ctx.player().getPositionVec().x - (dest.getX() + 0.5);
|
||||||
double diffZ = ctx.player().posZ - (dest.getZ() + 0.5);
|
double diffZ = ctx.player().getPositionVec().z - (dest.getZ() + 0.5);
|
||||||
double ab = Math.sqrt(diffX * diffX + diffZ * diffZ);
|
double ab = Math.sqrt(diffX * diffX + diffZ * diffZ);
|
||||||
double x = ctx.player().posX - (src.getX() + 0.5);
|
double x = ctx.player().getPositionVec().x - (src.getX() + 0.5);
|
||||||
double z = ctx.player().posZ - (src.getZ() + 0.5);
|
double z = ctx.player().getPositionVec().z - (src.getZ() + 0.5);
|
||||||
double fromStart = Math.sqrt(x * x + z * z);
|
double fromStart = Math.sqrt(x * x + z * z);
|
||||||
if (!playerFeet.equals(dest) || ab > 0.25) {
|
if (!playerFeet.equals(dest) || ab > 0.25) {
|
||||||
if (numTicks++ < 20 && fromStart < 1.25) {
|
if (numTicks++ < 20 && fromStart < 1.25) {
|
||||||
|
|||||||
@@ -226,7 +226,7 @@ public class MovementDiagonal extends Movement {
|
|||||||
} else if (!playerInValidPosition() && !(MovementHelper.isLiquid(ctx, src) && getValidPositions().contains(ctx.playerFeet().up()))) {
|
} else if (!playerInValidPosition() && !(MovementHelper.isLiquid(ctx, src) && getValidPositions().contains(ctx.playerFeet().up()))) {
|
||||||
return state.setStatus(MovementStatus.UNREACHABLE);
|
return state.setStatus(MovementStatus.UNREACHABLE);
|
||||||
}
|
}
|
||||||
if (dest.y > src.y && ctx.player().posY < src.y + 0.1 && ctx.player().collidedHorizontally) {
|
if (dest.y > src.y && ctx.player().getPositionVec().y < src.y + 0.1 && ctx.player().collidedHorizontally) {
|
||||||
state.setInput(Input.JUMP, true);
|
state.setInput(Input.JUMP, true);
|
||||||
}
|
}
|
||||||
if (sprint()) {
|
if (sprint()) {
|
||||||
|
|||||||
@@ -84,8 +84,8 @@ public class MovementDownward extends Movement {
|
|||||||
} else if (!playerInValidPosition()) {
|
} else if (!playerInValidPosition()) {
|
||||||
return state.setStatus(MovementStatus.UNREACHABLE);
|
return state.setStatus(MovementStatus.UNREACHABLE);
|
||||||
}
|
}
|
||||||
double diffX = ctx.player().posX - (dest.getX() + 0.5);
|
double diffX = ctx.player().getPositionVec().x - (dest.getX() + 0.5);
|
||||||
double diffZ = ctx.player().posZ - (dest.getZ() + 0.5);
|
double diffZ = ctx.player().getPositionVec().z - (dest.getZ() + 0.5);
|
||||||
double ab = Math.sqrt(diffX * diffX + diffZ * diffZ);
|
double ab = Math.sqrt(diffX * diffX + diffZ * diffZ);
|
||||||
|
|
||||||
if (numTicks++ < 10 && ab < 0.2) {
|
if (numTicks++ < 10 && ab < 0.2) {
|
||||||
|
|||||||
@@ -100,7 +100,7 @@ public class MovementFall extends Movement {
|
|||||||
return state.setStatus(MovementStatus.UNREACHABLE);
|
return state.setStatus(MovementStatus.UNREACHABLE);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ctx.player().posY - dest.getY() < ctx.playerController().getBlockReachDistance() && !ctx.player().onGround) {
|
if (ctx.player().getPositionVec().y - dest.getY() < ctx.playerController().getBlockReachDistance() && !ctx.player().onGround) {
|
||||||
ctx.player().inventory.currentItem = ctx.player().inventory.getSlotFor(STACK_BUCKET_WATER);
|
ctx.player().inventory.currentItem = ctx.player().inventory.getSlotFor(STACK_BUCKET_WATER);
|
||||||
|
|
||||||
targetRotation = new Rotation(toDest.getYaw(), 90.0F);
|
targetRotation = new Rotation(toDest.getYaw(), 90.0F);
|
||||||
@@ -115,7 +115,7 @@ public class MovementFall extends Movement {
|
|||||||
} else {
|
} else {
|
||||||
state.setTarget(new MovementTarget(toDest, false));
|
state.setTarget(new MovementTarget(toDest, false));
|
||||||
}
|
}
|
||||||
if (playerFeet.equals(dest) && (ctx.player().posY - playerFeet.getY() < 0.094 || isWater)) { // 0.094 because lilypads
|
if (playerFeet.equals(dest) && (ctx.player().getPositionVec().y - playerFeet.getY() < 0.094 || isWater)) { // 0.094 because lilypads
|
||||||
if (isWater) { // only match water, not flowing water (which we cannot pick up with a bucket)
|
if (isWater) { // only match water, not flowing water (which we cannot pick up with a bucket)
|
||||||
if (PlayerInventory.isHotbar(ctx.player().inventory.getSlotFor(STACK_BUCKET_EMPTY))) {
|
if (PlayerInventory.isHotbar(ctx.player().inventory.getSlotFor(STACK_BUCKET_EMPTY))) {
|
||||||
ctx.player().inventory.currentItem = ctx.player().inventory.getSlotFor(STACK_BUCKET_EMPTY);
|
ctx.player().inventory.currentItem = ctx.player().inventory.getSlotFor(STACK_BUCKET_EMPTY);
|
||||||
@@ -134,7 +134,7 @@ public class MovementFall extends Movement {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
Vec3d destCenter = VecUtils.getBlockPosCenter(dest); // we are moving to the 0.5 center not the edge (like if we were falling on a ladder)
|
Vec3d destCenter = VecUtils.getBlockPosCenter(dest); // we are moving to the 0.5 center not the edge (like if we were falling on a ladder)
|
||||||
if (Math.abs(ctx.player().posX + ctx.player().getMotion().x - destCenter.x) > 0.1 || Math.abs(ctx.player().posZ + ctx.player().getMotion().z - destCenter.z) > 0.1) {
|
if (Math.abs(ctx.player().getPositionVec().x + ctx.player().getMotion().x - destCenter.x) > 0.1 || Math.abs(ctx.player().getPositionVec().z + ctx.player().getMotion().z - destCenter.z) > 0.1) {
|
||||||
if (!ctx.player().onGround && Math.abs(ctx.player().getMotion().y) > 0.4) {
|
if (!ctx.player().onGround && Math.abs(ctx.player().getMotion().y) > 0.4) {
|
||||||
state.setInput(Input.SNEAK, true);
|
state.setInput(Input.SNEAK, true);
|
||||||
}
|
}
|
||||||
@@ -144,7 +144,7 @@ public class MovementFall extends Movement {
|
|||||||
if (avoid == null) {
|
if (avoid == null) {
|
||||||
avoid = src.subtract(dest);
|
avoid = src.subtract(dest);
|
||||||
} else {
|
} else {
|
||||||
double dist = Math.abs(avoid.getX() * (destCenter.x - avoid.getX() / 2.0 - ctx.player().posX)) + Math.abs(avoid.getZ() * (destCenter.z - avoid.getZ() / 2.0 - ctx.player().posZ));
|
double dist = Math.abs(avoid.getX() * (destCenter.x - avoid.getX() / 2.0 - ctx.player().getPositionVec().x)) + Math.abs(avoid.getZ() * (destCenter.z - avoid.getZ() / 2.0 - ctx.player().getPositionVec().z));
|
||||||
if (dist < 0.6) {
|
if (dist < 0.6) {
|
||||||
state.setInput(Input.MOVE_FORWARD, true);
|
state.setInput(Input.MOVE_FORWARD, true);
|
||||||
} else if (!ctx.player().onGround) {
|
} else if (!ctx.player().onGround) {
|
||||||
|
|||||||
@@ -246,19 +246,19 @@ public class MovementParkour extends Movement {
|
|||||||
// but i did it anyway
|
// but i did it anyway
|
||||||
return state.setStatus(MovementStatus.SUCCESS);
|
return state.setStatus(MovementStatus.SUCCESS);
|
||||||
}
|
}
|
||||||
if (ctx.player().posY - ctx.playerFeet().getY() < 0.094) { // lilypads
|
if (ctx.player().getPositionVec().y - ctx.playerFeet().getY() < 0.094) { // lilypads
|
||||||
state.setStatus(MovementStatus.SUCCESS);
|
state.setStatus(MovementStatus.SUCCESS);
|
||||||
}
|
}
|
||||||
} else if (!ctx.playerFeet().equals(src)) {
|
} else if (!ctx.playerFeet().equals(src)) {
|
||||||
if (ctx.playerFeet().equals(src.offset(direction)) || ctx.player().posY - src.y > 0.0001) {
|
if (ctx.playerFeet().equals(src.offset(direction)) || ctx.player().getPositionVec().y - src.y > 0.0001) {
|
||||||
if (!MovementHelper.canWalkOn(ctx, dest.down()) && !ctx.player().onGround && MovementHelper.attemptToPlaceABlock(state, baritone, dest.down(), true) == PlaceResult.READY_TO_PLACE) {
|
if (!MovementHelper.canWalkOn(ctx, dest.down()) && !ctx.player().onGround && MovementHelper.attemptToPlaceABlock(state, baritone, dest.down(), true) == PlaceResult.READY_TO_PLACE) {
|
||||||
// go in the opposite order to check DOWN before all horizontals -- down is preferable because you don't have to look to the side while in midair, which could mess up the trajectory
|
// go in the opposite order to check DOWN before all horizontals -- down is preferable because you don't have to look to the side while in midair, which could mess up the trajectory
|
||||||
state.setInput(Input.CLICK_RIGHT, true);
|
state.setInput(Input.CLICK_RIGHT, true);
|
||||||
}
|
}
|
||||||
// prevent jumping too late by checking for ascend
|
// prevent jumping too late by checking for ascend
|
||||||
if (dist == 3 && !ascend) { // this is a 2 block gap, dest = src + direction * 3
|
if (dist == 3 && !ascend) { // this is a 2 block gap, dest = src + direction * 3
|
||||||
double xDiff = (src.x + 0.5) - ctx.player().posX;
|
double xDiff = (src.x + 0.5) - ctx.player().getPositionVec().x;
|
||||||
double zDiff = (src.z + 0.5) - ctx.player().posZ;
|
double zDiff = (src.z + 0.5) - ctx.player().getPositionVec().z;
|
||||||
double distFromStart = Math.max(Math.abs(xDiff), Math.abs(zDiff));
|
double distFromStart = Math.max(Math.abs(xDiff), Math.abs(zDiff));
|
||||||
if (distFromStart < 0.7) {
|
if (distFromStart < 0.7) {
|
||||||
return state;
|
return state;
|
||||||
|
|||||||
@@ -172,7 +172,7 @@ public class MovementPillar extends Movement {
|
|||||||
// stay centered while swimming up a water column
|
// stay centered while swimming up a water column
|
||||||
state.setTarget(new MovementState.MovementTarget(RotationUtils.calcRotationFromVec3d(ctx.playerHead(), VecUtils.getBlockPosCenter(dest), ctx.playerRotations()), false));
|
state.setTarget(new MovementState.MovementTarget(RotationUtils.calcRotationFromVec3d(ctx.playerHead(), VecUtils.getBlockPosCenter(dest), ctx.playerRotations()), false));
|
||||||
Vec3d destCenter = VecUtils.getBlockPosCenter(dest);
|
Vec3d destCenter = VecUtils.getBlockPosCenter(dest);
|
||||||
if (Math.abs(ctx.player().posX - destCenter.x) > 0.2 || Math.abs(ctx.player().posZ - destCenter.z) > 0.2) {
|
if (Math.abs(ctx.player().getPositionVec().x - destCenter.x) > 0.2 || Math.abs(ctx.player().getPositionVec().z - destCenter.z) > 0.2) {
|
||||||
state.setInput(Input.MOVE_FORWARD, true);
|
state.setInput(Input.MOVE_FORWARD, true);
|
||||||
}
|
}
|
||||||
if (ctx.playerFeet().equals(dest)) {
|
if (ctx.playerFeet().equals(dest)) {
|
||||||
@@ -218,11 +218,11 @@ public class MovementPillar extends Movement {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
state.setInput(Input.SNEAK, ctx.player().posY > dest.getY() || ctx.player().posY < src.getY() + 0.2D); // delay placement by 1 tick for ncp compatibility
|
state.setInput(Input.SNEAK, ctx.player().getPositionVec().y > dest.getY() || ctx.player().getPositionVec().y < src.getY() + 0.2D); // delay placement by 1 tick for ncp compatibility
|
||||||
// since (lower down) we only right click once player.isSneaking, and that happens the tick after we request to sneak
|
// since (lower down) we only right click once player.isSneaking, and that happens the tick after we request to sneak
|
||||||
|
|
||||||
double diffX = ctx.player().posX - (dest.getX() + 0.5);
|
double diffX = ctx.player().getPositionVec().x - (dest.getX() + 0.5);
|
||||||
double diffZ = ctx.player().posZ - (dest.getZ() + 0.5);
|
double diffZ = ctx.player().getPositionVec().z - (dest.getZ() + 0.5);
|
||||||
double dist = Math.sqrt(diffX * diffX + diffZ * diffZ);
|
double dist = Math.sqrt(diffX * diffX + diffZ * diffZ);
|
||||||
double flatMotion = Math.sqrt(ctx.player().getMotion().x * ctx.player().getMotion().x + ctx.player().getMotion().z * ctx.player().getMotion().z);
|
double flatMotion = Math.sqrt(ctx.player().getMotion().x * ctx.player().getMotion().x + ctx.player().getMotion().z * ctx.player().getMotion().z);
|
||||||
if (dist > 0.17) {//why 0.17? because it seemed like a good number, that's why
|
if (dist > 0.17) {//why 0.17? because it seemed like a good number, that's why
|
||||||
@@ -236,7 +236,7 @@ public class MovementPillar extends Movement {
|
|||||||
state.setTarget(new MovementState.MovementTarget(rotation, true));
|
state.setTarget(new MovementState.MovementTarget(rotation, true));
|
||||||
} else if (flatMotion < 0.05) {
|
} else if (flatMotion < 0.05) {
|
||||||
// If our Y coordinate is above our goal, stop jumping
|
// If our Y coordinate is above our goal, stop jumping
|
||||||
state.setInput(Input.JUMP, ctx.player().posY < dest.getY());
|
state.setInput(Input.JUMP, ctx.player().getPositionVec().y < dest.getY());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -251,7 +251,7 @@ public class MovementPillar extends Movement {
|
|||||||
state.setInput(Input.JUMP, false); // breaking is like 5x slower when you're jumping
|
state.setInput(Input.JUMP, false); // breaking is like 5x slower when you're jumping
|
||||||
state.setInput(Input.CLICK_LEFT, true);
|
state.setInput(Input.CLICK_LEFT, true);
|
||||||
blockIsThere = false;
|
blockIsThere = false;
|
||||||
} else if (ctx.player().isSneaking() && (ctx.isLookingAt(src.down()) || ctx.isLookingAt(src)) && ctx.player().posY > dest.getY() + 0.1) {
|
} else if (ctx.player().isCrouching() && (ctx.isLookingAt(src.down()) || ctx.isLookingAt(src)) && ctx.player().getPositionVec().y > dest.getY() + 0.1) {
|
||||||
state.setInput(Input.CLICK_RIGHT, true);
|
state.setInput(Input.CLICK_RIGHT, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -175,7 +175,7 @@ public class MovementTraverse extends Movement {
|
|||||||
return state;
|
return state;
|
||||||
}
|
}
|
||||||
// and we aren't already pressed up against the block
|
// and we aren't already pressed up against the block
|
||||||
double dist = Math.max(Math.abs(ctx.player().posX - (dest.getX() + 0.5D)), Math.abs(ctx.player().posZ - (dest.getZ() + 0.5D)));
|
double dist = Math.max(Math.abs(ctx.player().getPositionVec().x - (dest.getX() + 0.5D)), Math.abs(ctx.player().getPositionVec().z - (dest.getZ() + 0.5D)));
|
||||||
if (dist < 0.83) {
|
if (dist < 0.83) {
|
||||||
return state;
|
return state;
|
||||||
}
|
}
|
||||||
@@ -245,7 +245,7 @@ public class MovementTraverse extends Movement {
|
|||||||
}
|
}
|
||||||
Block low = BlockStateInterface.get(ctx, src).getBlock();
|
Block low = BlockStateInterface.get(ctx, src).getBlock();
|
||||||
Block high = BlockStateInterface.get(ctx, src.up()).getBlock();
|
Block high = BlockStateInterface.get(ctx, src.up()).getBlock();
|
||||||
if (ctx.player().posY > src.y + 0.1D && !ctx.player().onGround && (low == Blocks.VINE || low == Blocks.LADDER || high == Blocks.VINE || high == Blocks.LADDER)) {
|
if (ctx.player().getPositionVec().y > src.y + 0.1D && !ctx.player().onGround && (low == Blocks.VINE || low == Blocks.LADDER || high == Blocks.VINE || high == Blocks.LADDER)) {
|
||||||
// hitting W could cause us to climb the ladder instead of going forward
|
// hitting W could cause us to climb the ladder instead of going forward
|
||||||
// wait until we're on the ground
|
// wait until we're on the ground
|
||||||
return state;
|
return state;
|
||||||
@@ -272,21 +272,21 @@ public class MovementTraverse extends Movement {
|
|||||||
wasTheBridgeBlockAlwaysThere = false;
|
wasTheBridgeBlockAlwaysThere = false;
|
||||||
Block standingOn = BlockStateInterface.get(ctx, feet.down()).getBlock();
|
Block standingOn = BlockStateInterface.get(ctx, feet.down()).getBlock();
|
||||||
if (standingOn.equals(Blocks.SOUL_SAND) || standingOn instanceof SlabBlock) { // see issue #118
|
if (standingOn.equals(Blocks.SOUL_SAND) || standingOn instanceof SlabBlock) { // see issue #118
|
||||||
double dist = Math.max(Math.abs(dest.getX() + 0.5 - ctx.player().posX), Math.abs(dest.getZ() + 0.5 - ctx.player().posZ));
|
double dist = Math.max(Math.abs(dest.getX() + 0.5 - ctx.player().getPositionVec().x), Math.abs(dest.getZ() + 0.5 - ctx.player().getPositionVec().z));
|
||||||
if (dist < 0.85) { // 0.5 + 0.3 + epsilon
|
if (dist < 0.85) { // 0.5 + 0.3 + epsilon
|
||||||
MovementHelper.moveTowards(ctx, state, dest);
|
MovementHelper.moveTowards(ctx, state, dest);
|
||||||
return state.setInput(Input.MOVE_FORWARD, false)
|
return state.setInput(Input.MOVE_FORWARD, false)
|
||||||
.setInput(Input.MOVE_BACK, true);
|
.setInput(Input.MOVE_BACK, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
double dist1 = Math.max(Math.abs(ctx.player().posX - (dest.getX() + 0.5D)), Math.abs(ctx.player().posZ - (dest.getZ() + 0.5D)));
|
double dist1 = Math.max(Math.abs(ctx.player().getPositionVec().x - (dest.getX() + 0.5D)), Math.abs(ctx.player().getPositionVec().z - (dest.getZ() + 0.5D)));
|
||||||
PlaceResult p = MovementHelper.attemptToPlaceABlock(state, baritone, dest.down(), false);
|
PlaceResult p = MovementHelper.attemptToPlaceABlock(state, baritone, dest.down(), false);
|
||||||
if ((p == PlaceResult.READY_TO_PLACE || dist1 < 0.6) && !Baritone.settings().assumeSafeWalk.value) {
|
if ((p == PlaceResult.READY_TO_PLACE || dist1 < 0.6) && !Baritone.settings().assumeSafeWalk.value) {
|
||||||
state.setInput(Input.SNEAK, true);
|
state.setInput(Input.SNEAK, true);
|
||||||
}
|
}
|
||||||
switch (p) {
|
switch (p) {
|
||||||
case READY_TO_PLACE: {
|
case READY_TO_PLACE: {
|
||||||
if (ctx.player().isSneaking() || Baritone.settings().assumeSafeWalk.value) {
|
if (ctx.player().isCrouching() || Baritone.settings().assumeSafeWalk.value) {
|
||||||
state.setInput(Input.CLICK_RIGHT, true);
|
state.setInput(Input.CLICK_RIGHT, true);
|
||||||
}
|
}
|
||||||
return state;
|
return state;
|
||||||
@@ -319,7 +319,7 @@ public class MovementTraverse extends Movement {
|
|||||||
|
|
||||||
Rotation backToFace = RotationUtils.calcRotationFromVec3d(ctx.playerHead(), new Vec3d(faceX, faceY, faceZ), ctx.playerRotations());
|
Rotation backToFace = RotationUtils.calcRotationFromVec3d(ctx.playerHead(), new Vec3d(faceX, faceY, faceZ), ctx.playerRotations());
|
||||||
float pitch = backToFace.getPitch();
|
float pitch = backToFace.getPitch();
|
||||||
double dist2 = Math.max(Math.abs(ctx.player().posX - faceX), Math.abs(ctx.player().posZ - faceZ));
|
double dist2 = Math.max(Math.abs(ctx.player().getPositionVec().x - faceX), Math.abs(ctx.player().getPositionVec().z - faceZ));
|
||||||
if (dist2 < 0.29) { // see issue #208
|
if (dist2 < 0.29) { // see issue #208
|
||||||
float yaw = RotationUtils.calcRotationFromVec3d(VecUtils.getBlockPosCenter(dest), ctx.playerHead(), ctx.playerRotations()).getYaw();
|
float yaw = RotationUtils.calcRotationFromVec3d(VecUtils.getBlockPosCenter(dest), ctx.playerHead(), ctx.playerRotations()).getYaw();
|
||||||
state.setTarget(new MovementState.MovementTarget(new Rotation(yaw, pitch), true));
|
state.setTarget(new MovementState.MovementTarget(new Rotation(yaw, pitch), true));
|
||||||
|
|||||||
@@ -414,7 +414,7 @@ public class PathExecutor implements IPathExecutor, Helper {
|
|||||||
// playerFeet adds 0.1251 to account for soul sand
|
// playerFeet adds 0.1251 to account for soul sand
|
||||||
// farmland is 0.9375
|
// farmland is 0.9375
|
||||||
// 0.07 is to account for farmland
|
// 0.07 is to account for farmland
|
||||||
if (ctx.player().posY >= center.getY() - 0.07) {
|
if (ctx.player().getPositionVec().y >= center.getY() - 0.07) {
|
||||||
behavior.baritone.getInputOverrideHandler().setInputForceState(Input.JUMP, false);
|
behavior.baritone.getInputOverrideHandler().setInputForceState(Input.JUMP, false);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@@ -485,7 +485,7 @@ public class PathExecutor implements IPathExecutor, Helper {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private static boolean skipNow(IPlayerContext ctx, IMovement current) {
|
private static boolean skipNow(IPlayerContext ctx, IMovement current) {
|
||||||
double offTarget = Math.abs(current.getDirection().getX() * (current.getSrc().z + 0.5D - ctx.player().posZ)) + Math.abs(current.getDirection().getZ() * (current.getSrc().x + 0.5D - ctx.player().posX));
|
double offTarget = Math.abs(current.getDirection().getX() * (current.getSrc().z + 0.5D - ctx.player().getPositionVec().z)) + Math.abs(current.getDirection().getZ() * (current.getSrc().x + 0.5D - ctx.player().getPositionVec().x));
|
||||||
if (offTarget > 0.1) {
|
if (offTarget > 0.1) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@@ -495,7 +495,7 @@ public class PathExecutor implements IPathExecutor, Helper {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
// wait 0.3
|
// wait 0.3
|
||||||
double flatDist = Math.abs(current.getDirection().getX() * (headBonk.getX() + 0.5D - ctx.player().posX)) + Math.abs(current.getDirection().getZ() * (headBonk.getZ() + 0.5 - ctx.player().posZ));
|
double flatDist = Math.abs(current.getDirection().getX() * (headBonk.getX() + 0.5D - ctx.player().getPositionVec().x)) + Math.abs(current.getDirection().getZ() * (headBonk.getZ() + 0.5 - ctx.player().getPositionVec().z));
|
||||||
return flatDist > 0.8;
|
return flatDist > 0.8;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -445,7 +445,7 @@ public final class BuilderProcess extends BaritoneProcessHelper implements IBuil
|
|||||||
BetterBlockPos pos = toBreak.get().getA();
|
BetterBlockPos pos = toBreak.get().getA();
|
||||||
baritone.getLookBehavior().updateTarget(rot, true);
|
baritone.getLookBehavior().updateTarget(rot, true);
|
||||||
MovementHelper.switchToBestToolFor(ctx, bcc.get(pos));
|
MovementHelper.switchToBestToolFor(ctx, bcc.get(pos));
|
||||||
if (ctx.player().isSneaking()) {
|
if (ctx.player().isCrouching()) {
|
||||||
// really horrible bug where a block is visible for breaking while sneaking but not otherwise
|
// really horrible bug where a block is visible for breaking while sneaking but not otherwise
|
||||||
// so you can't see it, it goes to place something else, sneaks, then the next tick it tries to break
|
// so you can't see it, it goes to place something else, sneaks, then the next tick it tries to break
|
||||||
// and is unable since it's unsneaked in the intermediary tick
|
// and is unable since it's unsneaked in the intermediary tick
|
||||||
@@ -781,7 +781,7 @@ public final class BuilderProcess extends BaritoneProcessHelper implements IBuil
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
// <toxic cloud>
|
// <toxic cloud>
|
||||||
result.add(((BlockItem) stack.getItem()).getBlock().getStateForPlacement(new BlockItemUseContext(new ItemUseContext(ctx.world(), ctx.player(), Hand.MAIN_HAND, stack, new BlockRayTraceResult(new Vec3d(ctx.player().posX, ctx.player().posY, ctx.player().posZ), Direction.UP, ctx.playerFeet(), false)) {})));
|
result.add(((BlockItem) stack.getItem()).getBlock().getStateForPlacement(new BlockItemUseContext(new ItemUseContext(ctx.world(), ctx.player(), Hand.MAIN_HAND, stack, new BlockRayTraceResult(new Vec3d(ctx.player().getPositionVec().x, ctx.player().getPositionVec().y, ctx.player().getPositionVec().z), Direction.UP, ctx.playerFeet(), false)) {})));
|
||||||
// </toxic cloud>
|
// </toxic cloud>
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
|
|||||||
@@ -282,7 +282,7 @@ public final class FarmProcess extends BaritoneProcessHelper implements IFarmPro
|
|||||||
ItemEntity ei = (ItemEntity) entity;
|
ItemEntity ei = (ItemEntity) entity;
|
||||||
if (PICKUP_DROPPED.contains(ei.getItem().getItem())) {
|
if (PICKUP_DROPPED.contains(ei.getItem().getItem())) {
|
||||||
// +0.1 because of farmland's 0.9375 dummy height lol
|
// +0.1 because of farmland's 0.9375 dummy height lol
|
||||||
goalz.add(new GoalBlock(new BlockPos(entity.posX, entity.posY + 0.1, entity.posZ)));
|
goalz.add(new GoalBlock(new BlockPos(entity.getPositionVec().x, entity.getPositionVec().y + 0.1, entity.getPositionVec().z)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -60,7 +60,7 @@ public final class FollowProcess extends BaritoneProcessHelper implements IFollo
|
|||||||
pos = new BlockPos(following);
|
pos = new BlockPos(following);
|
||||||
} else {
|
} else {
|
||||||
GoalXZ g = GoalXZ.fromDirection(following.getPositionVector(), Baritone.settings().followOffsetDirection.value, Baritone.settings().followOffsetDistance.value);
|
GoalXZ g = GoalXZ.fromDirection(following.getPositionVector(), Baritone.settings().followOffsetDirection.value, Baritone.settings().followOffsetDistance.value);
|
||||||
pos = new BlockPos(g.getX(), following.posY, g.getZ());
|
pos = new BlockPos(g.getX(), following.getPositionVec().y, g.getZ());
|
||||||
}
|
}
|
||||||
return new GoalNear(pos, Baritone.settings().followRadius.value);
|
return new GoalNear(pos, Baritone.settings().followRadius.value);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import baritone.api.event.events.RenderEvent;
|
|||||||
import baritone.api.event.listener.AbstractGameEventListener;
|
import baritone.api.event.listener.AbstractGameEventListener;
|
||||||
import baritone.api.selection.ISelection;
|
import baritone.api.selection.ISelection;
|
||||||
import baritone.utils.IRenderer;
|
import baritone.utils.IRenderer;
|
||||||
|
import com.mojang.blaze3d.matrix.MatrixStack;
|
||||||
import net.minecraft.util.math.AxisAlignedBB;
|
import net.minecraft.util.math.AxisAlignedBB;
|
||||||
|
|
||||||
public class SelectionRenderer implements IRenderer, AbstractGameEventListener {
|
public class SelectionRenderer implements IRenderer, AbstractGameEventListener {
|
||||||
@@ -18,7 +19,7 @@ public class SelectionRenderer implements IRenderer, AbstractGameEventListener {
|
|||||||
baritone.getGameEventHandler().registerEventListener(this);
|
baritone.getGameEventHandler().registerEventListener(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void renderSelections(ISelection[] selections) {
|
public static void renderSelections(MatrixStack stack, ISelection[] selections) {
|
||||||
float opacity = settings.selectionOpacity.value;
|
float opacity = settings.selectionOpacity.value;
|
||||||
boolean ignoreDepth = settings.renderSelectionIgnoreDepth.value;
|
boolean ignoreDepth = settings.renderSelectionIgnoreDepth.value;
|
||||||
float lineWidth = settings.selectionLineWidth.value;
|
float lineWidth = settings.selectionLineWidth.value;
|
||||||
@@ -30,20 +31,20 @@ public class SelectionRenderer implements IRenderer, AbstractGameEventListener {
|
|||||||
IRenderer.startLines(settings.colorSelection.value, opacity, lineWidth, ignoreDepth);
|
IRenderer.startLines(settings.colorSelection.value, opacity, lineWidth, ignoreDepth);
|
||||||
|
|
||||||
for (ISelection selection : selections) {
|
for (ISelection selection : selections) {
|
||||||
IRenderer.drawAABB(selection.aabb(), SELECTION_BOX_EXPANSION);
|
IRenderer.drawAABB(stack, selection.aabb(), SELECTION_BOX_EXPANSION);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (settings.renderSelectionCorners.value) {
|
if (settings.renderSelectionCorners.value) {
|
||||||
IRenderer.glColor(settings.colorSelectionPos1.value, opacity);
|
IRenderer.glColor(settings.colorSelectionPos1.value, opacity);
|
||||||
|
|
||||||
for (ISelection selection : selections) {
|
for (ISelection selection : selections) {
|
||||||
IRenderer.drawAABB(new AxisAlignedBB(selection.pos1(), selection.pos1().add(1, 1, 1)));
|
IRenderer.drawAABB(stack, new AxisAlignedBB(selection.pos1(), selection.pos1().add(1, 1, 1)));
|
||||||
}
|
}
|
||||||
|
|
||||||
IRenderer.glColor(settings.colorSelectionPos2.value, opacity);
|
IRenderer.glColor(settings.colorSelectionPos2.value, opacity);
|
||||||
|
|
||||||
for (ISelection selection : selections) {
|
for (ISelection selection : selections) {
|
||||||
IRenderer.drawAABB(new AxisAlignedBB(selection.pos2(), selection.pos2().add(1, 1, 1)));
|
IRenderer.drawAABB(stack, new AxisAlignedBB(selection.pos2(), selection.pos2().add(1, 1, 1)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -52,6 +53,6 @@ public class SelectionRenderer implements IRenderer, AbstractGameEventListener {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onRenderPass(RenderEvent event) {
|
public void onRenderPass(RenderEvent event) {
|
||||||
renderSelections(manager.getSelections());
|
renderSelections(event.getModelViewStack(), manager.getSelections());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ public class BlockStateInterface {
|
|||||||
private final ClientChunkProvider provider;
|
private final ClientChunkProvider provider;
|
||||||
private final WorldData worldData;
|
private final WorldData worldData;
|
||||||
protected final IBlockReader world;
|
protected final IBlockReader world;
|
||||||
public final BlockPos.MutableBlockPos isPassableBlockPos;
|
public final BlockPos.Mutable isPassableBlockPos;
|
||||||
public final IBlockReader access;
|
public final IBlockReader access;
|
||||||
|
|
||||||
private Chunk prev = null;
|
private Chunk prev = null;
|
||||||
@@ -74,7 +74,7 @@ public class BlockStateInterface {
|
|||||||
if (!Minecraft.getInstance().isOnExecutionThread()) {
|
if (!Minecraft.getInstance().isOnExecutionThread()) {
|
||||||
throw new IllegalStateException();
|
throw new IllegalStateException();
|
||||||
}
|
}
|
||||||
this.isPassableBlockPos = new BlockPos.MutableBlockPos();
|
this.isPassableBlockPos = new BlockPos.Mutable();
|
||||||
this.access = new BlockStateInterfaceAccessWrapper(this);
|
this.access = new BlockStateInterfaceAccessWrapper(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -23,21 +23,20 @@ import baritone.api.pathing.goals.GoalBlock;
|
|||||||
import baritone.api.pathing.goals.GoalTwoBlocks;
|
import baritone.api.pathing.goals.GoalTwoBlocks;
|
||||||
import baritone.api.utils.BetterBlockPos;
|
import baritone.api.utils.BetterBlockPos;
|
||||||
import baritone.api.utils.Helper;
|
import baritone.api.utils.Helper;
|
||||||
import com.mojang.blaze3d.platform.GlStateManager;
|
import com.mojang.blaze3d.matrix.MatrixStack;
|
||||||
|
import com.mojang.blaze3d.systems.RenderSystem;
|
||||||
import net.minecraft.client.entity.player.ClientPlayerEntity;
|
import net.minecraft.client.entity.player.ClientPlayerEntity;
|
||||||
import net.minecraft.client.gui.screen.Screen;
|
import net.minecraft.client.gui.screen.Screen;
|
||||||
|
import net.minecraft.client.renderer.Matrix4f;
|
||||||
|
import net.minecraft.client.renderer.Vector4f;
|
||||||
import net.minecraft.entity.Entity;
|
import net.minecraft.entity.Entity;
|
||||||
import net.minecraft.util.math.*;
|
import net.minecraft.util.math.*;
|
||||||
import net.minecraft.util.text.ITextComponent;
|
import net.minecraft.util.text.ITextComponent;
|
||||||
import net.minecraft.util.text.StringTextComponent;
|
import net.minecraft.util.text.StringTextComponent;
|
||||||
import net.minecraft.util.text.TextFormatting;
|
import net.minecraft.util.text.TextFormatting;
|
||||||
import net.minecraft.util.text.event.ClickEvent;
|
import net.minecraft.util.text.event.ClickEvent;
|
||||||
import org.lwjgl.BufferUtils;
|
|
||||||
import org.lwjgl.opengl.GL11;
|
|
||||||
|
|
||||||
import java.awt.*;
|
import java.awt.*;
|
||||||
import java.nio.FloatBuffer;
|
|
||||||
import java.nio.IntBuffer;
|
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
|
|
||||||
import static baritone.api.command.IBaritoneChatControl.FORCE_COMMAND_PREFIX;
|
import static baritone.api.command.IBaritoneChatControl.FORCE_COMMAND_PREFIX;
|
||||||
@@ -45,11 +44,7 @@ import static org.lwjgl.opengl.GL11.*;
|
|||||||
|
|
||||||
public class GuiClick extends Screen implements Helper {
|
public class GuiClick extends Screen implements Helper {
|
||||||
|
|
||||||
// My name is Brady and I grant leijurv permission to use this pasted code
|
private Matrix4f projectionViewMatrix;
|
||||||
private final FloatBuffer MODELVIEW = BufferUtils.createFloatBuffer(16);
|
|
||||||
private final FloatBuffer PROJECTION = BufferUtils.createFloatBuffer(16);
|
|
||||||
private final IntBuffer VIEWPORT = BufferUtils.createIntBuffer(16);
|
|
||||||
private final FloatBuffer TO_WORLD_BUFFER = BufferUtils.createFloatBuffer(3);
|
|
||||||
|
|
||||||
private BlockPos clickStart;
|
private BlockPos clickStart;
|
||||||
private BlockPos currentMouseOver;
|
private BlockPos currentMouseOver;
|
||||||
@@ -67,9 +62,10 @@ public class GuiClick extends Screen implements Helper {
|
|||||||
public void render(int mouseX, int mouseY, float partialTicks) {
|
public void render(int mouseX, int mouseY, float partialTicks) {
|
||||||
double mx = mc.mouseHelper.getMouseX();
|
double mx = mc.mouseHelper.getMouseX();
|
||||||
double my = mc.mouseHelper.getMouseY();
|
double my = mc.mouseHelper.getMouseY();
|
||||||
my = mc.mainWindow.getHeight() - my;
|
|
||||||
my *= mc.mainWindow.getFramebufferHeight() / (double) mc.mainWindow.getHeight();
|
my = mc.getMainWindow().getHeight() - my;
|
||||||
mx *= mc.mainWindow.getFramebufferWidth() / (double) mc.mainWindow.getWidth();
|
my *= mc.getMainWindow().getFramebufferHeight() / (double) mc.getMainWindow().getHeight();
|
||||||
|
mx *= mc.getMainWindow().getFramebufferWidth() / (double) mc.getMainWindow().getWidth();
|
||||||
Vec3d near = toWorld(mx, my, 0);
|
Vec3d near = toWorld(mx, my, 0);
|
||||||
Vec3d far = toWorld(mx, my, 1); // "Use 0.945 that's what stack overflow says" - leijurv
|
Vec3d far = toWorld(mx, my, 1); // "Use 0.945 that's what stack overflow says" - leijurv
|
||||||
if (near != null && far != null) {
|
if (near != null && far != null) {
|
||||||
@@ -114,224 +110,52 @@ public class GuiClick extends Screen implements Helper {
|
|||||||
return super.mouseClicked(mouseX, mouseY, mouseButton);
|
return super.mouseClicked(mouseX, mouseY, mouseButton);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void onRender() {
|
public void onRender(MatrixStack modelViewStack, Matrix4f projectionMatrix) {
|
||||||
GlStateManager.getMatrix(GL_MODELVIEW_MATRIX, (FloatBuffer) MODELVIEW.clear());
|
this.projectionViewMatrix = projectionMatrix.copy();
|
||||||
GlStateManager.getMatrix(GL_PROJECTION_MATRIX, (FloatBuffer) PROJECTION.clear());
|
this.projectionViewMatrix.mul(modelViewStack.getLast().getMatrix());
|
||||||
GL11.glGetIntegerv(GL_VIEWPORT, (IntBuffer) VIEWPORT.clear());
|
this.projectionViewMatrix.invert();
|
||||||
|
|
||||||
if (currentMouseOver != null) {
|
if (currentMouseOver != null) {
|
||||||
Entity e = mc.getRenderViewEntity();
|
Entity e = mc.getRenderViewEntity();
|
||||||
// drawSingleSelectionBox WHEN?
|
// drawSingleSelectionBox WHEN?
|
||||||
PathRenderer.drawManySelectionBoxes(e, Collections.singletonList(currentMouseOver), Color.CYAN);
|
PathRenderer.drawManySelectionBoxes(modelViewStack, e, Collections.singletonList(currentMouseOver), Color.CYAN);
|
||||||
if (clickStart != null && !clickStart.equals(currentMouseOver)) {
|
if (clickStart != null && !clickStart.equals(currentMouseOver)) {
|
||||||
GlStateManager.enableBlend();
|
RenderSystem.enableBlend();
|
||||||
GlStateManager.blendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ZERO);
|
RenderSystem.blendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ZERO);
|
||||||
GlStateManager.color4f(Color.RED.getColorComponents(null)[0], Color.RED.getColorComponents(null)[1], Color.RED.getColorComponents(null)[2], 0.4F);
|
RenderSystem.color4f(Color.RED.getColorComponents(null)[0], Color.RED.getColorComponents(null)[1], Color.RED.getColorComponents(null)[2], 0.4F);
|
||||||
GlStateManager.lineWidth(Baritone.settings().pathRenderLineWidthPixels.value);
|
RenderSystem.lineWidth(Baritone.settings().pathRenderLineWidthPixels.value);
|
||||||
GlStateManager.disableTexture();
|
RenderSystem.disableTexture();
|
||||||
GlStateManager.depthMask(false);
|
RenderSystem.depthMask(false);
|
||||||
GlStateManager.disableDepthTest();
|
RenderSystem.disableDepthTest();
|
||||||
BetterBlockPos a = new BetterBlockPos(currentMouseOver);
|
BetterBlockPos a = new BetterBlockPos(currentMouseOver);
|
||||||
BetterBlockPos b = new BetterBlockPos(clickStart);
|
BetterBlockPos b = new BetterBlockPos(clickStart);
|
||||||
IRenderer.drawAABB(new AxisAlignedBB(Math.min(a.x, b.x), Math.min(a.y, b.y), Math.min(a.z, b.z), Math.max(a.x, b.x) + 1, Math.max(a.y, b.y) + 1, Math.max(a.z, b.z) + 1));
|
IRenderer.drawAABB(modelViewStack, new AxisAlignedBB(Math.min(a.x, b.x), Math.min(a.y, b.y), Math.min(a.z, b.z), Math.max(a.x, b.x) + 1, Math.max(a.y, b.y) + 1, Math.max(a.z, b.z) + 1));
|
||||||
GlStateManager.enableDepthTest();
|
RenderSystem.enableDepthTest();
|
||||||
|
|
||||||
GlStateManager.depthMask(true);
|
RenderSystem.depthMask(true);
|
||||||
GlStateManager.enableTexture();
|
RenderSystem.enableTexture();
|
||||||
GlStateManager.disableBlend();
|
RenderSystem.disableBlend();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private Vec3d toWorld(double x, double y, double z) {
|
private Vec3d toWorld(double x, double y, double z) {
|
||||||
boolean result = gluUnProject((float) x, (float) y, (float) z, MODELVIEW, PROJECTION, VIEWPORT, (FloatBuffer) TO_WORLD_BUFFER.clear());
|
if (this.projectionViewMatrix == null) {
|
||||||
if (result) {
|
return null;
|
||||||
return new Vec3d(TO_WORLD_BUFFER.get(0), TO_WORLD_BUFFER.get(1), TO_WORLD_BUFFER.get(2));
|
|
||||||
}
|
}
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
// skidded from lwjgl2 :ok_hand:
|
x /= mc.getMainWindow().getFramebufferWidth();
|
||||||
// its uhhhhh mit license so its ok
|
y /= mc.getMainWindow().getFramebufferHeight();
|
||||||
// here is the uhh license
|
x = x * 2 - 1;
|
||||||
/*
|
y = y * 2 - 1;
|
||||||
* Copyright (c) 2002-2007 Lightweight Java Game Library Project
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions are
|
|
||||||
* met:
|
|
||||||
*
|
|
||||||
* * Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
*
|
|
||||||
* * Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* * Neither the name of 'Light Weight Java Game Library' nor the names of
|
|
||||||
* its contributors may be used to endorse or promote products derived
|
|
||||||
* from this software without specific prior written permission.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
||||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
|
|
||||||
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
|
||||||
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
|
|
||||||
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
|
||||||
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
|
||||||
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
|
|
||||||
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
|
|
||||||
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
|
|
||||||
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
public static boolean gluUnProject(
|
|
||||||
float winx,
|
|
||||||
float winy,
|
|
||||||
float winz,
|
|
||||||
FloatBuffer modelMatrix,
|
|
||||||
FloatBuffer projMatrix,
|
|
||||||
IntBuffer viewport,
|
|
||||||
FloatBuffer obj_pos) {
|
|
||||||
FloatBuffer finalMatrix = BufferUtils.createFloatBuffer(16);
|
|
||||||
float[] in = new float[4];
|
|
||||||
float[] out = new float[4];
|
|
||||||
|
|
||||||
__gluMultMatricesf(modelMatrix, projMatrix, finalMatrix);
|
|
||||||
|
|
||||||
if (!__gluInvertMatrixf(finalMatrix, finalMatrix))
|
|
||||||
return false;
|
|
||||||
|
|
||||||
in[0] = winx;
|
|
||||||
in[1] = winy;
|
|
||||||
in[2] = winz;
|
|
||||||
in[3] = 1.0f;
|
|
||||||
|
|
||||||
// Map x and y from window coordinates
|
|
||||||
in[0] = (in[0] - viewport.get(viewport.position() + 0)) / viewport.get(viewport.position() + 2);
|
|
||||||
in[1] = (in[1] - viewport.get(viewport.position() + 1)) / viewport.get(viewport.position() + 3);
|
|
||||||
|
|
||||||
// Map to range -1 to 1
|
|
||||||
in[0] = in[0] * 2 - 1;
|
|
||||||
in[1] = in[1] * 2 - 1;
|
|
||||||
in[2] = in[2] * 2 - 1;
|
|
||||||
|
|
||||||
__gluMultMatrixVecf(finalMatrix, in, out);
|
|
||||||
|
|
||||||
if (out[3] == 0.0)
|
|
||||||
return false;
|
|
||||||
|
|
||||||
out[3] = 1.0f / out[3];
|
|
||||||
|
|
||||||
obj_pos.put(obj_pos.position() + 0, out[0] * out[3]);
|
|
||||||
obj_pos.put(obj_pos.position() + 1, out[1] * out[3]);
|
|
||||||
obj_pos.put(obj_pos.position() + 2, out[2] * out[3]);
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void __gluMultMatrixVecf(FloatBuffer m, float[] in, float[] out) {
|
|
||||||
for (int i = 0; i < 4; i++) {
|
|
||||||
out[i] =
|
|
||||||
in[0] * m.get(m.position() + 0 * 4 + i)
|
|
||||||
+ in[1] * m.get(m.position() + 1 * 4 + i)
|
|
||||||
+ in[2] * m.get(m.position() + 2 * 4 + i)
|
|
||||||
+ in[3] * m.get(m.position() + 3 * 4 + i);
|
|
||||||
|
|
||||||
|
Vector4f pos = new Vector4f((float) x, (float) y, (float) z, 1.0F);
|
||||||
|
pos.transform(this.projectionViewMatrix);
|
||||||
|
if (pos.getW() == 0) {
|
||||||
|
return null;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
private static void __gluMultMatricesf(FloatBuffer a, FloatBuffer b, FloatBuffer r) {
|
pos.perspectiveDivide();
|
||||||
for (int i = 0; i < 4; i++) {
|
return new Vec3d(pos.getX(), pos.getY(), pos.getZ());
|
||||||
for (int j = 0; j < 4; j++) {
|
|
||||||
r.put(r.position() + i * 4 + j,
|
|
||||||
a.get(a.position() + i * 4 + 0) * b.get(b.position() + 0 * 4 + j) + a.get(a.position() + i * 4 + 1) * b.get(b.position() + 1 * 4 + j) + a.get(a.position() + i * 4 + 2) * b.get(b.position() + 2 * 4 + j) + a.get(a.position() + i * 4 + 3) * b.get(b.position() + 3 * 4 + j));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static boolean __gluInvertMatrixf(FloatBuffer src, FloatBuffer inverse) {
|
|
||||||
int i, j, k, swap;
|
|
||||||
float t;
|
|
||||||
FloatBuffer temp = BufferUtils.createFloatBuffer(16);
|
|
||||||
|
|
||||||
|
|
||||||
for (i = 0; i < 16; i++) {
|
|
||||||
temp.put(i, src.get(i + src.position()));
|
|
||||||
}
|
|
||||||
__gluMakeIdentityf(inverse);
|
|
||||||
|
|
||||||
for (i = 0; i < 4; i++) {
|
|
||||||
/*
|
|
||||||
* * Look for largest element in column
|
|
||||||
*/
|
|
||||||
swap = i;
|
|
||||||
for (j = i + 1; j < 4; j++) {
|
|
||||||
/*
|
|
||||||
* if (fabs(temp[j][i]) > fabs(temp[i][i])) { swap = j;
|
|
||||||
*/
|
|
||||||
if (Math.abs(temp.get(j * 4 + i)) > Math.abs(temp.get(i * 4 + i))) {
|
|
||||||
swap = j;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (swap != i) {
|
|
||||||
/*
|
|
||||||
* * Swap rows.
|
|
||||||
*/
|
|
||||||
for (k = 0; k < 4; k++) {
|
|
||||||
t = temp.get(i * 4 + k);
|
|
||||||
temp.put(i * 4 + k, temp.get(swap * 4 + k));
|
|
||||||
temp.put(swap * 4 + k, t);
|
|
||||||
|
|
||||||
t = inverse.get(i * 4 + k);
|
|
||||||
inverse.put(i * 4 + k, inverse.get(swap * 4 + k));
|
|
||||||
//inverse.put((i << 2) + k, inverse.get((swap << 2) + k));
|
|
||||||
inverse.put(swap * 4 + k, t);
|
|
||||||
//inverse.put((swap << 2) + k, t);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (temp.get(i * 4 + i) == 0) {
|
|
||||||
/*
|
|
||||||
* * No non-zero pivot. The matrix is singular, which shouldn't *
|
|
||||||
* happen. This means the user gave us a bad matrix.
|
|
||||||
*/
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
t = temp.get(i * 4 + i);
|
|
||||||
for (k = 0; k < 4; k++) {
|
|
||||||
temp.put(i * 4 + k, temp.get(i * 4 + k) / t);
|
|
||||||
inverse.put(i * 4 + k, inverse.get(i * 4 + k) / t);
|
|
||||||
}
|
|
||||||
for (j = 0; j < 4; j++) {
|
|
||||||
if (j != i) {
|
|
||||||
t = temp.get(j * 4 + i);
|
|
||||||
for (k = 0; k < 4; k++) {
|
|
||||||
temp.put(j * 4 + k, temp.get(j * 4 + k) - temp.get(i * 4 + k) * t);
|
|
||||||
inverse.put(j * 4 + k, inverse.get(j * 4 + k) - inverse.get(i * 4 + k) * t);
|
|
||||||
/*inverse.put(
|
|
||||||
(j << 2) + k,
|
|
||||||
inverse.get((j << 2) + k) - inverse.get((i << 2) + k) * t);*/
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static final float[] IDENTITY_MATRIX =
|
|
||||||
new float[]{
|
|
||||||
1.0f, 0.0f, 0.0f, 0.0f,
|
|
||||||
0.0f, 1.0f, 0.0f, 0.0f,
|
|
||||||
0.0f, 0.0f, 1.0f, 0.0f,
|
|
||||||
0.0f, 0.0f, 0.0f, 1.0f};
|
|
||||||
|
|
||||||
private static void __gluMakeIdentityf(FloatBuffer m) {
|
|
||||||
int oldPos = m.position();
|
|
||||||
m.put(IDENTITY_MATRIX);
|
|
||||||
m.position(oldPos);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,8 +21,10 @@ import baritone.api.BaritoneAPI;
|
|||||||
import baritone.api.Settings;
|
import baritone.api.Settings;
|
||||||
import baritone.api.utils.Helper;
|
import baritone.api.utils.Helper;
|
||||||
import baritone.utils.accessor.IEntityRenderManager;
|
import baritone.utils.accessor.IEntityRenderManager;
|
||||||
import com.mojang.blaze3d.platform.GlStateManager;
|
import com.mojang.blaze3d.matrix.MatrixStack;
|
||||||
|
import com.mojang.blaze3d.systems.RenderSystem;
|
||||||
import net.minecraft.client.renderer.BufferBuilder;
|
import net.minecraft.client.renderer.BufferBuilder;
|
||||||
|
import net.minecraft.client.renderer.Matrix4f;
|
||||||
import net.minecraft.client.renderer.Tessellator;
|
import net.minecraft.client.renderer.Tessellator;
|
||||||
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
|
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
|
||||||
import net.minecraft.util.math.AxisAlignedBB;
|
import net.minecraft.util.math.AxisAlignedBB;
|
||||||
@@ -40,20 +42,20 @@ public interface IRenderer {
|
|||||||
|
|
||||||
static void glColor(Color color, float alpha) {
|
static void glColor(Color color, float alpha) {
|
||||||
float[] colorComponents = color.getColorComponents(null);
|
float[] colorComponents = color.getColorComponents(null);
|
||||||
GlStateManager.color4f(colorComponents[0], colorComponents[1], colorComponents[2], alpha);
|
RenderSystem.color4f(colorComponents[0], colorComponents[1], colorComponents[2], alpha);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void startLines(Color color, float alpha, float lineWidth, boolean ignoreDepth) {
|
static void startLines(Color color, float alpha, float lineWidth, boolean ignoreDepth) {
|
||||||
GlStateManager.enableBlend();
|
RenderSystem.enableBlend();
|
||||||
GlStateManager.disableLighting();
|
RenderSystem.disableLighting();
|
||||||
GlStateManager.blendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ZERO);
|
RenderSystem.blendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ZERO);
|
||||||
glColor(color, alpha);
|
glColor(color, alpha);
|
||||||
GlStateManager.lineWidth(lineWidth);
|
RenderSystem.lineWidth(lineWidth);
|
||||||
GlStateManager.disableTexture();
|
RenderSystem.disableTexture();
|
||||||
GlStateManager.depthMask(false);
|
RenderSystem.depthMask(false);
|
||||||
|
|
||||||
if (ignoreDepth) {
|
if (ignoreDepth) {
|
||||||
GlStateManager.disableDepthTest();
|
RenderSystem.disableDepthTest();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -63,50 +65,51 @@ public interface IRenderer {
|
|||||||
|
|
||||||
static void endLines(boolean ignoredDepth) {
|
static void endLines(boolean ignoredDepth) {
|
||||||
if (ignoredDepth) {
|
if (ignoredDepth) {
|
||||||
GlStateManager.enableDepthTest();
|
RenderSystem.enableDepthTest();
|
||||||
}
|
}
|
||||||
|
|
||||||
GlStateManager.depthMask(true);
|
RenderSystem.depthMask(true);
|
||||||
GlStateManager.enableTexture();
|
RenderSystem.enableTexture();
|
||||||
GlStateManager.enableLighting();
|
RenderSystem.enableLighting();
|
||||||
GlStateManager.disableBlend();
|
RenderSystem.disableBlend();
|
||||||
}
|
}
|
||||||
|
|
||||||
static void drawAABB(AxisAlignedBB aabb) {
|
static void drawAABB(MatrixStack stack, AxisAlignedBB aabb) {
|
||||||
AxisAlignedBB toDraw = aabb.offset(-renderManager.renderPosX(), -renderManager.renderPosY(), -renderManager.renderPosZ());
|
AxisAlignedBB toDraw = aabb.offset(-renderManager.renderPosX(), -renderManager.renderPosY(), -renderManager.renderPosZ());
|
||||||
|
|
||||||
|
Matrix4f matrix4f = stack.getLast().getMatrix();
|
||||||
buffer.begin(GL_LINES, DefaultVertexFormats.POSITION);
|
buffer.begin(GL_LINES, DefaultVertexFormats.POSITION);
|
||||||
// bottom
|
// bottom
|
||||||
buffer.pos(toDraw.minX, toDraw.minY, toDraw.minZ).endVertex();
|
buffer.pos(matrix4f, (float) toDraw.minX, (float) toDraw.minY, (float) toDraw.minZ).endVertex();
|
||||||
buffer.pos(toDraw.maxX, toDraw.minY, toDraw.minZ).endVertex();
|
buffer.pos(matrix4f, (float) toDraw.maxX, (float) toDraw.minY, (float) toDraw.minZ).endVertex();
|
||||||
buffer.pos(toDraw.maxX, toDraw.minY, toDraw.minZ).endVertex();
|
buffer.pos(matrix4f, (float) toDraw.maxX, (float) toDraw.minY, (float) toDraw.minZ).endVertex();
|
||||||
buffer.pos(toDraw.maxX, toDraw.minY, toDraw.maxZ).endVertex();
|
buffer.pos(matrix4f, (float) toDraw.maxX, (float) toDraw.minY, (float) toDraw.maxZ).endVertex();
|
||||||
buffer.pos(toDraw.maxX, toDraw.minY, toDraw.maxZ).endVertex();
|
buffer.pos(matrix4f, (float) toDraw.maxX, (float) toDraw.minY, (float) toDraw.maxZ).endVertex();
|
||||||
buffer.pos(toDraw.minX, toDraw.minY, toDraw.maxZ).endVertex();
|
buffer.pos(matrix4f, (float) toDraw.minX, (float) toDraw.minY, (float) toDraw.maxZ).endVertex();
|
||||||
buffer.pos(toDraw.minX, toDraw.minY, toDraw.maxZ).endVertex();
|
buffer.pos(matrix4f, (float) toDraw.minX, (float) toDraw.minY, (float) toDraw.maxZ).endVertex();
|
||||||
buffer.pos(toDraw.minX, toDraw.minY, toDraw.minZ).endVertex();
|
buffer.pos(matrix4f, (float) toDraw.minX, (float) toDraw.minY, (float) toDraw.minZ).endVertex();
|
||||||
// top
|
// top
|
||||||
buffer.pos(toDraw.minX, toDraw.maxY, toDraw.minZ).endVertex();
|
buffer.pos(matrix4f, (float) toDraw.minX, (float) toDraw.maxY, (float) toDraw.minZ).endVertex();
|
||||||
buffer.pos(toDraw.maxX, toDraw.maxY, toDraw.minZ).endVertex();
|
buffer.pos(matrix4f, (float) toDraw.maxX, (float) toDraw.maxY, (float) toDraw.minZ).endVertex();
|
||||||
buffer.pos(toDraw.maxX, toDraw.maxY, toDraw.minZ).endVertex();
|
buffer.pos(matrix4f, (float) toDraw.maxX, (float) toDraw.maxY, (float) toDraw.minZ).endVertex();
|
||||||
buffer.pos(toDraw.maxX, toDraw.maxY, toDraw.maxZ).endVertex();
|
buffer.pos(matrix4f, (float) toDraw.maxX, (float) toDraw.maxY, (float) toDraw.maxZ).endVertex();
|
||||||
buffer.pos(toDraw.maxX, toDraw.maxY, toDraw.maxZ).endVertex();
|
buffer.pos(matrix4f, (float) toDraw.maxX, (float) toDraw.maxY, (float) toDraw.maxZ).endVertex();
|
||||||
buffer.pos(toDraw.minX, toDraw.maxY, toDraw.maxZ).endVertex();
|
buffer.pos(matrix4f, (float) toDraw.minX, (float) toDraw.maxY, (float) toDraw.maxZ).endVertex();
|
||||||
buffer.pos(toDraw.minX, toDraw.maxY, toDraw.maxZ).endVertex();
|
buffer.pos(matrix4f, (float) toDraw.minX, (float) toDraw.maxY, (float) toDraw.maxZ).endVertex();
|
||||||
buffer.pos(toDraw.minX, toDraw.maxY, toDraw.minZ).endVertex();
|
buffer.pos(matrix4f, (float) toDraw.minX, (float) toDraw.maxY, (float) toDraw.minZ).endVertex();
|
||||||
// corners
|
// corners
|
||||||
buffer.pos(toDraw.minX, toDraw.minY, toDraw.minZ).endVertex();
|
buffer.pos(matrix4f, (float) toDraw.minX, (float) toDraw.minY, (float) toDraw.minZ).endVertex();
|
||||||
buffer.pos(toDraw.minX, toDraw.maxY, toDraw.minZ).endVertex();
|
buffer.pos(matrix4f, (float) toDraw.minX, (float) toDraw.maxY, (float) toDraw.minZ).endVertex();
|
||||||
buffer.pos(toDraw.maxX, toDraw.minY, toDraw.minZ).endVertex();
|
buffer.pos(matrix4f, (float) toDraw.maxX, (float) toDraw.minY, (float) toDraw.minZ).endVertex();
|
||||||
buffer.pos(toDraw.maxX, toDraw.maxY, toDraw.minZ).endVertex();
|
buffer.pos(matrix4f, (float) toDraw.maxX, (float) toDraw.maxY, (float) toDraw.minZ).endVertex();
|
||||||
buffer.pos(toDraw.maxX, toDraw.minY, toDraw.maxZ).endVertex();
|
buffer.pos(matrix4f, (float) toDraw.maxX, (float) toDraw.minY, (float) toDraw.maxZ).endVertex();
|
||||||
buffer.pos(toDraw.maxX, toDraw.maxY, toDraw.maxZ).endVertex();
|
buffer.pos(matrix4f, (float) toDraw.maxX, (float) toDraw.maxY, (float) toDraw.maxZ).endVertex();
|
||||||
buffer.pos(toDraw.minX, toDraw.minY, toDraw.maxZ).endVertex();
|
buffer.pos(matrix4f, (float) toDraw.minX, (float) toDraw.minY, (float) toDraw.maxZ).endVertex();
|
||||||
buffer.pos(toDraw.minX, toDraw.maxY, toDraw.maxZ).endVertex();
|
buffer.pos(matrix4f, (float) toDraw.minX, (float) toDraw.maxY, (float) toDraw.maxZ).endVertex();
|
||||||
tessellator.draw();
|
tessellator.draw();
|
||||||
}
|
}
|
||||||
|
|
||||||
static void drawAABB(AxisAlignedBB aabb, double expand) {
|
static void drawAABB(MatrixStack stack, AxisAlignedBB aabb, double expand) {
|
||||||
drawAABB(aabb.grow(expand, expand, expand));
|
drawAABB(stack, aabb.grow(expand, expand, expand));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,8 +26,10 @@ import baritone.api.utils.Helper;
|
|||||||
import baritone.api.utils.interfaces.IGoalRenderPos;
|
import baritone.api.utils.interfaces.IGoalRenderPos;
|
||||||
import baritone.behavior.PathingBehavior;
|
import baritone.behavior.PathingBehavior;
|
||||||
import baritone.pathing.path.PathExecutor;
|
import baritone.pathing.path.PathExecutor;
|
||||||
import com.mojang.blaze3d.platform.GlStateManager;
|
import com.mojang.blaze3d.matrix.MatrixStack;
|
||||||
|
import com.mojang.blaze3d.systems.RenderSystem;
|
||||||
import net.minecraft.block.BlockState;
|
import net.minecraft.block.BlockState;
|
||||||
|
import net.minecraft.client.renderer.Matrix4f;
|
||||||
import net.minecraft.client.renderer.tileentity.BeaconTileEntityRenderer;
|
import net.minecraft.client.renderer.tileentity.BeaconTileEntityRenderer;
|
||||||
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
|
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
|
||||||
import net.minecraft.entity.Entity;
|
import net.minecraft.entity.Entity;
|
||||||
@@ -72,7 +74,7 @@ public final class PathRenderer implements IRenderer, Helper {
|
|||||||
float partialTicks = event.getPartialTicks();
|
float partialTicks = event.getPartialTicks();
|
||||||
Goal goal = behavior.getGoal();
|
Goal goal = behavior.getGoal();
|
||||||
if (Helper.mc.currentScreen instanceof GuiClick) {
|
if (Helper.mc.currentScreen instanceof GuiClick) {
|
||||||
((GuiClick) Helper.mc.currentScreen).onRender();
|
((GuiClick) Helper.mc.currentScreen).onRender(event.getModelViewStack(), event.getProjectionMatrix());
|
||||||
}
|
}
|
||||||
|
|
||||||
int thisPlayerDimension = behavior.baritone.getPlayerContext().world().getDimension().getType().getId();
|
int thisPlayerDimension = behavior.baritone.getPlayerContext().world().getDimension().getType().getId();
|
||||||
@@ -93,7 +95,7 @@ public final class PathRenderer implements IRenderer, Helper {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (goal != null && settings.renderGoal.value) {
|
if (goal != null && settings.renderGoal.value) {
|
||||||
drawDankLitGoalBox(renderView, goal, partialTicks, settings.colorGoalBox.value);
|
drawDankLitGoalBox(event.getModelViewStack(), renderView, goal, partialTicks, settings.colorGoalBox.value);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!settings.renderPath.value) {
|
if (!settings.renderPath.value) {
|
||||||
@@ -103,9 +105,9 @@ public final class PathRenderer implements IRenderer, Helper {
|
|||||||
PathExecutor current = behavior.getCurrent(); // this should prevent most race conditions?
|
PathExecutor current = behavior.getCurrent(); // this should prevent most race conditions?
|
||||||
PathExecutor next = behavior.getNext(); // like, now it's not possible for current!=null to be true, then suddenly false because of another thread
|
PathExecutor next = behavior.getNext(); // like, now it's not possible for current!=null to be true, then suddenly false because of another thread
|
||||||
if (current != null && settings.renderSelectionBoxes.value) {
|
if (current != null && settings.renderSelectionBoxes.value) {
|
||||||
drawManySelectionBoxes(renderView, current.toBreak(), settings.colorBlocksToBreak.value);
|
drawManySelectionBoxes(event.getModelViewStack(), renderView, current.toBreak(), settings.colorBlocksToBreak.value);
|
||||||
drawManySelectionBoxes(renderView, current.toPlace(), settings.colorBlocksToPlace.value);
|
drawManySelectionBoxes(event.getModelViewStack(), renderView, current.toPlace(), settings.colorBlocksToPlace.value);
|
||||||
drawManySelectionBoxes(renderView, current.toWalkInto(), settings.colorBlocksToWalkInto.value);
|
drawManySelectionBoxes(event.getModelViewStack(), renderView, current.toWalkInto(), settings.colorBlocksToWalkInto.value);
|
||||||
}
|
}
|
||||||
|
|
||||||
//drawManySelectionBoxes(player, Collections.singletonList(behavior.pathStart()), partialTicks, Color.WHITE);
|
//drawManySelectionBoxes(player, Collections.singletonList(behavior.pathStart()), partialTicks, Color.WHITE);
|
||||||
@@ -113,27 +115,27 @@ public final class PathRenderer implements IRenderer, Helper {
|
|||||||
// Render the current path, if there is one
|
// Render the current path, if there is one
|
||||||
if (current != null && current.getPath() != null) {
|
if (current != null && current.getPath() != null) {
|
||||||
int renderBegin = Math.max(current.getPosition() - 3, 0);
|
int renderBegin = Math.max(current.getPosition() - 3, 0);
|
||||||
drawPath(current.getPath(), renderBegin, settings.colorCurrentPath.value, settings.fadePath.value, 10, 20);
|
drawPath(event.getModelViewStack(), current.getPath(), renderBegin, settings.colorCurrentPath.value, settings.fadePath.value, 10, 20);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (next != null && next.getPath() != null) {
|
if (next != null && next.getPath() != null) {
|
||||||
drawPath(next.getPath(), 0, settings.colorNextPath.value, settings.fadePath.value, 10, 20);
|
drawPath(event.getModelViewStack(), next.getPath(), 0, settings.colorNextPath.value, settings.fadePath.value, 10, 20);
|
||||||
}
|
}
|
||||||
|
|
||||||
// If there is a path calculation currently running, render the path calculation process
|
// If there is a path calculation currently running, render the path calculation process
|
||||||
behavior.getInProgress().ifPresent(currentlyRunning -> {
|
behavior.getInProgress().ifPresent(currentlyRunning -> {
|
||||||
currentlyRunning.bestPathSoFar().ifPresent(p -> {
|
currentlyRunning.bestPathSoFar().ifPresent(p -> {
|
||||||
drawPath(p, 0, settings.colorBestPathSoFar.value, settings.fadePath.value, 10, 20);
|
drawPath(event.getModelViewStack(), p, 0, settings.colorBestPathSoFar.value, settings.fadePath.value, 10, 20);
|
||||||
});
|
});
|
||||||
|
|
||||||
currentlyRunning.pathToMostRecentNodeConsidered().ifPresent(mr -> {
|
currentlyRunning.pathToMostRecentNodeConsidered().ifPresent(mr -> {
|
||||||
drawPath(mr, 0, settings.colorMostRecentConsidered.value, settings.fadePath.value, 10, 20);
|
drawPath(event.getModelViewStack(), mr, 0, settings.colorMostRecentConsidered.value, settings.fadePath.value, 10, 20);
|
||||||
drawManySelectionBoxes(renderView, Collections.singletonList(mr.getDest()), settings.colorMostRecentConsidered.value);
|
drawManySelectionBoxes(event.getModelViewStack(), renderView, Collections.singletonList(mr.getDest()), settings.colorMostRecentConsidered.value);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void drawPath(IPath path, int startIndex, Color color, boolean fadeOut, int fadeStart0, int fadeEnd0) {
|
public static void drawPath(MatrixStack stack, IPath path, int startIndex, Color color, boolean fadeOut, int fadeStart0, int fadeEnd0) {
|
||||||
IRenderer.startLines(color, settings.pathRenderLineWidthPixels.value, settings.renderPathIgnoreDepth.value);
|
IRenderer.startLines(color, settings.pathRenderLineWidthPixels.value, settings.renderPathIgnoreDepth.value);
|
||||||
|
|
||||||
int fadeStart = fadeStart0 + startIndex;
|
int fadeStart = fadeStart0 + startIndex;
|
||||||
@@ -169,7 +171,7 @@ public final class PathRenderer implements IRenderer, Helper {
|
|||||||
IRenderer.glColor(color, alpha);
|
IRenderer.glColor(color, alpha);
|
||||||
}
|
}
|
||||||
|
|
||||||
drawLine(start.x, start.y, start.z, end.x, end.y, end.z);
|
drawLine(stack, start.x, start.y, start.z, end.x, end.y, end.z);
|
||||||
|
|
||||||
tessellator.draw();
|
tessellator.draw();
|
||||||
}
|
}
|
||||||
@@ -178,24 +180,26 @@ public final class PathRenderer implements IRenderer, Helper {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public static void drawLine(double x1, double y1, double z1, double x2, double y2, double z2) {
|
public static void drawLine(MatrixStack stack, double x1, double y1, double z1, double x2, double y2, double z2) {
|
||||||
|
Matrix4f matrix4f = stack.getLast().getMatrix();
|
||||||
|
|
||||||
double vpX = posX();
|
double vpX = posX();
|
||||||
double vpY = posY();
|
double vpY = posY();
|
||||||
double vpZ = posZ();
|
double vpZ = posZ();
|
||||||
boolean renderPathAsFrickinThingy = !settings.renderPathAsLine.value;
|
boolean renderPathAsFrickinThingy = !settings.renderPathAsLine.value;
|
||||||
|
|
||||||
buffer.begin(renderPathAsFrickinThingy ? GL_LINE_STRIP : GL_LINES, DefaultVertexFormats.POSITION);
|
buffer.begin(renderPathAsFrickinThingy ? GL_LINE_STRIP : GL_LINES, DefaultVertexFormats.POSITION);
|
||||||
buffer.pos(x1 + 0.5D - vpX, y1 + 0.5D - vpY, z1 + 0.5D - vpZ).endVertex();
|
buffer.pos(matrix4f, (float) (x1 + 0.5D - vpX), (float) (y1 + 0.5D - vpY), (float) (z1 + 0.5D - vpZ)).endVertex();
|
||||||
buffer.pos(x2 + 0.5D - vpX, y2 + 0.5D - vpY, z2 + 0.5D - vpZ).endVertex();
|
buffer.pos(matrix4f, (float) (x2 + 0.5D - vpX), (float) (y2 + 0.5D - vpY), (float) (z2 + 0.5D - vpZ)).endVertex();
|
||||||
|
|
||||||
if (renderPathAsFrickinThingy) {
|
if (renderPathAsFrickinThingy) {
|
||||||
buffer.pos(x2 + 0.5D - vpX, y2 + 0.53D - vpY, z2 + 0.5D - vpZ).endVertex();
|
buffer.pos(matrix4f, (float) (x2 + 0.5D - vpX), (float) (y2 + 0.53D - vpY), (float) (z2 + 0.5D - vpZ)).endVertex();
|
||||||
buffer.pos(x1 + 0.5D - vpX, y1 + 0.53D - vpY, z1 + 0.5D - vpZ).endVertex();
|
buffer.pos(matrix4f, (float) (x1 + 0.5D - vpX), (float) (y1 + 0.53D - vpY), (float) (z1 + 0.5D - vpZ)).endVertex();
|
||||||
buffer.pos(x1 + 0.5D - vpX, y1 + 0.5D - vpY, z1 + 0.5D - vpZ).endVertex();
|
buffer.pos(matrix4f, (float) (x1 + 0.5D - vpX), (float) (y1 + 0.5D - vpY), (float) (z1 + 0.5D - vpZ)).endVertex();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void drawManySelectionBoxes(Entity player, Collection<BlockPos> positions, Color color) {
|
public static void drawManySelectionBoxes(MatrixStack stack, Entity player, Collection<BlockPos> positions, Color color) {
|
||||||
IRenderer.startLines(color, settings.pathRenderLineWidthPixels.value, settings.renderSelectionBoxesIgnoreDepth.value);
|
IRenderer.startLines(color, settings.pathRenderLineWidthPixels.value, settings.renderSelectionBoxesIgnoreDepth.value);
|
||||||
|
|
||||||
//BlockPos blockpos = movingObjectPositionIn.getBlockPos();
|
//BlockPos blockpos = movingObjectPositionIn.getBlockPos();
|
||||||
@@ -206,13 +210,13 @@ public final class PathRenderer implements IRenderer, Helper {
|
|||||||
VoxelShape shape = state.getShape(player.world, pos);
|
VoxelShape shape = state.getShape(player.world, pos);
|
||||||
AxisAlignedBB toDraw = shape.isEmpty() ? VoxelShapes.fullCube().getBoundingBox() : shape.getBoundingBox();
|
AxisAlignedBB toDraw = shape.isEmpty() ? VoxelShapes.fullCube().getBoundingBox() : shape.getBoundingBox();
|
||||||
toDraw = toDraw.offset(pos);
|
toDraw = toDraw.offset(pos);
|
||||||
IRenderer.drawAABB(toDraw, .002D);
|
IRenderer.drawAABB(stack, toDraw, .002D);
|
||||||
});
|
});
|
||||||
|
|
||||||
IRenderer.endLines(settings.renderSelectionBoxesIgnoreDepth.value);
|
IRenderer.endLines(settings.renderSelectionBoxesIgnoreDepth.value);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void drawDankLitGoalBox(Entity player, Goal goal, float partialTicks, Color color) {
|
public static void drawDankLitGoalBox(MatrixStack stack, Entity player, Goal goal, float partialTicks, Color color) {
|
||||||
double renderPosX = posX();
|
double renderPosX = posX();
|
||||||
double renderPosY = posY();
|
double renderPosY = posY();
|
||||||
double renderPosZ = posZ();
|
double renderPosZ = posZ();
|
||||||
@@ -247,27 +251,32 @@ public final class PathRenderer implements IRenderer, Helper {
|
|||||||
|
|
||||||
Helper.mc.getTextureManager().bindTexture(TEXTURE_BEACON_BEAM);
|
Helper.mc.getTextureManager().bindTexture(TEXTURE_BEACON_BEAM);
|
||||||
if (settings.renderGoalIgnoreDepth.value) {
|
if (settings.renderGoalIgnoreDepth.value) {
|
||||||
GlStateManager.disableDepthTest();
|
RenderSystem.disableDepthTest();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
stack.push(); // push
|
||||||
|
stack.translate(goalPos.getX() - renderPosX, -renderPosY, goalPos.getZ() - renderPosZ); // translate
|
||||||
|
|
||||||
BeaconTileEntityRenderer.renderBeamSegment(
|
BeaconTileEntityRenderer.renderBeamSegment(
|
||||||
goalPos.getX() - renderPosX,
|
stack,
|
||||||
-renderPosY,
|
mc.getRenderTypeBuffers().getBufferSource(),
|
||||||
goalPos.getZ() - renderPosZ,
|
TEXTURE_BEACON_BEAM,
|
||||||
partialTicks,
|
partialTicks,
|
||||||
1.0,
|
1.0F,
|
||||||
player.world.getGameTime(),
|
player.world.getGameTime(),
|
||||||
0,
|
0,
|
||||||
256,
|
256,
|
||||||
color.getColorComponents(null),
|
color.getColorComponents(null),
|
||||||
|
|
||||||
// Arguments filled by the private method lol
|
// Arguments filled by the private method lol
|
||||||
0.2D,
|
0.2F,
|
||||||
0.25D
|
0.25F
|
||||||
);
|
);
|
||||||
|
|
||||||
|
stack.pop(); // pop
|
||||||
|
|
||||||
if (settings.renderGoalIgnoreDepth.value) {
|
if (settings.renderGoalIgnoreDepth.value) {
|
||||||
GlStateManager.enableDepthTest();
|
RenderSystem.enableDepthTest();
|
||||||
}
|
}
|
||||||
|
|
||||||
glPopAttrib();
|
glPopAttrib();
|
||||||
@@ -285,18 +294,18 @@ public final class PathRenderer implements IRenderer, Helper {
|
|||||||
maxY = 256 - renderPosY;
|
maxY = 256 - renderPosY;
|
||||||
} else if (goal instanceof GoalComposite) {
|
} else if (goal instanceof GoalComposite) {
|
||||||
for (Goal g : ((GoalComposite) goal).goals()) {
|
for (Goal g : ((GoalComposite) goal).goals()) {
|
||||||
drawDankLitGoalBox(player, g, partialTicks, color);
|
drawDankLitGoalBox(stack, player, g, partialTicks, color);
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
} else if (goal instanceof GoalInverted) {
|
} else if (goal instanceof GoalInverted) {
|
||||||
drawDankLitGoalBox(player, ((GoalInverted) goal).origin, partialTicks, settings.colorInvertedGoalBox.value);
|
drawDankLitGoalBox(stack, player, ((GoalInverted) goal).origin, partialTicks, settings.colorInvertedGoalBox.value);
|
||||||
return;
|
return;
|
||||||
} else if (goal instanceof GoalYLevel) {
|
} else if (goal instanceof GoalYLevel) {
|
||||||
GoalYLevel goalpos = (GoalYLevel) goal;
|
GoalYLevel goalpos = (GoalYLevel) goal;
|
||||||
minX = player.posX - settings.yLevelBoxSize.value - renderPosX;
|
minX = player.getPositionVec().x - settings.yLevelBoxSize.value - renderPosX;
|
||||||
minZ = player.posZ - settings.yLevelBoxSize.value - renderPosZ;
|
minZ = player.getPositionVec().z - settings.yLevelBoxSize.value - renderPosZ;
|
||||||
maxX = player.posX + settings.yLevelBoxSize.value - renderPosX;
|
maxX = player.getPositionVec().x + settings.yLevelBoxSize.value - renderPosX;
|
||||||
maxZ = player.posZ + settings.yLevelBoxSize.value - renderPosZ;
|
maxZ = player.getPositionVec().z + settings.yLevelBoxSize.value - renderPosZ;
|
||||||
minY = ((GoalYLevel) goal).level - renderPosY;
|
minY = ((GoalYLevel) goal).level - renderPosY;
|
||||||
maxY = minY + 2;
|
maxY = minY + 2;
|
||||||
y1 = 1 + y + goalpos.level - renderPosY;
|
y1 = 1 + y + goalpos.level - renderPosY;
|
||||||
@@ -307,31 +316,32 @@ public final class PathRenderer implements IRenderer, Helper {
|
|||||||
|
|
||||||
IRenderer.startLines(color, settings.goalRenderLineWidthPixels.value, settings.renderGoalIgnoreDepth.value);
|
IRenderer.startLines(color, settings.goalRenderLineWidthPixels.value, settings.renderGoalIgnoreDepth.value);
|
||||||
|
|
||||||
renderHorizontalQuad(minX, maxX, minZ, maxZ, y1);
|
renderHorizontalQuad(stack, minX, maxX, minZ, maxZ, y1);
|
||||||
renderHorizontalQuad(minX, maxX, minZ, maxZ, y2);
|
renderHorizontalQuad(stack, minX, maxX, minZ, maxZ, y2);
|
||||||
|
|
||||||
|
|
||||||
|
Matrix4f matrix4f = stack.getLast().getMatrix();
|
||||||
buffer.begin(GL_LINES, DefaultVertexFormats.POSITION);
|
buffer.begin(GL_LINES, DefaultVertexFormats.POSITION);
|
||||||
buffer.pos(minX, minY, minZ).endVertex();
|
buffer.pos(matrix4f, (float) minX, (float) minY, (float) minZ).endVertex();
|
||||||
buffer.pos(minX, maxY, minZ).endVertex();
|
buffer.pos(matrix4f, (float) minX, (float) maxY, (float) minZ).endVertex();
|
||||||
buffer.pos(maxX, minY, minZ).endVertex();
|
buffer.pos(matrix4f, (float) maxX, (float) minY, (float) minZ).endVertex();
|
||||||
buffer.pos(maxX, maxY, minZ).endVertex();
|
buffer.pos(matrix4f, (float) maxX, (float) maxY, (float) minZ).endVertex();
|
||||||
buffer.pos(maxX, minY, maxZ).endVertex();
|
buffer.pos(matrix4f, (float) maxX, (float) minY, (float) maxZ).endVertex();
|
||||||
buffer.pos(maxX, maxY, maxZ).endVertex();
|
buffer.pos(matrix4f, (float) maxX, (float) maxY, (float) maxZ).endVertex();
|
||||||
buffer.pos(minX, minY, maxZ).endVertex();
|
buffer.pos(matrix4f, (float) minX, (float) minY, (float) maxZ).endVertex();
|
||||||
buffer.pos(minX, maxY, maxZ).endVertex();
|
buffer.pos(matrix4f, (float) minX, (float) maxY, (float) maxZ).endVertex();
|
||||||
tessellator.draw();
|
tessellator.draw();
|
||||||
|
|
||||||
IRenderer.endLines(settings.renderGoalIgnoreDepth.value);
|
IRenderer.endLines(settings.renderGoalIgnoreDepth.value);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void renderHorizontalQuad(double minX, double maxX, double minZ, double maxZ, double y) {
|
private static void renderHorizontalQuad(MatrixStack stack, double minX, double maxX, double minZ, double maxZ, double y) {
|
||||||
if (y != 0) {
|
if (y != 0) {
|
||||||
|
Matrix4f matrix4f = stack.getLast().getMatrix();
|
||||||
buffer.begin(GL_LINE_LOOP, DefaultVertexFormats.POSITION);
|
buffer.begin(GL_LINE_LOOP, DefaultVertexFormats.POSITION);
|
||||||
buffer.pos(minX, y, minZ).endVertex();
|
buffer.pos(matrix4f, (float) minX, (float) y, (float) minZ).endVertex();
|
||||||
buffer.pos(maxX, y, minZ).endVertex();
|
buffer.pos(matrix4f, (float) maxX, (float) y, (float) minZ).endVertex();
|
||||||
buffer.pos(maxX, y, maxZ).endVertex();
|
buffer.pos(matrix4f, (float) maxX, (float) y, (float) maxZ).endVertex();
|
||||||
buffer.pos(minX, y, maxZ).endVertex();
|
buffer.pos(matrix4f, (float) minX, (float) y, (float) maxZ).endVertex();
|
||||||
tessellator.draw();
|
tessellator.draw();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ public class PlayerMovementInput extends MovementInput {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void tick(boolean p_217607_1_, boolean p_217607_2_) {
|
public void func_225607_a_(boolean p_225607_1_) {
|
||||||
this.moveStrafe = 0.0F;
|
this.moveStrafe = 0.0F;
|
||||||
this.moveForward = 0.0F;
|
this.moveForward = 0.0F;
|
||||||
|
|
||||||
@@ -51,7 +51,7 @@ public class PlayerMovementInput extends MovementInput {
|
|||||||
this.moveStrafe--;
|
this.moveStrafe--;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.sneak = handler.isInputForcedDown(Input.SNEAK)) {
|
if (this.field_228350_h_ = handler.isInputForcedDown(Input.SNEAK)) {
|
||||||
this.moveStrafe *= 0.3D;
|
this.moveStrafe *= 0.3D;
|
||||||
this.moveForward *= 0.3D;
|
this.moveForward *= 0.3D;
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -19,7 +19,7 @@ package baritone.utils.accessor;
|
|||||||
|
|
||||||
import net.minecraft.block.BlockState;
|
import net.minecraft.block.BlockState;
|
||||||
|
|
||||||
public interface IBlockStateContainer {
|
public interface IPalettedContainer {
|
||||||
|
|
||||||
BlockState getAtPalette(int index);
|
BlockState getAtPalette(int index);
|
||||||
|
|
||||||
Reference in New Issue
Block a user