From 213efd5e28eea6a0b6ad38097d1f45691c696186 Mon Sep 17 00:00:00 2001 From: DStrand1 Date: Mon, 6 Dec 2021 23:20:13 -0600 Subject: [PATCH] Fix covers rendering under bloom layer --- src/main/java/gregtech/api/cover/ICoverable.java | 5 +++-- .../common/covers/CoverDigitalInterface.java | 12 ++++++------ .../common/covers/CoverDigitalInterfaceWireless.java | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/main/java/gregtech/api/cover/ICoverable.java b/src/main/java/gregtech/api/cover/ICoverable.java index 749e89a2e82..ca5c383cedc 100644 --- a/src/main/java/gregtech/api/cover/ICoverable.java +++ b/src/main/java/gregtech/api/cover/ICoverable.java @@ -11,6 +11,7 @@ import gregtech.api.pipenet.block.BlockPipe.PipeConnectionData; import gregtech.api.render.GTBlockOperation; import gregtech.api.util.GTUtility; +import gregtech.api.util.RenderUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.network.PacketBuffer; @@ -86,7 +87,7 @@ default void renderCovers(CCRenderState renderState, Matrix4 translation, GTBloc coverBehavior.renderCoverPlate(renderState, translation, platePipeline, plateBox, layer); } if (coverBehavior.canRenderInLayer(layer)) { - coverBehavior.renderCover(renderState, translation.copy(), coverPipeline, plateBox, layer); + coverBehavior.renderCover(renderState, RenderUtil.adjustTrans(translation.copy(), sideFacing, 1), coverPipeline, plateBox, layer); if (coverPlateThickness == 0.0 && shouldRenderBackSide() && coverBehavior.canRenderBackside()) { //machine is full block, but still not opaque - render cover on the back side too Matrix4 backTranslation = translation.copy(); @@ -96,7 +97,7 @@ default void renderCovers(CCRenderState renderState, Matrix4 translation, GTBloc REVERSE_HORIZONTAL_ROTATION.apply(backTranslation); } backTranslation.translate(-sideFacing.getXOffset(), -sideFacing.getYOffset(), -sideFacing.getZOffset()); - coverBehavior.renderCover(renderState, backTranslation, coverPipeline, plateBox, layer); + coverBehavior.renderCover(renderState, backTranslation, coverPipeline, plateBox, layer); // may need to translate the layer here as well } } } diff --git a/src/main/java/gregtech/common/covers/CoverDigitalInterface.java b/src/main/java/gregtech/common/covers/CoverDigitalInterface.java index 73744b51791..bf83bc97d41 100644 --- a/src/main/java/gregtech/common/covers/CoverDigitalInterface.java +++ b/src/main/java/gregtech/common/covers/CoverDigitalInterface.java @@ -844,19 +844,19 @@ public void renderCover(CCRenderState ccRenderState, Matrix4 translation, IVerte translation.apply(rotation); } if (mode == MODE.PROXY) { - Textures.COVER_INTERFACE_PROXY.renderSided(this.attachedSide, cuboid6, ccRenderState, ops, RenderUtil.adjustTrans(translation, this.attachedSide, 1)); + Textures.COVER_INTERFACE_PROXY.renderSided(this.attachedSide, cuboid6, ccRenderState, ops, translation); } else if (mode == MODE.FLUID) { - Textures.COVER_INTERFACE_FLUID.renderSided(this.attachedSide, cuboid6, ccRenderState, ArrayUtils.addAll(ops, rotation), RenderUtil.adjustTrans(translation, this.attachedSide, 1)); + Textures.COVER_INTERFACE_FLUID.renderSided(this.attachedSide, cuboid6, ccRenderState, ArrayUtils.addAll(ops, rotation), translation); Textures.COVER_INTERFACE_FLUID_GLASS.renderSided(this.attachedSide, cuboid6, ccRenderState, ArrayUtils.addAll(ops, rotation), RenderUtil.adjustTrans(translation, this.attachedSide, 3)); } else if (mode == MODE.ITEM) { - Textures.COVER_INTERFACE_ITEM.renderSided(this.attachedSide, cuboid6, ccRenderState, ArrayUtils.addAll(ops, rotation), RenderUtil.adjustTrans(translation, this.attachedSide, 1)); + Textures.COVER_INTERFACE_ITEM.renderSided(this.attachedSide, cuboid6, ccRenderState, ArrayUtils.addAll(ops, rotation), translation); } else if (mode == MODE.ENERGY) { - Textures.COVER_INTERFACE_ENERGY.renderSided(this.attachedSide, cuboid6, ccRenderState, ArrayUtils.addAll(ops, rotation), RenderUtil.adjustTrans(translation, this.attachedSide, 1)); + Textures.COVER_INTERFACE_ENERGY.renderSided(this.attachedSide, cuboid6, ccRenderState, ArrayUtils.addAll(ops, rotation), translation); } else if (mode == MODE.MACHINE) { if (isWorkingEnabled) { - Textures.COVER_INTERFACE_MACHINE_ON.renderSided(this.attachedSide, cuboid6, ccRenderState, ArrayUtils.addAll(ops, rotation), RenderUtil.adjustTrans(translation, this.attachedSide, 1)); + Textures.COVER_INTERFACE_MACHINE_ON.renderSided(this.attachedSide, cuboid6, ccRenderState, ArrayUtils.addAll(ops, rotation), translation); } else { - Textures.COVER_INTERFACE_MACHINE_OFF.renderSided(this.attachedSide, cuboid6, ccRenderState, ArrayUtils.addAll(ops, rotation), RenderUtil.adjustTrans(translation, this.attachedSide, 1)); + Textures.COVER_INTERFACE_MACHINE_OFF.renderSided(this.attachedSide, cuboid6, ccRenderState, ArrayUtils.addAll(ops, rotation), translation); } } } diff --git a/src/main/java/gregtech/common/covers/CoverDigitalInterfaceWireless.java b/src/main/java/gregtech/common/covers/CoverDigitalInterfaceWireless.java index 8906c46280c..0faf8d464af 100644 --- a/src/main/java/gregtech/common/covers/CoverDigitalInterfaceWireless.java +++ b/src/main/java/gregtech/common/covers/CoverDigitalInterfaceWireless.java @@ -98,6 +98,6 @@ public ItemStack getPickItem() { @Override public void renderCover(CCRenderState ccRenderState, Matrix4 translation, IVertexOperation[] ops, Cuboid6 cuboid6, BlockRenderLayer blockRenderLayer) { - Textures.COVER_INTERFACE_WIRELESS.renderSided(this.attachedSide, cuboid6, ccRenderState, ops, RenderUtil.adjustTrans(translation, this.attachedSide, 1)); + Textures.COVER_INTERFACE_WIRELESS.renderSided(this.attachedSide, cuboid6, ccRenderState, ops, translation); } }