Some rendersystem substitutions I missed

This commit is contained in:
Vincent Lee committed 2020-06-15 09:19:58 -05:00
1 parent 391f434634
commit 1cefe8c078
5 files changed
+18 -15

No files matched your search

@@ -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();
}
}
}
@@ -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;
@@ -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<EntityDoppleganger, BipedM
int disfigurationUniform = GlStateManager.getUniformLocation(shader, "disfiguration");
ShaderHelper.FLOAT_BUF.position(0);
ShaderHelper.FLOAT_BUF.put(0, disfiguration);
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, grainIntensity);
GlStateManager.uniform1f(grainIntensityUniform, ShaderHelper.FLOAT_BUF);
RenderSystem.glUniform1(grainIntensityUniform, ShaderHelper.FLOAT_BUF);
};
public static final ShaderCallback defaultCallback = shader -> {
@@ -55,13 +56,13 @@ public class RenderDoppleganger extends BipedRenderer<EntityDoppleganger, BipedM
int disfigurationUniform = GlStateManager.getUniformLocation(shader, "disfiguration");
ShaderHelper.FLOAT_BUF.position(0);
ShaderHelper.FLOAT_BUF.put(0, DEFAULT_DISFIGURATION);
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, DEFAULT_GRAIN_INTENSITY);
GlStateManager.uniform1f(grainIntensityUniform, ShaderHelper.FLOAT_BUF);
RenderSystem.glUniform1(grainIntensityUniform, ShaderHelper.FLOAT_BUF);
};
public RenderDoppleganger(EntityRendererManager renderManager) {
@@ -10,6 +10,7 @@ package vazkii.botania.client.render.entity;
import com.mojang.blaze3d.platform.GlStateManager;
import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.client.renderer.entity.EntityRendererManager;
import net.minecraft.client.renderer.entity.MobRenderer;
import net.minecraft.util.ResourceLocation;
@@ -29,13 +30,13 @@ public class RenderPixie extends MobRenderer<EntityPixie, ModelPixie> {
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) {
@@ -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);
};
}