diff --git a/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java similarity index 65% rename from src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java rename to src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java index 914c2ade6..b2f4eb597 100644 --- a/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java @@ -10,10 +10,15 @@ */ package vazkii.botania.client.core.handler; +import java.awt.Color; + +import org.lwjgl.opengl.GL11; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.AxisAlignedBB; @@ -21,49 +26,24 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import org.lwjgl.opengl.GL11; import vazkii.botania.api.subtile.ISubTileContainer; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileEntity; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.PlayerHelper; +import vazkii.botania.common.entity.EntityMagicLandmine; import vazkii.botania.common.item.ItemTwigWand; import vazkii.botania.common.item.ModItems; -import java.awt.*; +public final class BlockHighlightRenderHandler { -public final class SubTileRadiusRenderHandler { - - private SubTileRadiusRenderHandler() {} + private BlockHighlightRenderHandler() {} @SubscribeEvent public static void onWorldRenderLast(RenderWorldLastEvent event) { Minecraft mc = Minecraft.getMinecraft(); RayTraceResult pos = mc.objectMouseOver; - if(!Botania.proxy.isClientPlayerWearingMonocle() || pos == null || pos.entityHit != null) - return; - BlockPos bPos = pos.getBlockPos(); - - ItemStack stackHeld = PlayerHelper.getFirstHeldItem(mc.thePlayer, ModItems.twigWand); - if(stackHeld != null && ItemTwigWand.getBindMode(stackHeld)) { - BlockPos coords = ItemTwigWand.getBoundTile(stackHeld); - if(coords.getY() != -1) { - bPos = coords; - } - } - - TileEntity tile = mc.theWorld.getTileEntity(bPos); - if(tile == null || !(tile instanceof ISubTileContainer)) - return; - ISubTileContainer container = (ISubTileContainer) tile; - SubTileEntity subtile = container.getSubTile(); - if(subtile == null) - return; - RadiusDescriptor descriptor = subtile.getRadius(); - if(descriptor == null) - return; - GlStateManager.pushMatrix(); GlStateManager.disableTexture2D(); GL11.glPushAttrib(GL11.GL_LIGHTING_BIT); @@ -71,9 +51,55 @@ public final class SubTileRadiusRenderHandler { GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - if(descriptor.isCircle()) - renderCircle(descriptor.getSubtileCoords(), descriptor.getCircleRadius()); - else renderRectangle(descriptor.getAABB()); + boundTile: { + if(Botania.proxy.isClientPlayerWearingMonocle() && pos != null && pos.entityHit == null) { + BlockPos bPos = pos.getBlockPos(); + + ItemStack stackHeld = PlayerHelper.getFirstHeldItem(mc.thePlayer, ModItems.twigWand); + if(stackHeld != null && ItemTwigWand.getBindMode(stackHeld)) { + BlockPos coords = ItemTwigWand.getBoundTile(stackHeld); + if(coords.getY() != -1) + bPos = coords; + } + + TileEntity tile = mc.theWorld.getTileEntity(bPos); + if(tile == null || !(tile instanceof ISubTileContainer)) + break boundTile; + ISubTileContainer container = (ISubTileContainer) tile; + SubTileEntity subtile = container.getSubTile(); + if(subtile == null) + break boundTile; + RadiusDescriptor descriptor = subtile.getRadius(); + if(descriptor == null) + break boundTile; + + if(descriptor.isCircle()) + renderCircle(descriptor.getSubtileCoords(), descriptor.getCircleRadius()); + else renderRectangle(descriptor.getAABB(), true, null, (byte) 32); + } + } + + double offY = -1.0 / 16 + 0.005; + for(Entity e : mc.theWorld.loadedEntityList) + if(e instanceof EntityMagicLandmine) { + BlockPos bpos = e.getPosition(); + AxisAlignedBB aabb = new AxisAlignedBB(bpos).offset(0, offY, 0).expand(2.5, 0, 2.5); + + float gs = (float) (Math.sin(ClientTickHandler.total / 20) + 1) * 0.2F + 0.6F; + int r = (int) (105 * gs); + int g = (int) (25 * gs); + int b = (int) (145 * gs); + Color color = new Color(r, g, b); + + int alpha = 32; + if(e.ticksExisted < 8) + alpha *= Math.min((e.ticksExisted + event.getPartialTicks()) / 8F, 1F); + else if(e.ticksExisted > 47) + alpha *= Math.min(1F - (e.ticksExisted - 47 + event.getPartialTicks()) / 8F, 1F); + + renderRectangle(aabb, false, color, (byte) alpha); + offY += 0.001; + } GlStateManager.enableTexture2D(); GlStateManager.disableBlend(); @@ -81,7 +107,7 @@ public final class SubTileRadiusRenderHandler { GlStateManager.popMatrix(); } - private static void renderRectangle(AxisAlignedBB aabb) { + private static void renderRectangle(AxisAlignedBB aabb, boolean inner, Color color, byte alpha) { double renderPosX, renderPosY, renderPosZ; try { @@ -94,10 +120,10 @@ public final class SubTileRadiusRenderHandler { GlStateManager.pushMatrix(); GlStateManager.translate(aabb.minX - renderPosX, aabb.minY - renderPosY, aabb.minZ - renderPosZ); - int color = Color.HSBtoRGB(ClientTickHandler.ticksInGame % 200 / 200F, 0.6F, 1F); - - Color colorRGB = new Color(color); - GL11.glColor4ub((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), (byte) 32); + + if(color == null) + color = Color.getHSBColor(ClientTickHandler.ticksInGame % 200 / 200F, 0.6F, 1F); + GL11.glColor4ub((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue(), alpha); double f = 1F / 16F; double x = aabb.maxX - aabb.minX - f; @@ -111,16 +137,18 @@ public final class SubTileRadiusRenderHandler { tessellator.getBuffer().pos(x, f, z).endVertex(); tessellator.draw(); - x += f; - z += f; - double f1 = f + f / 4F; - GL11.glColor4ub((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), (byte) 64); - tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION); - tessellator.getBuffer().pos(x, f1, 0).endVertex(); - tessellator.getBuffer().pos(0, f1, 0).endVertex(); - tessellator.getBuffer().pos(0, f1, z).endVertex(); - tessellator.getBuffer().pos(x, f1, z).endVertex(); - tessellator.draw(); + if(inner) { + x += f; + z += f; + double f1 = f + f / 4F; + GL11.glColor4ub((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue(), (byte) (alpha * 2)); + tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION); + tessellator.getBuffer().pos(x, f1, 0).endVertex(); + tessellator.getBuffer().pos(0, f1, 0).endVertex(); + tessellator.getBuffer().pos(0, f1, z).endVertex(); + tessellator.getBuffer().pos(x, f1, z).endVertex(); + tessellator.draw(); + } GL11.glColor4ub(((byte) 255), ((byte) 255), ((byte) 255), ((byte) 255)); GlStateManager.popMatrix(); diff --git a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java index 5bf0db83c..08431e764 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -61,7 +61,7 @@ import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.client.core.handler.MultiblockRenderHandler; import vazkii.botania.client.core.handler.PersistentVariableHelper; import vazkii.botania.client.core.handler.RenderLexicon; -import vazkii.botania.client.core.handler.SubTileRadiusRenderHandler; +import vazkii.botania.client.core.handler.BlockHighlightRenderHandler; import vazkii.botania.client.core.handler.TooltipAdditionDisplayHandler; import vazkii.botania.client.core.handler.TooltipHandler; import vazkii.botania.client.core.helper.ShaderHelper; @@ -207,7 +207,7 @@ public class ClientProxy implements IProxy { MinecraftForge.EVENT_BUS.register(TooltipHandler.class); MinecraftForge.EVENT_BUS.register(TooltipAdditionDisplayHandler.class); MinecraftForge.EVENT_BUS.register(DebugHandler.class); - MinecraftForge.EVENT_BUS.register(SubTileRadiusRenderHandler.class); + MinecraftForge.EVENT_BUS.register(BlockHighlightRenderHandler.class); MinecraftForge.EVENT_BUS.register(MultiblockRenderHandler.class); MinecraftForge.EVENT_BUS.register(SkyblockRenderEvents.class); MinecraftForge.EVENT_BUS.register(new RenderLexicon());