fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed usage of GL11 in favor of using GlStateManager.

Browse Source
This commit is contained in:
Sebastian Hartte
2016-10-03 00:23:45 +02:00
parent 62f224d77b
commit 2ab1fc0adf
16 changed files with 93 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/entity/RenderFloatingItem.java
+4 -5
View File
@@ -19,9 +19,8 @@
package appeng.entity;
import org.lwjgl.opengl.GL11;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.entity.RenderEntityItem;
import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.entity.item.EntityItem;
@@ -48,15 +47,15 @@ public class RenderFloatingItem extends RenderEntityItem
final EntityFloatingItem efi = (EntityFloatingItem) entityItem;
if( efi.getProgress() > 0.0 )
{
GL11.glPushMatrix();
GlStateManager.pushMatrix();
if( !( efi.getEntityItem().getItem() instanceof ItemBlock ) )
{
GL11.glTranslatef( 0, -0.15f, 0 );
GlStateManager.translate( 0, -0.15f, 0 );
}
super.doRender( efi, x, y, z, yaw, partialTick );
GL11.glPopMatrix();
GlStateManager.popMatrix();
}
}
}
src/main/java/appeng/entity/RenderTinyTNTPrimed.java
+2 -4
View File
@@ -19,8 +19,6 @@
package appeng.entity;
import org.lwjgl.opengl.GL11;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.BlockRendererDispatcher;
import net.minecraft.client.renderer.GlStateManager;
@@ -74,10 +72,10 @@ public class RenderTinyTNTPrimed extends Render
f2 *= f2;
f2 *= f2;
final float f3 = 1.0F + f2 * 0.3F;
GL11.glScalef( f3, f3, f3 );
GlStateManager.scale( f3, f3, f3 );
}
GL11.glScalef( 0.5f, 0.5f, 0.5f );
GlStateManager.scale( 0.5f, 0.5f, 0.5f );
f2 = ( 1.0F - ( tnt.getFuse() - life + 1.0F ) / 100.0F ) * 0.8F;
this.bindEntityTexture( tnt );
GlStateManager.translate( -0.5F, -0.5F, 0.5F );