From 1cefe8c078b95036ea1eb8578c1923815986151f Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 15 Jun 2020 09:19:44 -0500 Subject: [PATCH] Some rendersystem substitutions I missed --- .../botania/client/core/handler/KonamiHandler.java | 13 +++++++------ .../botania/client/core/helper/RenderHelper.java | 2 +- .../client/render/entity/RenderDoppleganger.java | 9 +++++---- .../botania/client/render/entity/RenderPixie.java | 5 +++-- .../botania/common/entity/EntityDoppleganger.java | 4 ++-- 5 files changed, 18 insertions(+), 15 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/KonamiHandler.java b/src/main/java/vazkii/botania/client/core/handler/KonamiHandler.java index 56a9f95d8..448066fd4 100644 --- a/src/main/java/vazkii/botania/client/core/handler/KonamiHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/KonamiHandler.java @@ -10,6 +10,7 @@ package vazkii.botania.client.core.handler; import com.mojang.blaze3d.platform.GlStateManager; +import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.Minecraft; import net.minecraft.client.audio.SimpleSound; import net.minecraft.client.resources.I18n; @@ -70,18 +71,18 @@ public class KonamiHandler { public static void renderBook(BookDrawScreenEvent evt) { if (konamiTime > 0) { String meme = I18n.format("botania.subtitle.way"); - GlStateManager.disableDepthTest(); - GlStateManager.pushMatrix(); + RenderSystem.disableDepthTest(); + RenderSystem.pushMatrix(); int fullWidth = Minecraft.getInstance().fontRenderer.getStringWidth(meme); int left = evt.gui.width; double widthPerTick = (fullWidth + evt.gui.width) / 240; double currWidth = left - widthPerTick * (240 - (konamiTime - evt.partialTicks)) * 3.2; - GlStateManager.translated(currWidth, evt.gui.height / 2 - 10, 0); - GlStateManager.scalef(4, 4, 4); + RenderSystem.translated(currWidth, evt.gui.height / 2 - 10, 0); + RenderSystem.scalef(4, 4, 4); Minecraft.getInstance().fontRenderer.drawStringWithShadow(meme, 0, 0, 0xFFFFFF); - GlStateManager.popMatrix(); - GlStateManager.enableDepthTest(); + RenderSystem.popMatrix(); + RenderSystem.enableDepthTest(); } } } 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 49eb31230..ff1825af3 100644 --- a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java @@ -175,7 +175,7 @@ public final class RenderHelper { int alpha = GlStateManager.getUniformLocation(shader, "alpha"); ShaderHelper.FLOAT_BUF.position(0); ShaderHelper.FLOAT_BUF.put(0, 0.4F); - GlStateManager.uniform1f(alpha, ShaderHelper.FLOAT_BUF); + RenderSystem.glUniform1(alpha, ShaderHelper.FLOAT_BUF); }; RenderType astrolabePreview = RenderType.makeType(LibResources.PREFIX_MOD + "astrolabe_preview", DefaultVertexFormats.ENTITY, 7, 256, true, true, glState); ASTROLABE_PREVIEW = useShaders ? new ShaderWrappedRenderLayer(ShaderHelper.BotaniaShader.ALPHA, cb, astrolabePreview) : astrolabePreview; diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java b/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java index c8cd38834..12d899d19 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java @@ -11,6 +11,7 @@ package vazkii.botania.client.render.entity; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.platform.GlStateManager; +import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.player.AbstractClientPlayerEntity; import net.minecraft.client.renderer.IRenderTypeBuffer; @@ -41,13 +42,13 @@ public class RenderDoppleganger extends BipedRenderer { @@ -55,13 +56,13 @@ public class RenderDoppleganger extends BipedRenderer { int disfigurationUniform = GlStateManager.getUniformLocation(shader, "disfiguration"); ShaderHelper.FLOAT_BUF.position(0); ShaderHelper.FLOAT_BUF.put(0, 0.025F); - GlStateManager.uniform1f(disfigurationUniform, ShaderHelper.FLOAT_BUF); + RenderSystem.glUniform1(disfigurationUniform, ShaderHelper.FLOAT_BUF); // Vert Uniforms int grainIntensityUniform = GlStateManager.getUniformLocation(shader, "grainIntensity"); ShaderHelper.FLOAT_BUF.position(0); ShaderHelper.FLOAT_BUF.put(0, 0.05F); - GlStateManager.uniform1f(grainIntensityUniform, ShaderHelper.FLOAT_BUF); + RenderSystem.glUniform1(grainIntensityUniform, ShaderHelper.FLOAT_BUF); }; public RenderPixie(EntityRendererManager renderManager) { diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index c1365492b..bca60cbef 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -996,11 +996,11 @@ public class EntityDoppleganger extends MobEntity implements IEntityAdditionalSp ShaderHelper.FLOAT_BUF.position(0); ShaderHelper.FLOAT_BUF.put(0, grainIntensity); - GlStateManager.uniform1f(grainIntensityUniform, ShaderHelper.FLOAT_BUF); + RenderSystem.glUniform1(grainIntensityUniform, ShaderHelper.FLOAT_BUF); ShaderHelper.FLOAT_BUF.position(0); ShaderHelper.FLOAT_BUF.put(0, getHealth() / getMaxHealth()); - GlStateManager.uniform1f(hpFractUniform, ShaderHelper.FLOAT_BUF); + RenderSystem.glUniform1(hpFractUniform, ShaderHelper.FLOAT_BUF); }; }