From 80952e091db6aff7f7662da859b83bb0bd86b434 Mon Sep 17 00:00:00 2001 From: Leijurv Date: Thu, 9 Jan 2020 17:15:05 -0800 Subject: [PATCH] comment out anything that isn't instantly obvious how to fix (e.g. anything involving rendering) --- build.gradle | 6 +- .../baritone/api/utils/BlockOptionalMeta.java | 5 +- .../baritone/api/utils/IPlayerContext.java | 6 +- src/api/java/baritone/api/utils/VecUtils.java | 4 +- .../launch/mixins/MixinChatScreen.java | 4 +- .../mixins/MixinEntityRenderManager.java | 14 ++--- .../launch/mixins/MixinGameRenderer.java | 4 +- .../launch/mixins/MixinMinecraft.java | 19 ++---- ...ainer.java => MixinPalettedContainer.java} | 12 ++-- src/launch/resources/mixins.baritone.json | 2 +- .../baritone/behavior/InventoryBehavior.java | 2 +- .../baritone/behavior/PathingBehavior.java | 4 +- src/main/java/baritone/cache/ChunkPacker.java | 4 +- .../java/baritone/cache/WorldScanner.java | 5 +- .../movement/movements/MovementAscend.java | 6 +- .../movement/movements/MovementDescend.java | 12 ++-- .../movement/movements/MovementDiagonal.java | 2 +- .../movement/movements/MovementDownward.java | 4 +- .../movement/movements/MovementFall.java | 8 +-- .../movement/movements/MovementParkour.java | 8 +-- .../movement/movements/MovementPillar.java | 12 ++-- .../movement/movements/MovementTraverse.java | 13 +++-- .../baritone/pathing/path/PathExecutor.java | 6 +- .../java/baritone/process/BuilderProcess.java | 4 +- .../java/baritone/process/FarmProcess.java | 2 +- .../java/baritone/process/FollowProcess.java | 2 +- .../baritone/utils/BlockStateInterface.java | 4 +- src/main/java/baritone/utils/GuiClick.java | 21 +++---- src/main/java/baritone/utils/IRenderer.java | 58 +++++++++---------- .../java/baritone/utils/PathRenderer.java | 50 ++++++++-------- .../baritone/utils/PlayerMovementInput.java | 4 +- ...Container.java => IPalettedContainer.java} | 2 +- .../format/defaults/MCEditSchematic.java | 2 +- 33 files changed, 146 insertions(+), 165 deletions(-) rename src/launch/java/baritone/launch/mixins/{MixinBlockStateContainer.java => MixinPalettedContainer.java} (78%) rename src/main/java/baritone/utils/accessor/{IBlockStateContainer.java => IPalettedContainer.java} (95%) diff --git a/build.gradle b/build.gradle index 2365ba5cf..803ace85d 100755 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ */ group 'baritone' -version '1.4.4' +version '1.5.0' buildscript { repositories { @@ -82,7 +82,7 @@ task sourceJar(type: Jar, dependsOn: classes) { } minecraft { - mappings channel: 'snapshot', version: '20190814-1.14.3' + mappings channel: 'snapshot', version: '20190719-1.14.3' reobfMappings 'notch' runs { @@ -138,7 +138,7 @@ repositories { } dependencies { - minecraft 'com.github.ImpactDevelopment:Vanilla:1.14.4' + minecraft 'com.github.ImpactDevelopment:Vanilla:1.15.1' runtime launchCompile('net.minecraft:launchwrapper:1.12') { exclude module: 'lwjgl' diff --git a/src/api/java/baritone/api/utils/BlockOptionalMeta.java b/src/api/java/baritone/api/utils/BlockOptionalMeta.java index a1b38cca1..ea79192a4 100644 --- a/src/api/java/baritone/api/utils/BlockOptionalMeta.java +++ b/src/api/java/baritone/api/utils/BlockOptionalMeta.java @@ -20,7 +20,8 @@ package baritone.api.utils; import baritone.api.utils.accessor.IItemStack; import com.google.common.collect.ImmutableSet; 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.ItemStack; import net.minecraft.resources.*; @@ -143,7 +144,7 @@ public final class BlockOptionalMeta { rpl.reloadPacksFromFinders(); IResourcePack thePack = ((ResourcePackInfo) rpl.getAllPacks().iterator().next()).getResourcePack(); IReloadableResourceManager resourceManager = new SimpleReloadableResourceManager(ResourcePackType.SERVER_DATA, null); - manager = new LootTableManager(); + manager = new LootTableManager(new LootPredicateManager()); resourceManager.addReloadListener(manager); try { resourceManager.reloadResourcesAndThen(new ThreadPerTaskExecutor(Thread::new), new ThreadPerTaskExecutor(Thread::new), Collections.singletonList(thePack), CompletableFuture.completedFuture(Unit.INSTANCE)).get(); diff --git a/src/api/java/baritone/api/utils/IPlayerContext.java b/src/api/java/baritone/api/utils/IPlayerContext.java index 872e331e2..765bfeb04 100644 --- a/src/api/java/baritone/api/utils/IPlayerContext.java +++ b/src/api/java/baritone/api/utils/IPlayerContext.java @@ -56,7 +56,7 @@ public interface IPlayerContext { default BetterBlockPos playerFeet() { // 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 // that causes the game to immediately crash @@ -76,11 +76,11 @@ public interface IPlayerContext { } 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() { - 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() { diff --git a/src/api/java/baritone/api/utils/VecUtils.java b/src/api/java/baritone/api/utils/VecUtils.java index dfc71fc38..422a7efc8 100644 --- a/src/api/java/baritone/api/utils/VecUtils.java +++ b/src/api/java/baritone/api/utils/VecUtils.java @@ -105,7 +105,7 @@ public final class VecUtils { * @see #getBlockPosCenter(BlockPos) */ 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) */ 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); } } diff --git a/src/launch/java/baritone/launch/mixins/MixinChatScreen.java b/src/launch/java/baritone/launch/mixins/MixinChatScreen.java index fe52723df..238546bd1 100644 --- a/src/launch/java/baritone/launch/mixins/MixinChatScreen.java +++ b/src/launch/java/baritone/launch/mixins/MixinChatScreen.java @@ -45,7 +45,7 @@ public class MixinChatScreen { @Shadow protected TextFieldWidget inputField; - +/* @Shadow @Final protected List commandUsage; @@ -95,5 +95,5 @@ public class MixinChatScreen { this.pendingSuggestions.complete(suggestions); } } - } + }*/ } diff --git a/src/launch/java/baritone/launch/mixins/MixinEntityRenderManager.java b/src/launch/java/baritone/launch/mixins/MixinEntityRenderManager.java index 6d4058c98..d443095c6 100644 --- a/src/launch/java/baritone/launch/mixins/MixinEntityRenderManager.java +++ b/src/launch/java/baritone/launch/mixins/MixinEntityRenderManager.java @@ -20,29 +20,23 @@ package baritone.launch.mixins; import baritone.utils.accessor.IEntityRenderManager; import net.minecraft.client.renderer.entity.EntityRendererManager; import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; @Mixin(EntityRendererManager.class) public class MixinEntityRenderManager implements IEntityRenderManager { - @Shadow - private double renderPosX; - @Shadow - private double renderPosY; - @Shadow - private double renderPosZ; + @Override public double renderPosX() { - return renderPosX; + return ((EntityRendererManager) (Object) this).info.getProjectedView().x; } @Override public double renderPosY() { - return renderPosY; + return ((EntityRendererManager) (Object) this).info.getProjectedView().y; } @Override public double renderPosZ() { - return renderPosZ; + return ((EntityRendererManager) (Object) this).info.getProjectedView().z; } } diff --git a/src/launch/java/baritone/launch/mixins/MixinGameRenderer.java b/src/launch/java/baritone/launch/mixins/MixinGameRenderer.java index fb279ba0f..ac1ff5aae 100644 --- a/src/launch/java/baritone/launch/mixins/MixinGameRenderer.java +++ b/src/launch/java/baritone/launch/mixins/MixinGameRenderer.java @@ -30,14 +30,14 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; public class MixinGameRenderer { @Inject( - method = "updateCameraAndRender(FJ)V", + method = "updateCameraAndRender", at = @At( value = "INVOKE_STRING", target = "Lnet/minecraft/profiler/IProfiler;endStartSection(Ljava/lang/String;)V", args = {"ldc=hand"} ) ) - private void renderWorldPass(float partialTicks, long finishTimeNano, CallbackInfo ci) { + private void renderWorldPass(float partialTicks, long finishTimeNano, boolean idfk, CallbackInfo ci) { for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) { ibaritone.getGameEventHandler().onRenderPass(new RenderEvent(partialTicks)); } diff --git a/src/launch/java/baritone/launch/mixins/MixinMinecraft.java b/src/launch/java/baritone/launch/mixins/MixinMinecraft.java index 12f64bf21..08444bb09 100644 --- a/src/launch/java/baritone/launch/mixins/MixinMinecraft.java +++ b/src/launch/java/baritone/launch/mixins/MixinMinecraft.java @@ -19,7 +19,6 @@ package baritone.launch.mixins; import baritone.api.BaritoneAPI; import baritone.api.IBaritone; -import baritone.api.event.events.BlockInteractEvent; import baritone.api.event.events.TickEvent; import baritone.api.event.events.WorldEvent; 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.gui.screen.Screen; 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.mixin.Mixin; 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.Redirect; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import org.spongepowered.asm.mixin.injection.callback.LocalCapture; import java.util.function.BiFunction; @@ -56,7 +50,7 @@ public class MixinMinecraft { public ClientWorld world; @Inject( - method = "init", + method = "", at = @At("RETURN") ) private void postInit(CallbackInfo ci) { @@ -64,11 +58,8 @@ public class MixinMinecraft { } @Inject( - method = "init", - at = @At( - value = "INVOKE", - target = "net/minecraft/client/Minecraft.startTimerHackThread()V" - ) + method = "startTimerHackThread", + at = @At("HEAD") ) private void preInit(CallbackInfo ci) { BaritoneAutoTest.INSTANCE.onPreInit(); @@ -147,7 +138,7 @@ public class MixinMinecraft { // allow user input is only the primary baritone return (BaritoneAPI.getProvider().getPrimaryBaritone().getPathingBehavior().getCurrent() != null && player != null) || screen.passEvents; } - +/* @Inject( method = "rightClickMouse", at = @At( @@ -159,5 +150,5 @@ public class MixinMinecraft { private void onBlockUse(CallbackInfo ci, Hand var1[], int var2, int var3, Hand enumhand, ItemStack itemstack, BlockRayTraceResult raytrace, int i, ActionResultType enumactionresult) { // rightClickMouse is only for the main player BaritoneAPI.getProvider().getPrimaryBaritone().getGameEventHandler().onBlockInteract(new BlockInteractEvent(raytrace.getPos(), BlockInteractEvent.Type.USE)); - } + }*/ } diff --git a/src/launch/java/baritone/launch/mixins/MixinBlockStateContainer.java b/src/launch/java/baritone/launch/mixins/MixinPalettedContainer.java similarity index 78% rename from src/launch/java/baritone/launch/mixins/MixinBlockStateContainer.java rename to src/launch/java/baritone/launch/mixins/MixinPalettedContainer.java index d6e223d99..c9f9e35c0 100644 --- a/src/launch/java/baritone/launch/mixins/MixinBlockStateContainer.java +++ b/src/launch/java/baritone/launch/mixins/MixinPalettedContainer.java @@ -18,22 +18,22 @@ package baritone.launch.mixins; import baritone.utils.accessor.IBitArray; -import baritone.utils.accessor.IBlockStateContainer; +import baritone.utils.accessor.IPalettedContainer; import net.minecraft.block.BlockState; import net.minecraft.util.BitArray; -import net.minecraft.world.chunk.BlockStateContainer; -import net.minecraft.world.chunk.IBlockStatePalette; +import net.minecraft.util.palette.IPalette; +import net.minecraft.util.palette.PalettedContainer; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; -@Mixin(BlockStateContainer.class) -public abstract class MixinBlockStateContainer implements IBlockStateContainer { +@Mixin(PalettedContainer.class) +public abstract class MixinPalettedContainer implements IPalettedContainer { @Shadow protected BitArray storage; @Shadow - protected IBlockStatePalette palette; + protected IPalette palette; @Override public BlockState getAtPalette(int index) { diff --git a/src/launch/resources/mixins.baritone.json b/src/launch/resources/mixins.baritone.json index 9d0d1b600..cb7195d02 100644 --- a/src/launch/resources/mixins.baritone.json +++ b/src/launch/resources/mixins.baritone.json @@ -9,7 +9,6 @@ }, "client": [ "MixinBitArray", - "MixinBlockStateContainer", "MixinChatScreen", "MixinChunkArray", "MixinClientChunkProvider", @@ -23,6 +22,7 @@ "MixinLootContext", "MixinMinecraft", "MixinNetworkManager", + "MixinPalettedContainer", "MixinPlayerController", "MixinScreen" ] diff --git a/src/main/java/baritone/behavior/InventoryBehavior.java b/src/main/java/baritone/behavior/InventoryBehavior.java index 97172d309..e142c99e7 100644 --- a/src/main/java/baritone/behavior/InventoryBehavior.java +++ b/src/main/java/baritone/behavior/InventoryBehavior.java @@ -137,7 +137,7 @@ public final class InventoryBehavior extends Behavior { 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)); - 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 } if (maybe != null && throwaway(select, stack -> stack.getItem() instanceof BlockItem && ((BlockItem) stack.getItem()).getBlock().equals(maybe.getBlock()))) { diff --git a/src/main/java/baritone/behavior/PathingBehavior.java b/src/main/java/baritone/behavior/PathingBehavior.java index 86fd95055..8ed7ce218 100644 --- a/src/main/java/baritone/behavior/PathingBehavior.java +++ b/src/main/java/baritone/behavior/PathingBehavior.java @@ -381,8 +381,8 @@ public final class PathingBehavior extends Behavior implements IPathingBehavior, BetterBlockPos feet = ctx.playerFeet(); if (!MovementHelper.canWalkOn(ctx, feet.down())) { if (ctx.player().onGround) { - double playerX = ctx.player().posX; - double playerZ = ctx.player().posZ; + double playerX = ctx.player().getPositionVec().x; + double playerZ = ctx.player().getPositionVec().z; ArrayList closest = new ArrayList<>(); for (int dx = -1; dx <= 1; dx++) { for (int dz = -1; dz <= 1; dz++) { diff --git a/src/main/java/baritone/cache/ChunkPacker.java b/src/main/java/baritone/cache/ChunkPacker.java index 7387dc1d2..fda9116b8 100644 --- a/src/main/java/baritone/cache/ChunkPacker.java +++ b/src/main/java/baritone/cache/ChunkPacker.java @@ -23,7 +23,7 @@ import baritone.utils.pathing.PathingBlockType; import net.minecraft.block.*; import net.minecraft.util.math.BlockPos; 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.ChunkSection; @@ -59,7 +59,7 @@ public final class ChunkPacker { // since a bitset is initialized to all zero, and air is saved as zeros continue; } - BlockStateContainer bsc = extendedblockstorage.getData(); + PalettedContainer bsc = extendedblockstorage.getData(); int yReal = y0 << 4; // the mapping of BlockStateContainer.getIndex from xyz to index is y << 8 | z << 4 | x; // for better cache locality, iterate in that order diff --git a/src/main/java/baritone/cache/WorldScanner.java b/src/main/java/baritone/cache/WorldScanner.java index 35297a470..b2c29415b 100644 --- a/src/main/java/baritone/cache/WorldScanner.java +++ b/src/main/java/baritone/cache/WorldScanner.java @@ -22,7 +22,7 @@ import baritone.api.cache.IWorldScanner; import baritone.api.utils.BetterBlockPos; import baritone.api.utils.BlockOptionalMetaLookup; import baritone.api.utils.IPlayerContext; -import baritone.utils.accessor.IBlockStateContainer; +import baritone.utils.accessor.IPalettedContainer; import net.minecraft.block.BlockState; import net.minecraft.client.multiplayer.ClientChunkProvider; 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.Chunk; import net.minecraft.world.chunk.ChunkSection; -import net.minecraft.world.chunk.IChunk; import java.util.*; import java.util.stream.IntStream; @@ -156,7 +155,7 @@ public enum WorldScanner implements IWorldScanner { continue; } int yReal = y0 << 4; - IBlockStateContainer bsc = (IBlockStateContainer) section.getData(); + IPalettedContainer bsc = (IPalettedContainer) section.getData(); // storageArray uses an optimized algorithm that's faster than getAt // creating this array and then using getAtPalette is faster than even getFast(int index) int[] storage = bsc.storageArray(); diff --git a/src/main/java/baritone/pathing/movement/movements/MovementAscend.java b/src/main/java/baritone/pathing/movement/movements/MovementAscend.java index cd36cf615..9313aed0c 100644 --- a/src/main/java/baritone/pathing/movement/movements/MovementAscend.java +++ b/src/main/java/baritone/pathing/movement/movements/MovementAscend.java @@ -176,7 +176,7 @@ public class MovementAscend extends Movement { ticksWithoutPlacement++; if (MovementHelper.attemptToPlaceABlock(state, baritone, dest.down(), false) == PlaceResult.READY_TO_PLACE) { state.setInput(Input.SNEAK, true); - if (ctx.player().isSneaking()) { + if (ctx.player().movementInput.field_228350_h_) { 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 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 sideDist = zAxis * Math.abs((dest.getX() + 0.5D) - ctx.player().posX) + xAxis * 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().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; if (Math.abs(lateralMotion) > 0.1) { diff --git a/src/main/java/baritone/pathing/movement/movements/MovementDescend.java b/src/main/java/baritone/pathing/movement/movements/MovementDescend.java index 5d5e39c17..da74dd792 100644 --- a/src/main/java/baritone/pathing/movement/movements/MovementDescend.java +++ b/src/main/java/baritone/pathing/movement/movements/MovementDescend.java @@ -212,11 +212,11 @@ public class MovementDescend extends Movement { BlockPos playerFeet = ctx.playerFeet(); 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 return state.setStatus(MovementStatus.SUCCESS); /* 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()) { @@ -231,11 +231,11 @@ public class MovementDescend extends Movement { )).setInput(Input.MOVE_FORWARD, true); return state; } - double diffX = ctx.player().posX - (dest.getX() + 0.5); - double diffZ = ctx.player().posZ - (dest.getZ() + 0.5); + double diffX = ctx.player().getPositionVec().x - (dest.getX() + 0.5); + double diffZ = ctx.player().getPositionVec().z - (dest.getZ() + 0.5); double ab = Math.sqrt(diffX * diffX + diffZ * diffZ); - double x = ctx.player().posX - (src.getX() + 0.5); - double z = ctx.player().posZ - (src.getZ() + 0.5); + double x = ctx.player().getPositionVec().x - (src.getX() + 0.5); + double z = ctx.player().getPositionVec().z - (src.getZ() + 0.5); double fromStart = Math.sqrt(x * x + z * z); if (!playerFeet.equals(dest) || ab > 0.25) { if (numTicks++ < 20 && fromStart < 1.25) { diff --git a/src/main/java/baritone/pathing/movement/movements/MovementDiagonal.java b/src/main/java/baritone/pathing/movement/movements/MovementDiagonal.java index bff896b68..417d25a20 100644 --- a/src/main/java/baritone/pathing/movement/movements/MovementDiagonal.java +++ b/src/main/java/baritone/pathing/movement/movements/MovementDiagonal.java @@ -226,7 +226,7 @@ public class MovementDiagonal extends Movement { } else if (!playerInValidPosition() && !(MovementHelper.isLiquid(ctx, src) && getValidPositions().contains(ctx.playerFeet().up()))) { 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); } if (sprint()) { diff --git a/src/main/java/baritone/pathing/movement/movements/MovementDownward.java b/src/main/java/baritone/pathing/movement/movements/MovementDownward.java index 89c692e85..44afbb763 100644 --- a/src/main/java/baritone/pathing/movement/movements/MovementDownward.java +++ b/src/main/java/baritone/pathing/movement/movements/MovementDownward.java @@ -84,8 +84,8 @@ public class MovementDownward extends Movement { } else if (!playerInValidPosition()) { return state.setStatus(MovementStatus.UNREACHABLE); } - double diffX = ctx.player().posX - (dest.getX() + 0.5); - double diffZ = ctx.player().posZ - (dest.getZ() + 0.5); + double diffX = ctx.player().getPositionVec().x - (dest.getX() + 0.5); + double diffZ = ctx.player().getPositionVec().z - (dest.getZ() + 0.5); double ab = Math.sqrt(diffX * diffX + diffZ * diffZ); if (numTicks++ < 10 && ab < 0.2) { diff --git a/src/main/java/baritone/pathing/movement/movements/MovementFall.java b/src/main/java/baritone/pathing/movement/movements/MovementFall.java index 0ee9b778e..9062cb50a 100644 --- a/src/main/java/baritone/pathing/movement/movements/MovementFall.java +++ b/src/main/java/baritone/pathing/movement/movements/MovementFall.java @@ -100,7 +100,7 @@ public class MovementFall extends Movement { 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); targetRotation = new Rotation(toDest.getYaw(), 90.0F); @@ -115,7 +115,7 @@ public class MovementFall extends Movement { } else { 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 (PlayerInventory.isHotbar(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) - 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) { state.setInput(Input.SNEAK, true); } @@ -144,7 +144,7 @@ public class MovementFall extends Movement { if (avoid == null) { avoid = src.subtract(dest); } 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) { state.setInput(Input.MOVE_FORWARD, true); } else if (!ctx.player().onGround) { diff --git a/src/main/java/baritone/pathing/movement/movements/MovementParkour.java b/src/main/java/baritone/pathing/movement/movements/MovementParkour.java index dcbede8d8..2f894e01e 100644 --- a/src/main/java/baritone/pathing/movement/movements/MovementParkour.java +++ b/src/main/java/baritone/pathing/movement/movements/MovementParkour.java @@ -246,19 +246,19 @@ public class MovementParkour extends Movement { // but i did it anyway 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); } } 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) { // 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); } // prevent jumping too late by checking for ascend if (dist == 3 && !ascend) { // this is a 2 block gap, dest = src + direction * 3 - double xDiff = (src.x + 0.5) - ctx.player().posX; - double zDiff = (src.z + 0.5) - ctx.player().posZ; + double xDiff = (src.x + 0.5) - ctx.player().getPositionVec().x; + double zDiff = (src.z + 0.5) - ctx.player().getPositionVec().z; double distFromStart = Math.max(Math.abs(xDiff), Math.abs(zDiff)); if (distFromStart < 0.7) { return state; diff --git a/src/main/java/baritone/pathing/movement/movements/MovementPillar.java b/src/main/java/baritone/pathing/movement/movements/MovementPillar.java index 4510d4254..bb80645c5 100644 --- a/src/main/java/baritone/pathing/movement/movements/MovementPillar.java +++ b/src/main/java/baritone/pathing/movement/movements/MovementPillar.java @@ -172,7 +172,7 @@ public class MovementPillar extends Movement { // stay centered while swimming up a water column state.setTarget(new MovementState.MovementTarget(RotationUtils.calcRotationFromVec3d(ctx.playerHead(), VecUtils.getBlockPosCenter(dest), ctx.playerRotations()), false)); 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); } 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 - double diffX = ctx.player().posX - (dest.getX() + 0.5); - double diffZ = ctx.player().posZ - (dest.getZ() + 0.5); + double diffX = ctx.player().getPositionVec().x - (dest.getX() + 0.5); + double diffZ = ctx.player().getPositionVec().z - (dest.getZ() + 0.5); 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); 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)); } else if (flatMotion < 0.05) { // 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.CLICK_LEFT, true); 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().movementInput.field_228350_h_ && (ctx.isLookingAt(src.down()) || ctx.isLookingAt(src)) && ctx.player().getPositionVec().y > dest.getY() + 0.1) { state.setInput(Input.CLICK_RIGHT, true); } } diff --git a/src/main/java/baritone/pathing/movement/movements/MovementTraverse.java b/src/main/java/baritone/pathing/movement/movements/MovementTraverse.java index 909405bc9..097541f46 100644 --- a/src/main/java/baritone/pathing/movement/movements/MovementTraverse.java +++ b/src/main/java/baritone/pathing/movement/movements/MovementTraverse.java @@ -175,7 +175,7 @@ public class MovementTraverse extends Movement { return state; } // 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) { return state; } @@ -245,7 +245,7 @@ public class MovementTraverse extends Movement { } Block low = BlockStateInterface.get(ctx, src).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 // wait until we're on the ground return state; @@ -272,21 +272,22 @@ public class MovementTraverse extends Movement { wasTheBridgeBlockAlwaysThere = false; Block standingOn = BlockStateInterface.get(ctx, feet.down()).getBlock(); 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 MovementHelper.moveTowards(ctx, state, dest); return state.setInput(Input.MOVE_FORWARD, false) .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); if ((p == PlaceResult.READY_TO_PLACE || dist1 < 0.6) && !Baritone.settings().assumeSafeWalk.value) { state.setInput(Input.SNEAK, true); } switch (p) { case READY_TO_PLACE: { - if (ctx.player().isSneaking() || Baritone.settings().assumeSafeWalk.value) { + + if (ctx.player().movementInput.field_228350_h_ || Baritone.settings().assumeSafeWalk.value) { state.setInput(Input.CLICK_RIGHT, true); } return state; @@ -319,7 +320,7 @@ public class MovementTraverse extends Movement { Rotation backToFace = RotationUtils.calcRotationFromVec3d(ctx.playerHead(), new Vec3d(faceX, faceY, faceZ), ctx.playerRotations()); 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 float yaw = RotationUtils.calcRotationFromVec3d(VecUtils.getBlockPosCenter(dest), ctx.playerHead(), ctx.playerRotations()).getYaw(); state.setTarget(new MovementState.MovementTarget(new Rotation(yaw, pitch), true)); diff --git a/src/main/java/baritone/pathing/path/PathExecutor.java b/src/main/java/baritone/pathing/path/PathExecutor.java index 451b0bdc1..1400875aa 100644 --- a/src/main/java/baritone/pathing/path/PathExecutor.java +++ b/src/main/java/baritone/pathing/path/PathExecutor.java @@ -414,7 +414,7 @@ public class PathExecutor implements IPathExecutor, Helper { // playerFeet adds 0.1251 to account for soul sand // farmland is 0.9375 // 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); return true; } @@ -485,7 +485,7 @@ public class PathExecutor implements IPathExecutor, Helper { } 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) { return false; } @@ -495,7 +495,7 @@ public class PathExecutor implements IPathExecutor, Helper { return true; } // 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; } diff --git a/src/main/java/baritone/process/BuilderProcess.java b/src/main/java/baritone/process/BuilderProcess.java index f63df6cd5..548579532 100644 --- a/src/main/java/baritone/process/BuilderProcess.java +++ b/src/main/java/baritone/process/BuilderProcess.java @@ -445,7 +445,7 @@ public final class BuilderProcess extends BaritoneProcessHelper implements IBuil BetterBlockPos pos = toBreak.get().getA(); baritone.getLookBehavior().updateTarget(rot, true); MovementHelper.switchToBestToolFor(ctx, bcc.get(pos)); - if (ctx.player().isSneaking()) { + if (ctx.player().movementInput.field_228350_h_) { // 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 // and is unable since it's unsneaked in the intermediary tick @@ -781,7 +781,7 @@ public final class BuilderProcess extends BaritoneProcessHelper implements IBuil continue; } // - 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)) {}))); // } return result; diff --git a/src/main/java/baritone/process/FarmProcess.java b/src/main/java/baritone/process/FarmProcess.java index ab3d55aff..c9d4d62d8 100644 --- a/src/main/java/baritone/process/FarmProcess.java +++ b/src/main/java/baritone/process/FarmProcess.java @@ -282,7 +282,7 @@ public final class FarmProcess extends BaritoneProcessHelper implements IFarmPro ItemEntity ei = (ItemEntity) entity; if (PICKUP_DROPPED.contains(ei.getItem().getItem())) { // +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))); } } } diff --git a/src/main/java/baritone/process/FollowProcess.java b/src/main/java/baritone/process/FollowProcess.java index 4f36e16da..63e280550 100644 --- a/src/main/java/baritone/process/FollowProcess.java +++ b/src/main/java/baritone/process/FollowProcess.java @@ -60,7 +60,7 @@ public final class FollowProcess extends BaritoneProcessHelper implements IFollo pos = new BlockPos(following); } else { 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); } diff --git a/src/main/java/baritone/utils/BlockStateInterface.java b/src/main/java/baritone/utils/BlockStateInterface.java index 6e4e36e23..60159f322 100644 --- a/src/main/java/baritone/utils/BlockStateInterface.java +++ b/src/main/java/baritone/utils/BlockStateInterface.java @@ -44,7 +44,7 @@ public class BlockStateInterface { private final ClientChunkProvider provider; private final WorldData worldData; protected final IBlockReader world; - public final BlockPos.MutableBlockPos isPassableBlockPos; + public final BlockPos.Mutable isPassableBlockPos; public final IBlockReader access; private Chunk prev = null; @@ -74,7 +74,7 @@ public class BlockStateInterface { if (!Minecraft.getInstance().isOnExecutionThread()) { throw new IllegalStateException(); } - this.isPassableBlockPos = new BlockPos.MutableBlockPos(); + this.isPassableBlockPos = new BlockPos.Mutable(); this.access = new BlockStateInterfaceAccessWrapper(this); } diff --git a/src/main/java/baritone/utils/GuiClick.java b/src/main/java/baritone/utils/GuiClick.java index 126de2f19..c3a19f909 100644 --- a/src/main/java/baritone/utils/GuiClick.java +++ b/src/main/java/baritone/utils/GuiClick.java @@ -23,25 +23,19 @@ import baritone.api.pathing.goals.GoalBlock; import baritone.api.pathing.goals.GoalTwoBlocks; import baritone.api.utils.BetterBlockPos; import baritone.api.utils.Helper; -import com.mojang.blaze3d.platform.GlStateManager; -import net.minecraft.client.entity.player.ClientPlayerEntity; import net.minecraft.client.gui.screen.Screen; -import net.minecraft.entity.Entity; -import net.minecraft.util.math.*; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.event.ClickEvent; import org.lwjgl.BufferUtils; -import org.lwjgl.opengl.GL11; -import java.awt.*; import java.nio.FloatBuffer; import java.nio.IntBuffer; -import java.util.Collections; import static baritone.api.command.IBaritoneChatControl.FORCE_COMMAND_PREFIX; -import static org.lwjgl.opengl.GL11.*; public class GuiClick extends Screen implements Helper { @@ -67,20 +61,21 @@ public class GuiClick extends Screen implements Helper { public void render(int mouseX, int mouseY, float partialTicks) { double mx = mc.mouseHelper.getMouseX(); double my = mc.mouseHelper.getMouseY(); - my = mc.mainWindow.getHeight() - my; + + /*my = mc.mainWindow.getHeight() - my; my *= mc.mainWindow.getFramebufferHeight() / (double) mc.mainWindow.getHeight(); mx *= mc.mainWindow.getFramebufferWidth() / (double) mc.mainWindow.getWidth(); Vec3d near = toWorld(mx, my, 0); Vec3d far = toWorld(mx, my, 1); // "Use 0.945 that's what stack overflow says" - leijurv if (near != null && far != null) { /// - Vec3d viewerPos = new Vec3d(PathRenderer.posX(), PathRenderer.posY(), PathRenderer.posZ()); + Vec3d viewerPos = new Vec3d(PathRenderer.getPositionVec().x(), PathRenderer.getPositionVec().y(), PathRenderer.getPositionVec().z()); ClientPlayerEntity player = BaritoneAPI.getProvider().getPrimaryBaritone().getPlayerContext().player(); RayTraceResult result = player.world.rayTraceBlocks(new RayTraceContext(near.add(viewerPos), far.add(viewerPos), RayTraceContext.BlockMode.OUTLINE, RayTraceContext.FluidMode.NONE, player)); if (result != null && result.getType() == RayTraceResult.Type.BLOCK) { currentMouseOver = ((BlockRayTraceResult) result).getPos(); } - } + }*/ } @Override @@ -115,7 +110,7 @@ public class GuiClick extends Screen implements Helper { } public void onRender() { - GlStateManager.getMatrix(GL_MODELVIEW_MATRIX, (FloatBuffer) MODELVIEW.clear()); + /*GlStateManager.getMatrix(GL_MODELVIEW_MATRIX, (FloatBuffer) MODELVIEW.clear()); GlStateManager.getMatrix(GL_PROJECTION_MATRIX, (FloatBuffer) PROJECTION.clear()); GL11.glGetIntegerv(GL_VIEWPORT, (IntBuffer) VIEWPORT.clear()); @@ -140,7 +135,7 @@ public class GuiClick extends Screen implements Helper { GlStateManager.enableTexture(); GlStateManager.disableBlend(); } - } + }*/ } private Vec3d toWorld(double x, double y, double z) { diff --git a/src/main/java/baritone/utils/IRenderer.java b/src/main/java/baritone/utils/IRenderer.java index ca200bf88..58424f53d 100644 --- a/src/main/java/baritone/utils/IRenderer.java +++ b/src/main/java/baritone/utils/IRenderer.java @@ -40,11 +40,11 @@ public interface IRenderer { static void glColor(Color color, float alpha) { float[] colorComponents = color.getColorComponents(null); - GlStateManager.color4f(colorComponents[0], colorComponents[1], colorComponents[2], alpha); + //GlStateManager.color4f(colorComponents[0], colorComponents[1], colorComponents[2], alpha); } static void startLines(Color color, float alpha, float lineWidth, boolean ignoreDepth) { - GlStateManager.enableBlend(); + /*GlStateManager.enableBlend(); GlStateManager.disableLighting(); GlStateManager.blendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ZERO); glColor(color, alpha); @@ -54,7 +54,7 @@ public interface IRenderer { if (ignoreDepth) { GlStateManager.disableDepthTest(); - } + }*/ } static void startLines(Color color, float lineWidth, boolean ignoreDepth) { @@ -62,14 +62,14 @@ public interface IRenderer { } static void endLines(boolean ignoredDepth) { - if (ignoredDepth) { + /*if (ignoredDepth) { GlStateManager.enableDepthTest(); } GlStateManager.depthMask(true); GlStateManager.enableTexture(); GlStateManager.enableLighting(); - GlStateManager.disableBlend(); + GlStateManager.disableBlend();*/ } static void drawAABB(AxisAlignedBB aabb) { @@ -77,32 +77,32 @@ public interface IRenderer { buffer.begin(GL_LINES, DefaultVertexFormats.POSITION); // bottom - buffer.pos(toDraw.minX, toDraw.minY, toDraw.minZ).endVertex(); - buffer.pos(toDraw.maxX, toDraw.minY, toDraw.minZ).endVertex(); - buffer.pos(toDraw.maxX, toDraw.minY, toDraw.minZ).endVertex(); - buffer.pos(toDraw.maxX, toDraw.minY, toDraw.maxZ).endVertex(); - buffer.pos(toDraw.maxX, toDraw.minY, toDraw.maxZ).endVertex(); - buffer.pos(toDraw.minX, toDraw.minY, toDraw.maxZ).endVertex(); - buffer.pos(toDraw.minX, toDraw.minY, toDraw.maxZ).endVertex(); - buffer.pos(toDraw.minX, toDraw.minY, toDraw.minZ).endVertex(); + buffer.func_225582_a_(toDraw.minX, toDraw.minY, toDraw.minZ).endVertex(); + buffer.func_225582_a_(toDraw.maxX, toDraw.minY, toDraw.minZ).endVertex(); + buffer.func_225582_a_(toDraw.maxX, toDraw.minY, toDraw.minZ).endVertex(); + buffer.func_225582_a_(toDraw.maxX, toDraw.minY, toDraw.maxZ).endVertex(); + buffer.func_225582_a_(toDraw.maxX, toDraw.minY, toDraw.maxZ).endVertex(); + buffer.func_225582_a_(toDraw.minX, toDraw.minY, toDraw.maxZ).endVertex(); + buffer.func_225582_a_(toDraw.minX, toDraw.minY, toDraw.maxZ).endVertex(); + buffer.func_225582_a_(toDraw.minX, toDraw.minY, toDraw.minZ).endVertex(); // top - buffer.pos(toDraw.minX, toDraw.maxY, toDraw.minZ).endVertex(); - buffer.pos(toDraw.maxX, toDraw.maxY, toDraw.minZ).endVertex(); - buffer.pos(toDraw.maxX, toDraw.maxY, toDraw.minZ).endVertex(); - buffer.pos(toDraw.maxX, toDraw.maxY, toDraw.maxZ).endVertex(); - buffer.pos(toDraw.maxX, toDraw.maxY, toDraw.maxZ).endVertex(); - buffer.pos(toDraw.minX, toDraw.maxY, toDraw.maxZ).endVertex(); - buffer.pos(toDraw.minX, toDraw.maxY, toDraw.maxZ).endVertex(); - buffer.pos(toDraw.minX, toDraw.maxY, toDraw.minZ).endVertex(); + buffer.func_225582_a_(toDraw.minX, toDraw.maxY, toDraw.minZ).endVertex(); + buffer.func_225582_a_(toDraw.maxX, toDraw.maxY, toDraw.minZ).endVertex(); + buffer.func_225582_a_(toDraw.maxX, toDraw.maxY, toDraw.minZ).endVertex(); + buffer.func_225582_a_(toDraw.maxX, toDraw.maxY, toDraw.maxZ).endVertex(); + buffer.func_225582_a_(toDraw.maxX, toDraw.maxY, toDraw.maxZ).endVertex(); + buffer.func_225582_a_(toDraw.minX, toDraw.maxY, toDraw.maxZ).endVertex(); + buffer.func_225582_a_(toDraw.minX, toDraw.maxY, toDraw.maxZ).endVertex(); + buffer.func_225582_a_(toDraw.minX, toDraw.maxY, toDraw.minZ).endVertex(); // corners - buffer.pos(toDraw.minX, toDraw.minY, toDraw.minZ).endVertex(); - buffer.pos(toDraw.minX, toDraw.maxY, toDraw.minZ).endVertex(); - buffer.pos(toDraw.maxX, toDraw.minY, toDraw.minZ).endVertex(); - buffer.pos(toDraw.maxX, toDraw.maxY, toDraw.minZ).endVertex(); - buffer.pos(toDraw.maxX, toDraw.minY, toDraw.maxZ).endVertex(); - buffer.pos(toDraw.maxX, toDraw.maxY, toDraw.maxZ).endVertex(); - buffer.pos(toDraw.minX, toDraw.minY, toDraw.maxZ).endVertex(); - buffer.pos(toDraw.minX, toDraw.maxY, toDraw.maxZ).endVertex(); + buffer.func_225582_a_(toDraw.minX, toDraw.minY, toDraw.minZ).endVertex(); + buffer.func_225582_a_(toDraw.minX, toDraw.maxY, toDraw.minZ).endVertex(); + buffer.func_225582_a_(toDraw.maxX, toDraw.minY, toDraw.minZ).endVertex(); + buffer.func_225582_a_(toDraw.maxX, toDraw.maxY, toDraw.minZ).endVertex(); + buffer.func_225582_a_(toDraw.maxX, toDraw.minY, toDraw.maxZ).endVertex(); + buffer.func_225582_a_(toDraw.maxX, toDraw.maxY, toDraw.maxZ).endVertex(); + buffer.func_225582_a_(toDraw.minX, toDraw.minY, toDraw.maxZ).endVertex(); + buffer.func_225582_a_(toDraw.minX, toDraw.maxY, toDraw.maxZ).endVertex(); tessellator.draw(); } diff --git a/src/main/java/baritone/utils/PathRenderer.java b/src/main/java/baritone/utils/PathRenderer.java index 48fc21b6b..5664a60ed 100644 --- a/src/main/java/baritone/utils/PathRenderer.java +++ b/src/main/java/baritone/utils/PathRenderer.java @@ -185,13 +185,13 @@ public final class PathRenderer implements IRenderer, Helper { boolean renderPathAsFrickinThingy = !settings.renderPathAsLine.value; 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(x2 + 0.5D - vpX, y2 + 0.5D - vpY, z2 + 0.5D - vpZ).endVertex(); + buffer.func_225582_a_(x1 + 0.5D - vpX, y1 + 0.5D - vpY, z1 + 0.5D - vpZ).endVertex(); + buffer.func_225582_a_(x2 + 0.5D - vpX, y2 + 0.5D - vpY, z2 + 0.5D - vpZ).endVertex(); if (renderPathAsFrickinThingy) { - buffer.pos(x2 + 0.5D - vpX, y2 + 0.53D - vpY, z2 + 0.5D - vpZ).endVertex(); - buffer.pos(x1 + 0.5D - vpX, y1 + 0.53D - vpY, z1 + 0.5D - vpZ).endVertex(); - buffer.pos(x1 + 0.5D - vpX, y1 + 0.5D - vpY, z1 + 0.5D - vpZ).endVertex(); + buffer.func_225582_a_(x2 + 0.5D - vpX, y2 + 0.53D - vpY, z2 + 0.5D - vpZ).endVertex(); + buffer.func_225582_a_(x1 + 0.5D - vpX, y1 + 0.53D - vpY, z1 + 0.5D - vpZ).endVertex(); + buffer.func_225582_a_(x1 + 0.5D - vpX, y1 + 0.5D - vpY, z1 + 0.5D - vpZ).endVertex(); } } @@ -247,10 +247,10 @@ public final class PathRenderer implements IRenderer, Helper { Helper.mc.getTextureManager().bindTexture(TEXTURE_BEACON_BEAM); if (settings.renderGoalIgnoreDepth.value) { - GlStateManager.disableDepthTest(); + //GlStateManager.disableDepthTest(); } - BeaconTileEntityRenderer.renderBeamSegment( + /* BeaconTileEntityRenderer.renderBeamSegment( goalPos.getX() - renderPosX, -renderPosY, goalPos.getZ() - renderPosZ, @@ -264,10 +264,10 @@ public final class PathRenderer implements IRenderer, Helper { // Arguments filled by the private method lol 0.2D, 0.25D - ); + );*/ if (settings.renderGoalIgnoreDepth.value) { - GlStateManager.enableDepthTest(); + //GlStateManager.enableDepthTest(); } glPopAttrib(); @@ -293,10 +293,10 @@ public final class PathRenderer implements IRenderer, Helper { return; } else if (goal instanceof GoalYLevel) { GoalYLevel goalpos = (GoalYLevel) goal; - minX = player.posX - settings.yLevelBoxSize.value - renderPosX; - minZ = player.posZ - settings.yLevelBoxSize.value - renderPosZ; - maxX = player.posX + settings.yLevelBoxSize.value - renderPosX; - maxZ = player.posZ + settings.yLevelBoxSize.value - renderPosZ; + minX = player.getPositionVec().x - settings.yLevelBoxSize.value - renderPosX; + minZ = player.getPositionVec().z - settings.yLevelBoxSize.value - renderPosZ; + maxX = player.getPositionVec().x + settings.yLevelBoxSize.value - renderPosX; + maxZ = player.getPositionVec().z + settings.yLevelBoxSize.value - renderPosZ; minY = ((GoalYLevel) goal).level - renderPosY; maxY = minY + 2; y1 = 1 + y + goalpos.level - renderPosY; @@ -312,14 +312,14 @@ public final class PathRenderer implements IRenderer, Helper { buffer.begin(GL_LINES, DefaultVertexFormats.POSITION); - buffer.pos(minX, minY, minZ).endVertex(); - buffer.pos(minX, maxY, minZ).endVertex(); - buffer.pos(maxX, minY, minZ).endVertex(); - buffer.pos(maxX, maxY, minZ).endVertex(); - buffer.pos(maxX, minY, maxZ).endVertex(); - buffer.pos(maxX, maxY, maxZ).endVertex(); - buffer.pos(minX, minY, maxZ).endVertex(); - buffer.pos(minX, maxY, maxZ).endVertex(); + buffer.func_225582_a_(minX, minY, minZ).endVertex(); + buffer.func_225582_a_(minX, maxY, minZ).endVertex(); + buffer.func_225582_a_(maxX, minY, minZ).endVertex(); + buffer.func_225582_a_(maxX, maxY, minZ).endVertex(); + buffer.func_225582_a_(maxX, minY, maxZ).endVertex(); + buffer.func_225582_a_(maxX, maxY, maxZ).endVertex(); + buffer.func_225582_a_(minX, minY, maxZ).endVertex(); + buffer.func_225582_a_(minX, maxY, maxZ).endVertex(); tessellator.draw(); IRenderer.endLines(settings.renderGoalIgnoreDepth.value); @@ -328,10 +328,10 @@ public final class PathRenderer implements IRenderer, Helper { private static void renderHorizontalQuad(double minX, double maxX, double minZ, double maxZ, double y) { if (y != 0) { buffer.begin(GL_LINE_LOOP, DefaultVertexFormats.POSITION); - buffer.pos(minX, y, minZ).endVertex(); - buffer.pos(maxX, y, minZ).endVertex(); - buffer.pos(maxX, y, maxZ).endVertex(); - buffer.pos(minX, y, maxZ).endVertex(); + buffer.func_225582_a_(minX, y, minZ).endVertex(); + buffer.func_225582_a_(maxX, y, minZ).endVertex(); + buffer.func_225582_a_(maxX, y, maxZ).endVertex(); + buffer.func_225582_a_(minX, y, maxZ).endVertex(); tessellator.draw(); } } diff --git a/src/main/java/baritone/utils/PlayerMovementInput.java b/src/main/java/baritone/utils/PlayerMovementInput.java index 1474485da..c81a90b19 100644 --- a/src/main/java/baritone/utils/PlayerMovementInput.java +++ b/src/main/java/baritone/utils/PlayerMovementInput.java @@ -29,7 +29,7 @@ public class PlayerMovementInput extends MovementInput { } @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.moveForward = 0.0F; @@ -51,7 +51,7 @@ public class PlayerMovementInput extends MovementInput { this.moveStrafe--; } - if (this.sneak = handler.isInputForcedDown(Input.SNEAK)) { + if (this.field_228350_h_ = handler.isInputForcedDown(Input.SNEAK)) { this.moveStrafe *= 0.3D; this.moveForward *= 0.3D; } diff --git a/src/main/java/baritone/utils/accessor/IBlockStateContainer.java b/src/main/java/baritone/utils/accessor/IPalettedContainer.java similarity index 95% rename from src/main/java/baritone/utils/accessor/IBlockStateContainer.java rename to src/main/java/baritone/utils/accessor/IPalettedContainer.java index 1ca642ae3..1d0490832 100644 --- a/src/main/java/baritone/utils/accessor/IBlockStateContainer.java +++ b/src/main/java/baritone/utils/accessor/IPalettedContainer.java @@ -19,7 +19,7 @@ package baritone.utils.accessor; import net.minecraft.block.BlockState; -public interface IBlockStateContainer { +public interface IPalettedContainer { BlockState getAtPalette(int index); diff --git a/src/main/java/baritone/utils/schematic/format/defaults/MCEditSchematic.java b/src/main/java/baritone/utils/schematic/format/defaults/MCEditSchematic.java index e62c25493..d5f69f1e9 100644 --- a/src/main/java/baritone/utils/schematic/format/defaults/MCEditSchematic.java +++ b/src/main/java/baritone/utils/schematic/format/defaults/MCEditSchematic.java @@ -70,4 +70,4 @@ public final class MCEditSchematic extends StaticSchematic { } } } -} \ No newline at end of file +}