Shit
This commit is contained in:
parent
c42ff423b8
commit
12d79206b0
Binary file not shown.
Binary file not shown.
After Width: | Height: | Size: 14 KiB |
|
@ -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
|
|
@ -266,6 +266,8 @@ public class GuiIngame extends Gui
|
||||||
var23 = this.mc.thePlayer.getTotalArmorValue();
|
var23 = this.mc.thePlayer.getTotalArmorValue();
|
||||||
int var24 = -1;
|
int var24 = -1;
|
||||||
|
|
||||||
|
this.mc.debug = "" + Minecraft.debugFPS + " fps, " + Minecraft.debugChunkUpdates + " chunk updates";
|
||||||
|
|
||||||
if (this.mc.gameSettings.showDebugInfo) {
|
if (this.mc.gameSettings.showDebugInfo) {
|
||||||
EaglerAdapter.glPushMatrix();
|
EaglerAdapter.glPushMatrix();
|
||||||
var8.drawStringWithShadow("Minecraft 1.6.4 (" + this.mc.debug + ")", 2, 2, 16777215);
|
var8.drawStringWithShadow("Minecraft 1.6.4 (" + this.mc.debug + ")", 2, 2, 16777215);
|
||||||
|
|
|
@ -43,4 +43,14 @@ public interface Icon
|
||||||
float getInterpolatedV(double var1);
|
float getInterpolatedV(double var1);
|
||||||
|
|
||||||
String getIconName();
|
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();
|
||||||
}
|
}
|
||||||
|
|
|
@ -83,4 +83,15 @@ public class IconFlipped implements Icon
|
||||||
{
|
{
|
||||||
return this.baseIcon.getIconName();
|
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();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -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
|
* 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.
|
* 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.
|
* When you place a block, it's set to 6, decremented once per tick, when it's 0, you can place another block.
|
||||||
|
|
|
@ -192,35 +192,28 @@ public class RenderItem extends Render
|
||||||
/**
|
/**
|
||||||
* Renders a dropped item
|
* 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;
|
Tessellator var8 = Tessellator.instance;
|
||||||
|
|
||||||
if (par2Icon == null)
|
if (par2Icon == null) {
|
||||||
{
|
|
||||||
par2Icon = this.renderManager.renderEngine.getMissingIcon(par1EntityItem.getEntityItem().getItemSpriteNumber());
|
par2Icon = this.renderManager.renderEngine.getMissingIcon(par1EntityItem.getEntityItem().getItemSpriteNumber());
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
float var25 = ((Icon)par2Icon).getMinU();
|
float var9 = par2Icon.getMinU();
|
||||||
float var26 = ((Icon)par2Icon).getMaxU();
|
float var10 = par2Icon.getMaxU();
|
||||||
float var11 = ((Icon)par2Icon).getMinV();
|
float var11 = par2Icon.getMinV();
|
||||||
float var12 = ((Icon)par2Icon).getMaxV();
|
float var12 = par2Icon.getMaxV();
|
||||||
float var13 = 1.0F;
|
float var13 = 1.0F;
|
||||||
float var14 = 0.5F;
|
float var14 = 0.5F;
|
||||||
float var15 = 0.25F;
|
float var15 = 0.25F;
|
||||||
float var17;
|
float var17;
|
||||||
|
|
||||||
if (this.renderManager.options.fancyGraphics)
|
if (this.renderManager.options.fancyGraphics) {
|
||||||
{
|
|
||||||
EaglerAdapter.glPushMatrix();
|
EaglerAdapter.glPushMatrix();
|
||||||
|
|
||||||
if (renderInFrame)
|
if (renderInFrame) {
|
||||||
{
|
|
||||||
EaglerAdapter.glRotatef(180.0F, 0.0F, 1.0F, 0.0F);
|
EaglerAdapter.glRotatef(180.0F, 0.0F, 1.0F, 0.0F);
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
EaglerAdapter.glRotatef((((float) par1EntityItem.age + par4) / 20.0F + par1EntityItem.hoverStart) * (180F / (float) Math.PI), 0.0F, 1.0F, 0.0F);
|
EaglerAdapter.glRotatef((((float) par1EntityItem.age + par4) / 20.0F + par1EntityItem.hoverStart) * (180F / (float) Math.PI), 0.0F, 1.0F, 0.0F);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -230,43 +223,32 @@ public class RenderItem extends Render
|
||||||
int var19 = var18.stackSize;
|
int var19 = var18.stackSize;
|
||||||
byte var24;
|
byte var24;
|
||||||
|
|
||||||
if (var19 < 2)
|
if (var19 < 2) {
|
||||||
{
|
|
||||||
var24 = 1;
|
var24 = 1;
|
||||||
}
|
} else if (var19 < 16) {
|
||||||
else if (var19 < 16)
|
|
||||||
{
|
|
||||||
var24 = 2;
|
var24 = 2;
|
||||||
}
|
} else if (var19 < 32) {
|
||||||
else if (var19 < 32)
|
|
||||||
{
|
|
||||||
var24 = 3;
|
var24 = 3;
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
var24 = 4;
|
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);
|
EaglerAdapter.glTranslatef(0.0F, 0.0F, var16 + var17);
|
||||||
|
|
||||||
if (var18.getItemSpriteNumber() == 0 && Block.blocksList[var18.itemID] != null)
|
if (var18.getItemSpriteNumber() == 0 && Block.blocksList[var18.itemID] != null) {
|
||||||
{
|
terrain.bindTexture();
|
||||||
TextureMap.locationBlocksTexture.bindTexture();
|
} else {
|
||||||
}
|
items.bindTexture();
|
||||||
else
|
|
||||||
{
|
|
||||||
TextureMap.locationItemsTexture.bindTexture();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
EaglerAdapter.glColor4f(par5, par6, par7, 1.0F);
|
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.glDepthFunc(EaglerAdapter.GL_EQUAL);
|
||||||
EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING);
|
EaglerAdapter.glDisable(EaglerAdapter.GL_LIGHTING);
|
||||||
RES_ITEM_GLINT.bindTexture();
|
RES_ITEM_GLINT.bindTexture();
|
||||||
|
@ -295,37 +277,35 @@ public class RenderItem extends Render
|
||||||
EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING);
|
EaglerAdapter.glEnable(EaglerAdapter.GL_LIGHTING);
|
||||||
EaglerAdapter.glDepthFunc(EaglerAdapter.GL_LEQUAL);
|
EaglerAdapter.glDepthFunc(EaglerAdapter.GL_LEQUAL);
|
||||||
}
|
}
|
||||||
|
EaglerAdapter.flipLightMatrix();
|
||||||
}
|
}
|
||||||
|
|
||||||
EaglerAdapter.glPopMatrix();
|
EaglerAdapter.glPopMatrix();
|
||||||
}
|
} else {
|
||||||
else
|
for (int var25 = 0; var25 < par3; ++var25) {
|
||||||
{
|
|
||||||
for (int var27 = 0; var27 < par3; ++var27)
|
|
||||||
{
|
|
||||||
EaglerAdapter.glPushMatrix();
|
EaglerAdapter.glPushMatrix();
|
||||||
|
|
||||||
if (var27 > 0)
|
if (var25 > 0) {
|
||||||
{
|
|
||||||
var17 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.3F;
|
var17 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.3F;
|
||||||
float var28 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.3F;
|
float var26 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.3F;
|
||||||
float var29 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.3F;
|
float var27 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.3F;
|
||||||
EaglerAdapter.glTranslatef(var17, var28, var29);
|
EaglerAdapter.glTranslatef(var17, var26, var27);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!renderInFrame)
|
if (!renderInFrame) {
|
||||||
{
|
|
||||||
EaglerAdapter.glRotatef(180.0F - this.renderManager.playerViewY, 0.0F, 1.0F, 0.0F);
|
EaglerAdapter.glRotatef(180.0F - this.renderManager.playerViewY, 0.0F, 1.0F, 0.0F);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!renderInFrame) EaglerAdapter.flipLightMatrix();
|
||||||
EaglerAdapter.glColor4f(par5, par6, par7, 1.0F);
|
EaglerAdapter.glColor4f(par5, par6, par7, 1.0F);
|
||||||
var8.startDrawingQuads();
|
var8.startDrawingQuads();
|
||||||
var8.setNormal(0.0F, 1.0F, 0.0F);
|
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) (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)var26, (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)var26, (double)var11);
|
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)var25, (double)var11);
|
var8.addVertexWithUV((double) (0.0F - var14), (double) (1.0F - var15), 0.0D, (double) var9, (double) var11);
|
||||||
var8.draw();
|
var8.draw();
|
||||||
|
if (!renderInFrame) EaglerAdapter.flipLightMatrix();
|
||||||
EaglerAdapter.glPopMatrix();
|
EaglerAdapter.glPopMatrix();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue