openglhelper -> glx

This commit is contained in:
Vincent Lee committed 2019-06-08 01:20:51 -07:00
1 parent 0e3c5949a1
commit c7cc76e1f3
15 files changed
+43 -43

No files matched your search

@@ -12,7 +12,7 @@ package vazkii.botania.client.core.handler;
import net.minecraft.client.Minecraft;
import com.mojang.blaze3d.platform.GlStateManager;
import net.minecraft.client.renderer.OpenGlHelper;
import com.mojang.blaze3d.platform.GLX;
import net.minecraft.client.renderer.entity.layers.LayerRenderer;
import net.minecraft.client.renderer.model.ItemCameraTransforms;
import net.minecraft.client.renderer.texture.AtlasTexture;
@@ -111,7 +111,7 @@ public final class BaubleRenderHandler implements LayerRenderer<PlayerEntity> {
int light = 15728880;
int lightmapX = light % 65536;
int lightmapY = light / 65536;
OpenGlHelper.glMultiTexCoord2f(OpenGlHelper.GL_TEXTURE1, lightmapX, lightmapY);
GLX.glMultiTexCoord2f(GLX.GL_TEXTURE1, lightmapX, lightmapY);
Minecraft.getInstance().getItemRenderer().renderItem(stack, ItemCameraTransforms.TransformType.NONE);
GlStateManager.popMatrix();
@@ -12,7 +12,7 @@ package vazkii.botania.client.core.helper;
import net.minecraft.client.Minecraft;
import com.mojang.blaze3d.platform.GlStateManager;
import net.minecraft.client.renderer.OpenGlHelper;
import com.mojang.blaze3d.platform.GLX;
import net.minecraft.resources.IResourceManager;
import net.minecraft.resources.SimpleReloadableResourceManager;
@@ -127,7 +127,7 @@ public final class ShaderHelper {
}
public static boolean useShaders() {
return ConfigHandler.CLIENT.useShaders.get() && OpenGlHelper.shadersSupported && checkIncompatibleMods();
return ConfigHandler.CLIENT.useShaders.get() && GLX.shadersSupported && checkIncompatibleMods();
}
private static boolean checkIncompatibleMods() {
@@ -12,7 +12,7 @@ package vazkii.botania.client.gui.lexicon.button;
import net.minecraft.client.Minecraft;
import com.mojang.blaze3d.platform.GlStateManager;
import net.minecraft.client.renderer.OpenGlHelper;
import com.mojang.blaze3d.platform.GLX;
import net.minecraft.client.renderer.texture.TextureManager;
import net.minecraft.client.resources.I18n;
import net.minecraft.util.ResourceLocation;
@@ -51,11 +51,11 @@ public class GuiButtonCategory extends GuiButtonLexicon {
int maskUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "mask");
float heightMatch = ticksHovered / time;
OpenGlHelper.glActiveTexture(ARBMultitexture.GL_TEXTURE0_ARB);
GLX.glActiveTexture(ARBMultitexture.GL_TEXTURE0_ARB);
GL11.glBindTexture(GL11.GL_TEXTURE_2D, r.getTexture(resource).getGlTextureId());
ARBShaderObjects.glUniform1iARB(imageUniform, 0);
OpenGlHelper.glActiveTexture(ARBMultitexture.GL_TEXTURE0_ARB + ConfigHandler.CLIENT.glSecondaryTextureUnit.get());
GLX.glActiveTexture(ARBMultitexture.GL_TEXTURE0_ARB + ConfigHandler.CLIENT.glSecondaryTextureUnit.get());
GlStateManager.enableTexture();
GL11.glGetInteger(GL11.GL_TEXTURE_BINDING_2D);
@@ -114,7 +114,7 @@ public class GuiButtonCategory extends GuiButtonLexicon {
boolean shaders = ShaderHelper.useShaders();
if(shaders) {
OpenGlHelper.glActiveTexture(ARBMultitexture.GL_TEXTURE0_ARB + ConfigHandler.CLIENT.glSecondaryTextureUnit.get());
GLX.glActiveTexture(ARBMultitexture.GL_TEXTURE0_ARB + ConfigHandler.CLIENT.glSecondaryTextureUnit.get());
texture = GL11.glGetInteger(GL11.GL_TEXTURE_BINDING_2D);
}
@@ -123,9 +123,9 @@ public class GuiButtonCategory extends GuiButtonLexicon {
ShaderHelper.releaseShader();
if(shaders) {
OpenGlHelper.glActiveTexture(ARBMultitexture.GL_TEXTURE0_ARB + ConfigHandler.CLIENT.glSecondaryTextureUnit.get());
GLX.glActiveTexture(ARBMultitexture.GL_TEXTURE0_ARB + ConfigHandler.CLIENT.glSecondaryTextureUnit.get());
GL11.glBindTexture(GL11.GL_TEXTURE_2D, texture);
OpenGlHelper.glActiveTexture(ARBMultitexture.GL_TEXTURE0_ARB);
GLX.glActiveTexture(ARBMultitexture.GL_TEXTURE0_ARB);
}
GlStateManager.popMatrix();
@@ -11,7 +11,7 @@
package vazkii.botania.client.model;
import com.mojang.blaze3d.platform.GlStateManager;
import net.minecraft.client.renderer.OpenGlHelper;
import com.mojang.blaze3d.platform.GLX;
import net.minecraft.client.renderer.entity.model.RendererModel;
import net.minecraft.client.renderer.model.Model;
import net.minecraft.client.renderer.entity.model.RendererModel;
@@ -70,7 +70,7 @@ public class ModelSpinningCubes extends Model {
int lightmapX = light % 65536;
int lightmapY = light / 65536;
OpenGlHelper.glMultiTexCoord2f(OpenGlHelper.GL_TEXTURE1, lightmapX, lightmapY);
GLX.glMultiTexCoord2f(GLX.GL_TEXTURE1, lightmapX, lightmapY);
spinningCube.render(1F / 16F);
if(repeat < origRepeat) {
@@ -12,7 +12,7 @@ package vazkii.botania.client.render.entity;
import net.minecraft.client.Minecraft;
import com.mojang.blaze3d.platform.GlStateManager;
import net.minecraft.client.renderer.OpenGlHelper;
import com.mojang.blaze3d.platform.GLX;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.entity.EntityRenderer;
import net.minecraft.client.renderer.entity.EntityRendererManager;
@@ -66,7 +66,7 @@ public class RenderBabylonWeapon extends EntityRenderer<EntityBabylonWeapon> {
float f2 = icon.getMinV();
float f3 = icon.getMaxV();
OpenGlHelper.glMultiTexCoord2f(OpenGlHelper.GL_TEXTURE1, 240, 240);
GLX.glMultiTexCoord2f(GLX.GL_TEXTURE1, 240, 240);
GlStateManager.disableLighting();
IconHelper.renderIconIn3D(Tessellator.getInstance(), f1, f2, f, f3, icon.getWidth(), icon.getHeight(), 1F / 16F);
GlStateManager.popMatrix();
@@ -11,7 +11,7 @@
package vazkii.botania.client.render.entity;
import com.mojang.blaze3d.platform.GlStateManager;
import net.minecraft.client.renderer.OpenGlHelper;
import com.mojang.blaze3d.platform.GLX;
import net.minecraft.client.renderer.entity.EntityRendererManager;
import net.minecraft.client.renderer.entity.MobRenderer;
import net.minecraft.client.renderer.entity.EntityRendererManager;
@@ -77,7 +77,7 @@ public class RenderPixie extends MobRenderer<EntityPixie> {
char c0 = 61680;
int j = c0 % 65536;
int k = c0 / 65536;
OpenGlHelper.glMultiTexCoord2f(OpenGlHelper.GL_TEXTURE1, j / 1.0F, k / 1.0F);
GLX.glMultiTexCoord2f(GLX.GL_TEXTURE1, j / 1.0F, k / 1.0F);
GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F);
GlStateManager.color4f(1.0F, 1.0F, 1.0F, f1);
return 1;
@@ -12,7 +12,7 @@ package vazkii.botania.client.render.tile;
import net.minecraft.client.Minecraft;
import com.mojang.blaze3d.platform.GlStateManager;
import net.minecraft.client.renderer.OpenGlHelper;
import com.mojang.blaze3d.platform.GLX;
import net.minecraft.client.renderer.model.ItemCameraTransforms;
import net.minecraft.client.renderer.texture.AtlasTexture;
import net.minecraft.client.renderer.texture.AtlasTexture;
@@ -96,7 +96,7 @@ public class RenderTileAvatar extends TileEntityRenderer<TileAvatar> {
int light = 15728880;
int lightmapX = light % 65536;
int lightmapY = light / 65536;
OpenGlHelper.glMultiTexCoord2f(OpenGlHelper.GL_TEXTURE1, lightmapX, lightmapY);
GLX.glMultiTexCoord2f(GLX.GL_TEXTURE1, lightmapX, lightmapY);
float alpha = (float) Math.sin(ClientTickHandler.ticksInGame / 20D) / 2F + 0.5F;
GlStateManager.color4f(1F, 1F, 1F, alpha + 0.183F);
model.render();
@@ -12,7 +12,7 @@ package vazkii.botania.client.render.tile;
import net.minecraft.client.Minecraft;
import com.mojang.blaze3d.platform.GlStateManager;
import net.minecraft.client.renderer.OpenGlHelper;
import com.mojang.blaze3d.platform.GLX;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.entity.EntityRenderer;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
@@ -76,7 +76,7 @@ public class RenderTileEnchanter extends TileEntityRenderer<TileEnchanter> {
int light = 15728880;
int lightmapX = light % 65536;
int lightmapY = light / 65536;
OpenGlHelper.glMultiTexCoord2f(OpenGlHelper.GL_TEXTURE1, lightmapX, lightmapY);
GLX.glMultiTexCoord2f(GLX.GL_TEXTURE1, lightmapX, lightmapY);
GlStateManager.color4f(0.6F + (float) ((Math.cos((ClientTickHandler.ticksInGame + f) / 6D) + 1D) / 5D), 0.1F, 0.9F, alpha);
}
@@ -12,7 +12,7 @@ package vazkii.botania.client.render.tile;
import net.minecraft.client.Minecraft;
import com.mojang.blaze3d.platform.GlStateManager;
import net.minecraft.client.renderer.OpenGlHelper;
import com.mojang.blaze3d.platform.GLX;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.texture.AtlasTexture;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
@@ -49,7 +49,7 @@ public class RenderTileTerraPlate extends TileEntityRenderer<TileTerraPlate> {
int light = 15728880;
int lightmapX = light % 65536;
int lightmapY = light / 65536;
OpenGlHelper.glMultiTexCoord2f(OpenGlHelper.GL_TEXTURE1, lightmapX, lightmapY);
GLX.glMultiTexCoord2f(GLX.GL_TEXTURE1, lightmapX, lightmapY);
GlStateManager.color4f(0.6F + (float) ((Math.cos((ClientTickHandler.ticksInGame + f) / 6D) + 1D) / 5D), 0.1F, 0.9F, alpha);
}
@@ -14,7 +14,7 @@ import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.BufferBuilder;
import com.mojang.blaze3d.platform.GlStateManager;
import net.minecraft.client.renderer.OpenGlHelper;
import com.mojang.blaze3d.platform.GLX;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.model.ItemCameraTransforms;
import net.minecraft.client.renderer.texture.AtlasTexture;
@@ -329,7 +329,7 @@ public class RenderTileTinyPotato extends TileEntityRenderer<TileTinyPotato> {
GlStateManager.translatef(0.0F, 0F / f1, 0.0F);
GlStateManager.depthMask(false);
GlStateManager.enableBlend();
OpenGlHelper.glBlendFuncSeparate(770, 771, 1, 0);
GLX.glBlendFuncSeparate(770, 771, 1, 0);
Tessellator tessellator = Tessellator.getInstance();
BufferBuilder worldrenderer = tessellator.getBuffer();
GlStateManager.disableTexture();
@@ -348,7 +348,7 @@ public class RenderTileTinyPotato extends TileEntityRenderer<TileTinyPotato> {
String str = name.equals("pahimar") ? "[WIP]" : "(soon)";
GlStateManager.depthMask(false);
GlStateManager.enableBlend();
OpenGlHelper.glBlendFuncSeparate(770, 771, 1, 0);
GLX.glBlendFuncSeparate(770, 771, 1, 0);
GlStateManager.disableTexture();
worldrenderer.begin(7, DefaultVertexFormats.POSITION_COLOR);
i = mc.fontRenderer.getStringWidth(str) / 2;
@@ -14,7 +14,7 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.world.ClientWorld;
import net.minecraft.client.renderer.BufferBuilder;
import com.mojang.blaze3d.platform.GlStateManager;
import net.minecraft.client.renderer.OpenGlHelper;
import com.mojang.blaze3d.platform.GLX;
import net.minecraft.client.renderer.RenderHelper;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
@@ -72,7 +72,7 @@ public class SkyblockSkyRenderer implements IRenderHandler {
GlStateManager.depthMask(false);
GlStateManager.enableFog();
GlStateManager.color3f(f, f1, f2);
if (OpenGlHelper.useVbo()) {
if (GLX.useVbo()) {
skyVBO.bindBuffer();
GlStateManager.enableClientState(32884);
GlStateManager.vertexPointer(3, 5126, 12, 0);
@@ -425,7 +425,7 @@ public class SkyblockSkyRenderer implements IRenderHandler {
// Excised from many occurences in WorldRenderer
private void drawVboOrList(net.minecraft.client.renderer.vertex.VertexBuffer vbo, int displayList) {
if (OpenGlHelper.useVbo()) {
if (GLX.useVbo()) {
vbo.bindBuffer();
GlStateManager.enableClientState(GL11.GL_VERTEX_ARRAY);
GlStateManager.vertexPointer(3, GL11.GL_FLOAT, 12, 0);
@@ -12,7 +12,7 @@ package vazkii.botania.common.item.equipment.bauble;
import net.minecraft.client.Minecraft;
import com.mojang.blaze3d.platform.GlStateManager;
import net.minecraft.client.renderer.OpenGlHelper;
import com.mojang.blaze3d.platform.GLX;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.texture.AtlasTexture;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
@@ -144,7 +144,7 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre
int light = 15728880;
int lightmapX = light % 65536;
int lightmapY = light / 65536;
OpenGlHelper.glMultiTexCoord2f(OpenGlHelper.GL_TEXTURE1, lightmapX, lightmapY);
GLX.glMultiTexCoord2f(GLX.GL_TEXTURE1, lightmapX, lightmapY);
}
GlStateManager.color3f(1, 1, 1);
}
@@ -14,7 +14,7 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.AbstractGui;
import net.minecraft.client.gui.AbstractGui;
import com.mojang.blaze3d.platform.GlStateManager;
import net.minecraft.client.renderer.OpenGlHelper;
import com.mojang.blaze3d.platform.GLX;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.texture.AtlasTexture;
@@ -334,8 +334,8 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem {
int lightmapX = light % 65536;
int lightmapY = light / 65536;
float lbx = OpenGlHelper.lastBrightnessX;
float lby = OpenGlHelper.lastBrightnessY;
float lbx = GLX.lastBrightnessX;
float lby = GLX.lastBrightnessY;
switch(meta) {
case 1 : { // Jibril
@@ -358,7 +358,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem {
h = 0.5F;
rx = 20F;
ry = -(float) ((Math.sin((double) (player.ticksExisted + partialTicks) * (flying ? 0.4F : 0.2F)) + 0.6F) * (flying ? 30F : 5F));
OpenGlHelper.glMultiTexCoord2f(OpenGlHelper.GL_TEXTURE1, lightmapX, lightmapY);
GLX.glMultiTexCoord2f(GLX.GL_TEXTURE1, lightmapX, lightmapY);
break;
}
case 5 : { // Kuroyukihime
@@ -374,7 +374,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem {
break;
}
case 7 : { // Lyfa
OpenGlHelper.glMultiTexCoord2f(OpenGlHelper.GL_TEXTURE1, lightmapX, lightmapY);
GLX.glMultiTexCoord2f(GLX.GL_TEXTURE1, lightmapX, lightmapY);
h = -0.1F;
rz = 0F;
ry = -rx;
@@ -387,7 +387,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem {
break;
}
case 9 : { // The One
OpenGlHelper.glMultiTexCoord2f(OpenGlHelper.GL_TEXTURE1, lightmapX, lightmapY);
GLX.glMultiTexCoord2f(GLX.GL_TEXTURE1, lightmapX, lightmapY);
rz = 180F;
rx = 0F;
h = 1.1F;
@@ -436,7 +436,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem {
GlStateManager.color3f(1F, 1F, 1F);
GlStateManager.popMatrix();
OpenGlHelper.glMultiTexCoord2f(OpenGlHelper.GL_TEXTURE1, lbx, lby);
GLX.glMultiTexCoord2f(GLX.GL_TEXTURE1, lbx, lby);
if(meta == 1)
renderHalo(player, partialTicks);
@@ -449,7 +449,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem {
GlStateManager.enableBlend();
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
GlStateManager.shadeModel(GL11.GL_SMOOTH);
OpenGlHelper.glMultiTexCoord2f(OpenGlHelper.GL_TEXTURE1, 240, 240);
GLX.glMultiTexCoord2f(GLX.GL_TEXTURE1, 240, 240);
GlStateManager.disableLighting();
GlStateManager.disableCull();
GlStateManager.color4f(1F, 1F, 1F, 1F);
@@ -12,7 +12,7 @@ package vazkii.botania.common.item.equipment.bauble;
import net.minecraft.client.Minecraft;
import com.mojang.blaze3d.platform.GlStateManager;
import net.minecraft.client.renderer.OpenGlHelper;
import com.mojang.blaze3d.platform.GLX;
import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.PlayerEntity;
@@ -102,7 +102,7 @@ public class ItemHolyCloak extends ItemBauble {
int light = 15728880;
int lightmapX = light % 65536;
int lightmapY = light / 65536;
OpenGlHelper.glMultiTexCoord2f(OpenGlHelper.GL_TEXTURE1, lightmapX, lightmapY);
GLX.glMultiTexCoord2f(GLX.GL_TEXTURE1, lightmapX, lightmapY);
Minecraft.getInstance().textureManager.bindTexture(item.getCloakGlowTexture());
model.render(1F);
}
@@ -12,7 +12,7 @@ package vazkii.botania.common.lexicon.page;
import net.minecraft.client.Minecraft;
import com.mojang.blaze3d.platform.GlStateManager;
import net.minecraft.client.renderer.OpenGlHelper;
import com.mojang.blaze3d.platform.GLX;
import net.minecraft.client.renderer.RenderHelper;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityType;
@@ -88,9 +88,9 @@ public class PageEntity extends LexiconPage{
GlStateManager.popMatrix();
RenderHelper.disableStandardItemLighting();
GlStateManager.disableRescaleNormal();
OpenGlHelper.glActiveTexture(OpenGlHelper.GL_TEXTURE1);
GLX.glActiveTexture(GLX.GL_TEXTURE1);
GlStateManager.disableTexture();
OpenGlHelper.glActiveTexture(OpenGlHelper.GL_TEXTURE0);
GLX.glActiveTexture(GLX.GL_TEXTURE0);
if(relativeMouseX >= x - dummyEntity.width * scale / 2 - 10 && relativeMouseY >= y - dummyEntity.height * scale - 20 && relativeMouseX <= x + dummyEntity.width * scale / 2 + 10 && relativeMouseY <= y + 20)
tooltipEntity = true;