diff --git a/src/launch/java/baritone/launch/mixins/MixinChatScreen.java b/src/launch/java/baritone/launch/mixins/MixinChatScreen.java index 238546bd1..368d9db7e 100644 --- a/src/launch/java/baritone/launch/mixins/MixinChatScreen.java +++ b/src/launch/java/baritone/launch/mixins/MixinChatScreen.java @@ -45,6 +45,7 @@ public class MixinChatScreen { @Shadow protected TextFieldWidget inputField; + //FIXME /* @Shadow @Final diff --git a/src/launch/java/baritone/launch/mixins/MixinMinecraft.java b/src/launch/java/baritone/launch/mixins/MixinMinecraft.java index 08444bb09..a36963a0c 100644 --- a/src/launch/java/baritone/launch/mixins/MixinMinecraft.java +++ b/src/launch/java/baritone/launch/mixins/MixinMinecraft.java @@ -138,6 +138,7 @@ public class MixinMinecraft { // allow user input is only the primary baritone return (BaritoneAPI.getProvider().getPrimaryBaritone().getPathingBehavior().getCurrent() != null && player != null) || screen.passEvents; } + //FIXME stupid LVT /* @Inject( method = "rightClickMouse", diff --git a/src/main/java/baritone/pathing/movement/movements/MovementTraverse.java b/src/main/java/baritone/pathing/movement/movements/MovementTraverse.java index 097541f46..7f42a7e43 100644 --- a/src/main/java/baritone/pathing/movement/movements/MovementTraverse.java +++ b/src/main/java/baritone/pathing/movement/movements/MovementTraverse.java @@ -286,7 +286,6 @@ public class MovementTraverse extends Movement { } switch (p) { case READY_TO_PLACE: { - if (ctx.player().movementInput.field_228350_h_ || Baritone.settings().assumeSafeWalk.value) { state.setInput(Input.CLICK_RIGHT, true); } diff --git a/src/main/java/baritone/utils/GuiClick.java b/src/main/java/baritone/utils/GuiClick.java index c3a19f909..5aac47660 100644 --- a/src/main/java/baritone/utils/GuiClick.java +++ b/src/main/java/baritone/utils/GuiClick.java @@ -61,7 +61,7 @@ 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(); - +//FIXME this entire class /*my = mc.mainWindow.getHeight() - my; my *= mc.mainWindow.getFramebufferHeight() / (double) mc.mainWindow.getHeight(); mx *= mc.mainWindow.getFramebufferWidth() / (double) mc.mainWindow.getWidth(); @@ -110,6 +110,7 @@ public class GuiClick extends Screen implements Helper { } public void onRender() { + //FIXME /*GlStateManager.getMatrix(GL_MODELVIEW_MATRIX, (FloatBuffer) MODELVIEW.clear()); GlStateManager.getMatrix(GL_PROJECTION_MATRIX, (FloatBuffer) PROJECTION.clear()); GL11.glGetIntegerv(GL_VIEWPORT, (IntBuffer) VIEWPORT.clear()); diff --git a/src/main/java/baritone/utils/IRenderer.java b/src/main/java/baritone/utils/IRenderer.java index 58424f53d..06b95ada6 100644 --- a/src/main/java/baritone/utils/IRenderer.java +++ b/src/main/java/baritone/utils/IRenderer.java @@ -21,7 +21,6 @@ import baritone.api.BaritoneAPI; import baritone.api.Settings; import baritone.api.utils.Helper; import baritone.utils.accessor.IEntityRenderManager; -import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; @@ -29,7 +28,7 @@ import net.minecraft.util.math.AxisAlignedBB; import java.awt.*; -import static org.lwjgl.opengl.GL11.*; +import static org.lwjgl.opengl.GL11.GL_LINES; public interface IRenderer { @@ -38,6 +37,7 @@ public interface IRenderer { IEntityRenderManager renderManager = (IEntityRenderManager) Helper.mc.getRenderManager(); Settings settings = BaritoneAPI.getSettings(); + //FIXME this entire class static void glColor(Color color, float alpha) { float[] colorComponents = color.getColorComponents(null); //GlStateManager.color4f(colorComponents[0], colorComponents[1], colorComponents[2], alpha); diff --git a/src/main/java/baritone/utils/PathRenderer.java b/src/main/java/baritone/utils/PathRenderer.java index 5664a60ed..fb08ad54e 100644 --- a/src/main/java/baritone/utils/PathRenderer.java +++ b/src/main/java/baritone/utils/PathRenderer.java @@ -26,9 +26,7 @@ import baritone.api.utils.Helper; import baritone.api.utils.interfaces.IGoalRenderPos; import baritone.behavior.PathingBehavior; import baritone.pathing.path.PathExecutor; -import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.block.BlockState; -import net.minecraft.client.renderer.tileentity.BeaconTileEntityRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; @@ -247,9 +245,10 @@ public final class PathRenderer implements IRenderer, Helper { Helper.mc.getTextureManager().bindTexture(TEXTURE_BEACON_BEAM); if (settings.renderGoalIgnoreDepth.value) { + // FIXME //GlStateManager.disableDepthTest(); } - +//FIXME /* BeaconTileEntityRenderer.renderBeamSegment( goalPos.getX() - renderPosX, -renderPosY, @@ -267,6 +266,7 @@ public final class PathRenderer implements IRenderer, Helper { );*/ if (settings.renderGoalIgnoreDepth.value) { + //FIXME //GlStateManager.enableDepthTest(); }