MrSphay/WorldHandler
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Reimplement block highlighting

Browse Source
This commit is contained in:
Marcel Konrad
2020-03-10 12:41:54 +01:00
parent 835b2c6944
commit 1f67c8e695
5 changed files with 50 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
src/main/java/exopandora/worldhandler/event/ClientEventHandler.java
View File

@@ -1,13 +1,21 @@
package exopandora.worldhandler.event;
import com.mojang.blaze3d.matrix.MatrixStack;
import com.mojang.blaze3d.vertex.IVertexBuilder;
import com.mojang.brigadier.CommandDispatcher;
import com.mojang.brigadier.ParseResults;
import com.mojang.brigadier.StringReader;
import com.mojang.brigadier.exceptions.CommandSyntaxException;
import exopandora.worldhandler.config.Config;
import exopandora.worldhandler.util.BlockHelper;
import exopandora.worldhandler.util.CommandHelper;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.IRenderTypeBuffer;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.client.renderer.WorldRenderer;
import net.minecraft.command.CommandSource;
import net.minecraft.util.math.Vec3d;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.client.event.ClientChatEvent;
@@ -20,68 +28,30 @@ public class ClientEventHandler
@SubscribeEvent
public static void renderWorldLastEvent(RenderWorldLastEvent event)
{
// if(Config.getSettings().highlightBlocks() && Minecraft.getInstance().world != null && Minecraft.getInstance().getRenderManager().info != null)
// {
// final double constant = 0.0020000000949949026D;
// Vec3d projected = Minecraft.getInstance().getRenderManager().info.getProjectedView();
//
// double minX = Math.min(BlockHelper.getPos1().getX(), BlockHelper.getPos2().getX()) - constant - projected.getX();
// double minY = Math.min(BlockHelper.getPos1().getY(), BlockHelper.getPos2().getY()) - constant - projected.getY();
// double minZ = Math.min(BlockHelper.getPos1().getZ(), BlockHelper.getPos2().getZ()) - constant - projected.getZ();
//
// double maxX = Math.max(BlockHelper.getPos1().getX(), BlockHelper.getPos2().getX()) + constant - projected.getX() + 1;
// double maxY = Math.max(BlockHelper.getPos1().getY(), BlockHelper.getPos2().getY()) + constant - projected.getY() + 1;
// double maxZ = Math.max(BlockHelper.getPos1().getZ(), BlockHelper.getPos2().getZ()) + constant - projected.getZ() + 1;
//
//// event.getMatrixStack().push();
// IVertexBuilder builder = Minecraft.getInstance().getRenderTypeBuffers().getBufferSource().getBuffer(RenderType.lines());
// WorldRenderer.drawBoundingBox(event.getMatrixStack(), builder, minX, minY, minZ, maxX, maxY, maxZ, 1.0F, 0.5F, 0.5F, 1.0F);
//// event.getMatrixStack().pop();
//
// RenderSystem.pushMatrix();
// RenderSystem.disableAlphaTest();
// RenderSystem.enableBlend();
// RenderSystem.defaultBlendFunc();
// RenderSystem.lineWidth(2.0F);
// RenderSystem.disableTexture();
// RenderSystem.depthMask(false);
//
// Tessellator tesselator = Tessellator.getInstance();
// BufferBuilder buffer = tesselator.getBuffer();
//
// final int alpha = 255;
// final int color1 = 223;
// final int color2 = 127;
//
// RenderSystem.lineWidth(2.0F);
// buffer.begin(3, DefaultVertexFormats.POSITION_COLOR);
// buffer.pos(minX, minY, minZ).color(color1, color1, color1, 0).endVertex();
// buffer.pos(minX, minY, minZ).color(color1, color1, color1, alpha).endVertex();
// buffer.pos(maxX, minY, minZ).color(color1, color2, color2, alpha).endVertex();
// buffer.pos(maxX, minY, maxZ).color(color1, color1, color1, alpha).endVertex();
// buffer.pos(minX, minY, maxZ).color(color1, color1, color1, alpha).endVertex();
// buffer.pos(minX, minY, minZ).color(color2, color2, color1, alpha).endVertex();
// buffer.pos(minX, maxY, minZ).color(color2, color1, color2, alpha).endVertex();
// buffer.pos(maxX, maxY, minZ).color(color1, color1, color1, alpha).endVertex();
// buffer.pos(maxX, maxY, maxZ).color(color1, color1, color1, alpha).endVertex();
// buffer.pos(minX, maxY, maxZ).color(color1, color1, color1, alpha).endVertex();
// buffer.pos(minX, maxY, minZ).color(color1, color1, color1, alpha).endVertex();
// buffer.pos(minX, maxY, maxZ).color(color1, color1, color1, alpha).endVertex();
// buffer.pos(minX, minY, maxZ).color(color1, color1, color1, alpha).endVertex();
// buffer.pos(maxX, minY, maxZ).color(color1, color1, color1, alpha).endVertex();
// buffer.pos(maxX, maxY, maxZ).color(color1, color1, color1, alpha).endVertex();
// buffer.pos(maxX, maxY, minZ).color(color1, color1, color1, alpha).endVertex();
// buffer.pos(maxX, minY, minZ).color(color1, color1, color1, alpha).endVertex();
// buffer.pos(maxX, minY, minZ).color(color1, color1, color1, 0).endVertex();
// tesselator.draw();
//
// RenderSystem.lineWidth(1.0F);
// RenderSystem.depthMask(true);
// RenderSystem.enableTexture();
// RenderSystem.disableBlend();
// RenderSystem.enableAlphaTest();
// RenderSystem.popMatrix();
// }
if(Config.getSettings().highlightBlocks() && Minecraft.getInstance().world != null && Minecraft.getInstance().getRenderManager().info != null)
{
Vec3d projected = Minecraft.getInstance().getRenderManager().info.getProjectedView();
MatrixStack matrix = event.getMatrixStack();
matrix.push();
matrix.translate(-projected.getX(), -projected.getY(), -projected.getZ());
double minX = Math.min(BlockHelper.getPos1().getX(), BlockHelper.getPos2().getX());
double minY = Math.min(BlockHelper.getPos1().getY(), BlockHelper.getPos2().getY());
double minZ = Math.min(BlockHelper.getPos1().getZ(), BlockHelper.getPos2().getZ());
double maxX = Math.max(BlockHelper.getPos1().getX(), BlockHelper.getPos2().getX()) + 1;
double maxY = Math.max(BlockHelper.getPos1().getY(), BlockHelper.getPos2().getY()) + 1;
double maxZ = Math.max(BlockHelper.getPos1().getZ(), BlockHelper.getPos2().getZ()) + 1;
IRenderTypeBuffer.Impl buffer = Minecraft.getInstance().getRenderTypeBuffers().getBufferSource();
IVertexBuilder builder = buffer.getBuffer(RenderType.getLines());
WorldRenderer.drawBoundingBox(matrix, builder, minX, minY, minZ, maxX, maxY, maxZ, 0.9F, 0.9F, 0.9F, 1.0F, 0.5F, 0.5F, 0.5F);
buffer.finish(RenderType.LINES);
matrix.pop();
}
}
@SubscribeEvent