From 3d98e8121fb3a7cb79715bb546de5c5d116629ed Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 26 Apr 2020 12:13:57 -0500 Subject: [PATCH] Fix #3254. Due to how the fallback buffer works, holding onto the buffer returned by getBuffer is dangerous, because the current layer could change and the GL state not properly reset. --- .../vazkii/botania/client/model/ModelBrewery.java | 14 ++++++++------ .../client/render/tile/RenderTileBrewery.java | 4 ---- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/main/java/vazkii/botania/client/model/ModelBrewery.java b/src/main/java/vazkii/botania/client/model/ModelBrewery.java index 21bba297f..c0af76e2b 100644 --- a/src/main/java/vazkii/botania/client/model/ModelBrewery.java +++ b/src/main/java/vazkii/botania/client/model/ModelBrewery.java @@ -20,13 +20,15 @@ import net.minecraft.client.renderer.model.Model; import net.minecraft.client.renderer.model.ModelRenderer; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.render.tile.RenderTileBrewery; import vazkii.botania.common.block.tile.TileBrewery; import javax.annotation.Nullable; public class ModelBrewery extends Model { - + private static final ResourceLocation TEXTURE = new ResourceLocation(LibResources.MODEL_BREWERY); final ModelRenderer top; final ModelRenderer pole; final ModelRenderer bottom; @@ -71,10 +73,10 @@ public class ModelBrewery extends Model { ms.pop(); } - IVertexBuilder buffer = buffers.getBuffer(getLayer(RenderTileBrewery.TEXTURE)); - pole.render(ms, buffer, light, overlay); - top.render(ms, buffer, light, overlay); - bottom.render(ms, buffer, light, overlay); + RenderType layer = getLayer(TEXTURE); + pole.render(ms, buffers.getBuffer(layer), light, overlay); + top.render(ms, buffers.getBuffer(layer), light, overlay); + bottom.render(ms, buffers.getBuffer(layer), light, overlay); ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(-polerot)); float degper = (float) (2F * Math.PI) / plates; @@ -99,7 +101,7 @@ public class ModelBrewery extends Model { renderItemStack(brewery.getItemHandler().getStackInSlot(i + 1), ms, buffers, light, overlay); ms.pop(); } - plate.render(ms, buffer, light, overlay); + plate.render(ms, buffers.getBuffer(layer), light, overlay); ms.translate(0F, -offset1, 0F); deg += degper; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java index 61e4a4554..9e85aff92 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java @@ -24,9 +24,7 @@ import vazkii.botania.common.block.tile.TileBrewery; import javax.annotation.Nullable; public class RenderTileBrewery extends TileEntityRenderer { - public static final ResourceLocation TEXTURE = new ResourceLocation(LibResources.MODEL_BREWERY); final ModelBrewery model = new ModelBrewery(); - public TileBrewery brewery; public RenderTileBrewery(TileEntityRendererDispatcher manager) { super(manager); @@ -34,10 +32,8 @@ public class RenderTileBrewery extends TileEntityRenderer { @Override public void render(@Nullable TileBrewery brewery, float f, MatrixStack ms, IRenderTypeBuffer buffers, int light, int overlay) { - this.brewery = brewery; ms.push(); - Minecraft.getInstance().textureManager.bindTexture(TEXTURE); ms.scale(1F, -1F, -1F); ms.translate(0.5F, -1.5F, -0.5F);