Miko/baritone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DrawAABB changes, set command bugfix, sel rendering change, selection setting name changes

Browse Source
This commit is contained in:
Logan Darklock
2019-09-03 23:46:20 -07:00
parent 8dc4ff26d6
commit 382ad0079c
6 changed files with 54 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/baritone/selection/SelectionRenderer.java
View File

@@ -17,7 +17,7 @@ public class SelectionRenderer implements IRenderer, AbstractGameEventListener {
public static void renderSelections(ISelection[] selections) {
float opacity = settings.selectionOpacity.value;
boolean ignoreDepth = settings.renderSelectionIgnoreDepth.value;
float lineWidth = settings.selectionRenderLineWidthPixels.value;
float lineWidth = settings.selectionLineWidth.value;
if (!settings.renderSelection.value) {
return;
@@ -26,26 +26,21 @@ public class SelectionRenderer implements IRenderer, AbstractGameEventListener {
IRenderer.startLines(settings.colorSelection.value, opacity, lineWidth, ignoreDepth);
for (ISelection selection : selections) {
IRenderer.drawAABB(selection.aabb());
IRenderer.drawAABB(selection.aabb(), .005f);
}
IRenderer.endLines(ignoreDepth);
if (settings.renderSelectionCorners.value) {
IRenderer.glColor(settings.colorSelectionPos1.value, opacity);
if (!settings.renderSelectionCorners.value) {
return;
}
for (ISelection selection : selections) {
IRenderer.drawAABB(new AxisAlignedBB(selection.pos1(), selection.pos1().add(1, 1, 1)));
}
IRenderer.startLines(settings.colorSelectionPos1.value, opacity, lineWidth, ignoreDepth);
IRenderer.glColor(settings.colorSelectionPos2.value, opacity);
for (ISelection selection : selections) {
IRenderer.drawAABB(new AxisAlignedBB(selection.pos1(), selection.pos1().add(1, 1, 1)), -.01f);
}
IRenderer.endLines(ignoreDepth);
IRenderer.startLines(settings.colorSelectionPos2.value, opacity, lineWidth, ignoreDepth);
for (ISelection selection : selections) {
IRenderer.drawAABB(new AxisAlignedBB(selection.pos2(), selection.pos2().add(1, 1, 1)), -.01f);
for (ISelection selection : selections) {
IRenderer.drawAABB(new AxisAlignedBB(selection.pos2(), selection.pos2().add(1, 1, 1)));
}
}
IRenderer.endLines(ignoreDepth);

6
src/main/java/baritone/utils/PathRenderer.java
View File

@@ -35,7 +35,6 @@ import baritone.behavior.PathingBehavior;
import baritone.pathing.path.PathExecutor;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.client.renderer.tileentity.TileEntityBeaconRenderer;
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
import net.minecraft.entity.Entity;
@@ -162,8 +161,7 @@ public final class PathRenderer implements IRenderer {
alpha = 0.4F * (1.0F - (float) (i - fadeStart) / (float) (fadeEnd - fadeStart));
}
float[] components = color.getComponents(null);
GlStateManager.color(components[0], components[1], components[2], alpha);
IRenderer.glColor(color, alpha);
}
drawLine(start.x, start.y, start.z, end.x, end.y, end.z);
@@ -207,7 +205,7 @@ public final class PathRenderer implements IRenderer {
toDraw = state.getSelectedBoundingBox(player.world, pos);
}
IRenderer.drawAABB(toDraw);
IRenderer.drawAABB(toDraw, .002f);
});
IRenderer.endLines(settings.renderSelectionBoxesIgnoreDepth.value);