catfoolyou
/
Project164
mirror of https://github.com/catfoolyou/Project164.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove LWJGL refs (unfinished)

This commit is contained in:
catfoolyou 2025-02-06 12:56:22 -05:00
parent bf43d47631
commit 36c3f15017
47 changed files with 132 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@ -9,7 +9,7 @@ sourceSets {
main { main {
java { java {
srcDir 'src/main/java' srcDir 'src/main/java'
srcDir 'src/lwjgl/java' srcDir 'src/teavm/java'
} }
} }
} }
@ -24,7 +24,7 @@ tasks.withType(JavaCompile) {
} }
dependencies { dependencies {
implementation fileTree(dir: './lwjgl-rundir/', include: '*.jar') //implementation fileTree(dir: './lwjgl-rundir/', include: '*.jar')
teavm(teavm.libs.jso) teavm(teavm.libs.jso)
teavm(teavm.libs.jsoApis) teavm(teavm.libs.jsoApis)

25
src/main/java/net/minecraft/src/CallableLWJGLVersion.java
View File

@ -1,25 +0,0 @@
package net.minecraft.src;
import java.util.concurrent.Callable;
import org.lwjgl.Sys;
class CallableLWJGLVersion implements Callable
{
/** Reference to the Minecraft object. */
final Minecraft mc;
CallableLWJGLVersion(Minecraft par1Minecraft)
{
this.mc = par1Minecraft;
}
public String getType()
{
return Sys.getVersion();
}
public Object call()
{
return this.getType();
}
}

5
src/main/java/net/minecraft/src/CallableMouseLocation.java
View File

@ -1,7 +1,8 @@
package net.minecraft.src; package net.minecraft.src;
import net.lax1dude.eaglercraft.EaglerAdapter;
import java.util.concurrent.Callable; import java.util.concurrent.Callable;
import org.lwjgl.input.Mouse;
class CallableMouseLocation implements Callable class CallableMouseLocation implements Callable
{ {
@ -20,7 +21,7 @@ class CallableMouseLocation implements Callable
public String callMouseLocation() public String callMouseLocation()
{ {
return String.format("Scaled: (%d, %d). Absolute: (%d, %d)", new Object[] {Integer.valueOf(this.field_90026_a), Integer.valueOf(this.field_90024_b), Integer.valueOf(Mouse.getX()), Integer.valueOf(Mouse.getY())}); return String.format("Scaled: (%d, %d). Absolute: (%d, %d)", new Object[] {Integer.valueOf(this.field_90026_a), Integer.valueOf(this.field_90024_b), Integer.valueOf(EaglerAdapter.mouseGetX()), Integer.valueOf(EaglerAdapter.mouseGetY())});
} }
public Object call() public Object call()

4
src/main/java/net/minecraft/src/GuiAchievement.java
View File

@ -2,7 +2,7 @@ package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation; import net.lax1dude.eaglercraft.TextureLocation;
import net.lax1dude.eaglercraft.EaglerAdapter; import net.lax1dude.eaglercraft.EaglerAdapter;
import org.lwjgl.opengl.GL12; import org.lwjgl.opengl.EaglerAdapter;
public class GuiAchievement extends Gui public class GuiAchievement extends Gui
{ {
@ -138,7 +138,7 @@ public class GuiAchievement extends Gui
RenderHelper.enableGUIStandardItemLighting(); RenderHelper.enableGUIStandardItemLighting();
EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING);
EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); EaglerAdapter.glEnable(EaglerAdapter.GL_RESCALE_NORMAL);
EaglerAdapter.glEnable(EaglerAdapter.GL_COLOR_MATERIAL); EaglerAdapter.glEnable(EaglerAdapter.GL_COLOR_MATERIAL);
EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING); EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING);
this.itemRender.renderItemAndEffectIntoGUI(this.theGame.fontRenderer, this.theGame.getTextureManager(), this.theAchievement.theItemStack, var5 + 8, var6 + 8); this.itemRender.renderItemAndEffectIntoGUI(this.theGame.fontRenderer, this.theGame.getTextureManager(), this.theAchievement.theItemStack, var5 + 8, var6 + 8);

12
src/main/java/net/minecraft/src/GuiChat.java
View File

@ -1,11 +1,11 @@
package net.minecraft.src; package net.minecraft.src;
import net.lax1dude.eaglercraft.EaglerAdapter;
import java.net.URI; import java.net.URI;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import org.lwjgl.input.Keyboard;
import org.lwjgl.input.Mouse;
public class GuiChat extends GuiScreen public class GuiChat extends GuiScreen
{ {
@ -44,7 +44,7 @@ public class GuiChat extends GuiScreen
*/ */
public void initGui() public void initGui()
{ {
Keyboard.enableRepeatEvents(true); EaglerAdapter.enableRepeatEvents(true);
this.sentHistoryCursor = this.mc.ingameGUI.getChatGUI().getSentMessages().size(); this.sentHistoryCursor = this.mc.ingameGUI.getChatGUI().getSentMessages().size();
this.inputField = new GuiTextField(this.fontRenderer, 4, this.height - 12, this.width - 4, 12); this.inputField = new GuiTextField(this.fontRenderer, 4, this.height - 12, this.width - 4, 12);
this.inputField.setMaxStringLength(100); this.inputField.setMaxStringLength(100);
@ -59,7 +59,7 @@ public class GuiChat extends GuiScreen
*/ */
public void onGuiClosed() public void onGuiClosed()
{ {
Keyboard.enableRepeatEvents(false); EaglerAdapter.enableRepeatEvents(false);
this.mc.ingameGUI.getChatGUI().resetScroll(); this.mc.ingameGUI.getChatGUI().resetScroll();
} }
@ -138,7 +138,7 @@ public class GuiChat extends GuiScreen
public void handleMouseInput() public void handleMouseInput()
{ {
super.handleMouseInput(); super.handleMouseInput();
int var1 = Mouse.getEventDWheel(); int var1 = EaglerAdapter.mouseGetEventDWheel();
if (var1 != 0) if (var1 != 0)
{ {
@ -168,7 +168,7 @@ public class GuiChat extends GuiScreen
{ {
if (par3 == 0 && this.mc.gameSettings.chatLinks) if (par3 == 0 && this.mc.gameSettings.chatLinks)
{ {
ChatClickData var4 = this.mc.ingameGUI.getChatGUI().func_73766_a(Mouse.getX(), Mouse.getY()); ChatClickData var4 = this.mc.ingameGUI.getChatGUI().func_73766_a(EaglerAdapter.mouseGetX(), EaglerAdapter.mouseGetY());
if (var4 != null) if (var4 != null)
{ {

7
src/main/java/net/minecraft/src/GuiCommandBlock.java
View File

@ -1,8 +1,9 @@
package net.minecraft.src; package net.minecraft.src;
import net.lax1dude.eaglercraft.EaglerAdapter;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream; import java.io.DataOutputStream;
import org.lwjgl.input.Keyboard;
public class GuiCommandBlock extends GuiScreen public class GuiCommandBlock extends GuiScreen
{ {
@ -32,7 +33,7 @@ public class GuiCommandBlock extends GuiScreen
*/ */
public void initGui() public void initGui()
{ {
Keyboard.enableRepeatEvents(true); EaglerAdapter.enableRepeatEvents(true);
this.buttonList.clear(); this.buttonList.clear();
this.buttonList.add(this.doneBtn = new GuiButton(0, this.width / 2 - 100, this.height / 4 + 96 + 12, StatCollector.translateToLocal("gui.done"))); this.buttonList.add(this.doneBtn = new GuiButton(0, this.width / 2 - 100, this.height / 4 + 96 + 12, StatCollector.translateToLocal("gui.done")));
this.buttonList.add(this.cancelBtn = new GuiButton(1, this.width / 2 - 100, this.height / 4 + 120 + 12, StatCollector.translateToLocal("gui.cancel"))); this.buttonList.add(this.cancelBtn = new GuiButton(1, this.width / 2 - 100, this.height / 4 + 120 + 12, StatCollector.translateToLocal("gui.cancel")));
@ -48,7 +49,7 @@ public class GuiCommandBlock extends GuiScreen
*/ */
public void onGuiClosed() public void onGuiClosed()
{ {
Keyboard.enableRepeatEvents(false); EaglerAdapter.enableRepeatEvents(false);
} }
/** /**

14
src/main/java/net/minecraft/src/GuiContainer.java
View File

@ -7,9 +7,7 @@ import java.util.List;
import java.util.Set; import java.util.Set;
import net.lax1dude.eaglercraft.TextureLocation; import net.lax1dude.eaglercraft.TextureLocation;
import org.lwjgl.input.Keyboard;
import net.lax1dude.eaglercraft.EaglerAdapter; import net.lax1dude.eaglercraft.EaglerAdapter;
import org.lwjgl.opengl.GL12;
public abstract class GuiContainer extends GuiScreen public abstract class GuiContainer extends GuiScreen
{ {
@ -93,7 +91,7 @@ public abstract class GuiContainer extends GuiScreen
int var4 = this.guiLeft; int var4 = this.guiLeft;
int var5 = this.guiTop; int var5 = this.guiTop;
this.drawGuiContainerBackgroundLayer(par3, par1, par2); this.drawGuiContainerBackgroundLayer(par3, par1, par2);
EaglerAdapter.glDisable(GL12.GL_RESCALE_NORMAL); EaglerAdapter.glDisable(EaglerAdapter.GL_RESCALE_NORMAL);
RenderHelper.disableStandardItemLighting(); RenderHelper.disableStandardItemLighting();
EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING);
EaglerAdapter.glDisable(EaglerAdapter.GL_DEPTH_TEST); EaglerAdapter.glDisable(EaglerAdapter.GL_DEPTH_TEST);
@ -102,7 +100,7 @@ public abstract class GuiContainer extends GuiScreen
EaglerAdapter.glPushMatrix(); EaglerAdapter.glPushMatrix();
EaglerAdapter.glTranslatef((float)var4, (float)var5, 0.0F); EaglerAdapter.glTranslatef((float)var4, (float)var5, 0.0F);
EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); EaglerAdapter.glEnable(EaglerAdapter.GL_RESCALE_NORMAL);
this.theSlot = null; this.theSlot = null;
short var6 = 240; short var6 = 240;
short var7 = 240; short var7 = 240;
@ -230,7 +228,7 @@ public abstract class GuiContainer extends GuiScreen
{ {
if (!par1List.isEmpty()) if (!par1List.isEmpty())
{ {
EaglerAdapter.glDisable(GL12.GL_RESCALE_NORMAL); EaglerAdapter.glDisable(EaglerAdapter.GL_RESCALE_NORMAL);
RenderHelper.disableStandardItemLighting(); RenderHelper.disableStandardItemLighting();
EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING);
EaglerAdapter.glDisable(EaglerAdapter.GL_DEPTH_TEST); EaglerAdapter.glDisable(EaglerAdapter.GL_DEPTH_TEST);
@ -300,7 +298,7 @@ public abstract class GuiContainer extends GuiScreen
EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING); EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING);
EaglerAdapter.glEnable(EaglerAdapter.GL_DEPTH_TEST); EaglerAdapter.glEnable(EaglerAdapter.GL_DEPTH_TEST);
RenderHelper.enableStandardItemLighting(); RenderHelper.enableStandardItemLighting();
EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); EaglerAdapter.glEnable(EaglerAdapter.GL_RESCALE_NORMAL);
} }
} }
@ -505,7 +503,7 @@ public abstract class GuiContainer extends GuiScreen
} }
else else
{ {
boolean var12 = var11 != -999 && (Keyboard.isKeyDown(42) || Keyboard.isKeyDown(54)); boolean var12 = var11 != -999 && (EaglerAdapter.isKeyDown(42) || EaglerAdapter.isKeyDown(54));
byte var13 = 0; byte var13 = 0;
if (var12) if (var12)
@ -731,7 +729,7 @@ public abstract class GuiContainer extends GuiScreen
} }
else else
{ {
var9 = var8 != -999 && (Keyboard.isKeyDown(42) || Keyboard.isKeyDown(54)); var9 = var8 != -999 && (EaglerAdapter.isKeyDown(42) || EaglerAdapter.isKeyDown(54));
if (var9) if (var9)
{ {

13
src/main/java/net/minecraft/src/GuiContainerCreative.java
View File

@ -6,10 +6,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import net.lax1dude.eaglercraft.TextureLocation; import net.lax1dude.eaglercraft.TextureLocation;
import org.lwjgl.input.Keyboard;
import org.lwjgl.input.Mouse;
import net.lax1dude.eaglercraft.EaglerAdapter; import net.lax1dude.eaglercraft.EaglerAdapter;
import org.lwjgl.opengl.GL12;
public class GuiContainerCreative extends InventoryEffectRenderer public class GuiContainerCreative extends InventoryEffectRenderer
{ {
@ -246,7 +243,7 @@ public class GuiContainerCreative extends InventoryEffectRenderer
{ {
super.initGui(); super.initGui();
this.buttonList.clear(); this.buttonList.clear();
Keyboard.enableRepeatEvents(true); EaglerAdapter.enableRepeatEvents(true);
this.searchField = new GuiTextField(this.fontRenderer, this.guiLeft + 82, this.guiTop + 6, 89, this.fontRenderer.FONT_HEIGHT); this.searchField = new GuiTextField(this.fontRenderer, this.guiLeft + 82, this.guiTop + 6, 89, this.fontRenderer.FONT_HEIGHT);
this.searchField.setMaxStringLength(15); this.searchField.setMaxStringLength(15);
this.searchField.setEnableBackgroundDrawing(false); this.searchField.setEnableBackgroundDrawing(false);
@ -276,7 +273,7 @@ public class GuiContainerCreative extends InventoryEffectRenderer
this.mc.thePlayer.inventoryContainer.removeCraftingFromCrafters(this.field_82324_x); this.mc.thePlayer.inventoryContainer.removeCraftingFromCrafters(this.field_82324_x);
} }
Keyboard.enableRepeatEvents(false); EaglerAdapter.enableRepeatEvents(false);
} }
/** /**
@ -555,7 +552,7 @@ public class GuiContainerCreative extends InventoryEffectRenderer
public void handleMouseInput() public void handleMouseInput()
{ {
super.handleMouseInput(); super.handleMouseInput();
int var1 = Mouse.getEventDWheel(); int var1 = EaglerAdapter.mouseGetEventDWheel();
if (var1 != 0 && this.needsScrollBars()) if (var1 != 0 && this.needsScrollBars())
{ {
@ -592,7 +589,7 @@ public class GuiContainerCreative extends InventoryEffectRenderer
*/ */
public void drawScreen(int par1, int par2, float par3) public void drawScreen(int par1, int par2, float par3)
{ {
boolean var4 = Mouse.isButtonDown(0); boolean var4 = EaglerAdapter.mouseIsButtonDown(0);
int var5 = this.guiLeft; int var5 = this.guiLeft;
int var6 = this.guiTop; int var6 = this.guiTop;
int var7 = var5 + 175; int var7 = var5 + 175;
@ -867,7 +864,7 @@ public class GuiContainerCreative extends InventoryEffectRenderer
var7 += 6; var7 += 6;
var8 += 8 + (var3 ? 1 : -1); var8 += 8 + (var3 ? 1 : -1);
EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING); EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING);
EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); EaglerAdapter.glEnable(EaglerAdapter.GL_RESCALE_NORMAL);
ItemStack var10 = new ItemStack(par1CreativeTabs.getTabIconItem()); ItemStack var10 = new ItemStack(par1CreativeTabs.getTabIconItem());
itemRenderer.renderItemAndEffectIntoGUI(this.fontRenderer, this.mc.getTextureManager(), var10, var7, var8); itemRenderer.renderItemAndEffectIntoGUI(this.fontRenderer, this.mc.getTextureManager(), var10, var7, var8);
itemRenderer.renderItemOverlayIntoGUI(this.fontRenderer, this.mc.getTextureManager(), var10, var7, var8); itemRenderer.renderItemOverlayIntoGUI(this.fontRenderer, this.mc.getTextureManager(), var10, var7, var8);

6
src/main/java/net/minecraft/src/GuiCreateFlatWorldListSlot.java
View File

@ -1,7 +1,7 @@
package net.minecraft.src; package net.minecraft.src;
import net.lax1dude.eaglercraft.EaglerAdapter; import net.lax1dude.eaglercraft.EaglerAdapter;
import org.lwjgl.opengl.GL12; import org.lwjgl.opengl.EaglerAdapter;
import net.lax1dude.eaglercraft.adapter.Tessellator; import net.lax1dude.eaglercraft.adapter.Tessellator;
class GuiCreateFlatWorldListSlot extends GuiSlot class GuiCreateFlatWorldListSlot extends GuiSlot
@ -20,7 +20,7 @@ class GuiCreateFlatWorldListSlot extends GuiSlot
private void func_82452_a(int par1, int par2, ItemStack par3ItemStack) private void func_82452_a(int par1, int par2, ItemStack par3ItemStack)
{ {
this.func_82451_d(par1 + 1, par2 + 1); this.func_82451_d(par1 + 1, par2 + 1);
EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); EaglerAdapter.glEnable(EaglerAdapter.GL_RESCALE_NORMAL);
if (par3ItemStack != null) if (par3ItemStack != null)
{ {
@ -29,7 +29,7 @@ class GuiCreateFlatWorldListSlot extends GuiSlot
RenderHelper.disableStandardItemLighting(); RenderHelper.disableStandardItemLighting();
} }
EaglerAdapter.glDisable(GL12.GL_RESCALE_NORMAL); EaglerAdapter.glDisable(EaglerAdapter.GL_RESCALE_NORMAL);
} }
private void func_82451_d(int par1, int par2) private void func_82451_d(int par1, int par2)

6
src/main/java/net/minecraft/src/GuiCreateWorld.java
View File

@ -1,7 +1,7 @@
package net.minecraft.src; package net.minecraft.src;
import net.lax1dude.eaglercraft.EaglerAdapter;
import net.lax1dude.eaglercraft.EaglercraftRandom; import net.lax1dude.eaglercraft.EaglercraftRandom;
import org.lwjgl.input.Keyboard;
public class GuiCreateWorld extends GuiScreen public class GuiCreateWorld extends GuiScreen
{ {
@ -91,7 +91,7 @@ public class GuiCreateWorld extends GuiScreen
*/ */
public void initGui() public void initGui()
{ {
Keyboard.enableRepeatEvents(true); EaglerAdapter.enableRepeatEvents(true);
this.buttonList.clear(); this.buttonList.clear();
this.buttonList.add(new GuiButton(0, this.width / 2 - 155, this.height - 28, 150, 20, StatCollector.translateToLocal("selectWorld.create"))); this.buttonList.add(new GuiButton(0, this.width / 2 - 155, this.height - 28, 150, 20, StatCollector.translateToLocal("selectWorld.create")));
this.buttonList.add(new GuiButton(1, this.width / 2 + 5, this.height - 28, 150, 20, StatCollector.translateToLocal("gui.cancel"))); this.buttonList.add(new GuiButton(1, this.width / 2 + 5, this.height - 28, 150, 20, StatCollector.translateToLocal("gui.cancel")));
@ -225,7 +225,7 @@ public class GuiCreateWorld extends GuiScreen
*/ */
public void onGuiClosed() public void onGuiClosed()
{ {
Keyboard.enableRepeatEvents(false); EaglerAdapter.enableRepeatEvents(false);
} }
/** /**

5
src/main/java/net/minecraft/src/GuiEditSign.java
View File

@ -1,6 +1,5 @@
package net.minecraft.src; package net.minecraft.src;
import org.lwjgl.input.Keyboard;
import net.lax1dude.eaglercraft.EaglerAdapter; import net.lax1dude.eaglercraft.EaglerAdapter;
public class GuiEditSign extends GuiScreen public class GuiEditSign extends GuiScreen
@ -36,7 +35,7 @@ public class GuiEditSign extends GuiScreen
public void initGui() public void initGui()
{ {
this.buttonList.clear(); this.buttonList.clear();
Keyboard.enableRepeatEvents(true); EaglerAdapter.enableRepeatEvents(true);
this.buttonList.add(this.doneBtn = new GuiButton(0, this.width / 2 - 100, this.height / 4 + 120, "Done")); this.buttonList.add(this.doneBtn = new GuiButton(0, this.width / 2 - 100, this.height / 4 + 120, "Done"));
this.entitySign.setEditable(false); this.entitySign.setEditable(false);
} }
@ -46,7 +45,7 @@ public class GuiEditSign extends GuiScreen
*/ */
public void onGuiClosed() public void onGuiClosed()
{ {
Keyboard.enableRepeatEvents(false); EaglerAdapter.enableRepeatEvents(false);
NetClientHandler var1 = this.mc.getNetHandler(); NetClientHandler var1 = this.mc.getNetHandler();
if (var1 != null) if (var1 != null)

8
src/main/java/net/minecraft/src/GuiEnchantment.java
View File

@ -4,8 +4,6 @@ import net.lax1dude.eaglercraft.EaglercraftRandom;
import net.lax1dude.eaglercraft.TextureLocation; import net.lax1dude.eaglercraft.TextureLocation;
import net.lax1dude.eaglercraft.EaglerAdapter; import net.lax1dude.eaglercraft.EaglerAdapter;
import org.lwjgl.opengl.GL12;
import org.lwjgl.util.glu.Project;
public class GuiEnchantment extends GuiContainer public class GuiEnchantment extends GuiContainer
{ {
@ -91,7 +89,7 @@ public class GuiEnchantment extends GuiContainer
ScaledResolution var6 = new ScaledResolution(this.mc.gameSettings, this.mc.displayWidth, this.mc.displayHeight); ScaledResolution var6 = new ScaledResolution(this.mc.gameSettings, this.mc.displayWidth, this.mc.displayHeight);
EaglerAdapter.glViewport((var6.getScaledWidth() - 320) / 2 * var6.getScaleFactor(), (var6.getScaledHeight() - 240) / 2 * var6.getScaleFactor(), 320 * var6.getScaleFactor(), 240 * var6.getScaleFactor()); EaglerAdapter.glViewport((var6.getScaledWidth() - 320) / 2 * var6.getScaleFactor(), (var6.getScaledHeight() - 240) / 2 * var6.getScaleFactor(), 320 * var6.getScaleFactor(), 240 * var6.getScaleFactor());
EaglerAdapter.glTranslatef(-0.34F, 0.23F, 0.0F); EaglerAdapter.glTranslatef(-0.34F, 0.23F, 0.0F);
Project.gluPerspective(90.0F, 1.3333334F, 9.0F, 80.0F); EaglerAdapter.gluPerspective(90.0F, 1.3333334F, 9.0F, 80.0F);
float var7 = 1.0F; float var7 = 1.0F;
EaglerAdapter.glMatrixMode(EaglerAdapter.GL_MODELVIEW); EaglerAdapter.glMatrixMode(EaglerAdapter.GL_MODELVIEW);
EaglerAdapter.glLoadIdentity(); EaglerAdapter.glLoadIdentity();
@ -132,9 +130,9 @@ public class GuiEnchantment extends GuiContainer
var11 = 1.0F; var11 = 1.0F;
} }
EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); EaglerAdapter.glEnable(EaglerAdapter.GL_RESCALE_NORMAL);
bookModel.render((Entity)null, 0.0F, var10, var11, var9, 0.0F, 0.0625F); bookModel.render((Entity)null, 0.0F, var10, var11, var9, 0.0F, 0.0625F);
EaglerAdapter.glDisable(GL12.GL_RESCALE_NORMAL); EaglerAdapter.glDisable(EaglerAdapter.GL_RESCALE_NORMAL);
RenderHelper.disableStandardItemLighting(); RenderHelper.disableStandardItemLighting();
EaglerAdapter.glMatrixMode(EaglerAdapter.GL_PROJECTION); EaglerAdapter.glMatrixMode(EaglerAdapter.GL_PROJECTION);
EaglerAdapter.glViewport(0, 0, this.mc.displayWidth, this.mc.displayHeight); EaglerAdapter.glViewport(0, 0, this.mc.displayWidth, this.mc.displayHeight);

7
src/main/java/net/minecraft/src/GuiFlatPresets.java
View File

@ -1,11 +1,12 @@
package net.minecraft.src; package net.minecraft.src;
import net.lax1dude.eaglercraft.EaglerAdapter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import org.lwjgl.input.Keyboard;
public class GuiFlatPresets extends GuiScreen public class GuiFlatPresets extends GuiScreen
{ {
@ -33,7 +34,7 @@ public class GuiFlatPresets extends GuiScreen
public void initGui() public void initGui()
{ {
this.buttonList.clear(); this.buttonList.clear();
Keyboard.enableRepeatEvents(true); EaglerAdapter.enableRepeatEvents(true);
this.field_82300_d = StatCollector.translateToLocal("createWorld.customize.presets.title"); this.field_82300_d = StatCollector.translateToLocal("createWorld.customize.presets.title");
this.field_82308_m = StatCollector.translateToLocal("createWorld.customize.presets.share"); this.field_82308_m = StatCollector.translateToLocal("createWorld.customize.presets.share");
this.field_82306_n = StatCollector.translateToLocal("createWorld.customize.presets.list"); this.field_82306_n = StatCollector.translateToLocal("createWorld.customize.presets.list");
@ -51,7 +52,7 @@ public class GuiFlatPresets extends GuiScreen
*/ */
public void onGuiClosed() public void onGuiClosed()
{ {
Keyboard.enableRepeatEvents(false); EaglerAdapter.enableRepeatEvents(false);
} }
/** /**

6
src/main/java/net/minecraft/src/GuiFlatPresetsListSlot.java
View File

@ -1,7 +1,7 @@
package net.minecraft.src; package net.minecraft.src;
import net.lax1dude.eaglercraft.EaglerAdapter; import net.lax1dude.eaglercraft.EaglerAdapter;
import org.lwjgl.opengl.GL12; import org.lwjgl.opengl.EaglerAdapter;
import net.lax1dude.eaglercraft.adapter.Tessellator; import net.lax1dude.eaglercraft.adapter.Tessellator;
class GuiFlatPresetsListSlot extends GuiSlot class GuiFlatPresetsListSlot extends GuiSlot
@ -20,11 +20,11 @@ class GuiFlatPresetsListSlot extends GuiSlot
private void func_82457_a(int par1, int par2, int par3) private void func_82457_a(int par1, int par2, int par3)
{ {
this.func_82456_d(par1 + 1, par2 + 1); this.func_82456_d(par1 + 1, par2 + 1);
EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); EaglerAdapter.glEnable(EaglerAdapter.GL_RESCALE_NORMAL);
RenderHelper.enableGUIStandardItemLighting(); RenderHelper.enableGUIStandardItemLighting();
GuiFlatPresets.getPresetIconRenderer().renderItemIntoGUI(this.flatPresetsGui.fontRenderer, this.flatPresetsGui.mc.getTextureManager(), new ItemStack(par3, 1, 0), par1 + 2, par2 + 2); GuiFlatPresets.getPresetIconRenderer().renderItemIntoGUI(this.flatPresetsGui.fontRenderer, this.flatPresetsGui.mc.getTextureManager(), new ItemStack(par3, 1, 0), par1 + 2, par2 + 2);
RenderHelper.disableStandardItemLighting(); RenderHelper.disableStandardItemLighting();
EaglerAdapter.glDisable(GL12.GL_RESCALE_NORMAL); EaglerAdapter.glDisable(EaglerAdapter.GL_RESCALE_NORMAL);
} }
private void func_82456_d(int par1, int par2) private void func_82456_d(int par1, int par2)

6
src/main/java/net/minecraft/src/GuiIngame.java
View File

@ -9,7 +9,7 @@ import net.lax1dude.eaglercraft.EaglercraftRandom;
import net.lax1dude.eaglercraft.TextureLocation; import net.lax1dude.eaglercraft.TextureLocation;
import net.lax1dude.eaglercraft.adapter.Tessellator; import net.lax1dude.eaglercraft.adapter.Tessellator;
import net.lax1dude.eaglercraft.EaglerAdapter; import net.lax1dude.eaglercraft.EaglerAdapter;
import org.lwjgl.opengl.GL12; import org.lwjgl.opengl.EaglerAdapter;
public class GuiIngame extends Gui public class GuiIngame extends Gui
{ {
@ -112,7 +112,7 @@ public class GuiIngame extends Gui
EaglerAdapter.glDisable(EaglerAdapter.GL_BLEND); EaglerAdapter.glDisable(EaglerAdapter.GL_BLEND);
this.mc.mcProfiler.startSection("actionBar"); this.mc.mcProfiler.startSection("actionBar");
EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); EaglerAdapter.glEnable(EaglerAdapter.GL_RESCALE_NORMAL);
RenderHelper.enableGUIStandardItemLighting(); RenderHelper.enableGUIStandardItemLighting();
for (var11 = 0; var11 < 9; ++var11) for (var11 = 0; var11 < 9; ++var11)
@ -123,7 +123,7 @@ public class GuiIngame extends Gui
} }
RenderHelper.disableStandardItemLighting(); RenderHelper.disableStandardItemLighting();
EaglerAdapter.glDisable(GL12.GL_RESCALE_NORMAL); EaglerAdapter.glDisable(EaglerAdapter.GL_RESCALE_NORMAL);
this.mc.mcProfiler.endSection(); this.mc.mcProfiler.endSection();
} }

3
src/main/java/net/minecraft/src/GuiInventory.java
View File

@ -1,7 +1,6 @@
package net.minecraft.src; package net.minecraft.src;
import net.lax1dude.eaglercraft.EaglerAdapter; import net.lax1dude.eaglercraft.EaglerAdapter;
import org.lwjgl.opengl.GL12;
public class GuiInventory extends InventoryEffectRenderer public class GuiInventory extends InventoryEffectRenderer
{ {
@ -112,7 +111,7 @@ public class GuiInventory extends InventoryEffectRenderer
par5EntityLivingBase.rotationYawHead = var10; par5EntityLivingBase.rotationYawHead = var10;
EaglerAdapter.glPopMatrix(); EaglerAdapter.glPopMatrix();
RenderHelper.disableStandardItemLighting(); RenderHelper.disableStandardItemLighting();
EaglerAdapter.glDisable(GL12.GL_RESCALE_NORMAL); EaglerAdapter.glDisable(EaglerAdapter.GL_RESCALE_NORMAL);
OpenGlHelper.setActiveTexture(OpenGlHelper.lightmapTexUnit); OpenGlHelper.setActiveTexture(OpenGlHelper.lightmapTexUnit);
EaglerAdapter.glDisable(EaglerAdapter.GL_TEXTURE_2D); EaglerAdapter.glDisable(EaglerAdapter.GL_TEXTURE_2D);
OpenGlHelper.setActiveTexture(OpenGlHelper.defaultTexUnit); OpenGlHelper.setActiveTexture(OpenGlHelper.defaultTexUnit);

4
src/main/java/net/minecraft/src/GuiMerchant.java
View File

@ -5,7 +5,7 @@ import java.io.DataOutputStream;
import net.lax1dude.eaglercraft.TextureLocation; import net.lax1dude.eaglercraft.TextureLocation;
import net.lax1dude.eaglercraft.EaglerAdapter; import net.lax1dude.eaglercraft.EaglerAdapter;
import org.lwjgl.opengl.GL12; import org.lwjgl.opengl.EaglerAdapter;
public class GuiMerchant extends GuiContainer public class GuiMerchant extends GuiContainer
{ {
@ -147,7 +147,7 @@ public class GuiMerchant extends GuiContainer
ItemStack var11 = var8.getItemToSell(); ItemStack var11 = var8.getItemToSell();
RenderHelper.enableGUIStandardItemLighting(); RenderHelper.enableGUIStandardItemLighting();
EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING);
EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); EaglerAdapter.glEnable(EaglerAdapter.GL_RESCALE_NORMAL);
EaglerAdapter.glEnable(EaglerAdapter.GL_COLOR_MATERIAL); EaglerAdapter.glEnable(EaglerAdapter.GL_COLOR_MATERIAL);
EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING); EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING);
itemRenderer.zLevel = 100.0F; itemRenderer.zLevel = 100.0F;

6
src/main/java/net/minecraft/src/GuiRenameWorld.java
View File

@ -1,6 +1,6 @@
package net.minecraft.src; package net.minecraft.src;
import org.lwjgl.input.Keyboard; import net.lax1dude.eaglercraft.EaglerAdapter;
public class GuiRenameWorld extends GuiScreen public class GuiRenameWorld extends GuiScreen
{ {
@ -27,7 +27,7 @@ public class GuiRenameWorld extends GuiScreen
*/ */
public void initGui() public void initGui()
{ {
Keyboard.enableRepeatEvents(true); EaglerAdapter.enableRepeatEvents(true);
this.buttonList.clear(); this.buttonList.clear();
this.buttonList.add(new GuiButton(0, this.width / 2 - 100, this.height / 4 + 96 + 12, StatCollector.translateToLocal("selectWorld.renameButton"))); this.buttonList.add(new GuiButton(0, this.width / 2 - 100, this.height / 4 + 96 + 12, StatCollector.translateToLocal("selectWorld.renameButton")));
this.buttonList.add(new GuiButton(1, this.width / 2 - 100, this.height / 4 + 120 + 12, StatCollector.translateToLocal("gui.cancel"))); this.buttonList.add(new GuiButton(1, this.width / 2 - 100, this.height / 4 + 120 + 12, StatCollector.translateToLocal("gui.cancel")));
@ -44,7 +44,7 @@ public class GuiRenameWorld extends GuiScreen
*/ */
public void onGuiClosed() public void onGuiClosed()
{ {
Keyboard.enableRepeatEvents(false); EaglerAdapter.enableRepeatEvents(false);
} }
/** /**

5
src/main/java/net/minecraft/src/GuiRepair.java
View File

@ -3,7 +3,6 @@ package net.minecraft.src;
import java.util.List; import java.util.List;
import net.lax1dude.eaglercraft.TextureLocation; import net.lax1dude.eaglercraft.TextureLocation;
import org.lwjgl.input.Keyboard;
import net.lax1dude.eaglercraft.EaglerAdapter; import net.lax1dude.eaglercraft.EaglerAdapter;
public class GuiRepair extends GuiContainer implements ICrafting public class GuiRepair extends GuiContainer implements ICrafting
@ -26,7 +25,7 @@ public class GuiRepair extends GuiContainer implements ICrafting
public void initGui() public void initGui()
{ {
super.initGui(); super.initGui();
Keyboard.enableRepeatEvents(true); EaglerAdapter.enableRepeatEvents(true);
int var1 = (this.width - this.xSize) / 2; int var1 = (this.width - this.xSize) / 2;
int var2 = (this.height - this.ySize) / 2; int var2 = (this.height - this.ySize) / 2;
this.itemNameField = new GuiTextField(this.fontRenderer, var1 + 62, var2 + 24, 103, 12); this.itemNameField = new GuiTextField(this.fontRenderer, var1 + 62, var2 + 24, 103, 12);
@ -44,7 +43,7 @@ public class GuiRepair extends GuiContainer implements ICrafting
public void onGuiClosed() public void onGuiClosed()
{ {
super.onGuiClosed(); super.onGuiClosed();
Keyboard.enableRepeatEvents(false); EaglerAdapter.enableRepeatEvents(false);
this.inventorySlots.removeCraftingFromCrafters(this); this.inventorySlots.removeCraftingFromCrafters(this);
} }

6
src/main/java/net/minecraft/src/GuiScreenAddServer.java
View File

@ -1,6 +1,6 @@
package net.minecraft.src; package net.minecraft.src;
import org.lwjgl.input.Keyboard; import net.lax1dude.eaglercraft.EaglerAdapter;
public class GuiScreenAddServer extends GuiScreen public class GuiScreenAddServer extends GuiScreen
{ {
@ -32,7 +32,7 @@ public class GuiScreenAddServer extends GuiScreen
*/ */
public void initGui() public void initGui()
{ {
Keyboard.enableRepeatEvents(true); EaglerAdapter.enableRepeatEvents(true);
this.buttonList.clear(); this.buttonList.clear();
this.buttonList.add(new GuiButton(0, this.width / 2 - 100, this.height / 4 + 96 + 12, StatCollector.translateToLocal("addServer.add"))); this.buttonList.add(new GuiButton(0, this.width / 2 - 100, this.height / 4 + 96 + 12, StatCollector.translateToLocal("addServer.add")));
this.buttonList.add(new GuiButton(1, this.width / 2 - 100, this.height / 4 + 120 + 12, StatCollector.translateToLocal("gui.cancel"))); this.buttonList.add(new GuiButton(1, this.width / 2 - 100, this.height / 4 + 120 + 12, StatCollector.translateToLocal("gui.cancel")));
@ -51,7 +51,7 @@ public class GuiScreenAddServer extends GuiScreen
*/ */
public void onGuiClosed() public void onGuiClosed()
{ {
Keyboard.enableRepeatEvents(false); EaglerAdapter.enableRepeatEvents(false);
} }
/** /**

5
src/main/java/net/minecraft/src/GuiScreenBook.java
View File

@ -4,7 +4,6 @@ import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream; import java.io.DataOutputStream;
import net.lax1dude.eaglercraft.TextureLocation; import net.lax1dude.eaglercraft.TextureLocation;
import org.lwjgl.input.Keyboard;
import net.lax1dude.eaglercraft.EaglerAdapter; import net.lax1dude.eaglercraft.EaglerAdapter;
public class GuiScreenBook extends GuiScreen public class GuiScreenBook extends GuiScreen
@ -83,7 +82,7 @@ public class GuiScreenBook extends GuiScreen
public void initGui() public void initGui()
{ {
this.buttonList.clear(); this.buttonList.clear();
Keyboard.enableRepeatEvents(true); EaglerAdapter.enableRepeatEvents(true);
if (this.bookIsUnsigned) if (this.bookIsUnsigned)
{ {
@ -109,7 +108,7 @@ public class GuiScreenBook extends GuiScreen
*/ */
public void onGuiClosed() public void onGuiClosed()
{ {
Keyboard.enableRepeatEvents(false); EaglerAdapter.enableRepeatEvents(false);
} }
private void updateButtons() private void updateButtons()

7
src/main/java/net/minecraft/src/GuiScreenSelectLocation.java
View File

@ -1,7 +1,6 @@
package net.minecraft.src; package net.minecraft.src;
import net.lax1dude.eaglercraft.adapter.Tessellator; import net.lax1dude.eaglercraft.adapter.Tessellator;
import org.lwjgl.input.Mouse;
import net.lax1dude.eaglercraft.EaglerAdapter; import net.lax1dude.eaglercraft.EaglerAdapter;
public abstract class GuiScreenSelectLocation public abstract class GuiScreenSelectLocation
@ -145,7 +144,7 @@ public abstract class GuiScreenSelectLocation
int var13; int var13;
int var20; int var20;
if (Mouse.isButtonDown(0)) if (EaglerAdapter.mouseIsButtonDown(0))
{ {
if (this.field_104102_m == -1.0F) if (this.field_104102_m == -1.0F)
{ {
@ -222,9 +221,9 @@ public abstract class GuiScreenSelectLocation
} }
else else
{ {
while (!this.field_104092_f.gameSettings.touchscreen && Mouse.next()) while (!this.field_104092_f.gameSettings.touchscreen && EaglerAdapter.mouseNext())
{ {
int var16 = Mouse.getEventDWheel(); int var16 = EaglerAdapter.mouseGetEventDWheel();
if (var16 != 0) if (var16 != 0)
{ {

4
src/main/java/net/minecraft/src/GuiSlotStats.java
View File

@ -4,8 +4,8 @@ import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import net.lax1dude.eaglercraft.EaglerAdapter;
import net.lax1dude.eaglercraft.adapter.Tessellator; import net.lax1dude.eaglercraft.adapter.Tessellator;
import org.lwjgl.input.Mouse;
abstract class GuiSlotStats extends GuiSlot abstract class GuiSlotStats extends GuiSlot
{ {
@ -47,7 +47,7 @@ abstract class GuiSlotStats extends GuiSlot
protected void func_77222_a(int par1, int par2, Tessellator par3Tessellator) protected void func_77222_a(int par1, int par2, Tessellator par3Tessellator)
{ {
if (!Mouse.isButtonDown(0)) if (!EaglerAdapter.mouseIsButtonDown(0))
{ {
this.field_77262_g = -1; this.field_77262_g = -1;
} }

6
src/main/java/net/minecraft/src/GuiStats.java
View File

@ -2,7 +2,7 @@ package net.minecraft.src;
import net.lax1dude.eaglercraft.adapter.Tessellator; import net.lax1dude.eaglercraft.adapter.Tessellator;
import net.lax1dude.eaglercraft.EaglerAdapter; import net.lax1dude.eaglercraft.EaglerAdapter;
import org.lwjgl.opengl.GL12; import org.lwjgl.opengl.EaglerAdapter;
public class GuiStats extends GuiScreen public class GuiStats extends GuiScreen
{ {
@ -116,11 +116,11 @@ public class GuiStats extends GuiScreen
private void drawItemSprite(int par1, int par2, int par3) private void drawItemSprite(int par1, int par2, int par3)
{ {
this.drawButtonBackground(par1 + 1, par2 + 1); this.drawButtonBackground(par1 + 1, par2 + 1);
EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); EaglerAdapter.glEnable(EaglerAdapter.GL_RESCALE_NORMAL);
RenderHelper.enableGUIStandardItemLighting(); RenderHelper.enableGUIStandardItemLighting();
renderItem.renderItemIntoGUI(this.fontRenderer, this.mc.getTextureManager(), new ItemStack(par3, 1, 0), par1 + 2, par2 + 2); renderItem.renderItemIntoGUI(this.fontRenderer, this.mc.getTextureManager(), new ItemStack(par3, 1, 0), par1 + 2, par2 + 2);
RenderHelper.disableStandardItemLighting(); RenderHelper.disableStandardItemLighting();
EaglerAdapter.glDisable(GL12.GL_RESCALE_NORMAL); EaglerAdapter.glDisable(EaglerAdapter.GL_RESCALE_NORMAL);
} }
/** /**

14
src/main/java/net/minecraft/src/ItemRenderer.java
View File

@ -4,7 +4,7 @@ import net.lax1dude.eaglercraft.EaglerAdapter;
import net.lax1dude.eaglercraft.TextureLocation; import net.lax1dude.eaglercraft.TextureLocation;
import net.lax1dude.eaglercraft.adapter.Tessellator; import net.lax1dude.eaglercraft.adapter.Tessellator;
import net.lax1dude.eaglercraft.EaglerAdapter; import net.lax1dude.eaglercraft.EaglerAdapter;
import org.lwjgl.opengl.GL12; import org.lwjgl.opengl.EaglerAdapter;
public class ItemRenderer public class ItemRenderer
{ {
@ -76,7 +76,7 @@ public class ItemRenderer
float var10 = var5.getMaxV(); float var10 = var5.getMaxV();
float var11 = 0.0F; float var11 = 0.0F;
float var12 = 0.3F; float var12 = 0.3F;
EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); EaglerAdapter.glEnable(EaglerAdapter.GL_RESCALE_NORMAL);
EaglerAdapter.glTranslatef(-var11, -var12, 0.0F); EaglerAdapter.glTranslatef(-var11, -var12, 0.0F);
float var13 = 1.5F; float var13 = 1.5F;
EaglerAdapter.glScalef(var13, var13, var13); EaglerAdapter.glScalef(var13, var13, var13);
@ -116,7 +116,7 @@ public class ItemRenderer
EaglerAdapter.glDepthFunc(EaglerAdapter.GL_LEQUAL); EaglerAdapter.glDepthFunc(EaglerAdapter.GL_LEQUAL);
} }
EaglerAdapter.glDisable(GL12.GL_RESCALE_NORMAL); EaglerAdapter.glDisable(EaglerAdapter.GL_RESCALE_NORMAL);
} }
EaglerAdapter.glPopMatrix(); EaglerAdapter.glPopMatrix();
@ -281,7 +281,7 @@ public class ItemRenderer
EaglerAdapter.glTranslatef(0.0F, 0.0F * var20 - (1.0F - var2) * 1.2F - var21 * 0.5F + 0.04F, -0.9F * var20); EaglerAdapter.glTranslatef(0.0F, 0.0F * var20 - (1.0F - var2) * 1.2F - var21 * 0.5F + 0.04F, -0.9F * var20);
EaglerAdapter.glRotatef(90.0F, 0.0F, 1.0F, 0.0F); EaglerAdapter.glRotatef(90.0F, 0.0F, 1.0F, 0.0F);
EaglerAdapter.glRotatef(var21 * -85.0F, 0.0F, 0.0F, 1.0F); EaglerAdapter.glRotatef(var21 * -85.0F, 0.0F, 0.0F, 1.0F);
EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); EaglerAdapter.glEnable(EaglerAdapter.GL_RESCALE_NORMAL);
var28.bindTexture(var3); var28.bindTexture(var3);
for (var12 = 0; var12 < 2; ++var12) for (var12 = 0; var12 < 2; ++var12)
@ -368,7 +368,7 @@ public class ItemRenderer
EaglerAdapter.glTranslatef(0.7F * var20, -0.65F * var20 - (1.0F - var2) * 0.6F, -0.9F * var20); EaglerAdapter.glTranslatef(0.7F * var20, -0.65F * var20 - (1.0F - var2) * 0.6F, -0.9F * var20);
EaglerAdapter.glRotatef(45.0F, 0.0F, 1.0F, 0.0F); EaglerAdapter.glRotatef(45.0F, 0.0F, 1.0F, 0.0F);
EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); EaglerAdapter.glEnable(EaglerAdapter.GL_RESCALE_NORMAL);
var21 = var3.getSwingProgress(par1); var21 = var3.getSwingProgress(par1);
var23 = MathHelper.sin(var21 * var21 * (float)Math.PI); var23 = MathHelper.sin(var21 * var21 * (float)Math.PI);
var13 = MathHelper.sin(MathHelper.sqrt_float(var21) * (float)Math.PI); var13 = MathHelper.sin(MathHelper.sqrt_float(var21) * (float)Math.PI);
@ -455,7 +455,7 @@ public class ItemRenderer
EaglerAdapter.glTranslatef(-var13 * 0.3F, MathHelper.sin(MathHelper.sqrt_float(var21) * (float)Math.PI * 2.0F) * 0.4F, -var23 * 0.4F); EaglerAdapter.glTranslatef(-var13 * 0.3F, MathHelper.sin(MathHelper.sqrt_float(var21) * (float)Math.PI * 2.0F) * 0.4F, -var23 * 0.4F);
EaglerAdapter.glTranslatef(0.8F * var20, -0.75F * var20 - (1.0F - var2) * 0.6F, -0.9F * var20); EaglerAdapter.glTranslatef(0.8F * var20, -0.75F * var20 - (1.0F - var2) * 0.6F, -0.9F * var20);
EaglerAdapter.glRotatef(45.0F, 0.0F, 1.0F, 0.0F); EaglerAdapter.glRotatef(45.0F, 0.0F, 1.0F, 0.0F);
EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); EaglerAdapter.glEnable(EaglerAdapter.GL_RESCALE_NORMAL);
var21 = var3.getSwingProgress(par1); var21 = var3.getSwingProgress(par1);
var23 = MathHelper.sin(var21 * var21 * (float)Math.PI); var23 = MathHelper.sin(var21 * var21 * (float)Math.PI);
var13 = MathHelper.sin(MathHelper.sqrt_float(var21) * (float)Math.PI); var13 = MathHelper.sin(MathHelper.sqrt_float(var21) * (float)Math.PI);
@ -476,7 +476,7 @@ public class ItemRenderer
EaglerAdapter.glPopMatrix(); EaglerAdapter.glPopMatrix();
} }
EaglerAdapter.glDisable(GL12.GL_RESCALE_NORMAL); EaglerAdapter.glDisable(EaglerAdapter.GL_RESCALE_NORMAL);
RenderHelper.disableStandardItemLighting(); RenderHelper.disableStandardItemLighting();
} }

3
src/main/java/net/minecraft/src/LoadingScreenRenderer.java
View File

@ -1,7 +1,6 @@
package net.minecraft.src; package net.minecraft.src;
import net.lax1dude.eaglercraft.adapter.Tessellator; import net.lax1dude.eaglercraft.adapter.Tessellator;
import org.lwjgl.opengl.Display;
import net.lax1dude.eaglercraft.EaglerAdapter; import net.lax1dude.eaglercraft.EaglerAdapter;
public class LoadingScreenRenderer implements IProgressUpdate public class LoadingScreenRenderer implements IProgressUpdate
@ -152,7 +151,7 @@ public class LoadingScreenRenderer implements IProgressUpdate
this.mc.fontRenderer.drawStringWithShadow(this.currentlyDisplayedText, (var5 - this.mc.fontRenderer.getStringWidth(this.currentlyDisplayedText)) / 2, var6 / 2 - 4 - 16, 16777215); this.mc.fontRenderer.drawStringWithShadow(this.currentlyDisplayedText, (var5 - this.mc.fontRenderer.getStringWidth(this.currentlyDisplayedText)) / 2, var6 / 2 - 4 - 16, 16777215);
this.mc.fontRenderer.drawStringWithShadow(this.field_73727_a, (var5 - this.mc.fontRenderer.getStringWidth(this.field_73727_a)) / 2, var6 / 2 - 4 + 8, 16777215); this.mc.fontRenderer.drawStringWithShadow(this.field_73727_a, (var5 - this.mc.fontRenderer.getStringWidth(this.field_73727_a)) / 2, var6 / 2 - 4 + 8, 16777215);
Display.update(); this.mc.updateDisplay();
try try
{ {

17
src/main/java/net/minecraft/src/MouseHelper.java
View File

@ -1,7 +1,6 @@
package net.minecraft.src; package net.minecraft.src;
import org.lwjgl.input.Mouse; import net.lax1dude.eaglercraft.EaglerAdapter;
import org.lwjgl.opengl.Display;
public class MouseHelper public class MouseHelper
{ {
@ -16,7 +15,11 @@ public class MouseHelper
*/ */
public void grabMouseCursor() public void grabMouseCursor()
{ {
Mouse.setGrabbed(true); int var1 = Minecraft.getMinecraft().displayWidth;
int var2 = Minecraft.getMinecraft().displayHeight;
EaglerAdapter.mouseSetCursorPosition(var1 / 2, var2 / 2);
EaglerAdapter.mouseSetGrabbed(true);
this.deltaX = 0; this.deltaX = 0;
this.deltaY = 0; this.deltaY = 0;
} }
@ -26,13 +29,13 @@ public class MouseHelper
*/ */
public void ungrabMouseCursor() public void ungrabMouseCursor()
{ {
Mouse.setCursorPosition(Display.getWidth() / 2, Display.getHeight() / 2); //EaglerAdapter.mouseSetCursorPosition(Display.getWidth() / 2, Display.getHeight() / 2);
Mouse.setGrabbed(false); EaglerAdapter.mouseSetGrabbed(false);
} }
public void mouseXYChange() public void mouseXYChange()
{ {
this.deltaX = Mouse.getDX(); this.deltaX = EaglerAdapter.mouseGetDX();
this.deltaY = Mouse.getDY(); this.deltaY = EaglerAdapter.mouseGetDY();
} }
} }

14
src/main/java/net/minecraft/src/OpenGlCapsChecker.java
View File

@ -1,14 +0,0 @@
package net.minecraft.src;
import org.lwjgl.opengl.GLContext;
public class OpenGlCapsChecker
{
/**
* Checks if we support OpenGL occlusion.
*/
public static boolean checkARBOcclusion()
{
return GLContext.getCapabilities().GL_ARB_occlusion_query;
}
}

5
src/main/java/net/minecraft/src/RenderArrow.java
View File

@ -3,7 +3,6 @@ package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation; import net.lax1dude.eaglercraft.TextureLocation;
import net.lax1dude.eaglercraft.adapter.Tessellator; import net.lax1dude.eaglercraft.adapter.Tessellator;
import net.lax1dude.eaglercraft.EaglerAdapter; import net.lax1dude.eaglercraft.EaglerAdapter;
import org.lwjgl.opengl.GL12;
public class RenderArrow extends Render public class RenderArrow extends Render
{ {
@ -27,7 +26,7 @@ public class RenderArrow extends Render
float var18 = (float)(5 + var11 * 10) / 32.0F; float var18 = (float)(5 + var11 * 10) / 32.0F;
float var19 = (float)(10 + var11 * 10) / 32.0F; float var19 = (float)(10 + var11 * 10) / 32.0F;
float var20 = 0.05625F; float var20 = 0.05625F;
EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); EaglerAdapter.glEnable(EaglerAdapter.GL_RESCALE_NORMAL);
float var21 = (float)par1EntityArrow.arrowShake - par9; float var21 = (float)par1EntityArrow.arrowShake - par9;
if (var21 > 0.0F) if (var21 > 0.0F)
@ -66,7 +65,7 @@ public class RenderArrow extends Render
var10.draw(); var10.draw();
} }
EaglerAdapter.glDisable(GL12.GL_RESCALE_NORMAL); EaglerAdapter.glDisable(EaglerAdapter.GL_RESCALE_NORMAL);
EaglerAdapter.glPopMatrix(); EaglerAdapter.glPopMatrix();
} }

4
src/main/java/net/minecraft/src/RenderBlocks.java
View File

@ -2,7 +2,7 @@ package net.minecraft.src;
import net.lax1dude.eaglercraft.adapter.Tessellator; import net.lax1dude.eaglercraft.adapter.Tessellator;
import net.lax1dude.eaglercraft.EaglerAdapter; import net.lax1dude.eaglercraft.EaglerAdapter;
import org.lwjgl.opengl.GL12; import org.lwjgl.opengl.EaglerAdapter;
public class RenderBlocks public class RenderBlocks
{ {
@ -7668,7 +7668,7 @@ public class RenderBlocks
EaglerAdapter.glRotatef(90.0F, 0.0F, 1.0F, 0.0F); EaglerAdapter.glRotatef(90.0F, 0.0F, 1.0F, 0.0F);
EaglerAdapter.glTranslatef(-0.5F, -0.5F, -0.5F); EaglerAdapter.glTranslatef(-0.5F, -0.5F, -0.5F);
ChestItemRenderHelper.instance.renderChest(par1Block, par2, par3); ChestItemRenderHelper.instance.renderChest(par1Block, par2, par3);
EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); EaglerAdapter.glEnable(EaglerAdapter.GL_RESCALE_NORMAL);
} }
else if (var6 == 6) else if (var6 == 6)
{ {

7
src/main/java/net/minecraft/src/RenderEnderman.java
View File

@ -2,7 +2,6 @@ package net.minecraft.src;
import net.lax1dude.eaglercraft.EaglercraftRandom; import net.lax1dude.eaglercraft.EaglercraftRandom;
import net.lax1dude.eaglercraft.EaglerAdapter; import net.lax1dude.eaglercraft.EaglerAdapter;
import org.lwjgl.opengl.GL12;
import net.lax1dude.eaglercraft.TextureLocation; import net.lax1dude.eaglercraft.TextureLocation;
public class RenderEnderman extends RenderLiving public class RenderEnderman extends RenderLiving
@ -55,7 +54,7 @@ public class RenderEnderman extends RenderLiving
if (par1EntityEnderman.getCarried() > 0) if (par1EntityEnderman.getCarried() > 0)
{ {
EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); EaglerAdapter.glEnable(EaglerAdapter.GL_RESCALE_NORMAL);
EaglerAdapter.glPushMatrix(); EaglerAdapter.glPushMatrix();
float var3 = 0.5F; float var3 = 0.5F;
EaglerAdapter.glTranslatef(0.0F, 0.6875F, -0.75F); EaglerAdapter.glTranslatef(0.0F, 0.6875F, -0.75F);
@ -72,11 +71,11 @@ public class RenderEnderman extends RenderLiving
this.bindTexture(TextureMap.locationBlocksTexture); this.bindTexture(TextureMap.locationBlocksTexture);
this.renderBlocks.renderBlockAsItem(Block.blocksList[par1EntityEnderman.getCarried()], par1EntityEnderman.getCarryingData(), 1.0F); this.renderBlocks.renderBlockAsItem(Block.blocksList[par1EntityEnderman.getCarried()], par1EntityEnderman.getCarryingData(), 1.0F);
EaglerAdapter.glPopMatrix(); EaglerAdapter.glPopMatrix();
EaglerAdapter.glDisable(GL12.GL_RESCALE_NORMAL); EaglerAdapter.glDisable(EaglerAdapter.GL_RESCALE_NORMAL);
} }
} }
public static final TextureLocation tex_eyes = new TextureLocation("/mob/enderman_eyes.png"); public static final TextureLocation tex_eyes = endermanEyesTexture;
/** /**
* Render the endermans eyes * Render the endermans eyes
*/ */

5
src/main/java/net/minecraft/src/RenderFireball.java
View File

@ -3,7 +3,6 @@ package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation; import net.lax1dude.eaglercraft.TextureLocation;
import net.lax1dude.eaglercraft.adapter.Tessellator; import net.lax1dude.eaglercraft.adapter.Tessellator;
import net.lax1dude.eaglercraft.EaglerAdapter; import net.lax1dude.eaglercraft.EaglerAdapter;
import org.lwjgl.opengl.GL12;
public class RenderFireball extends Render public class RenderFireball extends Render
{ {
@ -19,7 +18,7 @@ public class RenderFireball extends Render
EaglerAdapter.glPushMatrix(); EaglerAdapter.glPushMatrix();
this.bindEntityTexture(par1EntityFireball); this.bindEntityTexture(par1EntityFireball);
EaglerAdapter.glTranslatef((float)par2, (float)par4, (float)par6); EaglerAdapter.glTranslatef((float)par2, (float)par4, (float)par6);
EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); EaglerAdapter.glEnable(EaglerAdapter.GL_RESCALE_NORMAL);
float var10 = this.field_77002_a; float var10 = this.field_77002_a;
EaglerAdapter.glScalef(var10 / 1.0F, var10 / 1.0F, var10 / 1.0F); EaglerAdapter.glScalef(var10 / 1.0F, var10 / 1.0F, var10 / 1.0F);
Icon var11 = Item.fireballCharge.getIconFromDamage(0); Icon var11 = Item.fireballCharge.getIconFromDamage(0);
@ -40,7 +39,7 @@ public class RenderFireball extends Render
var12.addVertexWithUV((double)(var17 - var18), (double)(1.0F - var19), 0.0D, (double)var14, (double)var15); var12.addVertexWithUV((double)(var17 - var18), (double)(1.0F - var19), 0.0D, (double)var14, (double)var15);
var12.addVertexWithUV((double)(0.0F - var18), (double)(1.0F - var19), 0.0D, (double)var13, (double)var15); var12.addVertexWithUV((double)(0.0F - var18), (double)(1.0F - var19), 0.0D, (double)var13, (double)var15);
var12.draw(); var12.draw();
EaglerAdapter.glDisable(GL12.GL_RESCALE_NORMAL); EaglerAdapter.glDisable(EaglerAdapter.GL_RESCALE_NORMAL);
EaglerAdapter.glPopMatrix(); EaglerAdapter.glPopMatrix();
} }

5
src/main/java/net/minecraft/src/RenderFish.java
View File

@ -3,7 +3,6 @@ package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation; import net.lax1dude.eaglercraft.TextureLocation;
import net.lax1dude.eaglercraft.adapter.Tessellator; import net.lax1dude.eaglercraft.adapter.Tessellator;
import net.lax1dude.eaglercraft.EaglerAdapter; import net.lax1dude.eaglercraft.EaglerAdapter;
import org.lwjgl.opengl.GL12;
public class RenderFish extends Render public class RenderFish extends Render
{ {
@ -16,7 +15,7 @@ public class RenderFish extends Render
{ {
EaglerAdapter.glPushMatrix(); EaglerAdapter.glPushMatrix();
EaglerAdapter.glTranslatef((float)par2, (float)par4, (float)par6); EaglerAdapter.glTranslatef((float)par2, (float)par4, (float)par6);
EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); EaglerAdapter.glEnable(EaglerAdapter.GL_RESCALE_NORMAL);
EaglerAdapter.glScalef(0.5F, 0.5F, 0.5F); EaglerAdapter.glScalef(0.5F, 0.5F, 0.5F);
this.bindEntityTexture(par1EntityFishHook); this.bindEntityTexture(par1EntityFishHook);
Tessellator var10 = Tessellator.instance; Tessellator var10 = Tessellator.instance;
@ -38,7 +37,7 @@ public class RenderFish extends Render
var10.addVertexWithUV((double)(var17 - var18), (double)(1.0F - var19), 0.0D, (double)var14, (double)var15); var10.addVertexWithUV((double)(var17 - var18), (double)(1.0F - var19), 0.0D, (double)var14, (double)var15);
var10.addVertexWithUV((double)(0.0F - var18), (double)(1.0F - var19), 0.0D, (double)var13, (double)var15); var10.addVertexWithUV((double)(0.0F - var18), (double)(1.0F - var19), 0.0D, (double)var13, (double)var15);
var10.draw(); var10.draw();
EaglerAdapter.glDisable(GL12.GL_RESCALE_NORMAL); EaglerAdapter.glDisable(EaglerAdapter.GL_RESCALE_NORMAL);
EaglerAdapter.glPopMatrix(); EaglerAdapter.glPopMatrix();
if (par1EntityFishHook.angler != null) if (par1EntityFishHook.angler != null)

5
src/main/java/net/minecraft/src/RenderIronGolem.java
View File

@ -2,7 +2,6 @@ package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation; import net.lax1dude.eaglercraft.TextureLocation;
import net.lax1dude.eaglercraft.EaglerAdapter; import net.lax1dude.eaglercraft.EaglerAdapter;
import org.lwjgl.opengl.GL12;
public class RenderIronGolem extends RenderLiving public class RenderIronGolem extends RenderLiving
{ {
@ -55,7 +54,7 @@ public class RenderIronGolem extends RenderLiving
if (par1EntityIronGolem.getHoldRoseTick() != 0) if (par1EntityIronGolem.getHoldRoseTick() != 0)
{ {
EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); EaglerAdapter.glEnable(EaglerAdapter.GL_RESCALE_NORMAL);
EaglerAdapter.glPushMatrix(); EaglerAdapter.glPushMatrix();
EaglerAdapter.glRotatef(5.0F + 180.0F * this.ironGolemModel.ironGolemRightArm.rotateAngleX / (float)Math.PI, 1.0F, 0.0F, 0.0F); EaglerAdapter.glRotatef(5.0F + 180.0F * this.ironGolemModel.ironGolemRightArm.rotateAngleX / (float)Math.PI, 1.0F, 0.0F, 0.0F);
EaglerAdapter.glTranslatef(-0.6875F, 1.25F, -0.9375F); EaglerAdapter.glTranslatef(-0.6875F, 1.25F, -0.9375F);
@ -71,7 +70,7 @@ public class RenderIronGolem extends RenderLiving
this.bindTexture(TextureMap.locationBlocksTexture); this.bindTexture(TextureMap.locationBlocksTexture);
this.renderBlocks.renderBlockAsItem(Block.plantRed, 0, 1.0F); this.renderBlocks.renderBlockAsItem(Block.plantRed, 0, 1.0F);
EaglerAdapter.glPopMatrix(); EaglerAdapter.glPopMatrix();
EaglerAdapter.glDisable(GL12.GL_RESCALE_NORMAL); EaglerAdapter.glDisable(EaglerAdapter.GL_RESCALE_NORMAL);
} }
} }

6
src/main/java/net/minecraft/src/RenderItem.java
View File

@ -5,7 +5,7 @@ import net.lax1dude.eaglercraft.EaglercraftRandom;
import net.lax1dude.eaglercraft.TextureLocation; import net.lax1dude.eaglercraft.TextureLocation;
import net.lax1dude.eaglercraft.adapter.Tessellator; import net.lax1dude.eaglercraft.adapter.Tessellator;
import net.lax1dude.eaglercraft.EaglerAdapter; import net.lax1dude.eaglercraft.EaglerAdapter;
import org.lwjgl.opengl.GL12; import org.lwjgl.opengl.EaglerAdapter;
public class RenderItem extends Render public class RenderItem extends Render
{ {
@ -68,7 +68,7 @@ public class RenderItem extends Render
} }
EaglerAdapter.glTranslatef((float)par2, (float)par4 + var11, (float)par6); EaglerAdapter.glTranslatef((float)par2, (float)par4 + var11, (float)par6);
EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); EaglerAdapter.glEnable(EaglerAdapter.GL_RESCALE_NORMAL);
float var18; float var18;
float var19; float var19;
float var20; float var20;
@ -180,7 +180,7 @@ public class RenderItem extends Render
} }
} }
EaglerAdapter.glDisable(GL12.GL_RESCALE_NORMAL); EaglerAdapter.glDisable(EaglerAdapter.GL_RESCALE_NORMAL);
EaglerAdapter.glPopMatrix(); EaglerAdapter.glPopMatrix();
} }
} }

3
src/main/java/net/minecraft/src/RenderLeashKnot.java
View File

@ -2,7 +2,6 @@ package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation; import net.lax1dude.eaglercraft.TextureLocation;
import net.lax1dude.eaglercraft.EaglerAdapter; import net.lax1dude.eaglercraft.EaglerAdapter;
import org.lwjgl.opengl.GL12;
public class RenderLeashKnot extends Render public class RenderLeashKnot extends Render
{ {
@ -15,7 +14,7 @@ public class RenderLeashKnot extends Render
EaglerAdapter.glDisable(EaglerAdapter.GL_CULL_FACE); EaglerAdapter.glDisable(EaglerAdapter.GL_CULL_FACE);
EaglerAdapter.glTranslatef((float)par2, (float)par4, (float)par6); EaglerAdapter.glTranslatef((float)par2, (float)par4, (float)par6);
float var10 = 0.0625F; float var10 = 0.0625F;
EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); EaglerAdapter.glEnable(EaglerAdapter.GL_RESCALE_NORMAL);
EaglerAdapter.glScalef(-1.0F, -1.0F, 1.0F); EaglerAdapter.glScalef(-1.0F, -1.0F, 1.0F);
EaglerAdapter.glEnable(EaglerAdapter.GL_ALPHA_TEST); EaglerAdapter.glEnable(EaglerAdapter.GL_ALPHA_TEST);
this.bindEntityTexture(par1EntityLeashKnot); this.bindEntityTexture(par1EntityLeashKnot);

5
src/main/java/net/minecraft/src/RenderPainting.java
View File

@ -3,7 +3,6 @@ package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation; import net.lax1dude.eaglercraft.TextureLocation;
import net.lax1dude.eaglercraft.adapter.Tessellator; import net.lax1dude.eaglercraft.adapter.Tessellator;
import net.lax1dude.eaglercraft.EaglerAdapter; import net.lax1dude.eaglercraft.EaglerAdapter;
import org.lwjgl.opengl.GL12;
public class RenderPainting extends Render public class RenderPainting extends Render
{ {
@ -14,13 +13,13 @@ public class RenderPainting extends Render
EaglerAdapter.glPushMatrix(); EaglerAdapter.glPushMatrix();
EaglerAdapter.glTranslatef((float)par2, (float)par4, (float)par6); EaglerAdapter.glTranslatef((float)par2, (float)par4, (float)par6);
EaglerAdapter.glRotatef(par8, 0.0F, 1.0F, 0.0F); EaglerAdapter.glRotatef(par8, 0.0F, 1.0F, 0.0F);
EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); EaglerAdapter.glEnable(EaglerAdapter.GL_RESCALE_NORMAL);
this.bindEntityTexture(par1EntityPainting); this.bindEntityTexture(par1EntityPainting);
EnumArt var10 = par1EntityPainting.art; EnumArt var10 = par1EntityPainting.art;
float var11 = 0.0625F; float var11 = 0.0625F;
EaglerAdapter.glScalef(var11, var11, var11); EaglerAdapter.glScalef(var11, var11, var11);
this.func_77010_a(par1EntityPainting, var10.sizeX, var10.sizeY, var10.offsetX, var10.offsetY); this.func_77010_a(par1EntityPainting, var10.sizeX, var10.sizeY, var10.offsetX, var10.offsetY);
EaglerAdapter.glDisable(GL12.GL_RESCALE_NORMAL); EaglerAdapter.glDisable(EaglerAdapter.GL_RESCALE_NORMAL);
EaglerAdapter.glPopMatrix(); EaglerAdapter.glPopMatrix();
} }

6
src/main/java/net/minecraft/src/RenderSnowball.java
View File

@ -3,7 +3,7 @@ package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation; import net.lax1dude.eaglercraft.TextureLocation;
import net.lax1dude.eaglercraft.adapter.Tessellator; import net.lax1dude.eaglercraft.adapter.Tessellator;
import net.lax1dude.eaglercraft.EaglerAdapter; import net.lax1dude.eaglercraft.EaglerAdapter;
import org.lwjgl.opengl.GL12; import org.lwjgl.opengl.EaglerAdapter;
public class RenderSnowball extends Render public class RenderSnowball extends Render
{ {
@ -35,7 +35,7 @@ public class RenderSnowball extends Render
{ {
EaglerAdapter.glPushMatrix(); EaglerAdapter.glPushMatrix();
EaglerAdapter.glTranslatef((float)par2, (float)par4, (float)par6); EaglerAdapter.glTranslatef((float)par2, (float)par4, (float)par6);
EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); EaglerAdapter.glEnable(EaglerAdapter.GL_RESCALE_NORMAL);
EaglerAdapter.glScalef(0.5F, 0.5F, 0.5F); EaglerAdapter.glScalef(0.5F, 0.5F, 0.5F);
this.bindEntityTexture(par1Entity); this.bindEntityTexture(par1Entity);
Tessellator var11 = Tessellator.instance; Tessellator var11 = Tessellator.instance;
@ -54,7 +54,7 @@ public class RenderSnowball extends Render
} }
this.func_77026_a(var11, var10); this.func_77026_a(var11, var10);
EaglerAdapter.glDisable(GL12.GL_RESCALE_NORMAL); EaglerAdapter.glDisable(EaglerAdapter.GL_RESCALE_NORMAL);
EaglerAdapter.glPopMatrix(); EaglerAdapter.glPopMatrix();
} }
} }

3
src/main/java/net/minecraft/src/RenderWitherSkull.java
View File

@ -2,7 +2,6 @@ package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation; import net.lax1dude.eaglercraft.TextureLocation;
import net.lax1dude.eaglercraft.EaglerAdapter; import net.lax1dude.eaglercraft.EaglerAdapter;
import org.lwjgl.opengl.GL12;
public class RenderWitherSkull extends Render public class RenderWitherSkull extends Render
{ {
@ -37,7 +36,7 @@ public class RenderWitherSkull extends Render
float var11 = par1EntityWitherSkull.prevRotationPitch + (par1EntityWitherSkull.rotationPitch - par1EntityWitherSkull.prevRotationPitch) * par9; float var11 = par1EntityWitherSkull.prevRotationPitch + (par1EntityWitherSkull.rotationPitch - par1EntityWitherSkull.prevRotationPitch) * par9;
EaglerAdapter.glTranslatef((float)par2, (float)par4, (float)par6); EaglerAdapter.glTranslatef((float)par2, (float)par4, (float)par6);
float var12 = 0.0625F; float var12 = 0.0625F;
EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); EaglerAdapter.glEnable(EaglerAdapter.GL_RESCALE_NORMAL);
EaglerAdapter.glScalef(-1.0F, -1.0F, 1.0F); EaglerAdapter.glScalef(-1.0F, -1.0F, 1.0F);
EaglerAdapter.glEnable(EaglerAdapter.GL_ALPHA_TEST); EaglerAdapter.glEnable(EaglerAdapter.GL_ALPHA_TEST);
this.bindEntityTexture(par1EntityWitherSkull); this.bindEntityTexture(par1EntityWitherSkull);

4
src/main/java/net/minecraft/src/RenderXPOrb.java
View File

@ -3,7 +3,7 @@ package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation; import net.lax1dude.eaglercraft.TextureLocation;
import net.lax1dude.eaglercraft.adapter.Tessellator; import net.lax1dude.eaglercraft.adapter.Tessellator;
import net.lax1dude.eaglercraft.EaglerAdapter; import net.lax1dude.eaglercraft.EaglerAdapter;
import org.lwjgl.opengl.GL12; import org.lwjgl.opengl.EaglerAdapter;
public class RenderXPOrb extends Render public class RenderXPOrb extends Render
{ {
@ -56,7 +56,7 @@ public class RenderXPOrb extends Render
var25.addVertexWithUV((double)(0.0F - var16), (double)(1.0F - var17), 0.0D, (double)var11, (double)var13); var25.addVertexWithUV((double)(0.0F - var16), (double)(1.0F - var17), 0.0D, (double)var11, (double)var13);
var25.draw(); var25.draw();
EaglerAdapter.glDisable(EaglerAdapter.GL_BLEND); EaglerAdapter.glDisable(EaglerAdapter.GL_BLEND);
EaglerAdapter.glDisable(GL12.GL_RESCALE_NORMAL); EaglerAdapter.glDisable(EaglerAdapter.GL_RESCALE_NORMAL);
EaglerAdapter.glPopMatrix(); EaglerAdapter.glPopMatrix();
} }

6
src/main/java/net/minecraft/src/RendererLivingEntity.java
View File

@ -5,7 +5,7 @@ import net.lax1dude.eaglercraft.EaglercraftRandom;
import net.lax1dude.eaglercraft.TextureLocation; import net.lax1dude.eaglercraft.TextureLocation;
import net.lax1dude.eaglercraft.adapter.Tessellator; import net.lax1dude.eaglercraft.adapter.Tessellator;
import net.lax1dude.eaglercraft.EaglerAdapter; import net.lax1dude.eaglercraft.EaglerAdapter;
import org.lwjgl.opengl.GL12; import org.lwjgl.opengl.EaglerAdapter;
public abstract class RendererLivingEntity extends Render public abstract class RendererLivingEntity extends Render
{ {
@ -112,7 +112,7 @@ public abstract class RendererLivingEntity extends Render
var13 = this.handleRotationFloat(par1EntityLivingBase, par9); var13 = this.handleRotationFloat(par1EntityLivingBase, par9);
this.rotateCorpse(par1EntityLivingBase, var13, var10, par9); this.rotateCorpse(par1EntityLivingBase, var13, var10, par9);
float var14 = 0.0625F; float var14 = 0.0625F;
EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); EaglerAdapter.glEnable(EaglerAdapter.GL_RESCALE_NORMAL);
EaglerAdapter.glScalef(-1.0F, -1.0F, 1.0F); EaglerAdapter.glScalef(-1.0F, -1.0F, 1.0F);
this.preRenderCallback(par1EntityLivingBase, par9); this.preRenderCallback(par1EntityLivingBase, par9);
EaglerAdapter.glTranslatef(0.0F, -24.0F * var14 - 0.0078125F, 0.0F); EaglerAdapter.glTranslatef(0.0F, -24.0F * var14 - 0.0078125F, 0.0F);
@ -250,7 +250,7 @@ public abstract class RendererLivingEntity extends Render
EaglerAdapter.glEnable(EaglerAdapter.GL_TEXTURE_2D); EaglerAdapter.glEnable(EaglerAdapter.GL_TEXTURE_2D);
} }
EaglerAdapter.glDisable(GL12.GL_RESCALE_NORMAL); EaglerAdapter.glDisable(EaglerAdapter.GL_RESCALE_NORMAL);
} }
catch (Exception var25) catch (Exception var25)
{ {

2
src/main/java/net/minecraft/src/ScreenShotHelper.java
View File

@ -9,7 +9,7 @@ import java.util.Date;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import org.lwjgl.BufferUtils; import org.lwjgl.BufferUtils;
import net.lax1dude.eaglercraft.EaglerAdapter; import net.lax1dude.eaglercraft.EaglerAdapter;
import org.lwjgl.opengl.GL12; import org.lwjgl.opengl.EaglerAdapter;
public class ScreenShotHelper public class ScreenShotHelper
{ {

9
src/main/java/net/minecraft/src/SelectionListBase.java
View File

@ -1,10 +1,9 @@
package net.minecraft.src; package net.minecraft.src;
import net.lax1dude.eaglercraft.adapter.Tessellator; import net.lax1dude.eaglercraft.adapter.Tessellator;
import org.lwjgl.input.Mouse;
import net.lax1dude.eaglercraft.EaglerAdapter; import net.lax1dude.eaglercraft.EaglerAdapter;
public abstract class SelectionListBase public abstract class SelectionListBase // KEEP THIS CLASS (used in eagler somewhere)
{ {
private final Minecraft mc; private final Minecraft mc;
private final int field_96619_e; private final int field_96619_e;
@ -84,7 +83,7 @@ public abstract class SelectionListBase
int var13; int var13;
int var20; int var20;
if (Mouse.isButtonDown(0)) if (EaglerAdapter.mouseIsButtonDown(0))
{ {
if (this.field_96628_i == -1.0F) if (this.field_96628_i == -1.0F)
{ {
@ -160,9 +159,9 @@ public abstract class SelectionListBase
} }
else else
{ {
while (!this.mc.gameSettings.touchscreen && Mouse.next()) while (!this.mc.gameSettings.touchscreen && EaglerAdapter.mouseNext())
{ {
int var16 = Mouse.getEventDWheel(); int var16 = EaglerAdapter.mouseGetEventDWheel();
if (var16 != 0) if (var16 != 0)
{ {

8
src/main/java/net/minecraft/src/TextureUtil.java
View File

@ -7,7 +7,7 @@ import javax.imageio.ImageIO;
import net.lax1dude.eaglercraft.TextureLocation; import net.lax1dude.eaglercraft.TextureLocation;
import net.lax1dude.eaglercraft.EaglerAdapter; import net.lax1dude.eaglercraft.EaglerAdapter;
import org.lwjgl.opengl.GL12; import org.lwjgl.opengl.EaglerAdapter;
public class TextureUtil public class TextureUtil
{ {
@ -44,7 +44,7 @@ public class TextureUtil
var10 = Math.min(var7, par2 - var9); var10 = Math.min(var7, par2 - var9);
int var11 = par1 * var10; int var11 = par1 * var10;
copyToBufferPos(par0ArrayOfInteger, var8, var11); copyToBufferPos(par0ArrayOfInteger, var8, var11);
EaglerAdapter.glTexSubImage2D(EaglerAdapter.GL_TEXTURE_2D, 0, par3, par4 + var9, par1, var10, GL12.GL_BGRA, GL12.GL_UNSIGNED_INT_8_8_8_8_REV, dataBuffer); EaglerAdapter.glTexSubImage2D(EaglerAdapter.GL_TEXTURE_2D, 0, par3, par4 + var9, par1, var10, EaglerAdapter.GL_BGRA, EaglerAdapter.GL_UNSIGNED_INT_8_8_8_8_REV, dataBuffer);
} }
} }
@ -57,7 +57,7 @@ public class TextureUtil
public static void allocateTexture(int par0, int par1, int par2) public static void allocateTexture(int par0, int par1, int par2)
{ {
bindTexture(par0); bindTexture(par0);
EaglerAdapter.glTexImage2D(EaglerAdapter.GL_TEXTURE_2D, 0, EaglerAdapter.GL_RGBA, par1, par2, 0, GL12.GL_BGRA, GL12.GL_UNSIGNED_INT_8_8_8_8_REV, (IntBuffer)null); EaglerAdapter.glTexImage2D(EaglerAdapter.GL_TEXTURE_2D, 0, EaglerAdapter.GL_RGBA, par1, par2, 0, EaglerAdapter.GL_BGRA, EaglerAdapter.GL_UNSIGNED_INT_8_8_8_8_REV, (IntBuffer)null);
} }
public static int uploadTextureImageSub(int par0, BufferedImage par1BufferedImage, int par2, int par3, boolean par4, boolean par5) public static int uploadTextureImageSub(int par0, BufferedImage par1BufferedImage, int par2, int par3, boolean par4, boolean par5)
@ -83,7 +83,7 @@ public class TextureUtil
int var12 = var5 * var11; int var12 = var5 * var11;
par0BufferedImage.getRGB(0, var10, var5, var11, var8, 0, var5); par0BufferedImage.getRGB(0, var10, var5, var11, var8, 0, var5);
copyToBuffer(var8, var12); copyToBuffer(var8, var12);
EaglerAdapter.glTexSubImage2D(EaglerAdapter.GL_TEXTURE_2D, 0, par1, par2 + var10, var5, var11, GL12.GL_BGRA, GL12.GL_UNSIGNED_INT_8_8_8_8_REV, dataBuffer); EaglerAdapter.glTexSubImage2D(EaglerAdapter.GL_TEXTURE_2D, 0, par1, par2 + var10, var5, var11, EaglerAdapter.GL_BGRA, EaglerAdapter.GL_UNSIGNED_INT_8_8_8_8_REV, dataBuffer);
} }
} }

5
src/main/java/net/minecraft/src/TileEntityChestRenderer.java
View File

@ -4,7 +4,6 @@ import java.util.Calendar;
import net.lax1dude.eaglercraft.TextureLocation; import net.lax1dude.eaglercraft.TextureLocation;
import net.lax1dude.eaglercraft.EaglerAdapter; import net.lax1dude.eaglercraft.EaglerAdapter;
import org.lwjgl.opengl.GL12;
public class TileEntityChestRenderer extends TileEntitySpecialRenderer public class TileEntityChestRenderer extends TileEntitySpecialRenderer
{ {
@ -99,7 +98,7 @@ public class TileEntityChestRenderer extends TileEntitySpecialRenderer
} }
EaglerAdapter.glPushMatrix(); EaglerAdapter.glPushMatrix();
EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); EaglerAdapter.glEnable(EaglerAdapter.GL_RESCALE_NORMAL);
EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
EaglerAdapter.glTranslatef((float)par2, (float)par4 + 1.0F, (float)par6 + 1.0F); EaglerAdapter.glTranslatef((float)par2, (float)par4 + 1.0F, (float)par6 + 1.0F);
EaglerAdapter.glScalef(1.0F, -1.0F, -1.0F); EaglerAdapter.glScalef(1.0F, -1.0F, -1.0F);
@ -165,7 +164,7 @@ public class TileEntityChestRenderer extends TileEntitySpecialRenderer
var12 = 1.0F - var12 * var12 * var12; var12 = 1.0F - var12 * var12 * var12;
var14.chestLid.rotateAngleX = -(var12 * (float)Math.PI / 2.0F); var14.chestLid.rotateAngleX = -(var12 * (float)Math.PI / 2.0F);
var14.renderAll(); var14.renderAll();
EaglerAdapter.glDisable(GL12.GL_RESCALE_NORMAL); EaglerAdapter.glDisable(EaglerAdapter.GL_RESCALE_NORMAL);
EaglerAdapter.glPopMatrix(); EaglerAdapter.glPopMatrix();
EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
} }

6
src/main/java/net/minecraft/src/TileEntityEnderChestRenderer.java
View File

@ -2,7 +2,7 @@ package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation; import net.lax1dude.eaglercraft.TextureLocation;
import net.lax1dude.eaglercraft.EaglerAdapter; import net.lax1dude.eaglercraft.EaglerAdapter;
import org.lwjgl.opengl.GL12; import org.lwjgl.opengl.EaglerAdapter;
public class TileEntityEnderChestRenderer extends TileEntitySpecialRenderer public class TileEntityEnderChestRenderer extends TileEntitySpecialRenderer
{ {
@ -25,7 +25,7 @@ public class TileEntityEnderChestRenderer extends TileEntitySpecialRenderer
this.bindTexture(field_110637_a); this.bindTexture(field_110637_a);
EaglerAdapter.glPushMatrix(); EaglerAdapter.glPushMatrix();
EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); EaglerAdapter.glEnable(EaglerAdapter.GL_RESCALE_NORMAL);
EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
EaglerAdapter.glTranslatef((float)par2, (float)par4 + 1.0F, (float)par6 + 1.0F); EaglerAdapter.glTranslatef((float)par2, (float)par4 + 1.0F, (float)par6 + 1.0F);
EaglerAdapter.glScalef(1.0F, -1.0F, -1.0F); EaglerAdapter.glScalef(1.0F, -1.0F, -1.0F);
@ -59,7 +59,7 @@ public class TileEntityEnderChestRenderer extends TileEntitySpecialRenderer
var11 = 1.0F - var11 * var11 * var11; var11 = 1.0F - var11 * var11 * var11;
this.theEnderChestModel.chestLid.rotateAngleX = -(var11 * (float)Math.PI / 2.0F); this.theEnderChestModel.chestLid.rotateAngleX = -(var11 * (float)Math.PI / 2.0F);
this.theEnderChestModel.renderAll(); this.theEnderChestModel.renderAll();
EaglerAdapter.glDisable(GL12.GL_RESCALE_NORMAL); EaglerAdapter.glDisable(EaglerAdapter.GL_RESCALE_NORMAL);
EaglerAdapter.glPopMatrix(); EaglerAdapter.glPopMatrix();
EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); EaglerAdapter.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
} }

4
src/main/java/net/minecraft/src/TileEntitySkullRenderer.java
View File

@ -2,7 +2,7 @@ package net.minecraft.src;
import net.lax1dude.eaglercraft.TextureLocation; import net.lax1dude.eaglercraft.TextureLocation;
import net.lax1dude.eaglercraft.EaglerAdapter; import net.lax1dude.eaglercraft.EaglerAdapter;
import org.lwjgl.opengl.GL12; import org.lwjgl.opengl.EaglerAdapter;
public class TileEntitySkullRenderer extends TileEntitySpecialRenderer public class TileEntitySkullRenderer extends TileEntitySpecialRenderer
{ {
@ -93,7 +93,7 @@ public class TileEntitySkullRenderer extends TileEntitySpecialRenderer
} }
float var10 = 0.0625F; float var10 = 0.0625F;
EaglerAdapter.glEnable(GL12.GL_RESCALE_NORMAL); EaglerAdapter.glEnable(EaglerAdapter.GL_RESCALE_NORMAL);
EaglerAdapter.glScalef(-1.0F, -1.0F, 1.0F); EaglerAdapter.glScalef(-1.0F, -1.0F, 1.0F);
EaglerAdapter.glEnable(EaglerAdapter.GL_ALPHA_TEST); EaglerAdapter.glEnable(EaglerAdapter.GL_ALPHA_TEST);
var8.render((Entity)null, 0.0F, 0.0F, 0.0F, par5, 0.0F, var10); var8.render((Entity)null, 0.0F, 0.0F, 0.0F, par5, 0.0F, var10);