diff --git a/src/main/java/appeng/block/paint/PaintSplotchesBakedModel.java b/src/main/java/appeng/block/paint/PaintSplotchesBakedModel.java index 7a2712d7c..02cefc91a 100644 --- a/src/main/java/appeng/block/paint/PaintSplotchesBakedModel.java +++ b/src/main/java/appeng/block/paint/PaintSplotchesBakedModel.java @@ -76,10 +76,10 @@ class PaintSplotchesBakedModel implements BakedModel, FabricBakedModel { if (s.isLumen()) { builder.setColorRGB(s.getColor().whiteVariant); - builder.setRenderFullBright(true); + builder.setEmissiveMaterial(true); } else { builder.setColorRGB(s.getColor().mediumVariant); - builder.setRenderFullBright(false); + builder.setEmissiveMaterial(false); } float offset = offsetConstant; diff --git a/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java b/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java index 9ded11ef1..081a5a3f7 100644 --- a/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java +++ b/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java @@ -144,7 +144,7 @@ class QnbFormedBakedModel implements BakedModel, FabricBakedModel { if (formedState.isPowered()) { builder.setTexture(this.lightCornerTexture); - builder.setRenderFullBright(true); + builder.setEmissiveMaterial(true); for (Direction facing : Direction.values()) { // Offset the face by a slight amount so that it is drawn over the already drawn // ring texture @@ -158,6 +158,7 @@ class QnbFormedBakedModel implements BakedModel, FabricBakedModel { DEFAULT_RENDER_MIN - zOffset, DEFAULT_RENDER_MAX + xOffset, DEFAULT_RENDER_MAX + yOffset, DEFAULT_RENDER_MAX + zOffset); } + builder.setEmissiveMaterial(false); } } else { builder.setTexture(this.ringTexture); @@ -170,7 +171,7 @@ class QnbFormedBakedModel implements BakedModel, FabricBakedModel { if (formedState.isPowered()) { builder.setTexture(this.lightTexture); - builder.setRenderFullBright(true); + builder.setEmissiveMaterial(true); for (Direction facing : Direction.values()) { // Offset the face by a slight amount so that it is drawn over the already drawn // ring texture diff --git a/src/main/java/appeng/client/render/cablebus/CableBuilder.java b/src/main/java/appeng/client/render/cablebus/CableBuilder.java index 8e27bba11..6f4218d00 100644 --- a/src/main/java/appeng/client/render/cablebus/CableBuilder.java +++ b/src/main/java/appeng/client/render/cablebus/CableBuilder.java @@ -346,7 +346,7 @@ class CableBuilder { this.addBigCoveredCableSizedCube(facing, cubeBuilder); // Render the channel indicators brightly lit at night - cubeBuilder.setRenderFullBright(true); + cubeBuilder.setEmissiveMaterial(true); cubeBuilder.setTexture(oddChannel); cubeBuilder.setColorRGB(cableColor.blackVariant); @@ -357,14 +357,14 @@ class CableBuilder { this.addBigCoveredCableSizedCube(facing, cubeBuilder); // Reset back to normal rendering for the rest - cubeBuilder.setRenderFullBright(false); + cubeBuilder.setEmissiveMaterial(false); cubeBuilder.setTexture(texture); } addCoveredCableSizedCube(facing, cubeBuilder); // Render the channel indicators brightly lit at night - cubeBuilder.setRenderFullBright(true); + cubeBuilder.setEmissiveMaterial(true); cubeBuilder.setTexture(oddChannel); cubeBuilder.setColorRGB(cableColor.blackVariant); @@ -373,6 +373,9 @@ class CableBuilder { cubeBuilder.setTexture(evenChannel); cubeBuilder.setColorRGB(cableColor.whiteVariant); addCoveredCableSizedCube(facing, cubeBuilder); + + // Reset back to default + cubeBuilder.setEmissiveMaterial(false); } public void addStraightSmartConnection(Direction facing, AEColor cableColor, int channels, QuadEmitter emitter) { @@ -389,7 +392,7 @@ class CableBuilder { Sprite evenChannel = this.smartCableTextures.getEvenTextureForChannels(channels); // Render the channel indicators brightly lit at night - cubeBuilder.setRenderFullBright(true); + cubeBuilder.setEmissiveMaterial(true); cubeBuilder.setTexture(oddChannel); cubeBuilder.setColorRGB(cableColor.blackVariant); @@ -398,6 +401,9 @@ class CableBuilder { cubeBuilder.setTexture(evenChannel); cubeBuilder.setColorRGB(cableColor.whiteVariant); addStraightCoveredCableSizedCube(facing, cubeBuilder); + + // Reset back to default + cubeBuilder.setEmissiveMaterial(false); } public void addConstrainedSmartConnection(Direction facing, AEColor cableColor, int distanceFromEdge, int channels, @@ -420,7 +426,7 @@ class CableBuilder { Sprite evenChannel = this.smartCableTextures.getEvenTextureForChannels(channels); // Render the channel indicators brightly lit at night - cubeBuilder.setRenderFullBright(true); + cubeBuilder.setEmissiveMaterial(true); cubeBuilder.setTexture(oddChannel); cubeBuilder.setColorRGB(cableColor.blackVariant); @@ -429,6 +435,9 @@ class CableBuilder { cubeBuilder.setTexture(evenChannel); cubeBuilder.setColorRGB(cableColor.whiteVariant); addCoveredCableSizedCube(facing, distanceFromEdge, cubeBuilder); + + // Reset back to default + cubeBuilder.setEmissiveMaterial(false); } public void addDenseCoveredConnection(Direction facing, AEColor cableColor, AECableType connectionType, @@ -452,7 +461,7 @@ class CableBuilder { addDenseCableSizedCube(facing, cubeBuilder); // Reset back to normal rendering for the rest - cubeBuilder.setRenderFullBright(false); + cubeBuilder.setEmissiveMaterial(false); cubeBuilder.setTexture(texture); } @@ -488,7 +497,7 @@ class CableBuilder { Sprite evenChannel = this.smartCableTextures.getEvenTextureForChannels(channels); // Render the channel indicators brightly lit at night - cubeBuilder.setRenderFullBright(true); + cubeBuilder.setEmissiveMaterial(true); cubeBuilder.setTexture(oddChannel); cubeBuilder.setColorRGB(cableColor.blackVariant); @@ -499,7 +508,7 @@ class CableBuilder { addDenseCableSizedCube(facing, cubeBuilder); // Reset back to normal rendering for the rest - cubeBuilder.setRenderFullBright(false); + cubeBuilder.setEmissiveMaterial(false); cubeBuilder.setTexture(texture); } @@ -532,7 +541,7 @@ class CableBuilder { Sprite evenChannel = this.smartCableTextures.getEvenTextureForChannels(channels); // Render the channel indicators brightly lit at night - cubeBuilder.setRenderFullBright(true); + cubeBuilder.setEmissiveMaterial(true); cubeBuilder.setTexture(oddChannel); cubeBuilder.setColorRGB(cableColor.blackVariant); @@ -541,6 +550,9 @@ class CableBuilder { cubeBuilder.setTexture(evenChannel); cubeBuilder.setColorRGB(cableColor.whiteVariant); addStraightDenseCableSizedCube(facing, cubeBuilder); + + // Reset back to default + cubeBuilder.setEmissiveMaterial(false); } private static void addDenseCableSizedCube(Direction facing, CubeBuilder cubeBuilder) { diff --git a/src/main/java/appeng/client/render/cablebus/CubeBuilder.java b/src/main/java/appeng/client/render/cablebus/CubeBuilder.java index 93ebd4af7..ab687c023 100644 --- a/src/main/java/appeng/client/render/cablebus/CubeBuilder.java +++ b/src/main/java/appeng/client/render/cablebus/CubeBuilder.java @@ -49,7 +49,7 @@ public class CubeBuilder { private boolean useStandardUV = false; - private boolean renderFullBright; + private boolean emissiveMaterial; private final QuadEmitter emitter; @@ -144,7 +144,7 @@ public class CubeBuilder { break; } - if (renderFullBright) { + if (emissiveMaterial) { // Force Brightness to 15, this is for full bright mode // this vertex element will only be present in that case int lightmap = LightmapTextureManager.pack(15, 15); @@ -409,8 +409,8 @@ public class CubeBuilder { this.setColorRGB((int) (r * 255) << 16 | (int) (g * 255) << 8 | (int) (b * 255)); } - public void setRenderFullBright(boolean renderFullBright) { - this.renderFullBright = renderFullBright; + public void setEmissiveMaterial(boolean renderFullBright) { + this.emissiveMaterial = renderFullBright; } public void setCustomUv(Direction facing, float u1, float v1, float u2, float v2) { diff --git a/src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyBakedModel.java b/src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyBakedModel.java index d9f217c96..0cf605beb 100644 --- a/src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyBakedModel.java +++ b/src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyBakedModel.java @@ -68,7 +68,7 @@ public class P2PTunnelFrequencyBakedModel implements IDynamicPartBakedModel { cb.setTexture(this.texture); cb.useStandardUV(); - cb.setRenderFullBright(active); + cb.setEmissiveMaterial(active); for (int i = 0; i < 4; ++i) { final int[] offs = QUAD_OFFSETS[i]; @@ -89,6 +89,9 @@ public class P2PTunnelFrequencyBakedModel implements IDynamicPartBakedModel { } + // Reset back to default + cb.setEmissiveMaterial(false); + return meshBuilder.build(); } diff --git a/src/main/java/appeng/client/render/crafting/LightBakedModel.java b/src/main/java/appeng/client/render/crafting/LightBakedModel.java index bcdae4a7d..094ece1ec 100644 --- a/src/main/java/appeng/client/render/crafting/LightBakedModel.java +++ b/src/main/java/appeng/client/render/crafting/LightBakedModel.java @@ -50,8 +50,10 @@ class LightBakedModel extends CraftingCubeBakedModel { builder.addCube(x1, y1, z1, x2, y2, z2); boolean powered = state.get(AbstractCraftingUnitBlock.POWERED); - builder.setRenderFullBright(powered); + builder.setEmissiveMaterial(powered); builder.setTexture(this.lightTexture); builder.addCube(x1, y1, z1, x2, y2, z2); + // Reset back to default + builder.setEmissiveMaterial(false); } } diff --git a/src/main/java/appeng/client/render/crafting/MonitorBakedModel.java b/src/main/java/appeng/client/render/crafting/MonitorBakedModel.java index e175f3a64..487646c82 100644 --- a/src/main/java/appeng/client/render/crafting/MonitorBakedModel.java +++ b/src/main/java/appeng/client/render/crafting/MonitorBakedModel.java @@ -76,7 +76,7 @@ public class MonitorBakedModel extends CraftingCubeBakedModel { AEColor color = getColor(modelData); boolean powered = state.get(CraftingMonitorBlock.POWERED); - builder.setRenderFullBright(powered); + builder.setEmissiveMaterial(powered); builder.setColorRGB(color.whiteVariant); builder.setTexture(this.lightBrightTexture); @@ -90,6 +90,8 @@ public class MonitorBakedModel extends CraftingCubeBakedModel { builder.setTexture(this.lightDarkTexture); builder.addCube(x1, y1, z1, x2, y2, z2); + // Reset back to default + builder.setEmissiveMaterial(false); } private static AEColor getColor(CraftingCubeModelData modelData) { diff --git a/src/main/java/appeng/client/render/spatial/SpatialPylonBakedModel.java b/src/main/java/appeng/client/render/spatial/SpatialPylonBakedModel.java index f75b3aa01..0a1b34b8b 100644 --- a/src/main/java/appeng/client/render/spatial/SpatialPylonBakedModel.java +++ b/src/main/java/appeng/client/render/spatial/SpatialPylonBakedModel.java @@ -127,7 +127,7 @@ class SpatialPylonBakedModel implements BakedModel, FabricBakedModel { if ((flags & SpatialPylonBlockEntity.DISPLAY_POWERED_ENABLED) == SpatialPylonBlockEntity.DISPLAY_POWERED_ENABLED) { - builder.setRenderFullBright(true); + builder.setEmissiveMaterial(true); } builder.setTextures(this.textures.get(getTextureTypeFromSideInside(flags, ori, Direction.UP)), @@ -144,6 +144,9 @@ class SpatialPylonBakedModel implements BakedModel, FabricBakedModel { builder.setTexture(this.textures.get(SpatialPylonTextureType.DIM)); builder.addCube(0, 0, 0, 16, 16, 16); } + + // Reset back to default + builder.setEmissiveMaterial(false); } @Override