fujin/Wizardry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert to GlStateManager calls

Browse Source 
also removes the weird reflection being used to access the RenderItem
This commit is contained in:
Shadows_of_Fire
2018-05-04 06:45:57 -04:00
parent 30dd587d34
commit 35cb2c31fc
2 changed files with 40 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/client/GuiWizardHandbook.java
+4 -4
View File
@@ -182,7 +182,7 @@ public class GuiWizardHandbook extends GuiScreen {
RenderHelper.enableGUIStandardItemLighting(); RenderHelper.enableGUIStandardItemLighting();
GlStateManager.disableLighting(); GlStateManager.disableLighting();
GlStateManager.enableRescaleNormal(); GlStateManager.enableRescaleNormal();
GL11.glEnable(GL11.GL_COLOR_MATERIAL); GlStateManager.enableColorMaterial();
GlStateManager.enableLighting(); GlStateManager.enableLighting();
itemRender.zLevel = 100.0F; itemRender.zLevel = 100.0F;
@@ -204,7 +204,7 @@ public class GuiWizardHandbook extends GuiScreen {
GlStateManager.popMatrix(); GlStateManager.popMatrix();
GlStateManager.enableLighting(); GlStateManager.enableLighting();
GL11.glEnable(GL11.GL_DEPTH_TEST); GlStateManager.enableDepth();
RenderHelper.enableStandardItemLighting(); RenderHelper.enableStandardItemLighting();
} }
@@ -219,7 +219,7 @@ public class GuiWizardHandbook extends GuiScreen {
RenderHelper.enableGUIStandardItemLighting(); RenderHelper.enableGUIStandardItemLighting();
GlStateManager.disableLighting(); GlStateManager.disableLighting();
GlStateManager.enableRescaleNormal(); GlStateManager.enableRescaleNormal();
GL11.glEnable(GL11.GL_COLOR_MATERIAL); GlStateManager.enableColorMaterial();
itemRender.zLevel = 0.0F; itemRender.zLevel = 0.0F;
GlStateManager.disableLighting(); GlStateManager.disableLighting();
@@ -239,7 +239,7 @@ public class GuiWizardHandbook extends GuiScreen {
GlStateManager.popMatrix(); GlStateManager.popMatrix();
GlStateManager.enableLighting(); GlStateManager.enableLighting();
GL11.glEnable(GL11.GL_DEPTH_TEST); GlStateManager.enableDepth();
RenderHelper.enableStandardItemLighting(); RenderHelper.enableStandardItemLighting();
} }
src/main/java/electroblob/wizardry/client/WizardryClientEventHandler.java
+36 -52
View File
@@ -1,7 +1,5 @@
package electroblob.wizardry.client; package electroblob.wizardry.client;
import java.lang.reflect.Field;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import electroblob.wizardry.WizardData; import electroblob.wizardry.WizardData;
@@ -21,7 +19,6 @@ import electroblob.wizardry.util.WandHelper;
import electroblob.wizardry.util.WizardryUtilities; import electroblob.wizardry.util.WizardryUtilities;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiMerchant; import net.minecraft.client.gui.GuiMerchant;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.BufferBuilder;
import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.GlStateManager;
@@ -50,7 +47,6 @@ import net.minecraftforge.client.event.TextureStitchEvent;
import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
import net.minecraftforge.fml.relauncher.ReflectionHelper;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
@@ -73,12 +69,6 @@ public final class WizardryClientEventHandler {
private static final ResourceLocation pointerTexture = new ResourceLocation(Wizardry.MODID, "textures/entity/pointer.png"); private static final ResourceLocation pointerTexture = new ResourceLocation(Wizardry.MODID, "textures/entity/pointer.png");
private static final ResourceLocation targetPointerTexture = new ResourceLocation(Wizardry.MODID, "textures/entity/target_pointer.png"); private static final ResourceLocation targetPointerTexture = new ResourceLocation(Wizardry.MODID, "textures/entity/target_pointer.png");
private static final Field ITEM_RENDERER;
static {
ITEM_RENDERER = ReflectionHelper.findField(GuiScreen.class, "itemRender", "field_146296_j");
}
@SubscribeEvent @SubscribeEvent
public static void onTextureStitchEvent(TextureStitchEvent.Pre event){ public static void onTextureStitchEvent(TextureStitchEvent.Pre event){
event.getMap().registerSprite(ContainerArcaneWorkbench.EMPTY_SLOT_CRYSTAL); event.getMap().registerSprite(ContainerArcaneWorkbench.EMPTY_SLOT_CRYSTAL);
@@ -164,36 +154,30 @@ public final class WizardryClientEventHandler {
} }
private static void renderItemAndTooltip(GuiContainer gui, ItemStack stack, int x, int y, int mouseX, int mouseY, boolean tooltip){ private static void renderItemAndTooltip(GuiContainer gui, ItemStack stack, int x, int y, int mouseX, int mouseY, boolean tooltip){
try {
RenderItem renderItem = (RenderItem)ITEM_RENDERER.get(gui);
GlStateManager.pushMatrix();
RenderHelper.enableGUIStandardItemLighting();
GlStateManager.disableLighting();
GlStateManager.enableRescaleNormal();
GL11.glEnable(GL11.GL_COLOR_MATERIAL);
GlStateManager.enableLighting();
renderItem.zLevel = 100.0F;
if(!stack.isEmpty()){
renderItem.renderItemAndEffectIntoGUI(stack, x, y);
renderItem.renderItemOverlays(Minecraft.getMinecraft().fontRenderer, stack, x, y);
if(tooltip){
gui.drawHoveringText(gui.getItemToolTip(stack), mouseX + gui.getXSize()/2 - gui.width/2,
mouseY + gui.getYSize()/2 - gui.height/2);
}
}
GlStateManager.popMatrix(); RenderItem renderItem = Minecraft.getMinecraft().getRenderItem();
GlStateManager.enableLighting(); GlStateManager.pushMatrix();
GL11.glEnable(GL11.GL_DEPTH_TEST); RenderHelper.enableGUIStandardItemLighting();
RenderHelper.enableStandardItemLighting(); GlStateManager.disableLighting();
GlStateManager.enableRescaleNormal();
} catch (Exception e){ GlStateManager.enableColorMaterial();
e.printStackTrace(); GlStateManager.enableLighting();
renderItem.zLevel = 100.0F;
if(!stack.isEmpty()){
renderItem.renderItemAndEffectIntoGUI(stack, x, y);
renderItem.renderItemOverlays(Minecraft.getMinecraft().fontRenderer, stack, x, y);
if(tooltip){
gui.drawHoveringText(gui.getItemToolTip(stack), mouseX + gui.getXSize()/2 - gui.width/2,
mouseY + gui.getYSize()/2 - gui.height/2);
}
} }
GlStateManager.popMatrix();
GlStateManager.enableLighting();
GlStateManager.enableDepth();
RenderHelper.enableStandardItemLighting();
} }
// Third person // Third person
@@ -241,7 +225,7 @@ public final class WizardryClientEventHandler {
GlStateManager.disableLighting(); GlStateManager.disableLighting();
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240f, 240f); OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240f, 240f);
// Disabling depth test allows it to be seen through everything. // Disabling depth test allows it to be seen through everything.
GL11.glDisable(GL11.GL_DEPTH_TEST); GlStateManager.disableDepth();
GlStateManager.color(1, 1, 1, 1); GlStateManager.color(1, 1, 1, 1);
GlStateManager.translate(event.getX(), event.getY() + event.getEntity().height + 0.5, event.getZ()); GlStateManager.translate(event.getX(), event.getY() + event.getEntity().height + 0.5, event.getZ());
@@ -265,7 +249,7 @@ public final class WizardryClientEventHandler {
GlStateManager.enableCull(); GlStateManager.enableCull();
GlStateManager.enableLighting(); GlStateManager.enableLighting();
GL11.glEnable(GL11.GL_DEPTH_TEST); GlStateManager.enableDepth();
GlStateManager.popMatrix(); GlStateManager.popMatrix();
} }
@@ -282,7 +266,7 @@ public final class WizardryClientEventHandler {
GlStateManager.disableLighting(); GlStateManager.disableLighting();
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240f, 240f); OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240f, 240f);
// Disabling depth test allows it to be seen through everything. // Disabling depth test allows it to be seen through everything.
GL11.glDisable(GL11.GL_DEPTH_TEST); GlStateManager.disableDepth();
GlStateManager.color(1, 1, 1, 1); GlStateManager.color(1, 1, 1, 1);
GlStateManager.translate(event.getX(), event.getY() + event.getEntity().height + 0.5, event.getZ()); GlStateManager.translate(event.getX(), event.getY() + event.getEntity().height + 0.5, event.getZ());
@@ -306,7 +290,7 @@ public final class WizardryClientEventHandler {
GlStateManager.enableCull(); GlStateManager.enableCull();
GlStateManager.enableLighting(); GlStateManager.enableLighting();
GL11.glEnable(GL11.GL_DEPTH_TEST); GlStateManager.enableDepth();
GlStateManager.popMatrix(); GlStateManager.popMatrix();
} }
@@ -327,7 +311,7 @@ public final class WizardryClientEventHandler {
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240f, 240f); OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240f, 240f);
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
// Disabling depth test allows it to be seen through everything. // Disabling depth test allows it to be seen through everything.
GL11.glDisable(GL11.GL_DEPTH_TEST); GlStateManager.disableDepth();
GlStateManager.translate(event.getX(), event.getY() + event.getEntity().height * 0.6, event.getZ()); GlStateManager.translate(event.getX(), event.getY() + event.getEntity().height * 0.6, event.getZ());
@@ -351,7 +335,7 @@ public final class WizardryClientEventHandler {
GlStateManager.enableCull(); GlStateManager.enableCull();
GlStateManager.disableBlend(); GlStateManager.disableBlend();
GlStateManager.enableLighting(); GlStateManager.enableLighting();
GL11.glEnable(GL11.GL_DEPTH_TEST); GlStateManager.enableDepth();
GlStateManager.popMatrix(); GlStateManager.popMatrix();
} }
@@ -365,8 +349,8 @@ public final class WizardryClientEventHandler {
GlStateManager.pushMatrix(); GlStateManager.pushMatrix();
GL11.glDisable(GL11.GL_DEPTH_TEST); GlStateManager.disableDepth();
GL11.glDepthMask(false); GlStateManager.depthMask(false);
OpenGlHelper.glBlendFunc(770, 771, 1, 0); OpenGlHelper.glBlendFunc(770, 771, 1, 0);
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
GlStateManager.disableAlpha(); GlStateManager.disableAlpha();
@@ -383,8 +367,8 @@ public final class WizardryClientEventHandler {
buffer.pos(0.0D, 0.0D, -90.0D).tex(0.0D, 0.0D).endVertex(); buffer.pos(0.0D, 0.0D, -90.0D).tex(0.0D, 0.0D).endVertex();
tessellator.draw(); tessellator.draw();
GL11.glDepthMask(true); GlStateManager.depthMask(true);
GL11.glEnable(GL11.GL_DEPTH_TEST); GlStateManager.enableDepth();
GlStateManager.enableAlpha(); GlStateManager.enableAlpha();
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
@@ -395,8 +379,8 @@ public final class WizardryClientEventHandler {
GlStateManager.pushMatrix(); GlStateManager.pushMatrix();
GL11.glDisable(GL11.GL_DEPTH_TEST); GlStateManager.disableDepth();
GL11.glDepthMask(false); GlStateManager.depthMask(false);
OpenGlHelper.glBlendFunc(770, 771, 1, 0); OpenGlHelper.glBlendFunc(770, 771, 1, 0);
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
GlStateManager.disableAlpha(); GlStateManager.disableAlpha();
@@ -413,8 +397,8 @@ public final class WizardryClientEventHandler {
buffer.pos(0.0D, 0.0D, -90.0D).tex(0.0D, 0.0D).endVertex(); buffer.pos(0.0D, 0.0D, -90.0D).tex(0.0D, 0.0D).endVertex();
tessellator.draw(); tessellator.draw();
GL11.glDepthMask(true); GlStateManager.depthMask(true);
GL11.glEnable(GL11.GL_DEPTH_TEST); GlStateManager.enableDepth();
GlStateManager.enableAlpha(); GlStateManager.enableAlpha();
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);