mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-17 19:05:16 +00:00
Rendersystem substitutions
This commit is contained in:
1 parent
af297af299
commit
76bdd37efe
35 files changed
+192
-184
No files matched your search
@@ -12,6 +12,7 @@ package vazkii.botania.client.core.handler;
|
||||
|
||||
import com.mojang.blaze3d.platform.GLX;
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import com.mojang.blaze3d.systems.RenderSystem;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
@@ -61,15 +62,15 @@ public final class BossBarHandler {
|
||||
int fw = (int) ((double) fgRect.width * evt.getBossInfo().getPercent());
|
||||
int tx = c - mc.fontRenderer.getStringWidth(name) / 2;
|
||||
|
||||
GlStateManager.color4f(1F, 1F, 1F, 1F);
|
||||
RenderSystem.color4f(1F, 1F, 1F, 1F);
|
||||
int auxHeight = currentBoss.bossBarRenderCallback(x, y);
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
RenderSystem.enableBlend();
|
||||
RenderSystem.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
mc.textureManager.bindTexture(currentBoss.getBossBarTexture());
|
||||
drawBar(currentBoss, x, y, bgRect.x, bgRect.y, bgRect.width, bgRect.height, true);
|
||||
drawBar(currentBoss, xf, yf, fgRect.x, fgRect.y, fw, fgRect.height, false);
|
||||
mc.fontRenderer.drawStringWithShadow(name, tx, y - 10, 0xA2018C);
|
||||
GlStateManager.enableBlend();
|
||||
RenderSystem.enableBlend();
|
||||
evt.setIncrement(Math.max(bgRect.height, fgRect.height) + auxHeight + mc.fontRenderer.FONT_HEIGHT);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -13,6 +13,7 @@ package vazkii.botania.client.core.handler;
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
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.Atlases;
|
||||
@@ -76,7 +77,7 @@ public final class ContributorFancinessHandler extends LayerRenderer<AbstractCli
|
||||
|
||||
String name = player.getDisplayName().getString();
|
||||
|
||||
GlStateManager.pushMatrix();
|
||||
RenderSystem.pushMatrix();
|
||||
AccessoryRenderHelper.translateToHeadLevel(player, partialTicks);
|
||||
|
||||
if(name.equals("haighyorkie"))
|
||||
@@ -88,7 +89,7 @@ public final class ContributorFancinessHandler extends LayerRenderer<AbstractCli
|
||||
if(player.isWearing(PlayerModelPart.CAPE) && flowerMap.containsKey(name))
|
||||
renderFlower(ms, buffers, player, flowerMap.get(name));
|
||||
|
||||
GlStateManager.popMatrix();
|
||||
RenderSystem.popMatrix();
|
||||
}
|
||||
|
||||
public static void firstStart() {
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
package vazkii.botania.client.core.handler;
|
||||
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import com.mojang.blaze3d.systems.RenderSystem;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.client.Minecraft;
|
||||
@@ -241,7 +242,7 @@ public final class HUDHandler {
|
||||
profiler.endSection();
|
||||
profiler.endSection();
|
||||
|
||||
GlStateManager.color4f(1F, 1F, 1F, 1F);
|
||||
RenderSystem.color4f(1F, 1F, 1F, 1F);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -260,10 +261,10 @@ public final class HUDHandler {
|
||||
int x = mc.getWindow().getScaledWidth() / 2 - mc.fontRenderer.getStringWidth(disp) / 2;
|
||||
int y = mc.getWindow().getScaledHeight() - 70;
|
||||
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
RenderSystem.enableBlend();
|
||||
RenderSystem.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
mc.fontRenderer.drawStringWithShadow(disp, x, y, color);
|
||||
GlStateManager.disableBlend();
|
||||
RenderSystem.disableBlend();
|
||||
}
|
||||
profiler.endSection();
|
||||
}
|
||||
@@ -287,14 +288,14 @@ public final class HUDHandler {
|
||||
}
|
||||
|
||||
Color color = new Color(Color.HSBtoRGB(0.55F, (float) Math.min(1F, Math.sin(Util.milliTime() / 200D) * 0.5 + 1F), 1F));
|
||||
GlStateManager.color4f(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, 1 - (color.getRed() / 255F));
|
||||
RenderSystem.color4f(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, 1 - (color.getRed() / 255F));
|
||||
mc.textureManager.bindTexture(manaBar);
|
||||
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
RenderSystem.enableBlend();
|
||||
RenderSystem.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
RenderHelper.drawTexturedModalRect(x, y, 0, 0, 251, width, 5);
|
||||
GlStateManager.disableBlend();
|
||||
GlStateManager.color4f(1, 1, 1, 1);
|
||||
RenderSystem.disableBlend();
|
||||
RenderSystem.color4f(1, 1, 1, 1);
|
||||
}
|
||||
|
||||
private static void renderPoolRecipeHUD(TilePool tile, ItemStack stack) {
|
||||
@@ -310,19 +311,19 @@ public final class HUDHandler {
|
||||
int u = tile.getCurrentMana() >= recipe.getManaToConsume() ? 0 : 22;
|
||||
int v = mc.player.getName().getString().equals("haighyorkie") && mc.player.isSneaking() ? 23 : 8;
|
||||
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
RenderSystem.enableBlend();
|
||||
RenderSystem.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
|
||||
mc.textureManager.bindTexture(manaBar);
|
||||
RenderHelper.drawTexturedModalRect(x, y, 0, u, v, 22, 15);
|
||||
GlStateManager.color4f(1F, 1F, 1F, 1F);
|
||||
RenderSystem.color4f(1F, 1F, 1F, 1F);
|
||||
|
||||
mc.getItemRenderer().renderItemAndEffectIntoGUI(stack, x - 20, y);
|
||||
mc.getItemRenderer().renderItemAndEffectIntoGUI(recipe.getOutput(), x + 26, y);
|
||||
mc.getItemRenderer().renderItemOverlays(mc.fontRenderer, recipe.getOutput(), x + 26, y);
|
||||
|
||||
GlStateManager.disableLighting();
|
||||
GlStateManager.disableBlend();
|
||||
RenderSystem.disableLighting();
|
||||
RenderSystem.disableBlend();
|
||||
}
|
||||
profiler.endSection();
|
||||
}
|
||||
@@ -347,7 +348,7 @@ public final class HUDHandler {
|
||||
mc.fontRenderer.drawStringWithShadow(tile.getItemCount() + "x", w / 2 + 30, h / 2, 0xFFFFFF);
|
||||
if(tile.locked)
|
||||
mc.fontRenderer.drawStringWithShadow(I18n.format("botaniamisc.locked"), w / 2 + 30, h / 2 + 10, 0xFFAA00);
|
||||
GlStateManager.enableRescaleNormal();
|
||||
RenderSystem.enableRescaleNormal();
|
||||
mc.getItemRenderer().renderItemAndEffectIntoGUI(target, w / 2 + 10, h / 2 - 10);
|
||||
}
|
||||
|
||||
@@ -366,7 +367,7 @@ public final class HUDHandler {
|
||||
|
||||
AbstractGui.fill(x - 6, y - 6, x + l + 6, y + 37, 0x44000000);
|
||||
AbstractGui.fill(x - 4, y - 4, x + l + 4, y + 35, 0x44000000);
|
||||
GlStateManager.enableRescaleNormal();
|
||||
RenderSystem.enableRescaleNormal();
|
||||
mc.getItemRenderer().renderItemAndEffectIntoGUI(new ItemStack(ModBlocks.corporeaIndex), x, y + 10);
|
||||
|
||||
mc.fontRenderer.drawStringWithShadow(txt0, x + 20, y, 0xFFFFFF);
|
||||
@@ -375,8 +376,8 @@ public final class HUDHandler {
|
||||
}
|
||||
|
||||
public static void drawSimpleManaHUD(int color, int mana, int maxMana, String name) {
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
RenderSystem.enableBlend();
|
||||
RenderSystem.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
Minecraft mc = Minecraft.getInstance();
|
||||
int x = mc.getWindow().getScaledWidth() / 2 - mc.fontRenderer.getStringWidth(name) / 2;
|
||||
int y = mc.getWindow().getScaledHeight() / 2 + 10;
|
||||
@@ -395,7 +396,7 @@ public final class HUDHandler {
|
||||
mc.fontRenderer.drawString(text, x, y, color);
|
||||
}
|
||||
|
||||
GlStateManager.disableBlend();
|
||||
RenderSystem.disableBlend();
|
||||
}
|
||||
|
||||
public static void drawComplexManaHUD(int color, int mana, int maxMana, String name, ItemStack bindDisplay, boolean properlyBound) {
|
||||
@@ -406,10 +407,10 @@ public final class HUDHandler {
|
||||
int x = mc.getWindow().getScaledWidth() / 2 + 55;
|
||||
int y = mc.getWindow().getScaledHeight() / 2 + 12;
|
||||
|
||||
GlStateManager.enableRescaleNormal();
|
||||
RenderSystem.enableRescaleNormal();
|
||||
mc.getItemRenderer().renderItemAndEffectIntoGUI(bindDisplay, x, y);
|
||||
|
||||
GlStateManager.disableDepthTest();
|
||||
RenderSystem.disableDepthTest();
|
||||
if(properlyBound) {
|
||||
mc.fontRenderer.drawStringWithShadow("\u2714", x + 10, y + 9, 0x004C00);
|
||||
mc.fontRenderer.drawStringWithShadow("\u2714", x + 10, y + 8, 0x0BD20D);
|
||||
@@ -417,13 +418,13 @@ public final class HUDHandler {
|
||||
mc.fontRenderer.drawStringWithShadow("\u2718", x + 10, y + 9, 0x4C0000);
|
||||
mc.fontRenderer.drawStringWithShadow("\u2718", x + 10, y + 8, 0xD2080D);
|
||||
}
|
||||
GlStateManager.enableDepthTest();
|
||||
RenderSystem.enableDepthTest();
|
||||
}
|
||||
|
||||
public static void renderManaBar(int x, int y, int color, float alpha, int mana, int maxMana) {
|
||||
Minecraft mc = Minecraft.getInstance();
|
||||
|
||||
GlStateManager.color4f(1F, 1F, 1F, alpha);
|
||||
RenderSystem.color4f(1F, 1F, 1F, alpha);
|
||||
mc.textureManager.bindTexture(manaBar);
|
||||
RenderHelper.drawTexturedModalRect(x, y, 0, 0, 0, 102, 5);
|
||||
|
||||
@@ -435,8 +436,8 @@ public final class HUDHandler {
|
||||
RenderHelper.drawTexturedModalRect(x + 1, y + 1, 0, 0, 5, 100, 3);
|
||||
|
||||
Color color_ = new Color(color);
|
||||
GlStateManager.color4f(color_.getRed() / 255F, color_.getGreen() / 255F, color_.getBlue() / 255F, alpha);
|
||||
RenderSystem.color4f(color_.getRed() / 255F, color_.getGreen() / 255F, color_.getBlue() / 255F, alpha);
|
||||
RenderHelper.drawTexturedModalRect(x + 1, y + 1, 0, 0, 5, Math.min(100, manaPercentage), 3);
|
||||
GlStateManager.color4f(1, 1, 1, 1);
|
||||
RenderSystem.color4f(1, 1, 1, 1);
|
||||
}
|
||||
}
|
||||
@@ -11,6 +11,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.renderer.RenderHelper;
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
@@ -42,20 +43,20 @@ public final class ItemsRemainingRenderHandler {
|
||||
int start = maxTicks - leaveTicks;
|
||||
float alpha = ticks + partTicks > start ? 1F : (ticks + partTicks) / start;
|
||||
|
||||
GlStateManager.disableAlphaTest();
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.enableRescaleNormal();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
RenderSystem.disableAlphaTest();
|
||||
RenderSystem.enableBlend();
|
||||
RenderSystem.enableRescaleNormal();
|
||||
RenderSystem.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
|
||||
GlStateManager.color4f(1F, 1F, 1F, alpha);
|
||||
RenderSystem.color4f(1F, 1F, 1F, alpha);
|
||||
int xp = x + (int) (16F * (1F - alpha));
|
||||
GlStateManager.translatef(xp, y, 0F);
|
||||
GlStateManager.scalef(alpha, 1F, 1F);
|
||||
RenderSystem.translatef(xp, y, 0F);
|
||||
RenderSystem.scalef(alpha, 1F, 1F);
|
||||
mc.getItemRenderer().renderItemAndEffectIntoGUI(stack, 0, 0);
|
||||
GlStateManager.scalef(1F / alpha,1F, 1F);
|
||||
GlStateManager.translatef(-xp, -y, 0F);
|
||||
GlStateManager.color4f(1F, 1F, 1F, 1F);
|
||||
GlStateManager.enableBlend();
|
||||
RenderSystem.scalef(1F / alpha,1F, 1F);
|
||||
RenderSystem.translatef(-xp, -y, 0F);
|
||||
RenderSystem.color4f(1F, 1F, 1F, 1F);
|
||||
RenderSystem.enableBlend();
|
||||
|
||||
String text = "";
|
||||
|
||||
@@ -78,8 +79,8 @@ public final class ItemsRemainingRenderHandler {
|
||||
int color = 0x00FFFFFF | (int) (alpha * 0xFF) << 24;
|
||||
mc.fontRenderer.drawStringWithShadow(text, x + 20, y + 6, color);
|
||||
|
||||
GlStateManager.disableBlend();
|
||||
GlStateManager.enableAlphaTest();
|
||||
RenderSystem.disableBlend();
|
||||
RenderSystem.enableAlphaTest();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -11,6 +11,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.renderer.Tessellator;
|
||||
import net.minecraft.client.renderer.texture.TextureManager;
|
||||
@@ -55,14 +56,14 @@ public class LightningHandler {
|
||||
double interpPosY = entity.lastTickPosY + (entity.getY() - entity.lastTickPosY) * frame;
|
||||
double interpPosZ = entity.lastTickPosZ + (entity.getZ() - entity.lastTickPosZ) * frame;
|
||||
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.translated(-interpPosX, -interpPosY, -interpPosZ);
|
||||
RenderSystem.pushMatrix();
|
||||
RenderSystem.translated(-interpPosX, -interpPosY, -interpPosZ);
|
||||
|
||||
Tessellator tessellator = Tessellator.getInstance();
|
||||
|
||||
GlStateManager.depthMask(false);
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
RenderSystem.depthMask(false);
|
||||
RenderSystem.enableBlend();
|
||||
RenderSystem.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
|
||||
render.bindTexture(outsideResource);
|
||||
int counter = 0;
|
||||
@@ -94,11 +95,11 @@ public class LightningHandler {
|
||||
|
||||
queuedLightningBolts.clear();
|
||||
|
||||
GlStateManager.disableBlend();
|
||||
GlStateManager.depthMask(true);
|
||||
RenderSystem.disableBlend();
|
||||
RenderSystem.depthMask(true);
|
||||
|
||||
GlStateManager.translated(interpPosX, interpPosY, interpPosZ);
|
||||
GlStateManager.popMatrix();
|
||||
RenderSystem.translated(interpPosX, interpPosY, interpPosZ);
|
||||
RenderSystem.popMatrix();
|
||||
|
||||
profiler.endSection();
|
||||
profiler.endSection();
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
package vazkii.botania.client.core.handler;
|
||||
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import com.mojang.blaze3d.systems.RenderSystem;
|
||||
import net.minecraft.client.gui.AbstractGui;
|
||||
import net.minecraft.client.gui.FontRenderer;
|
||||
import net.minecraft.client.resources.I18n;
|
||||
@@ -57,7 +58,7 @@ public final class TooltipAdditionDisplayHandler {
|
||||
float huePer = width == 0 ? 0F : 1F / width;
|
||||
float hueOff = (ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks) * 0.01F;
|
||||
|
||||
GlStateManager.disableDepthTest();
|
||||
RenderSystem.disableDepthTest();
|
||||
AbstractGui.fill(mouseX - 1, mouseY - height - 1, mouseX + width + 1, mouseY, 0xFF000000);
|
||||
for(int i = 0; i < rainbowWidth; i++)
|
||||
AbstractGui.fill(mouseX + i, mouseY - height, mouseX + i + 1, mouseY, Color.HSBtoRGB(hueOff + huePer * i, 1F, 1F));
|
||||
@@ -66,14 +67,14 @@ public final class TooltipAdditionDisplayHandler {
|
||||
String rank = I18n.format("botania.rank" + level).replaceAll("&", "\u00a7");
|
||||
|
||||
GL11.glPushAttrib(GL11.GL_LIGHTING_BIT);
|
||||
GlStateManager.disableLighting();
|
||||
RenderSystem.disableLighting();
|
||||
font.drawStringWithShadow(rank, mouseX, mouseY - 12, 0xFFFFFF);
|
||||
if(!ss) {
|
||||
rank = I18n.format("botania.rank" + (level + 1)).replaceAll("&", "\u00a7");
|
||||
font.drawStringWithShadow(rank, mouseX + width - font.getStringWidth(rank), mouseY - 12, 0xFFFFFF);
|
||||
}
|
||||
GlStateManager.enableLighting();
|
||||
GlStateManager.enableDepthTest();
|
||||
RenderSystem.enableLighting();
|
||||
RenderSystem.enableDepthTest();
|
||||
GL11.glPopAttrib();
|
||||
}
|
||||
|
||||
@@ -81,7 +82,7 @@ public final class TooltipAdditionDisplayHandler {
|
||||
float fraction = display.getManaFractionForDisplay(stack);
|
||||
int manaBarWidth = (int) Math.ceil(width * fraction);
|
||||
|
||||
GlStateManager.disableDepthTest();
|
||||
RenderSystem.disableDepthTest();
|
||||
AbstractGui.fill(mouseX - 1, mouseY - height - 1, mouseX + width + 1, mouseY, 0xFF000000);
|
||||
AbstractGui.fill(mouseX, mouseY - height, mouseX + manaBarWidth, mouseY, Color.HSBtoRGB(0.528F, ((float) Math.sin((ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks) * 0.2) + 1F) * 0.3F + 0.4F, 1F));
|
||||
AbstractGui.fill(mouseX + manaBarWidth, mouseY - height, mouseX + width, mouseY, 0xFF555555);
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
package vazkii.botania.client.core.helper;
|
||||
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import com.mojang.blaze3d.systems.RenderSystem;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.shader.IShaderManager;
|
||||
import net.minecraft.client.shader.ShaderLinkHelper;
|
||||
@@ -108,7 +109,7 @@ public final class ShaderHelper {
|
||||
|
||||
// todo 1.15 is this still necessary? only has an effect without a vsh and we now have passthrough vsh for every program
|
||||
lighting = GL11.glGetBoolean(GL11.GL_LIGHTING);
|
||||
GlStateManager.disableLighting();
|
||||
RenderSystem.disableLighting();
|
||||
ShaderLinkHelper.useProgram(shader);
|
||||
|
||||
int time = GlStateManager.getUniformLocation(shader, "time");
|
||||
@@ -125,7 +126,7 @@ public final class ShaderHelper {
|
||||
public static void releaseShader() {
|
||||
// todo 1.15 see above
|
||||
if(lighting)
|
||||
GlStateManager.enableLighting();
|
||||
RenderSystem.enableLighting();
|
||||
ShaderLinkHelper.useProgram(0);
|
||||
}
|
||||
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
package vazkii.botania.client.fx;
|
||||
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import com.mojang.blaze3d.systems.RenderSystem;
|
||||
import com.mojang.blaze3d.vertex.IVertexBuilder;
|
||||
import net.minecraft.client.particle.IParticleRenderType;
|
||||
import net.minecraft.client.particle.Particle;
|
||||
@@ -115,21 +116,21 @@ public class FXWisp extends Particle {
|
||||
}
|
||||
|
||||
private static void beginRenderCommon(BufferBuilder bufferBuilder, TextureManager textureManager) {
|
||||
GlStateManager.depthMask(false);
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE);
|
||||
GlStateManager.alphaFunc(GL11.GL_GREATER, 0.003921569F);
|
||||
GlStateManager.disableLighting();
|
||||
RenderSystem.depthMask(false);
|
||||
RenderSystem.enableBlend();
|
||||
RenderSystem.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE);
|
||||
RenderSystem.alphaFunc(GL11.GL_GREATER, 0.003921569F);
|
||||
RenderSystem.disableLighting();
|
||||
|
||||
GlStateManager.color4f(1.0F, 1.0F, 1.0F, 0.75F);
|
||||
RenderSystem.color4f(1.0F, 1.0F, 1.0F, 0.75F);
|
||||
textureManager.bindTexture(ConfigHandler.CLIENT.matrixMode.get() ? vanillaParticles : particles);
|
||||
bufferBuilder.begin(GL11.GL_QUADS, DefaultVertexFormats.PARTICLE_POSITION_TEX_COLOR_LMAP);
|
||||
}
|
||||
|
||||
private static void endRenderCommon() {
|
||||
GlStateManager.alphaFunc(GL11.GL_GREATER, 0.1F);
|
||||
GlStateManager.disableBlend();
|
||||
GlStateManager.depthMask(true);
|
||||
RenderSystem.alphaFunc(GL11.GL_GREATER, 0.1F);
|
||||
RenderSystem.disableBlend();
|
||||
RenderSystem.depthMask(true);
|
||||
}
|
||||
|
||||
private static final IParticleRenderType NORMAL_RENDER = new IParticleRenderType() {
|
||||
@@ -154,13 +155,13 @@ public class FXWisp extends Particle {
|
||||
@Override
|
||||
public void beginRender(BufferBuilder bufferBuilder, TextureManager textureManager) {
|
||||
beginRenderCommon(bufferBuilder, textureManager);
|
||||
GlStateManager.disableDepthTest();
|
||||
RenderSystem.disableDepthTest();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void finishRender(Tessellator tessellator) {
|
||||
tessellator.draw();
|
||||
GlStateManager.enableDepthTest();
|
||||
RenderSystem.enableDepthTest();
|
||||
endRenderCommon();
|
||||
}
|
||||
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
package vazkii.botania.client.gui.bag;
|
||||
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import com.mojang.blaze3d.systems.RenderSystem;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.screen.inventory.ContainerScreen;
|
||||
import net.minecraft.client.renderer.RenderHelper;
|
||||
@@ -51,7 +52,7 @@ public class GuiFlowerBag extends ContainerScreen<ContainerFlowerBag> {
|
||||
@Override
|
||||
protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY) {
|
||||
Minecraft mc = Minecraft.getInstance();
|
||||
GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
mc.getTextureManager().bindTexture(texture);
|
||||
int k = (width - xSize) / 2;
|
||||
int l = (height - ySize) / 2;
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
package vazkii.botania.client.gui.box;
|
||||
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import com.mojang.blaze3d.systems.RenderSystem;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.screen.inventory.ContainerScreen;
|
||||
import net.minecraft.entity.player.PlayerInventory;
|
||||
@@ -36,7 +37,7 @@ public class GuiBaubleBox extends ContainerScreen<ContainerBaubleBox> {
|
||||
|
||||
@Override
|
||||
protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY) {
|
||||
GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
Minecraft.getInstance().getTextureManager().bindTexture(texture);
|
||||
blit(guiLeft, guiTop, 0, 0, xSize, ySize);
|
||||
|
||||
|
||||
+5
-4
@@ -10,6 +10,7 @@ package vazkii.botania.client.integration.jei.elventrade;
|
||||
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import com.mojang.blaze3d.systems.RenderSystem;
|
||||
import mezz.jei.api.constants.VanillaTypes;
|
||||
import mezz.jei.api.gui.IRecipeLayout;
|
||||
import mezz.jei.api.gui.drawable.IDrawable;
|
||||
@@ -93,11 +94,11 @@ public class ElvenTradeRecipeCategory implements IRecipeCategory<RecipeElvenTrad
|
||||
|
||||
@Override
|
||||
public void draw(RecipeElvenTrade recipe, double mouseX, double mouseY) {
|
||||
GlStateManager.enableAlphaTest();
|
||||
GlStateManager.enableBlend();
|
||||
RenderSystem.enableAlphaTest();
|
||||
RenderSystem.enableBlend();
|
||||
overlay.draw(0, 4);
|
||||
GlStateManager.disableBlend();
|
||||
GlStateManager.disableAlphaTest();
|
||||
RenderSystem.disableBlend();
|
||||
RenderSystem.disableAlphaTest();
|
||||
|
||||
Minecraft.getInstance().textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE);
|
||||
TextureAtlasSprite sprite = MiscellaneousIcons.INSTANCE.alfPortalTex;
|
||||
|
||||
+5
-4
@@ -10,6 +10,7 @@ package vazkii.botania.client.integration.jei.manapool;
|
||||
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import com.mojang.blaze3d.systems.RenderSystem;
|
||||
import mezz.jei.api.constants.VanillaTypes;
|
||||
import mezz.jei.api.gui.IRecipeLayout;
|
||||
import mezz.jei.api.gui.drawable.IDrawable;
|
||||
@@ -99,12 +100,12 @@ public class ManaPoolRecipeCategory implements IRecipeCategory<RecipeManaInfusio
|
||||
|
||||
@Override
|
||||
public void draw(RecipeManaInfusion recipe, double mouseX, double mouseY) {
|
||||
GlStateManager.enableAlphaTest();
|
||||
GlStateManager.enableBlend();
|
||||
RenderSystem.enableAlphaTest();
|
||||
RenderSystem.enableBlend();
|
||||
overlay.draw(48, 0);
|
||||
HUDHandler.renderManaBar(28, 50, 0x0000FF, 0.75F, recipe.getManaToConsume(), TilePool.MAX_MANA / 10);
|
||||
GlStateManager.disableBlend();
|
||||
GlStateManager.disableAlphaTest();
|
||||
RenderSystem.disableBlend();
|
||||
RenderSystem.disableAlphaTest();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
+5
-4
@@ -9,6 +9,7 @@
|
||||
package vazkii.botania.client.integration.jei.orechid;
|
||||
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import com.mojang.blaze3d.systems.RenderSystem;
|
||||
import mezz.jei.api.constants.VanillaTypes;
|
||||
import mezz.jei.api.gui.IRecipeLayout;
|
||||
import mezz.jei.api.gui.drawable.IDrawable;
|
||||
@@ -93,10 +94,10 @@ public class OrechidIgnemRecipeCategory implements IRecipeCategory<OrechidIgnemR
|
||||
|
||||
@Override
|
||||
public void draw(OrechidIgnemRecipeWrapper recipe, double mouseX, double mouseY) {
|
||||
GlStateManager.enableAlphaTest();
|
||||
GlStateManager.enableBlend();
|
||||
RenderSystem.enableAlphaTest();
|
||||
RenderSystem.enableBlend();
|
||||
overlay.draw(48, 0);
|
||||
GlStateManager.disableBlend();
|
||||
GlStateManager.disableAlphaTest();
|
||||
RenderSystem.disableBlend();
|
||||
RenderSystem.disableAlphaTest();
|
||||
}
|
||||
}
|
||||
+5
-4
@@ -9,6 +9,7 @@
|
||||
package vazkii.botania.client.integration.jei.orechid;
|
||||
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import com.mojang.blaze3d.systems.RenderSystem;
|
||||
import mezz.jei.api.constants.VanillaTypes;
|
||||
import mezz.jei.api.gui.IRecipeLayout;
|
||||
import mezz.jei.api.gui.drawable.IDrawable;
|
||||
@@ -123,11 +124,11 @@ public class OrechidRecipeCategory implements IRecipeCategory<OrechidRecipeWrapp
|
||||
|
||||
@Override
|
||||
public void draw(OrechidRecipeWrapper recipe, double mouseX, double mouseY) {
|
||||
GlStateManager.enableAlphaTest();
|
||||
GlStateManager.enableBlend();
|
||||
RenderSystem.enableAlphaTest();
|
||||
RenderSystem.enableBlend();
|
||||
overlay.draw(48, 0);
|
||||
GlStateManager.disableBlend();
|
||||
GlStateManager.disableAlphaTest();
|
||||
RenderSystem.disableBlend();
|
||||
RenderSystem.disableAlphaTest();
|
||||
}
|
||||
|
||||
}
|
||||
+5
-4
@@ -9,6 +9,7 @@
|
||||
package vazkii.botania.client.integration.jei.petalapothecary;
|
||||
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import com.mojang.blaze3d.systems.RenderSystem;
|
||||
import mezz.jei.api.constants.VanillaTypes;
|
||||
import mezz.jei.api.gui.IRecipeLayout;
|
||||
import mezz.jei.api.gui.drawable.IDrawable;
|
||||
@@ -88,11 +89,11 @@ public class PetalApothecaryRecipeCategory implements IRecipeCategory<RecipePeta
|
||||
|
||||
@Override
|
||||
public void draw(RecipePetals recipe, double mouseX, double mouseY) {
|
||||
GlStateManager.enableAlphaTest();
|
||||
GlStateManager.enableBlend();
|
||||
RenderSystem.enableAlphaTest();
|
||||
RenderSystem.enableBlend();
|
||||
overlay.draw();
|
||||
GlStateManager.disableBlend();
|
||||
GlStateManager.disableAlphaTest();
|
||||
RenderSystem.disableBlend();
|
||||
RenderSystem.disableAlphaTest();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
+5
-4
@@ -9,6 +9,7 @@
|
||||
package vazkii.botania.client.integration.jei.puredaisy;
|
||||
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import com.mojang.blaze3d.systems.RenderSystem;
|
||||
import mezz.jei.api.constants.VanillaTypes;
|
||||
import mezz.jei.api.gui.IRecipeLayout;
|
||||
import mezz.jei.api.gui.drawable.IDrawable;
|
||||
@@ -107,11 +108,11 @@ public class PureDaisyRecipeCategory implements IRecipeCategory<RecipePureDaisy>
|
||||
|
||||
@Override
|
||||
public void draw(RecipePureDaisy recipe, double mouseX, double mouseY) {
|
||||
GlStateManager.enableAlphaTest();
|
||||
GlStateManager.enableBlend();
|
||||
RenderSystem.enableAlphaTest();
|
||||
RenderSystem.enableBlend();
|
||||
overlay.draw(48, 0);
|
||||
GlStateManager.disableBlend();
|
||||
GlStateManager.disableAlphaTest();
|
||||
RenderSystem.disableBlend();
|
||||
RenderSystem.disableAlphaTest();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
+5
-4
@@ -9,6 +9,7 @@
|
||||
package vazkii.botania.client.integration.jei.runicaltar;
|
||||
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import com.mojang.blaze3d.systems.RenderSystem;
|
||||
import mezz.jei.api.constants.VanillaTypes;
|
||||
import mezz.jei.api.gui.IRecipeLayout;
|
||||
import mezz.jei.api.gui.drawable.IDrawable;
|
||||
@@ -89,12 +90,12 @@ public class RunicAltarRecipeCategory implements IRecipeCategory<RecipeRuneAltar
|
||||
|
||||
@Override
|
||||
public void draw(RecipeRuneAltar recipe, double mouseX, double mouseY) {
|
||||
GlStateManager.enableAlphaTest();
|
||||
GlStateManager.enableBlend();
|
||||
RenderSystem.enableAlphaTest();
|
||||
RenderSystem.enableBlend();
|
||||
overlay.draw();
|
||||
HUDHandler.renderManaBar(28, 113, 0x0000FF, 0.75F, recipe.getManaUsage(), TilePool.MAX_MANA / 10);
|
||||
GlStateManager.disableBlend();
|
||||
GlStateManager.disableAlphaTest();
|
||||
RenderSystem.disableBlend();
|
||||
RenderSystem.disableAlphaTest();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
+4
-3
@@ -11,6 +11,7 @@
|
||||
package vazkii.botania.client.patchouli.component;
|
||||
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import com.mojang.blaze3d.systems.RenderSystem;
|
||||
import net.minecraft.client.gui.screen.Screen;
|
||||
import net.minecraft.item.crafting.Ingredient;
|
||||
import vazkii.botania.common.core.handler.ConfigHandler;
|
||||
@@ -65,10 +66,10 @@ abstract class RotatingItemListComponentBase implements ICustomComponent {
|
||||
double xPos = x + Math.cos(angle * Math.PI / 180D) * radius + 32;
|
||||
double yPos = y + Math.sin(angle * Math.PI / 180D) * radius + 32;
|
||||
|
||||
GlStateManager.pushMatrix(); // This translation makes it not stuttery. It does not affect the tooltip as that is drawn separately later.
|
||||
GlStateManager.translated(xPos - (int) xPos, yPos - (int) yPos, 0);
|
||||
RenderSystem.pushMatrix(); // This translation makes it not stuttery. It does not affect the tooltip as that is drawn separately later.
|
||||
RenderSystem.translated(xPos - (int) xPos, yPos - (int) yPos, 0);
|
||||
context.renderIngredient((int) xPos, (int) yPos, mouseX, mouseY, ingredient);
|
||||
GlStateManager.popMatrix();
|
||||
RenderSystem.popMatrix();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -11,6 +11,7 @@
|
||||
package vazkii.botania.client.patchouli.component;
|
||||
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import com.mojang.blaze3d.systems.RenderSystem;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import vazkii.patchouli.api.IComponentRenderContext;
|
||||
import vazkii.patchouli.api.ICustomComponent;
|
||||
@@ -47,30 +48,30 @@ public class TerraPlateComponent implements ICustomComponent {
|
||||
|
||||
@Override
|
||||
public void render(IComponentRenderContext context, float pticks, int mouseX, int mouseY) {
|
||||
GlStateManager.pushMatrix();
|
||||
GlStateManager.translatef(0F, 0F, -10.0f);
|
||||
RenderSystem.pushMatrix();
|
||||
RenderSystem.translatef(0F, 0F, -10.0f);
|
||||
context.renderItemStack(x + 13, y + 1, mouseX, mouseY, cornerBlock);
|
||||
|
||||
GlStateManager.translatef(0F, 0F, 5F);
|
||||
RenderSystem.translatef(0F, 0F, 5F);
|
||||
context.renderItemStack(x + 20, y + 4, mouseX, mouseY, middleBlock);
|
||||
context.renderItemStack(x + 7, y + 4, mouseX, mouseY, middleBlock);
|
||||
|
||||
GlStateManager.translatef(0F, 0F, 5F);
|
||||
RenderSystem.translatef(0F, 0F, 5F);
|
||||
context.renderItemStack(x + 13, y + 8, mouseX, mouseY, cornerBlock);
|
||||
context.renderItemStack(x + 27, y + 8, mouseX, mouseY, centerBlock);
|
||||
context.renderItemStack(x, y + 8, mouseX, mouseY, cornerBlock);
|
||||
|
||||
GlStateManager.translatef(0F, 0F, 5F);
|
||||
RenderSystem.translatef(0F, 0F, 5F);
|
||||
context.renderItemStack(x + 7, y + 12, mouseX, mouseY, middleBlock);
|
||||
context.renderItemStack(x + 20, y + 12, mouseX, mouseY, middleBlock);
|
||||
|
||||
GlStateManager.translatef(0F, 0F, 5F);
|
||||
RenderSystem.translatef(0F, 0F, 5F);
|
||||
context.renderItemStack(x + 14, y + 15, mouseX, mouseY, cornerBlock);
|
||||
|
||||
GlStateManager.translatef(0F, 0F, 5F);
|
||||
RenderSystem.translatef(0F, 0F, 5F);
|
||||
context.renderItemStack(x + 13, y, mouseX, mouseY, plateBlock);
|
||||
GlStateManager.translatef(0F, 0F, -10.0f);
|
||||
RenderSystem.translatef(0F, 0F, -10.0f);
|
||||
|
||||
GlStateManager.popMatrix();
|
||||
RenderSystem.popMatrix();
|
||||
}
|
||||
}
|
||||
@@ -52,7 +52,7 @@ public class RenderCorporeaSpark extends RenderSparkBase<EntityCorporeaSpark> {
|
||||
ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(90));
|
||||
float scalef = 1F / 6F;
|
||||
ms.scale(scalef, scalef, scalef);
|
||||
GlStateManager.color4f(1F, 1F, 1F, absTime / 10);
|
||||
//todo 1.15 GlStateManager.color4f(1F, 1F, 1F, absTime / 10);
|
||||
ms.translate(0F, 0F, -2F + (time < 0 ? -absTime : absTime) / 6);
|
||||
|
||||
TextureAtlasSprite icon = Minecraft.getInstance().getItemRenderer().getItemModelWithOverrides(stack, entity.world, null).getParticleTexture();
|
||||
|
||||
@@ -87,9 +87,6 @@ public class RenderTilePylon extends TileEntityRenderer<TilePylon> {
|
||||
}
|
||||
|
||||
ms.push();
|
||||
GlStateManager.enableRescaleNormal();
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
|
||||
float worldTime = ClientTickHandler.ticksInGame + pticks;
|
||||
|
||||
@@ -131,7 +128,6 @@ public class RenderTilePylon extends TileEntityRenderer<TilePylon> {
|
||||
GlStateManager.enableCull();
|
||||
ms.pop();
|
||||
|
||||
GlStateManager.disableBlend();
|
||||
ms.pop();
|
||||
}
|
||||
|
||||
|
||||
@@ -13,6 +13,7 @@ package vazkii.botania.client.render.tile;
|
||||
import com.mojang.blaze3d.matrix.MatrixStack;
|
||||
import com.mojang.blaze3d.platform.GLX;
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import com.mojang.blaze3d.systems.RenderSystem;
|
||||
import com.mojang.blaze3d.vertex.IVertexBuilder;
|
||||
import com.mojang.datafixers.util.Pair;
|
||||
import net.minecraft.block.Block;
|
||||
@@ -185,8 +186,8 @@ public class RenderTileTinyPotato extends TileEntityRenderer<TileTinyPotato> {
|
||||
MinecraftForge.EVENT_BUS.post(new TinyPotatoRenderEvent(potato, potato.name, partialTicks, ms, buffers, light, overlay));
|
||||
ms.pop();
|
||||
|
||||
GlStateManager.rotatef(-rotZ, 0F, 0F, 1F);
|
||||
GlStateManager.rotatef(-rotY, 0F, 1F, 0F);
|
||||
RenderSystem.rotatef(-rotZ, 0F, 0F, 1F);
|
||||
RenderSystem.rotatef(-rotY, 0F, 1F, 0F);
|
||||
ms.scale(1F, -1F, -1F);
|
||||
|
||||
renderName(potato, name, ms, buffers, light);
|
||||
|
||||
@@ -66,7 +66,6 @@ public class BlockCraftyCrate extends BlockOpenCrate implements IWandHUD {
|
||||
AbstractGui.fill(xp, yp, xp + 16, yp + 16, enabled ? 0x22FFFFFF : 0x22FF0000);
|
||||
|
||||
ItemStack item = craft.getItemHandler().getStackInSlot(index);
|
||||
GlStateManager.enableRescaleNormal();
|
||||
mc.getItemRenderer().renderItemAndEffectIntoGUI(item, xp, yp);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
package vazkii.botania.common.block.subtile.functional;
|
||||
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import com.mojang.blaze3d.systems.RenderSystem;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.block.ChestBlock;
|
||||
@@ -240,13 +241,11 @@ public class SubTileHopperhock extends TileEntityFunctionalFlower {
|
||||
|
||||
int color = getColor();
|
||||
String filter = I18n.format("botaniamisc.filter" + filterType);
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
int x = mc.getWindow().getScaledWidth() / 2 - mc.fontRenderer.getStringWidth(filter) / 2;
|
||||
int y = mc.getWindow().getScaledHeight() / 2 + 30;
|
||||
|
||||
mc.fontRenderer.drawStringWithShadow(filter, x, y, color);
|
||||
GlStateManager.disableBlend();
|
||||
RenderSystem.disableLighting();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -150,8 +150,6 @@ public class SubTileRannuncarpus extends TileEntityFunctionalFlower {
|
||||
ItemStack recieverStack = new ItemStack(filter.getBlock());
|
||||
int color = getColor();
|
||||
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
if(!recieverStack.isEmpty()) {
|
||||
ITextComponent stackName = recieverStack.getDisplayName();
|
||||
int width = 16 + mc.fontRenderer.getStringWidth(stackName.getString()) / 2;
|
||||
@@ -162,8 +160,6 @@ public class SubTileRannuncarpus extends TileEntityFunctionalFlower {
|
||||
mc.getItemRenderer().renderItemAndEffectIntoGUI(recieverStack, x, y);
|
||||
}
|
||||
|
||||
GlStateManager.disableLighting();
|
||||
GlStateManager.disableBlend();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
package vazkii.botania.common.block.subtile.generating;
|
||||
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import com.mojang.blaze3d.systems.RenderSystem;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.RenderHelper;
|
||||
@@ -136,8 +137,6 @@ public class SubTileSpectrolus extends TileEntityGeneratingFlower {
|
||||
ItemStack stack = new ItemStack(ModBlocks.getWool(nextColor));
|
||||
int color = getColor();
|
||||
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
if(!stack.isEmpty()) {
|
||||
ITextComponent stackName = stack.getDisplayName();
|
||||
int width = 16 + mc.fontRenderer.getStringWidth(stackName.getString()) / 2;
|
||||
@@ -148,8 +147,7 @@ public class SubTileSpectrolus extends TileEntityGeneratingFlower {
|
||||
mc.getItemRenderer().renderItemAndEffectIntoGUI(stack, x, y);
|
||||
}
|
||||
|
||||
GlStateManager.disableLighting();
|
||||
GlStateManager.disableBlend();
|
||||
RenderSystem.disableLighting();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -12,6 +12,7 @@ package vazkii.botania.common.block.tile;
|
||||
|
||||
import com.google.common.base.Preconditions;
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import com.mojang.blaze3d.systems.RenderSystem;
|
||||
import net.minecraft.block.Blocks;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.resources.I18n;
|
||||
@@ -376,7 +377,7 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary,
|
||||
|
||||
for(RecipePetals recipe : BotaniaAPI.petalRecipes.values())
|
||||
if(recipe.matches(itemHandler)) {
|
||||
GlStateManager.color4f(1F, 1F, 1F, 1F);
|
||||
RenderSystem.color4f(1F, 1F, 1F, 1F);
|
||||
mc.textureManager.bindTexture(HUDHandler.manaBar);
|
||||
RenderHelper.drawTexturedModalRect(xc + radius + 9, yc - 8, 0, 0, 8, 22, 15);
|
||||
|
||||
@@ -390,9 +391,9 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary,
|
||||
for(int i = 0; i < amt; i++) {
|
||||
double xPos = xc + Math.cos(angle * Math.PI / 180D) * radius - 8;
|
||||
double yPos = yc + Math.sin(angle * Math.PI / 180D) * radius - 8;
|
||||
GlStateManager.translated(xPos, yPos, 0);
|
||||
RenderSystem.translated(xPos, yPos, 0);
|
||||
mc.getItemRenderer().renderItemIntoGUI(itemHandler.getStackInSlot(i), 0, 0);
|
||||
GlStateManager.translated(-xPos, -yPos, 0);
|
||||
RenderSystem.translated(-xPos, -yPos, 0);
|
||||
|
||||
angle += anglePer;
|
||||
}
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
package vazkii.botania.common.block.tile;
|
||||
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import com.mojang.blaze3d.systems.RenderSystem;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.resources.I18n;
|
||||
import net.minecraft.entity.item.ItemEntity;
|
||||
@@ -367,21 +368,21 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver,
|
||||
float anglePer = 360F / amt;
|
||||
for(RecipeRuneAltar recipe : BotaniaAPI.runeAltarRecipes.values())
|
||||
if(recipe.matches(itemHandler)) {
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.enableRescaleNormal();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
RenderSystem.enableBlend();
|
||||
RenderSystem.enableRescaleNormal();
|
||||
RenderSystem.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
|
||||
float progress = (float) mana / (float) manaToGet;
|
||||
|
||||
mc.textureManager.bindTexture(HUDHandler.manaBar);
|
||||
GlStateManager.color4f(1F, 1F, 1F, 1F);
|
||||
RenderSystem.color4f(1F, 1F, 1F, 1F);
|
||||
RenderHelper.drawTexturedModalRect(xc + radius + 9, yc - 8, 0, progress == 1F ? 0 : 22, 8, 22, 15);
|
||||
|
||||
if(progress == 1F) {
|
||||
mc.getItemRenderer().renderItemIntoGUI(new ItemStack(ModBlocks.livingrock), xc + radius + 16, yc + 8);
|
||||
GlStateManager.translatef(0F, 0F, 100F);
|
||||
RenderSystem.translatef(0F, 0F, 100F);
|
||||
mc.getItemRenderer().renderItemIntoGUI(new ItemStack(ModItems.twigWand), xc + radius + 24, yc + 8);
|
||||
GlStateManager.translatef(0F, 0F, -100F);
|
||||
RenderSystem.translatef(0F, 0F, -100F);
|
||||
}
|
||||
|
||||
RenderHelper.renderProgressPie(xc + radius + 32, yc - 8, progress, recipe.getOutput());
|
||||
@@ -393,9 +394,9 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver,
|
||||
for(int i = 0; i < amt; i++) {
|
||||
double xPos = xc + Math.cos(angle * Math.PI / 180D) * radius - 8;
|
||||
double yPos = yc + Math.sin(angle * Math.PI / 180D) * radius - 8;
|
||||
GlStateManager.translated(xPos, yPos, 0);
|
||||
RenderSystem.translated(xPos, yPos, 0);
|
||||
mc.getItemRenderer().renderItemIntoGUI(itemHandler.getStackInSlot(i), 0, 0);
|
||||
GlStateManager.translated(-xPos, -yPos, 0);
|
||||
RenderSystem.translated(-xPos, -yPos, 0);
|
||||
|
||||
angle += anglePer;
|
||||
}
|
||||
|
||||
@@ -12,6 +12,7 @@ package vazkii.botania.common.block.tile.mana;
|
||||
|
||||
import com.google.common.base.Predicates;
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import com.mojang.blaze3d.systems.RenderSystem;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.client.Minecraft;
|
||||
@@ -404,12 +405,12 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt
|
||||
int u = outputting ? 22 : 0;
|
||||
int v = 38;
|
||||
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
RenderSystem.enableBlend();
|
||||
RenderSystem.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
|
||||
mc.textureManager.bindTexture(HUDHandler.manaBar);
|
||||
RenderHelper.drawTexturedModalRect(x, y, 0, u, v, 22, 15);
|
||||
GlStateManager.color4f(1F, 1F, 1F, 1F);
|
||||
RenderSystem.color4f(1F, 1F, 1F, 1F);
|
||||
|
||||
ItemStack tablet = new ItemStack(ModItems.manaTablet);
|
||||
ItemManaTablet.setStackCreative(tablet);
|
||||
@@ -417,8 +418,8 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt
|
||||
mc.getItemRenderer().renderItemAndEffectIntoGUI(tablet, x - 20, y);
|
||||
mc.getItemRenderer().renderItemAndEffectIntoGUI(pool, x + 26, y);
|
||||
|
||||
GlStateManager.disableLighting();
|
||||
GlStateManager.disableBlend();
|
||||
RenderSystem.disableLighting();
|
||||
RenderSystem.disableBlend();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -12,6 +12,7 @@ package vazkii.botania.common.block.tile.mana;
|
||||
|
||||
import com.google.common.base.Predicates;
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import com.mojang.blaze3d.systems.RenderSystem;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.RenderHelper;
|
||||
import net.minecraft.entity.Entity;
|
||||
@@ -555,8 +556,6 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector,
|
||||
|
||||
ItemStack lens = itemHandler.getStackInSlot(0);
|
||||
if(!lens.isEmpty()) {
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
String lensName = lens.getDisplayName().getString();
|
||||
int width = 16 + mc.fontRenderer.getStringWidth(lensName) / 2;
|
||||
int x = mc.getWindow().getScaledWidth() / 2 - width;
|
||||
@@ -564,15 +563,12 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector,
|
||||
|
||||
mc.fontRenderer.drawStringWithShadow(lensName, x + 20, y + 5, color);
|
||||
mc.getItemRenderer().renderItemAndEffectIntoGUI(lens, x, y);
|
||||
GlStateManager.disableLighting();
|
||||
GlStateManager.disableBlend();
|
||||
RenderSystem.disableLighting();
|
||||
}
|
||||
|
||||
if(receiver != null) {
|
||||
TileEntity receiverTile = (TileEntity) receiver;
|
||||
ItemStack recieverStack = new ItemStack(world.getBlockState(receiverTile.getPos()).getBlock());
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
if(!recieverStack.isEmpty()) {
|
||||
String stackName = recieverStack.getDisplayName().getString();
|
||||
int width = 16 + mc.fontRenderer.getStringWidth(stackName) / 2;
|
||||
@@ -583,11 +579,10 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector,
|
||||
mc.getItemRenderer().renderItemAndEffectIntoGUI(recieverStack, x, y);
|
||||
}
|
||||
|
||||
GlStateManager.disableLighting();
|
||||
GlStateManager.disableBlend();
|
||||
RenderSystem.disableLighting();
|
||||
}
|
||||
|
||||
GlStateManager.color4f(1F, 1F, 1F, 1F);
|
||||
RenderSystem.color4f(1F, 1F, 1F, 1F);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -98,10 +98,7 @@ public class TileTurntable extends TileMod implements ITickableTileEntity {
|
||||
|
||||
int x = mc.getWindow().getScaledWidth() / 2 - mc.fontRenderer.getStringWidth(speed) / 2;
|
||||
int y = mc.getWindow().getScaledHeight() / 2 - 15;
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
mc.fontRenderer.drawStringWithShadow(speed, x, y, color);
|
||||
GlStateManager.disableBlend();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -13,6 +13,7 @@ package vazkii.botania.common.entity;
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import com.mojang.blaze3d.platform.GLX;
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import com.mojang.blaze3d.systems.RenderSystem;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.client.Minecraft;
|
||||
@@ -925,19 +926,16 @@ public class EntityDoppleganger extends MobEntity implements IBotaniaBoss, IEnti
|
||||
@Override
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
public int bossBarRenderCallback(int x, int y) {
|
||||
GlStateManager.pushMatrix();
|
||||
RenderSystem.pushMatrix();
|
||||
int px = x + 160;
|
||||
int py = y + 12;
|
||||
|
||||
Minecraft mc = Minecraft.getInstance();
|
||||
ItemStack stack = new ItemStack(Items.PLAYER_HEAD);
|
||||
mc.textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE);
|
||||
GlStateManager.enableRescaleNormal();
|
||||
mc.getItemRenderer().renderItemIntoGUI(stack, px, py);
|
||||
net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting();
|
||||
|
||||
mc.fontRenderer.drawStringWithShadow("" + playerCount, px + 15, py + 4, 0xFFFFFF);
|
||||
GlStateManager.popMatrix();
|
||||
RenderSystem.popMatrix();
|
||||
|
||||
return 5;
|
||||
}
|
||||
|
||||
@@ -11,9 +11,12 @@
|
||||
package vazkii.botania.common.item;
|
||||
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import com.mojang.blaze3d.systems.RenderSystem;
|
||||
import net.minecraft.block.Blocks;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.FontRenderer;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
|
||||
import net.minecraft.entity.LivingEntity;
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -193,18 +196,18 @@ public class ItemSextant extends ItemMod {
|
||||
|
||||
if(inRange) {
|
||||
radius += 4;
|
||||
GlStateManager.disableTexture();
|
||||
GlStateManager.lineWidth(3F);
|
||||
GL11.glBegin(GL11.GL_LINE_STRIP);
|
||||
GlStateManager.color4f(0F, 1F, 1F, 1F);
|
||||
RenderSystem.disableTexture();
|
||||
RenderSystem.lineWidth(3F);
|
||||
Tessellator.getInstance().getBuffer().begin(GL11.GL_LINE_STRIP, DefaultVertexFormats.POSITION);
|
||||
RenderSystem.color4f(0F, 1F, 1F, 1F);
|
||||
for(int i = 0; i < 361; i++) {
|
||||
float radian = (float) (i * Math.PI / 180);
|
||||
double xp = x + Math.cos(radian) * radius;
|
||||
double yp = y + Math.sin(radian) * radius;
|
||||
GL11.glVertex2d(xp, yp);
|
||||
Tessellator.getInstance().getBuffer().vertex(xp, yp, 0).endVertex();
|
||||
}
|
||||
GL11.glEnd();
|
||||
GlStateManager.enableTexture();
|
||||
Tessellator.getInstance().draw();
|
||||
RenderSystem.enableTexture();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
package vazkii.botania.common.item.equipment.bauble;
|
||||
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import com.mojang.blaze3d.systems.RenderSystem;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.AbstractGui;
|
||||
import net.minecraft.entity.LivingEntity;
|
||||
@@ -105,14 +106,14 @@ public class ItemDodgeRing extends ItemBauble {
|
||||
if(!player.abilities.isFlying) {
|
||||
int cd = ItemNBTHelper.getInt(stack, TAG_DODGE_COOLDOWN, 0);
|
||||
int width = Math.min((int) ((cd - pticks) * 2), 40);
|
||||
GlStateManager.color4f(1F, 1F, 1F, 1F);
|
||||
RenderSystem.color4f(1F, 1F, 1F, 1F);
|
||||
if(width > 0) {
|
||||
AbstractGui.fill(xo, y - 2, xo + 40, y - 1, 0x88000000);
|
||||
AbstractGui.fill(xo, y - 2, xo + width, y - 1, 0xFFFFFFFF);
|
||||
}
|
||||
}
|
||||
|
||||
GlStateManager.enableAlphaTest();
|
||||
GlStateManager.color4f(1F, 1F, 1F, 1F);
|
||||
RenderSystem.enableAlphaTest();
|
||||
RenderSystem.color4f(1F, 1F, 1F, 1F);
|
||||
}
|
||||
}
|
||||
@@ -13,6 +13,7 @@ package vazkii.botania.common.item.equipment.bauble;
|
||||
import com.mojang.blaze3d.matrix.MatrixStack;
|
||||
import com.mojang.blaze3d.platform.GLX;
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import com.mojang.blaze3d.systems.RenderSystem;
|
||||
import com.mojang.blaze3d.vertex.IVertexBuilder;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.AbstractGui;
|
||||
@@ -362,7 +363,8 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem {
|
||||
rz = 0F;
|
||||
ry = -rx;
|
||||
rx = 0F;
|
||||
GlStateManager.color4f(1F, 1F, 1F, 0.5F + (float) Math.cos((double) (player.ticksExisted + partialTicks) * 0.3F) * 0.2F);
|
||||
// todo 1.15
|
||||
RenderSystem.color4f(1F, 1F, 1F, 0.5F + (float) Math.cos((double) (player.ticksExisted + partialTicks) * 0.3F) * 0.2F);
|
||||
break;
|
||||
}
|
||||
case 8: { // Mega Ultra Chicken
|
||||
@@ -375,7 +377,8 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem {
|
||||
rx = 0F;
|
||||
h = 1.1F;
|
||||
ry = -(float) ((Math.sin((double) (player.ticksExisted + partialTicks) * 0.2F) + 0.6F) * (flying ? 12F : 5F));
|
||||
GlStateManager.color4f(1F, 1F, 1F, 0.5F + (flying ? (float) Math.cos((double) (player.ticksExisted + partialTicks) * 0.3F) * 0.25F + 0.25F : 0F));
|
||||
// todo 1.15
|
||||
RenderSystem.color4f(1F, 1F, 1F, 0.5F + (flying ? (float) Math.cos((double) (player.ticksExisted + partialTicks) * 0.3F) * 0.25F + 0.25F : 0F));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -460,26 +463,26 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem {
|
||||
float trans = 1F;
|
||||
if(i == segs - 1) {
|
||||
trans = (float) last / (float) segTime;
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
GlStateManager.disableAlphaTest();
|
||||
RenderSystem.enableBlend();
|
||||
RenderSystem.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
RenderSystem.disableAlphaTest();
|
||||
}
|
||||
|
||||
GlStateManager.color4f(1F, 1F, 1F, trans);
|
||||
RenderSystem.color4f(1F, 1F, 1F, trans);
|
||||
RenderHelper.drawTexturedModalRect(x, y, 0, u, v, 9, 9);
|
||||
x += 8;
|
||||
}
|
||||
|
||||
if(player.abilities.isFlying) {
|
||||
int width = ItemNBTHelper.getInt(stack, TAG_DASH_COOLDOWN, 0);
|
||||
GlStateManager.color4f(1F, 1F, 1F, 1F);
|
||||
RenderSystem.color4f(1F, 1F, 1F, 1F);
|
||||
if(width > 0)
|
||||
AbstractGui.fill(xo, y - 2, xo + 80, y - 1, 0x88000000);
|
||||
AbstractGui.fill(xo, y - 2, xo + width, y - 1, 0xFFFFFFFF);
|
||||
}
|
||||
|
||||
GlStateManager.enableAlphaTest();
|
||||
GlStateManager.color4f(1F, 1F, 1F, 1F);
|
||||
RenderSystem.enableAlphaTest();
|
||||
RenderSystem.color4f(1F, 1F, 1F, 1F);
|
||||
mc.textureManager.bindTexture(AbstractGui.GUI_ICONS_LOCATION);
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user