From 8547c21474ddde7443e84de4f73b004342546d26 Mon Sep 17 00:00:00 2001 From: Kam Date: Thu, 13 Feb 2025 03:30:04 -0500 Subject: [PATCH] Fix Lamps --- src/main/java/noppes/npcs/blocks/tiles/TileVariant.java | 2 -- .../npcs/client/renderer/blocks/BlockTallLampRenderer.java | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/noppes/npcs/blocks/tiles/TileVariant.java b/src/main/java/noppes/npcs/blocks/tiles/TileVariant.java index 7d0f9b662..5a637d55c 100644 --- a/src/main/java/noppes/npcs/blocks/tiles/TileVariant.java +++ b/src/main/java/noppes/npcs/blocks/tiles/TileVariant.java @@ -70,12 +70,10 @@ public class TileVariant extends TileEntity { compound.setInteger("BrushColor", ColorUtil.colorTableInts[bannerColor]); } compound.setInteger("CNPCVariant", bannerColor); - compound.removeTag("BannerColor"); fixMade = true; } if(compound.hasKey("BannerRotation")){ compound.setInteger("CNPCRotation", compound.getInteger("BannerRotation")); - compound.removeTag("BannerRotation"); fixMade = true; } } diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockTallLampRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockTallLampRenderer.java index 18d8814ee..28c1d6b6b 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockTallLampRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockTallLampRenderer.java @@ -56,7 +56,7 @@ public class BlockTallLampRenderer extends BlockRendererInterface{ modelLegacy.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); this.bindTexture(resourceTop); - float[] color = ColorUtil.hexToRGB(ColorUtil.colorTableInts[tile.color]); + float[] color = ColorUtil.hexToRGB(tile.color); GL11.glColor3f(color[0], color[1], color[2]); topLegacy.render(null, 0, 0, 0, 0, 0.0F, 0.0625F); } else { @@ -74,7 +74,7 @@ public class BlockTallLampRenderer extends BlockRendererInterface{ model.Light.render(0.0625F); OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, (float)brightX, (float)brightY); - float[] color = ColorUtil.hexToRGB(ColorUtil.colorTableInts[tile.color]); + float[] color = ColorUtil.hexToRGB(tile.color); GL11.glColor3f(color[0], color[1], color[2]); model.Shade.render(0.0625F); }