From 5b48dffa7711b5922ef086ee79f40139ea5e34ba Mon Sep 17 00:00:00 2001 From: ZettaSword <38763491+ZettaSword@users.noreply.github.com> Date: Thu, 4 Aug 2022 23:15:06 +0300 Subject: [PATCH] fix: Fixed the adaptive brightness of Oak/Iron/Diamondflesh --- .../client/renderer/entity/layers/LayerDiamond.java | 7 ++++++- .../wizardry/client/renderer/entity/layers/LayerIron.java | 7 ++++++- .../wizardry/client/renderer/entity/layers/LayerOak.java | 7 ++++++- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/main/java/electroblob/wizardry/client/renderer/entity/layers/LayerDiamond.java b/src/main/java/electroblob/wizardry/client/renderer/entity/layers/LayerDiamond.java index 964b9694..78c590f1 100644 --- a/src/main/java/electroblob/wizardry/client/renderer/entity/layers/LayerDiamond.java +++ b/src/main/java/electroblob/wizardry/client/renderer/entity/layers/LayerDiamond.java @@ -39,9 +39,14 @@ public class LayerDiamond extends LayerTiledOverlay { GlStateManager.enableBlend(); GlStateManager.blendFunc(SourceFactor.SRC_ALPHA, DestFactor.ONE_MINUS_SRC_ALPHA); + int j = entity.getBrightnessForRender(); + int k = j % 65536; + int l = j / 65536; + OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, (float) k, (float) l); + super.doRenderLayer(entity, limbSwing, limbSwingAmount, partialTicks, ageInTicks, netHeadYaw, headPitch, scale); GlStateManager.disableBlend(); } -} \ No newline at end of file +} diff --git a/src/main/java/electroblob/wizardry/client/renderer/entity/layers/LayerIron.java b/src/main/java/electroblob/wizardry/client/renderer/entity/layers/LayerIron.java index f7e6b3bd..bb3d35cf 100644 --- a/src/main/java/electroblob/wizardry/client/renderer/entity/layers/LayerIron.java +++ b/src/main/java/electroblob/wizardry/client/renderer/entity/layers/LayerIron.java @@ -39,9 +39,14 @@ public class LayerIron extends LayerTiledOverlay { GlStateManager.enableBlend(); GlStateManager.blendFunc(SourceFactor.SRC_ALPHA, DestFactor.ONE_MINUS_SRC_ALPHA); + int j = entity.getBrightnessForRender(); + int k = j % 65536; + int l = j / 65536; + OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, (float) k, (float) l); + super.doRenderLayer(entity, limbSwing, limbSwingAmount, partialTicks, ageInTicks, netHeadYaw, headPitch, scale); GlStateManager.disableBlend(); } -} \ No newline at end of file +} diff --git a/src/main/java/electroblob/wizardry/client/renderer/entity/layers/LayerOak.java b/src/main/java/electroblob/wizardry/client/renderer/entity/layers/LayerOak.java index 111b3217..1b526796 100644 --- a/src/main/java/electroblob/wizardry/client/renderer/entity/layers/LayerOak.java +++ b/src/main/java/electroblob/wizardry/client/renderer/entity/layers/LayerOak.java @@ -39,9 +39,14 @@ public class LayerOak extends LayerTiledOverlay { GlStateManager.enableBlend(); GlStateManager.blendFunc(SourceFactor.SRC_ALPHA, DestFactor.ONE_MINUS_SRC_ALPHA); + int j = entity.getBrightnessForRender(); + int k = j % 65536; + int l = j / 65536; + OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, (float) k, (float) l); + super.doRenderLayer(entity, limbSwing, limbSwingAmount, partialTicks, ageInTicks, netHeadYaw, headPitch, scale); GlStateManager.disableBlend(); } -} \ No newline at end of file +}