diff --git a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java index 7e3e44f32..a1a5e6495 100644 --- a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java @@ -130,7 +130,11 @@ public final class RenderHelper { glState = RenderType.State.builder().texture(new RenderState.TextureState()).transparency(TRANSLUCENT_TRANSPARENCY).build(false); SPINNING_CUBE_GHOST = RenderType.of(LibResources.PREFIX_MOD + "spinning_cube_ghost", DefaultVertexFormats.POSITION_COLOR_TEXTURE_OVERLAY_LIGHT_NORMAL, GL11.GL_QUADS, 64, glState); - glState = RenderType.State.builder().texture(mipmapBlockAtlasTexture).transparency(TRANSLUCENT_TRANSPARENCY).lightmap(enableLightmap).build(true); + glState = RenderType.State.builder().texture(mipmapBlockAtlasTexture) + .transparency(TRANSLUCENT_TRANSPARENCY) + .diffuseLighting(new RenderState.DiffuseLightingState(true)) + .alpha(oneTenthAlpha) + .lightmap(enableLightmap).build(true); ICON_OVERLAY = RenderType.of(LibResources.PREFIX_MOD + "icon_overlay", DefaultVertexFormats.POSITION_COLOR_TEXTURE_LIGHT, GL11.GL_QUADS, 128, glState); RenderState.TextureState babylonTexture = new RenderState.TextureState(new ResourceLocation(LibResources.MISC_BABYLON), false, true); @@ -142,7 +146,12 @@ public final class RenderHelper { ENCHANTER = new ShaderWrappedRenderLayer(ShaderHelper.BotaniaShader.ENCHANTER_RUNE, null, ICON_OVERLAY); RenderState.TextureState haloTexture = new RenderState.TextureState(ItemFlightTiara.textureHalo, false, true); - glState = RenderType.State.builder().texture(haloTexture).transparency(TRANSLUCENT_TRANSPARENCY).cull(disableCull).shadeModel(smoothShade).build(true); + glState = RenderType.State.builder().texture(haloTexture) + .transparency(TRANSLUCENT_TRANSPARENCY) + .diffuseLighting(new RenderState.DiffuseLightingState(true)) + .alpha(oneTenthAlpha) + .cull(disableCull) + .build(true); HALO = new ShaderWrappedRenderLayer(ShaderHelper.BotaniaShader.HALO, null, RenderType.of(LibResources.PREFIX_MOD + "halo", DefaultVertexFormats.POSITION_TEX, GL11.GL_QUADS, 64, glState)); glState = RenderType.State.builder().texture(new RenderState.TextureState(RenderTilePylon.MANA_TEXTURE, false, false)).transparency(TRANSLUCENT_TRANSPARENCY).diffuseLighting(enableDiffuse).alpha(zeroAlpha).cull(disableCull).lightmap(enableLightmap).overlay(enableOverlay).build(true); diff --git a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java index 9a824b5fa..79ef3ce7b 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -13,7 +13,9 @@ import com.google.common.collect.ImmutableList; import net.minecraft.block.FlowerBlock; import net.minecraft.block.TallFlowerBlock; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.RenderTypeBuffers; import net.minecraft.client.renderer.RenderTypeLookup; import net.minecraft.client.renderer.entity.PlayerRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; @@ -31,6 +33,7 @@ import net.minecraft.world.World; import net.minecraftforge.client.settings.KeyConflictContext; import net.minecraftforge.fml.DeferredWorkQueue; import net.minecraftforge.fml.client.registry.ClientRegistry; +import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; import net.minecraftforge.fml.event.lifecycle.FMLLoadCompleteEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; @@ -46,6 +49,7 @@ import vazkii.botania.client.core.handler.ContributorFancinessHandler; import vazkii.botania.client.core.handler.LayerTerraHelmet; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.handler.PersistentVariableHelper; +import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.fx.FXLightning; import vazkii.botania.common.Botania; @@ -67,6 +71,7 @@ import java.io.IOException; import java.time.LocalDateTime; import java.time.Month; import java.util.Map; +import java.util.SortedMap; public class ClientProxy implements IProxy { @@ -166,6 +171,10 @@ public class ClientProxy implements IProxy { DeferredWorkQueue.runLater(() -> { initAuxiliaryRender(); ColorHandler.init(); + + // Needed to prevent mana pools on carts from X-raying through the cart + SortedMap layers = ObfuscationReflectionHelper.getPrivateValue(RenderTypeBuffers.class, Minecraft.getInstance().getBufferBuilders(), "field_228480_b_"); + layers.put(RenderHelper.MANA_POOL_WATER, new BufferBuilder(RenderHelper.MANA_POOL_WATER.getExpectedBufferSize())); }); }