diff --git a/lwjgl-rundir/eaglercraft.jar b/lwjgl-rundir/eaglercraft.jar index cbf5a69..367037c 100644 Binary files a/lwjgl-rundir/eaglercraft.jar and b/lwjgl-rundir/eaglercraft.jar differ diff --git a/lwjgl-rundir/resources/textures/blocks/water.png b/lwjgl-rundir/resources/textures/blocks/water.png new file mode 100644 index 0000000..7775802 Binary files /dev/null and b/lwjgl-rundir/resources/textures/blocks/water.png differ diff --git a/lwjgl-rundir/resources/textures/blocks/water.txt b/lwjgl-rundir/resources/textures/blocks/water.txt new file mode 100644 index 0000000..fc9eecf --- /dev/null +++ b/lwjgl-rundir/resources/textures/blocks/water.txt @@ -0,0 +1 @@ +0*2,1*2,2*2,3*2,4*2,5*2,6*2,7*2,8*2,9*2,10*2,11*2,12*2,13*2,14*2,15*2,16*2,17*2,18*2,19*2,20*2,21*2,22*2,23*2,24*2,25*2,26*2,27*2,28*2,29*2,30*2,31*2 \ No newline at end of file diff --git a/src/main/java/net/minecraft/src/GuiIngame.java b/src/main/java/net/minecraft/src/GuiIngame.java index fa0151b..2c3a0a3 100644 --- a/src/main/java/net/minecraft/src/GuiIngame.java +++ b/src/main/java/net/minecraft/src/GuiIngame.java @@ -266,6 +266,8 @@ public class GuiIngame extends Gui var23 = this.mc.thePlayer.getTotalArmorValue(); int var24 = -1; + this.mc.debug = "" + Minecraft.debugFPS + " fps, " + Minecraft.debugChunkUpdates + " chunk updates"; + if (this.mc.gameSettings.showDebugInfo) { EaglerAdapter.glPushMatrix(); var8.drawStringWithShadow("Minecraft 1.6.4 (" + this.mc.debug + ")", 2, 2, 16777215); diff --git a/src/main/java/net/minecraft/src/Icon.java b/src/main/java/net/minecraft/src/Icon.java index 1bb2d55..8d6e304 100644 --- a/src/main/java/net/minecraft/src/Icon.java +++ b/src/main/java/net/minecraft/src/Icon.java @@ -43,4 +43,14 @@ public interface Icon float getInterpolatedV(double var1); String getIconName(); + + /** + * Returns the width of the texture sheet this icon is on, in pixels. + */ + int getSheetWidth(); + + /** + * Returns the height of the texture sheet this icon is on, in pixels. + */ + int getSheetHeight(); } diff --git a/src/main/java/net/minecraft/src/IconFlipped.java b/src/main/java/net/minecraft/src/IconFlipped.java index 14403dd..226af17 100644 --- a/src/main/java/net/minecraft/src/IconFlipped.java +++ b/src/main/java/net/minecraft/src/IconFlipped.java @@ -83,4 +83,15 @@ public class IconFlipped implements Icon { return this.baseIcon.getIconName(); } + + public int getSheetWidth() { + return this.baseIcon.getSheetWidth(); + } + + /** + * Returns the height of the texture sheet this icon is on, in pixels. + */ + public int getSheetHeight() { + return this.baseIcon.getSheetHeight(); + } } diff --git a/src/main/java/net/minecraft/src/Minecraft.java b/src/main/java/net/minecraft/src/Minecraft.java index 689a742..2164e13 100644 --- a/src/main/java/net/minecraft/src/Minecraft.java +++ b/src/main/java/net/minecraft/src/Minecraft.java @@ -97,7 +97,7 @@ public class Minecraft * This is set to fpsCounter every debug screen update, and is shown on the debug screen. It's also sent as part of * the usage snooping. */ - private static int debugFPS; + public static int debugFPS; /** * When you place a block, it's set to 6, decremented once per tick, when it's 0, you can place another block. diff --git a/src/main/java/net/minecraft/src/RenderItem.java b/src/main/java/net/minecraft/src/RenderItem.java index f5013ee..eafd4a1 100644 --- a/src/main/java/net/minecraft/src/RenderItem.java +++ b/src/main/java/net/minecraft/src/RenderItem.java @@ -192,36 +192,29 @@ public class RenderItem extends Render /** * Renders a dropped item */ - private void renderDroppedItem(EntityItem par1EntityItem, Icon par2Icon, int par3, float par4, float par5, float par6, float par7) - { + private void renderDroppedItem(EntityItem par1EntityItem, Icon par2Icon, int par3, float par4, float par5, float par6, float par7) { Tessellator var8 = Tessellator.instance; - if (par2Icon == null) - { + if (par2Icon == null) { par2Icon = this.renderManager.renderEngine.getMissingIcon(par1EntityItem.getEntityItem().getItemSpriteNumber()); - } - float var25 = ((Icon)par2Icon).getMinU(); - float var26 = ((Icon)par2Icon).getMaxU(); - float var11 = ((Icon)par2Icon).getMinV(); - float var12 = ((Icon)par2Icon).getMaxV(); + float var9 = par2Icon.getMinU(); + float var10 = par2Icon.getMaxU(); + float var11 = par2Icon.getMinV(); + float var12 = par2Icon.getMaxV(); float var13 = 1.0F; float var14 = 0.5F; float var15 = 0.25F; float var17; - if (this.renderManager.options.fancyGraphics) - { + if (this.renderManager.options.fancyGraphics) { EaglerAdapter.glPushMatrix(); - if (renderInFrame) - { + if (renderInFrame) { EaglerAdapter.glRotatef(180.0F, 0.0F, 1.0F, 0.0F); - } - else - { - EaglerAdapter.glRotatef((((float)par1EntityItem.age + par4) / 20.0F + par1EntityItem.hoverStart) * (180F / (float)Math.PI), 0.0F, 1.0F, 0.0F); + } else { + EaglerAdapter.glRotatef((((float) par1EntityItem.age + par4) / 20.0F + par1EntityItem.hoverStart) * (180F / (float) Math.PI), 0.0F, 1.0F, 0.0F); } float var16 = 0.0625F; @@ -230,43 +223,32 @@ public class RenderItem extends Render int var19 = var18.stackSize; byte var24; - if (var19 < 2) - { + if (var19 < 2) { var24 = 1; - } - else if (var19 < 16) - { + } else if (var19 < 16) { var24 = 2; - } - else if (var19 < 32) - { + } else if (var19 < 32) { var24 = 3; - } - else - { + } else { var24 = 4; } - EaglerAdapter.glTranslatef(-var14, -var15, -((var16 + var17) * (float)var24 / 2.0F)); + EaglerAdapter.glTranslatef(-var14, -var15, -((var16 + var17) * (float) var24 / 2.0F)); - for (int var20 = 0; var20 < var24; ++var20) - { + for (int var20 = 0; var20 < var24; ++var20) { EaglerAdapter.glTranslatef(0.0F, 0.0F, var16 + var17); - if (var18.getItemSpriteNumber() == 0 && Block.blocksList[var18.itemID] != null) - { - TextureMap.locationBlocksTexture.bindTexture(); - } - else - { - TextureMap.locationItemsTexture.bindTexture(); + if (var18.getItemSpriteNumber() == 0 && Block.blocksList[var18.itemID] != null) { + terrain.bindTexture(); + } else { + items.bindTexture(); } EaglerAdapter.glColor4f(par5, par6, par7, 1.0F); - ItemRenderer.renderItemIn2D(var8, var26, var11, var25, var12, ((Icon)par2Icon).getIconWidth(), ((Icon)par2Icon).getIconHeight(), var16); + EaglerAdapter.flipLightMatrix(); + ItemRenderer.renderItemIn2D(var8, var10, var11, var9, var12, par2Icon.getSheetWidth(), par2Icon.getSheetHeight(), var16); - if (var18.hasEffect()) - { + if (var18 != null && var18.hasEffect()) { EaglerAdapter.glDepthFunc(EaglerAdapter.GL_EQUAL); EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING); RES_ITEM_GLINT.bindTexture(); @@ -278,14 +260,14 @@ public class RenderItem extends Render EaglerAdapter.glPushMatrix(); float var22 = 0.125F; EaglerAdapter.glScalef(var22, var22, var22); - float var23 = (float)(Minecraft.getSystemTime() % 3000L) / 3000.0F * 8.0F; + float var23 = (float) (Minecraft.getSystemTime() % 3000L) / 3000.0F * 8.0F; EaglerAdapter.glTranslatef(var23, 0.0F, 0.0F); EaglerAdapter.glRotatef(-50.0F, 0.0F, 0.0F, 1.0F); ItemRenderer.renderItemIn2D(var8, 0.0F, 0.0F, 1.0F, 1.0F, 255, 255, var16); EaglerAdapter.glPopMatrix(); EaglerAdapter.glPushMatrix(); EaglerAdapter.glScalef(var22, var22, var22); - var23 = (float)(Minecraft.getSystemTime() % 4873L) / 4873.0F * 8.0F; + var23 = (float) (Minecraft.getSystemTime() % 4873L) / 4873.0F * 8.0F; EaglerAdapter.glTranslatef(-var23, 0.0F, 0.0F); EaglerAdapter.glRotatef(10.0F, 0.0F, 0.0F, 1.0F); ItemRenderer.renderItemIn2D(var8, 0.0F, 0.0F, 1.0F, 1.0F, 255, 255, var16); @@ -295,37 +277,35 @@ public class RenderItem extends Render EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING); EaglerAdapter.glDepthFunc(EaglerAdapter.GL_LEQUAL); } + EaglerAdapter.flipLightMatrix(); } EaglerAdapter.glPopMatrix(); - } - else - { - for (int var27 = 0; var27 < par3; ++var27) - { + } else { + for (int var25 = 0; var25 < par3; ++var25) { EaglerAdapter.glPushMatrix(); - if (var27 > 0) - { + if (var25 > 0) { var17 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.3F; - float var28 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.3F; - float var29 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.3F; - EaglerAdapter.glTranslatef(var17, var28, var29); + float var26 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.3F; + float var27 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.3F; + EaglerAdapter.glTranslatef(var17, var26, var27); } - if (!renderInFrame) - { + if (!renderInFrame) { EaglerAdapter.glRotatef(180.0F - this.renderManager.playerViewY, 0.0F, 1.0F, 0.0F); } + if (!renderInFrame) EaglerAdapter.flipLightMatrix(); EaglerAdapter.glColor4f(par5, par6, par7, 1.0F); var8.startDrawingQuads(); var8.setNormal(0.0F, 1.0F, 0.0F); - var8.addVertexWithUV((double)(0.0F - var14), (double)(0.0F - var15), 0.0D, (double)var25, (double)var12); - var8.addVertexWithUV((double)(var13 - var14), (double)(0.0F - var15), 0.0D, (double)var26, (double)var12); - var8.addVertexWithUV((double)(var13 - var14), (double)(1.0F - var15), 0.0D, (double)var26, (double)var11); - var8.addVertexWithUV((double)(0.0F - var14), (double)(1.0F - var15), 0.0D, (double)var25, (double)var11); + var8.addVertexWithUV((double) (0.0F - var14), (double) (0.0F - var15), 0.0D, (double) var9, (double) var12); + var8.addVertexWithUV((double) (var13 - var14), (double) (0.0F - var15), 0.0D, (double) var10, (double) var12); + var8.addVertexWithUV((double) (var13 - var14), (double) (1.0F - var15), 0.0D, (double) var10, (double) var11); + var8.addVertexWithUV((double) (0.0F - var14), (double) (1.0F - var15), 0.0D, (double) var9, (double) var11); var8.draw(); + if (!renderInFrame) EaglerAdapter.flipLightMatrix(); EaglerAdapter.glPopMatrix(); } }