From d24cd263bf9b14e7f6a3d18f2e0a445fd637a564 Mon Sep 17 00:00:00 2001 From: Brady Date: Tue, 27 Jun 2023 23:37:47 -0500 Subject: [PATCH] Fix rendering bot player in gui --- src/main/java/baritone/bot/impl/BotGuiInventory.java | 8 ++++++++ src/main/java/baritone/bot/impl/BotPlayer.java | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/src/main/java/baritone/bot/impl/BotGuiInventory.java b/src/main/java/baritone/bot/impl/BotGuiInventory.java index 099f10901..c9b469a31 100644 --- a/src/main/java/baritone/bot/impl/BotGuiInventory.java +++ b/src/main/java/baritone/bot/impl/BotGuiInventory.java @@ -42,4 +42,12 @@ public final class BotGuiInventory extends GuiInventory { mc.displayHeight = primary.displayHeight; super.setWorldAndResolution(mc, width, height); } + + @Override + protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY) { + final BotPlayer player = (BotPlayer) this.user.getPlayerContext().player(); + player.isUser = false; + super.drawGuiContainerBackgroundLayer(partialTicks, mouseX, mouseY); + player.isUser = true; + } } diff --git a/src/main/java/baritone/bot/impl/BotPlayer.java b/src/main/java/baritone/bot/impl/BotPlayer.java index e211bf41f..deea18e5e 100644 --- a/src/main/java/baritone/bot/impl/BotPlayer.java +++ b/src/main/java/baritone/bot/impl/BotPlayer.java @@ -57,11 +57,13 @@ public final class BotPlayer extends EntityPlayerSP { private final IBaritoneUser user; private NetworkPlayerInfo playerInfo; + public boolean isUser; public BotPlayer(IBaritoneUser user, Minecraft mc, World world, NetHandlerPlayClient netHandlerPlayClient, StatisticsManager statisticsManager, RecipeBook recipeBook) { super(mc, world, netHandlerPlayClient, statisticsManager, recipeBook); this.user = user; this.movementInput = new PlayerMovementInput(this.user.getBaritone().getInputOverrideHandler()); + this.isUser = true; } @Override @@ -70,6 +72,12 @@ public final class BotPlayer extends EntityPlayerSP { super.onUpdate(); } + @Override + public boolean isUser() { + // Used by BotGuiInventory to fix player model rendering in the gui + return this.isUser; + } + @Override public void sendStatusMessage(@Nonnull ITextComponent chatComponent, boolean actionBar) { // TODO: Custom message handling