From 109d045a4d877f627663aa6d49c7e51fd8a61c22 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 4 Apr 2016 13:09:02 -0500 Subject: [PATCH] Fix ugly multiblock rendering --- .../handler/ContributorFancinessHandler.java | 2 +- .../core/handler/MultiblockRenderHandler.java | 71 ++++++++++++++++++- .../client/core/helper/ShaderHelper.java | 3 +- 3 files changed, 73 insertions(+), 3 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java index bb3c33d4a..431b21bdf 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java @@ -181,7 +181,7 @@ public final class ContributorFancinessHandler implements LayerRenderer> 16 & 255) / 255.0F; + float f1 = (float)(i >> 8 & 255) / 255.0F; + float f2 = (float)(i & 255) / 255.0F; + + if (!p_178266_4_) + { + GlStateManager.color(brightness, brightness, brightness, 1.0F); + } + + renderModelBrightnessColor(p_178266_2_, model, brightness, f, f1, f2, alpha); + } + + // Copy of BlockModelRenderer.renderModelBrightnessColor + alpha arg + private static void renderModelBrightnessColor(IBlockState p_187495_1_, IBakedModel p_187495_2_, float p_187495_3_, float p_187495_4_, float p_187495_5_, float p_187495_6_, float alpha) { + for (EnumFacing enumfacing : EnumFacing.values()) + { + renderModelBrightnessColorQuads(p_187495_3_, p_187495_4_, p_187495_5_, p_187495_6_, p_187495_2_.getQuads(p_187495_1_, enumfacing, 0L), alpha); + } + + renderModelBrightnessColorQuads(p_187495_3_, p_187495_4_, p_187495_5_, p_187495_6_, p_187495_2_.getQuads(p_187495_1_, (EnumFacing)null, 0L), alpha); + } + + // Copy of BlockModelRenderer.renderModelBrightnessColorQuads + alpha arg + private static void renderModelBrightnessColorQuads(float brightness, float red, float green, float blue, List listQuads, float alpha) + { + Tessellator tessellator = Tessellator.getInstance(); + VertexBuffer vertexbuffer = tessellator.getBuffer(); + int i = 0; + + for (int j = listQuads.size(); i < j; ++i) + { + BakedQuad bakedquad = (BakedQuad)listQuads.get(i); + vertexbuffer.begin(7, DefaultVertexFormats.ITEM); + vertexbuffer.addVertexData(bakedquad.getVertexData()); + + // Botania - alpha + int a = ((int) (255 * alpha)); + int r = ((int) (255 * brightness * (bakedquad.hasTintIndex() ? red : 1))); + int g = ((int) (255 * brightness * (bakedquad.hasTintIndex() ? green : 1))); + int b = ((int) (255 * brightness * (bakedquad.hasTintIndex() ? blue : 1))); + int argb = a << 24 | r << 16 | g << 8 | b; + vertexbuffer.putColor4(argb); + + Vec3i vec3i = bakedquad.getFace().getDirectionVec(); + vertexbuffer.putNormal((float)vec3i.getX(), (float)vec3i.getY(), (float)vec3i.getZ()); + tessellator.draw(); + } + } } diff --git a/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java b/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java index fa48b075d..86a48662d 100644 --- a/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java @@ -13,6 +13,7 @@ package vazkii.botania.client.core.helper; import java.io.BufferedReader; import java.io.InputStream; import java.io.InputStreamReader; +import java.util.stream.Collectors; import net.minecraft.client.renderer.OpenGlHelper; @@ -155,7 +156,7 @@ public final class ShaderHelper { return ""; try (BufferedReader reader = new BufferedReader(new InputStreamReader(in, "UTF-8"))) { - return reader.lines().reduce("", (s1, s2) -> s1 + "\n" + s2); + return reader.lines().collect(Collectors.joining("\n")); } }