Merge pull request #55 from PrototypeTrousers/fix-ie-colors

Fix Immersive Engineering Redstone connectors missing their color
Asek3 · Oct 12, 2024 · d6685cb · d6685cb
2 parents 29c95c4 + 7271f5b
commit d6685cb
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/build.gradle b/build.gradle
@@ -66,6 +66,7 @@ dependencies {
     //implementation rfg.deobf("curse.maven:thermfound-222880:2926428")
     //implementation rfg.deobf("curse.maven:thermdyn-227443:2920505")
     //implementation rfg.deobf("curse.maven:ae2-223794:2747063")
+    //implementation rfg.deobf("curse.maven:ie-231951:2974106")
 }
 
 jar {

diff --git a/src/main/java/me/jellysquid/mods/sodium/client/render/pipeline/BlockRenderer.java b/src/main/java/me/jellysquid/mods/sodium/client/render/pipeline/BlockRenderer.java
@@ -112,7 +112,9 @@ private void renderQuadList(IBlockAccess world, IBlockState state, BlockPos pos,
             lighter.calculate((ModelQuadView) quad, pos, light, cullFace, quadFace, quad.shouldApplyDiffuseLighting());
 
             if (quad.hasTintIndex() && colorizer == null) {
-                colorizer = this.blockColors.getColorProvider(state);
+                if (this.blockColors.hasColorProvider(state)) {
+                    colorizer = this.blockColors.getColorProvider(state);
+                }
             }
 
             this.renderQuad(world, state, pos, sink, offset, colorizer, quad, light, renderData);
@@ -129,7 +131,7 @@ private void renderQuad(IBlockAccess world, IBlockState state, BlockPos pos, Mod
 
         int[] colors = null;
 
-        if (bakedQuad.hasTintIndex()) {
+        if (bakedQuad.hasTintIndex() && colorProvider != null) {
             colors = this.biomeColorBlender.getColors(colorProvider, world, state, pos, src);
         }
 

diff --git a/src/main/java/me/jellysquid/mods/sodium/client/world/biome/BlockColorsExtended.java b/src/main/java/me/jellysquid/mods/sodium/client/world/biome/BlockColorsExtended.java
@@ -5,4 +5,5 @@
 
 public interface BlockColorsExtended {
     IBlockColor getColorProvider(IBlockState state);
+    boolean hasColorProvider(IBlockState state);
 }
diff --git a/src/main/java/me/jellysquid/mods/sodium/mixin/core/model/MixinBlockColors.java b/src/main/java/me/jellysquid/mods/sodium/mixin/core/model/MixinBlockColors.java
@@ -41,4 +41,9 @@ private void preRegisterColor(IBlockColor provider, Block[] blocks, CallbackInfo
     public IBlockColor getColorProvider(IBlockState state) {
         return this.blocksToColor.get(state.getBlock());
     }
+
+    @Override
+    public boolean hasColorProvider(IBlockState state) {
+        return this.blocksToColor.get(state.getBlock()) != DEFAULT_PROVIDER;
+    }
 }