diff --git a/src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java index ef9bb8e7b..e1ff81a1b 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java @@ -176,6 +176,8 @@ public final class BlockHighlightRenderHandler { radius -= f; IVertexBuilder buffer = buffers.getBuffer(CIRCLE); + // todo 1.15 ! TRIANGLE_FAN GL draw mode means we can't batch up everything like we're doing right now--they'll all run together + // todo 1.15 we must either draw between each circle or use a different draw mode (probably switch to GL_TRIANGLES) Matrix4f mat = ms.peek().getModel(); buffer.vertex(mat, 0, f, 0).color(colorRGB.getRed(), colorRGB.getGreen(), colorRGB.getBlue(), alpha).endVertex(); for(int i = 0; i < totalAngles + 1; i += step) { diff --git a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java index 83066c6e3..f421872c4 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -116,7 +116,7 @@ public final class ModelHandler { ClientRegistry.bindTileEntityRenderer(TileRedStringInterceptor.TYPE, RenderTileRedString::new); ClientRegistry.bindTileEntityRenderer(TileRedStringRelay.TYPE, RenderTileRedString::new); ClientRegistry.bindTileEntityRenderer(TilePrism.TYPE, RenderTilePrism::new); - ClientRegistry.bindTileEntityRenderer(TileCorporeaIndex.TYPE, new RenderTileCorporeaIndex()); + ClientRegistry.bindTileEntityRenderer(TileCorporeaIndex.TYPE, RenderTileCorporeaIndex::new); ClientRegistry.bindTileEntityRenderer(TilePump.TYPE, RenderTilePump::new); ClientRegistry.bindTileEntityRenderer(TileCorporeaCrystalCube.TYPE, RenderTileCorporeaCrystalCube::new); ClientRegistry.bindTileEntityRenderer(TileIncensePlate.TYPE, RenderTileIncensePlate::new); diff --git a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java index 9250084c2..3bd5b93d9 100644 --- a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java @@ -10,119 +10,34 @@ */ package vazkii.botania.client.core.helper; +import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.platform.GlStateManager; +import com.mojang.blaze3d.vertex.IVertexBuilder; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.BufferBuilder; +import net.minecraft.client.renderer.IRenderTypeBuffer; +import net.minecraft.client.renderer.Matrix4f; +import net.minecraft.client.renderer.RenderState; +import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.Vector3f; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.settings.KeyBinding; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.lib.LibResources; +import java.util.Arrays; import java.util.List; import java.util.Random; +import java.util.function.Consumer; public final class RenderHelper { - public static void renderTooltip(int x, int y, List tooltipData) { - int color = 0x505000ff; - int color2 = 0xf0100010; - - renderTooltip(x, y, tooltipData, color, color2); - } - - public static void renderTooltipOrange(int x, int y, List tooltipData) { - int color = 0x50a06600; - int color2 = 0xf01e1200; - - renderTooltip(x, y, tooltipData, color, color2); - } - - public static void renderTooltipGreen(int x, int y, List tooltipData) { - int color = 0x5000a000; - int color2 = 0xf0001e00; - - renderTooltip(x, y, tooltipData, color, color2); - } - - public static void renderTooltip(int x, int y, List tooltipData, int color, int color2) { - boolean lighting = GL11.glGetBoolean(GL11.GL_LIGHTING); - if(lighting) - net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting(); - - if (!tooltipData.isEmpty()) { - int var5 = 0; - int var6; - int var7; - FontRenderer fontRenderer = Minecraft.getInstance().fontRenderer; - for (var6 = 0; var6 < tooltipData.size(); ++var6) { - var7 = fontRenderer.getStringWidth(tooltipData.get(var6)); - if (var7 > var5) - var5 = var7; - } - var6 = x + 12; - var7 = y - 12; - int var9 = 8; - if (tooltipData.size() > 1) - var9 += 2 + (tooltipData.size() - 1) * 10; - float z = 300F; - drawGradientRect(var6 - 3, var7 - 4, z, var6 + var5 + 3, var7 - 3, color2, color2); - drawGradientRect(var6 - 3, var7 + var9 + 3, z, var6 + var5 + 3, var7 + var9 + 4, color2, color2); - drawGradientRect(var6 - 3, var7 - 3, z, var6 + var5 + 3, var7 + var9 + 3, color2, color2); - drawGradientRect(var6 - 4, var7 - 3, z, var6 - 3, var7 + var9 + 3, color2, color2); - drawGradientRect(var6 + var5 + 3, var7 - 3, z, var6 + var5 + 4, var7 + var9 + 3, color2, color2); - int var12 = (color & 0xFFFFFF) >> 1 | color & -16777216; - drawGradientRect(var6 - 3, var7 - 3 + 1, z, var6 - 3 + 1, var7 + var9 + 3 - 1, color, var12); - drawGradientRect(var6 + var5 + 2, var7 - 3 + 1, z, var6 + var5 + 3, var7 + var9 + 3 - 1, color, var12); - drawGradientRect(var6 - 3, var7 - 3, z, var6 + var5 + 3, var7 - 3 + 1, color, color); - drawGradientRect(var6 - 3, var7 + var9 + 2, z, var6 + var5 + 3, var7 + var9 + 3, var12, var12); - - GlStateManager.disableDepthTest(); - for (int var13 = 0; var13 < tooltipData.size(); ++var13) { - String var14 = tooltipData.get(var13); - fontRenderer.drawStringWithShadow(var14, var6, var7, -1); - if (var13 == 0) - var7 += 2; - var7 += 10; - } - GlStateManager.enableDepthTest(); - } - if(!lighting) - net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting(); - GlStateManager.color4f(1F, 1F, 1F, 1F); - } - - public static void drawGradientRect(int par1, int par2, float z, int par3, int par4, int par5, int par6) { - float var7 = (par5 >> 24 & 255) / 255F; - float var8 = (par5 >> 16 & 255) / 255F; - float var9 = (par5 >> 8 & 255) / 255F; - float var10 = (par5 & 255) / 255F; - float var11 = (par6 >> 24 & 255) / 255F; - float var12 = (par6 >> 16 & 255) / 255F; - float var13 = (par6 >> 8 & 255) / 255F; - float var14 = (par6 & 255) / 255F; - GlStateManager.disableTexture(); - GlStateManager.enableBlend(); - GlStateManager.disableAlphaTest(); - GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GlStateManager.shadeModel(GL11.GL_SMOOTH); - Tessellator var15 = Tessellator.getInstance(); - var15.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_COLOR); - var15.getBuffer().vertex(par3, par2, z).color(var8, var9, var10, var7).endVertex(); - var15.getBuffer().vertex(par1, par2, z).color(var8, var9, var10, var7).endVertex(); - var15.getBuffer().vertex(par1, par4, z).color(var12, var13, var14, var11).endVertex(); - var15.getBuffer().vertex(par3, par4, z).color(var12, var13, var14, var11).endVertex(); - var15.draw(); - GlStateManager.shadeModel(GL11.GL_FLAT); - GlStateManager.disableBlend(); - GlStateManager.enableAlphaTest(); - GlStateManager.enableTexture(); - } - public static void drawTexturedModalRect(int par1, int par2, float z, int par3, int par4, int par5, int par6) { drawTexturedModalRect(par1, par2, z, par3, par4, par5, par6, 0.00390625F, 0.00390625F); } @@ -137,58 +52,68 @@ public final class RenderHelper { tessellator.draw(); } - public static void renderStar(int color, float xScale, float yScale, float zScale, long seed) { - Tessellator tessellator = Tessellator.getInstance(); + private static final RenderType STAR_LAYER; + static { + RenderState.TransparencyState lightningTransparency = ObfuscationReflectionHelper.getPrivateValue(RenderState.class, null, "field_228512_d_"); + RenderType.State glState = RenderType.State.builder().shadeModel(new RenderState.ShadeModelState(true)) + .writeMaskState(new RenderState.WriteMaskState(true, false)) + .transparency(lightningTransparency) + .build(false); + STAR_LAYER = RenderType.of("botania:star", DefaultVertexFormats.POSITION_COLOR, GL11.GL_TRIANGLES, 256, false, true, glState); + } + + public static void renderStar(MatrixStack ms, IRenderTypeBuffer buffers, int color, float xScale, float yScale, float zScale, long seed) { + IVertexBuilder buffer = buffers.getBuffer(STAR_LAYER); float ticks = (ClientTickHandler.ticksInGame % 200) + ClientTickHandler.partialTicks; if (ticks >= 100) ticks = 200 - ticks - 1; float f1 = ticks / 200F; - float f2 = 0F; - if (f1 > 0.7F) - f2 = (f1 - 0.7F) / 0.2F; + float f2 = f1 > 0.F ? (f1 - 0.7F) / 0.2F : 0; Random random = new Random(seed); - GlStateManager.pushMatrix(); - GlStateManager.disableTexture(); - GlStateManager.shadeModel(GL11.GL_SMOOTH); - GlStateManager.enableBlend(); - GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE); - GlStateManager.disableAlphaTest(); - GlStateManager.enableCull(); - GlStateManager.depthMask(false); - GlStateManager.scalef(xScale, yScale, zScale); + ms.push(); + ms.scale(xScale, yScale, zScale); for (int i = 0; i < (f1 + f1 * f1) / 2F * 90F + 30F; i++) { - GlStateManager.rotatef(random.nextFloat() * 360F, 1F, 0F, 0F); - GlStateManager.rotatef(random.nextFloat() * 360F, 0F, 1F, 0F); - GlStateManager.rotatef(random.nextFloat() * 360F, 0F, 0F, 1F); - GlStateManager.rotatef(random.nextFloat() * 360F, 1F, 0F, 0F); - GlStateManager.rotatef(random.nextFloat() * 360F, 0F, 1F, 0F); - GlStateManager.rotatef(random.nextFloat() * 360F + f1 * 90F, 0F, 0F, 1F); - tessellator.getBuffer().begin(GL11.GL_TRIANGLE_FAN, DefaultVertexFormats.POSITION_COLOR); + // todo 1.15 compose the quaternions before multiplying into ms? + ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(random.nextFloat() * 360F)); + ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(random.nextFloat() * 360F)); + ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(random.nextFloat() * 360F)); + ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(random.nextFloat() * 360F)); + ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(random.nextFloat() * 360F)); + ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(random.nextFloat() * 360F + f1 * 90F)); float f3 = random.nextFloat() * 20F + 5F + f2 * 10F; float f4 = random.nextFloat() * 2F + 1F + f2 * 2F; float r = ((color & 0xFF0000) >> 16) / 255F; float g = ((color & 0xFF00) >> 8) / 255F; float b = (color & 0xFF) / 255F; - tessellator.getBuffer().vertex(0, 0, 0).color(r, g, b, 1F - f2).endVertex(); - tessellator.getBuffer().vertex(-0.866D * f4, f3, -0.5F * f4).color(0, 0, 0, 0).endVertex(); - tessellator.getBuffer().vertex(0.866D * f4, f3, -0.5F * f4).color(0, 0, 0, 0).endVertex(); - tessellator.getBuffer().vertex(0, f3, 1F * f4).color(0, 0, 0, 0).endVertex(); - tessellator.getBuffer().vertex(-0.866D * f4, f3, -0.5F * f4).color(0, 0, 0, 0).endVertex(); - tessellator.draw(); + Matrix4f mat = ms.peek().getModel(); + Runnable center = () -> buffer.vertex(mat, 0, 0, 0).color(r, g, b, 1F - f2).endVertex(); + Runnable[] vertices = { + () -> buffer.vertex(mat, -0.866F * f4, f3, -0.5F * f4).color(0, 0, 0, 0).endVertex(), + () -> buffer.vertex(mat, 0.866F * f4, f3, -0.5F * f4).color(0, 0, 0, 0).endVertex(), + () -> buffer.vertex(mat, 0, f3, 1F * f4).color(0, 0, 0, 0).endVertex(), + () -> buffer.vertex(mat, -0.866F * f4, f3, -0.5F * f4).color(0, 0, 0, 0).endVertex() + }; + triangleFan(center, vertices); } - GlStateManager.depthMask(true); - GlStateManager.disableCull(); - GlStateManager.disableBlend(); - GlStateManager.shadeModel(GL11.GL_FLAT); - GlStateManager.color4f(1F, 1F, 1F, 1F); - GlStateManager.enableTexture(); - GlStateManager.enableAlphaTest(); - GlStateManager.popMatrix(); + ms.pop(); + } + + /** + * With a buffer in GL_TRIANGLES mode, emulates GL_TRIANGLE_FAN on the CPU. + * This is because batching of GL_TRIANGLE_FAN makes no sense (the vertices would bleed into one massive fan) + * Primitive restart would also work but it's not easy to use in Minecraft + */ + public static void triangleFan(Runnable center, Runnable... vertices) { + for (int i = 0; i < vertices.length - 1; i++) { + center.run(); + vertices[i].run(); + vertices[i + 1].run(); + } } public static void renderProgressPie(int x, int y, float progress, ItemStack stack) { diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderManaStorm.java b/src/main/java/vazkii/botania/client/render/entity/RenderManaStorm.java index 0f19987d0..e94f6b803 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderManaStorm.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderManaStorm.java @@ -10,7 +10,9 @@ */ package vazkii.botania.client.render.entity; +import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.platform.GlStateManager; +import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.entity.EntityRenderer; import net.minecraft.client.renderer.entity.EntityRendererManager; import net.minecraft.client.renderer.texture.AtlasTexture; @@ -27,15 +29,12 @@ public class RenderManaStorm extends EntityRenderer { } @Override - public void doRender(@Nonnull EntityManaStorm storm, double x, double y, double z, float something, float pticks) { - GlStateManager.pushMatrix(); - GlStateManager.translated(x, y, z); + public void render(EntityManaStorm storm, float yaw, float pticks, MatrixStack ms, IRenderTypeBuffer buffers, int light) { + ms.push(); float maxScale = 1.95F; float scale = 0.05F + ((float) storm.burstsFired / EntityManaStorm.TOTAL_BURSTS - (storm.deathTime == 0 ? 0 : storm.deathTime + pticks) / EntityManaStorm.DEATH_TIME) * maxScale; - RenderHelper.renderStar(0x00FF00, scale, scale, scale, storm.getUniqueID().getMostSignificantBits()); - GlStateManager.disableBlend(); - GlStateManager.disableRescaleNormal(); - GlStateManager.popMatrix(); + RenderHelper.renderStar(ms, buffers, 0x00FF00, scale, scale, scale, storm.getUniqueID().getMostSignificantBits()); + ms.pop(); } @Nonnull diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java index 2ce903550..338e7841b 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java @@ -10,10 +10,12 @@ */ package vazkii.botania.client.render.tile; +import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.entity.model.EnderCrystalModel; +import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; +import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.util.ResourceLocation; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.lib.LibResources; @@ -23,23 +25,24 @@ import javax.annotation.Nullable; public class RenderTileCorporeaIndex extends TileEntityRenderer { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_CORPOREA_INDEX); - private final EnderCrystalModel crystal = new EnderCrystalModel(0F, false); public static boolean move = true; + public RenderTileCorporeaIndex(TileEntityRendererDispatcher manager) { + super(manager); + } + @Override - public void render(@Nullable TileCorporeaIndex index, double x, double y, double z, float partticks, int digProgress) { + public void render(@Nullable TileCorporeaIndex index, float partticks, MatrixStack ms, IRenderTypeBuffer buffers, int light, int overlay) { move = index != null; - GlStateManager.pushMatrix(); - GlStateManager.translated(x + 0.5, y, z + 0.5); - Minecraft.getInstance().textureManager.bindTexture(texture); - + ms.push(); float translation = move ? (float) ((Math.cos((index.ticksWithCloseby + (index.hasCloseby ? partticks : 0)) / 10F) * 0.5 + 0.5) * 0.25) : 0F; float rotation = move ? index.ticks * 2 + partticks : 0F; float scale = 0.6F; - GlStateManager.scalef(scale, scale, scale); - crystal.render(null, 0F, rotation, translation, 0F, 0F, 1F / 16F); - GlStateManager.scalef(1F / scale, 1F / scale, 1F / scale); + ms.scale(scale, scale, scale); + // todo 1.15 reimplement this + // crystal.render(null, 0F, rotation, translation, 0F, 0F, 1F / 16F); + ms.scale(1F / scale, 1F / scale, 1F / scale); if(index != null && index.closeby > 0F) { float starScale = 0.02F; @@ -50,22 +53,22 @@ public class RenderTileCorporeaIndex extends TileEntityRenderer { ms.pop(); } - GlStateManager.pushMatrix(); - GlStateManager.translatef(0.5F, 1.8F, 0.5F); - GlStateManager.rotatef(180F, 1F, 0F, 1F); + ms.push(); + ms.translate(0.5F, 1.8F, 0.5F); + ms.multiply(new Vector3f(1, 0, 1).getDegreesQuaternion(180F)); int repeat = 15; cubes.renderSpinningCubes(2, repeat, repeat); - GlStateManager.popMatrix(); + ms.pop(); - GlStateManager.translatef(0F, 0.2F, 0F); + ms.translate(0F, 0.2F, 0F); float scale = altar.getTargetMana() == 0 ? 0 : (float) altar.getCurrentMana() / (float) altar.getTargetMana() / 75F; if(scale != 0) { int seed = altar.getPos().getX() ^ altar.getPos().getY() ^ altar.getPos().getZ(); - GlStateManager.translatef(0.5F, 0.7F, 0.5F); - RenderHelper.renderStar(0x00E4D7, scale, scale, scale, seed); + ms.translate(0.5F, 0.7F, 0.5F); + RenderHelper.renderStar(ms, buffers, 0x00E4D7, scale, scale, scale, seed); } - GlStateManager.enableAlphaTest(); - GlStateManager.popMatrix(); + ms.pop(); } }