mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-21 20:52:26 +00:00
Update build.xml (Ant) for newer Forge. Adjust MCP mappings as needed.
This commit is contained in:
1 parent
456adb947b
commit
de50db7165
70 files changed
+194
-187
No files matched your search
+7
-1
@@ -1,6 +1,6 @@
|
||||
# Tinkers Construct -- Access Transformer
|
||||
# Required for Ant build system.
|
||||
# Last update: Minecraft 1.6.2 (TC git: e0b414ed74f29cbfb6a2732a70bcf5e7d8d82a08)
|
||||
# Last update: Minecraft 1.6.2 - 2013 Sept 7(TC git: 0a07dfabd007c6436a73dec7ec70e734116895ad)
|
||||
|
||||
# EntityArrow - Grabbed 'em all, since so much is accessed
|
||||
public ug.a
|
||||
@@ -27,3 +27,9 @@ public awb.i #buttonList
|
||||
# ThreadDownloadImageData
|
||||
public bhz.g #field_110559_g
|
||||
public bhz.d #field_110560_d
|
||||
|
||||
# EntityLivingBase
|
||||
public-f oe.aS #getMaxHealth()
|
||||
|
||||
# IBossDisplayData
|
||||
public-f sf.aS #getMaxHealth()
|
||||
@@ -18,7 +18,7 @@
|
||||
<property name="mcpsrc.dir" value="${mcp.dir}/src"/>
|
||||
|
||||
<property name="mc.version" value="1.6.2"/>
|
||||
<property name="forge.version" value="9.10.0.845"/>
|
||||
<property name="forge.version" value="9.10.1.858"/>
|
||||
|
||||
<property name="version.major" value="0"/>
|
||||
<property name="version.minor" value="0"/>
|
||||
|
||||
@@ -397,7 +397,7 @@ public class CastingBasinLogic extends InventoryLogic implements IFluidTank, IFl
|
||||
@Override
|
||||
public void onDataPacket (INetworkManager net, Packet132TileEntityData packet)
|
||||
{
|
||||
readFromNBT(packet.customParam1);
|
||||
readFromNBT(packet.data);
|
||||
worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord);
|
||||
}
|
||||
|
||||
|
||||
@@ -571,7 +571,7 @@ public class CastingChannelLogic extends TileEntity implements IFluidTank, IFlui
|
||||
@Override
|
||||
public void onDataPacket (INetworkManager net, Packet132TileEntityData packet)
|
||||
{
|
||||
readCustomNBT(packet.customParam1);
|
||||
readCustomNBT(packet.data);
|
||||
this.worldObj.markBlockForRenderUpdate(this.xCoord, this.yCoord, this.zCoord);
|
||||
}
|
||||
|
||||
|
||||
@@ -395,7 +395,7 @@ public class CastingTableLogic extends InventoryLogic implements IFluidTank, IFl
|
||||
@Override
|
||||
public void onDataPacket (INetworkManager net, Packet132TileEntityData packet)
|
||||
{
|
||||
readFromNBT(packet.customParam1);
|
||||
readFromNBT(packet.data);
|
||||
worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord);
|
||||
}
|
||||
|
||||
|
||||
@@ -482,7 +482,7 @@ public class DrawbridgeLogic extends InventoryLogic implements IFacingLogic, IAc
|
||||
@Override
|
||||
public void onDataPacket (INetworkManager net, Packet132TileEntityData packet)
|
||||
{
|
||||
readFromNBT(packet.customParam1);
|
||||
readFromNBT(packet.data);
|
||||
worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord);
|
||||
}
|
||||
|
||||
|
||||
@@ -114,7 +114,7 @@ public class DryingRackLogic extends InventoryLogic
|
||||
@Override
|
||||
public void onDataPacket (INetworkManager net, Packet132TileEntityData packet)
|
||||
{
|
||||
readCustomNBT(packet.customParam1);
|
||||
readCustomNBT(packet.data);
|
||||
worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord);
|
||||
}
|
||||
|
||||
|
||||
@@ -179,7 +179,7 @@ public class FaucetLogic extends TileEntity implements IFacingLogic, IActiveLogi
|
||||
@Override
|
||||
public void onDataPacket (INetworkManager net, Packet132TileEntityData packet)
|
||||
{
|
||||
readCustomNBT(packet.customParam1);
|
||||
readCustomNBT(packet.data);
|
||||
worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord);
|
||||
}
|
||||
|
||||
|
||||
@@ -190,7 +190,7 @@ public class FirestarterLogic extends TileEntity implements IFacingLogic, IActiv
|
||||
@Override
|
||||
public void onDataPacket (INetworkManager net, Packet132TileEntityData packet)
|
||||
{
|
||||
readCustomNBT(packet.customParam1);
|
||||
readCustomNBT(packet.data);
|
||||
worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord);
|
||||
}
|
||||
}
|
||||
@@ -111,7 +111,7 @@ public class GolemCoreLogic extends InventoryLogic implements IInventory
|
||||
@Override
|
||||
public void onDataPacket (INetworkManager net, Packet132TileEntityData packet)
|
||||
{
|
||||
readFromNBT(packet.customParam1);
|
||||
readFromNBT(packet.data);
|
||||
worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord);
|
||||
}
|
||||
}
|
||||
@@ -158,7 +158,7 @@ public class LavaTankLogic extends MultiServantLogic implements IFluidHandler
|
||||
@Override
|
||||
public void onDataPacket (INetworkManager net, Packet132TileEntityData packet)
|
||||
{
|
||||
readCustomNBT(packet.customParam1);
|
||||
readCustomNBT(packet.data);
|
||||
worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord);
|
||||
}
|
||||
|
||||
|
||||
@@ -59,7 +59,7 @@ public class LiquidTextureLogic extends TileEntity
|
||||
@Override
|
||||
public void onDataPacket (INetworkManager net, Packet132TileEntityData packet)
|
||||
{
|
||||
readCustomNBT(packet.customParam1);
|
||||
readCustomNBT(packet.data);
|
||||
worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord);
|
||||
}
|
||||
}
|
||||
@@ -140,7 +140,7 @@ public class MultiServantLogic extends TileEntity implements IServantLogic
|
||||
@Override
|
||||
public void onDataPacket (INetworkManager net, Packet132TileEntityData packet)
|
||||
{
|
||||
readCustomNBT(packet.customParam1);
|
||||
readCustomNBT(packet.data);
|
||||
worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord);
|
||||
}
|
||||
}
|
||||
@@ -66,7 +66,7 @@ public class RedwireLogic extends TileEntity
|
||||
@Override
|
||||
public void onDataPacket (INetworkManager net, Packet132TileEntityData packet)
|
||||
{
|
||||
readCustomNBT(packet.customParam1);
|
||||
readCustomNBT(packet.data);
|
||||
worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord);
|
||||
}
|
||||
}
|
||||
@@ -207,7 +207,7 @@ public class SmelteryDrainLogic extends MultiServantLogic implements IFluidHandl
|
||||
@Override
|
||||
public void onDataPacket (INetworkManager net, Packet132TileEntityData packet)
|
||||
{
|
||||
readFromNBT(packet.customParam1);
|
||||
readFromNBT(packet.data);
|
||||
worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord);
|
||||
}
|
||||
}
|
||||
@@ -1076,7 +1076,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci
|
||||
@Override
|
||||
public void onDataPacket (INetworkManager net, Packet132TileEntityData packet)
|
||||
{
|
||||
readFromNBT(packet.customParam1);
|
||||
readFromNBT(packet.data);
|
||||
worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord);
|
||||
}
|
||||
}
|
||||
@@ -107,7 +107,7 @@ public class TileEntityLandmine extends TileEntity implements IInventory
|
||||
@Override
|
||||
public void onDataPacket (INetworkManager net, Packet132TileEntityData packet)
|
||||
{
|
||||
readFromNBT(packet.customParam1);
|
||||
readFromNBT(packet.data);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -61,7 +61,7 @@ public class ToolStationLogic extends InventoryLogic implements ISidedInventory
|
||||
if (this.worldObj != null)
|
||||
{
|
||||
this.blockMetadata = this.worldObj.getBlockMetadata(this.xCoord, this.yCoord, this.zCoord);
|
||||
this.worldObj.updateTileEntityChunkAndDoNothing(this.xCoord, this.yCoord, this.zCoord, this);
|
||||
this.worldObj.markTileEntityChunkModified(this.xCoord, this.yCoord, this.zCoord, this);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -72,8 +72,8 @@ public class CustomBowRenderer implements IItemRenderer
|
||||
GL11.glPopMatrix();
|
||||
return;
|
||||
}
|
||||
TextureManager texturemanager = this.mc.func_110434_K();
|
||||
texturemanager.func_110577_a(texturemanager.func_130087_a(stack.getItemSpriteNumber()));
|
||||
TextureManager texturemanager = this.mc.getTextureManager();
|
||||
texturemanager.bindTexture(texturemanager.getResourceLocation(stack.getItemSpriteNumber()));
|
||||
|
||||
if (type == ItemRenderType.EQUIPPED_FIRST_PERSON)
|
||||
{
|
||||
@@ -101,7 +101,7 @@ public class CustomBowRenderer implements IItemRenderer
|
||||
GL11.glRotatef(50.0F, 0.0F, 1.0F, 0.0F);
|
||||
GL11.glRotatef(335.0F, 0.0F, 0.0F, 1.0F);
|
||||
GL11.glTranslatef(-0.9375F, -0.0625F, 0.0F);
|
||||
ItemRenderer.renderItemIn2D(tessellator, f1, f2, f, f3, icon.getOriginX(), icon.getOriginY(), 0.0625F);
|
||||
ItemRenderer.renderItemIn2D(tessellator, f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 0.0625F);
|
||||
|
||||
GL11.glDisable(GL12.GL_RESCALE_NORMAL);
|
||||
|
||||
|
||||
@@ -52,7 +52,7 @@ public class RenderItemCopy extends Render
|
||||
*/
|
||||
public void doRenderItem (EntityItem par1EntityItem, double par2, double par4, double par6, float par8, float par9)
|
||||
{
|
||||
this.func_110777_b(par1EntityItem);
|
||||
this.bindEntityTexture(par1EntityItem);
|
||||
this.random.setSeed(187L);
|
||||
ItemStack itemstack = par1EntityItem.getEntityItem();
|
||||
|
||||
@@ -192,7 +192,7 @@ public class RenderItemCopy extends Render
|
||||
|
||||
protected ResourceLocation func_110796_a (EntityItem par1EntityItem)
|
||||
{
|
||||
return this.renderManager.renderEngine.func_130087_a(par1EntityItem.getEntityItem().getItemSpriteNumber());
|
||||
return this.renderManager.renderEngine.getResourceLocation(par1EntityItem.getEntityItem().getItemSpriteNumber());
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -209,9 +209,9 @@ public class RenderItemCopy extends Render
|
||||
|
||||
if (par2Icon == null)
|
||||
{
|
||||
TextureManager texturemanager = Minecraft.getMinecraft().func_110434_K();
|
||||
ResourceLocation resourcelocation = texturemanager.func_130087_a(par1EntityItem.getEntityItem().getItemSpriteNumber());
|
||||
par2Icon = ((TextureMap) texturemanager.func_110581_b(resourcelocation)).func_110572_b("missingno");
|
||||
TextureManager texturemanager = Minecraft.getMinecraft().getTextureManager();
|
||||
ResourceLocation resourcelocation = texturemanager.getResourceLocation(par1EntityItem.getEntityItem().getItemSpriteNumber());
|
||||
par2Icon = ((TextureMap) texturemanager.getTexture(resourcelocation)).getAtlasSprite("missingno");
|
||||
}
|
||||
|
||||
float f4 = ((Icon) par2Icon).getMinU();
|
||||
@@ -261,21 +261,21 @@ public class RenderItemCopy extends Render
|
||||
|
||||
if (itemstack.getItemSpriteNumber() == 0)
|
||||
{
|
||||
this.func_110776_a(TextureMap.field_110575_b);
|
||||
this.bindTexture(TextureMap.locationBlocksTexture);
|
||||
}
|
||||
else
|
||||
{
|
||||
this.func_110776_a(TextureMap.field_110576_c);
|
||||
this.bindTexture(TextureMap.locationItemsTexture);
|
||||
}
|
||||
|
||||
GL11.glColor4f(par5, par6, par7, 1.0F);
|
||||
ItemRenderer.renderItemIn2D(tessellator, f5, f6, f4, f7, ((Icon) par2Icon).getOriginX(), ((Icon) par2Icon).getOriginY(), f12);
|
||||
ItemRenderer.renderItemIn2D(tessellator, f5, f6, f4, f7, ((Icon) par2Icon).getIconWidth(), ((Icon) par2Icon).getIconHeight(), f12);
|
||||
|
||||
if (itemstack.hasEffect(pass))
|
||||
{
|
||||
GL11.glDepthFunc(GL11.GL_EQUAL);
|
||||
GL11.glDisable(GL11.GL_LIGHTING);
|
||||
this.renderManager.renderEngine.func_110577_a(field_110798_h);
|
||||
this.renderManager.renderEngine.bindTexture(field_110798_h);
|
||||
GL11.glEnable(GL11.GL_BLEND);
|
||||
GL11.glBlendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE);
|
||||
float f13 = 0.76F;
|
||||
@@ -358,7 +358,7 @@ public class RenderItemCopy extends Render
|
||||
Block block = (k < Block.blocksList.length ? Block.blocksList[k] : null);
|
||||
if (par3ItemStack.getItemSpriteNumber() == 0 && block != null && RenderBlocks.renderItemIn3d(Block.blocksList[k].getRenderType()))
|
||||
{
|
||||
par2TextureManager.func_110577_a(TextureMap.field_110575_b);
|
||||
par2TextureManager.bindTexture(TextureMap.locationBlocksTexture);
|
||||
GL11.glPushMatrix();
|
||||
GL11.glTranslatef((float) (par4 - 2), (float) (par5 + 3), -3.0F + this.zLevel);
|
||||
GL11.glScalef(10.0F, 10.0F, 10.0F);
|
||||
@@ -388,7 +388,7 @@ public class RenderItemCopy extends Render
|
||||
|
||||
for (int j1 = 0; j1 < Item.itemsList[k].getRenderPasses(l); ++j1)
|
||||
{
|
||||
par2TextureManager.func_110577_a(par3ItemStack.getItemSpriteNumber() == 0 ? TextureMap.field_110575_b : TextureMap.field_110576_c);
|
||||
par2TextureManager.bindTexture(par3ItemStack.getItemSpriteNumber() == 0 ? TextureMap.locationBlocksTexture : TextureMap.locationItemsTexture);
|
||||
Icon icon = Item.itemsList[k].getIcon(par3ItemStack, j1);
|
||||
int k1 = Item.itemsList[k].getColorFromItemStack(par3ItemStack, j1);
|
||||
f1 = (float) (k1 >> 16 & 255) / 255.0F;
|
||||
@@ -413,12 +413,12 @@ public class RenderItemCopy extends Render
|
||||
else
|
||||
{
|
||||
GL11.glDisable(GL11.GL_LIGHTING);
|
||||
ResourceLocation resourcelocation = par2TextureManager.func_130087_a(par3ItemStack.getItemSpriteNumber());
|
||||
par2TextureManager.func_110577_a(resourcelocation);
|
||||
ResourceLocation resourcelocation = par2TextureManager.getResourceLocation(par3ItemStack.getItemSpriteNumber());
|
||||
par2TextureManager.bindTexture(resourcelocation);
|
||||
|
||||
if (object == null)
|
||||
{
|
||||
object = ((TextureMap) Minecraft.getMinecraft().func_110434_K().func_110581_b(resourcelocation)).func_110572_b("missingno");
|
||||
object = ((TextureMap) Minecraft.getMinecraft().getTextureManager().getTexture(resourcelocation)).getAtlasSprite("missingno");
|
||||
}
|
||||
|
||||
i1 = Item.itemsList[k].getColorFromItemStack(par3ItemStack, 0);
|
||||
@@ -448,7 +448,7 @@ public class RenderItemCopy extends Render
|
||||
GL11.glDepthFunc(GL11.GL_GREATER);
|
||||
GL11.glDisable(GL11.GL_LIGHTING);
|
||||
GL11.glDepthMask(false);
|
||||
manager.func_110577_a(field_110798_h);
|
||||
manager.bindTexture(field_110798_h);
|
||||
this.zLevel -= 50.0F;
|
||||
GL11.glEnable(GL11.GL_BLEND);
|
||||
GL11.glBlendFunc(GL11.GL_DST_COLOR, GL11.GL_DST_COLOR);
|
||||
@@ -479,7 +479,7 @@ public class RenderItemCopy extends Render
|
||||
GL11.glDepthFunc(GL11.GL_GREATER);
|
||||
GL11.glDisable(GL11.GL_LIGHTING);
|
||||
GL11.glDepthMask(false);
|
||||
par2TextureManager.func_110577_a(field_110798_h);
|
||||
par2TextureManager.bindTexture(field_110798_h);
|
||||
this.zLevel -= 50.0F;
|
||||
GL11.glEnable(GL11.GL_BLEND);
|
||||
GL11.glBlendFunc(GL11.GL_DST_COLOR, GL11.GL_DST_COLOR);
|
||||
@@ -601,7 +601,7 @@ public class RenderItemCopy extends Render
|
||||
tessellator.draw();
|
||||
}
|
||||
|
||||
protected ResourceLocation func_110775_a (Entity par1Entity)
|
||||
protected ResourceLocation getEntityTexture (Entity par1Entity)
|
||||
{
|
||||
return this.func_110796_a((EntityItem) par1Entity);
|
||||
}
|
||||
|
||||
@@ -109,13 +109,13 @@ public class TClientEvents
|
||||
highlight = false;
|
||||
}
|
||||
|
||||
AttributeInstance attrMaxHealth = this.mc.thePlayer.func_110148_a(SharedMonsterAttributes.field_111267_a);
|
||||
int health = MathHelper.ceiling_float_int(mc.thePlayer.func_110143_aJ());
|
||||
AttributeInstance attrMaxHealth = this.mc.thePlayer.getEntityAttribute(SharedMonsterAttributes.maxHealth);
|
||||
int health = MathHelper.ceiling_float_int(mc.thePlayer.getHealth());
|
||||
int healthLast = MathHelper.ceiling_float_int(mc.thePlayer.prevHealth);
|
||||
float healthMax = (float) attrMaxHealth.func_111126_e();
|
||||
float healthMax = (float) attrMaxHealth.getAttributeValue();
|
||||
if (healthMax > 20)
|
||||
healthMax = 20;
|
||||
float absorb = this.mc.thePlayer.func_110139_bj();
|
||||
float absorb = this.mc.thePlayer.getAbsorptionAmount();
|
||||
|
||||
int healthRows = MathHelper.ceiling_float_int((healthMax + absorb) / 2.0F / 10.0F);
|
||||
int rowHeight = Math.max(10 - (healthRows - 2), 3);
|
||||
@@ -187,9 +187,9 @@ public class TClientEvents
|
||||
return;
|
||||
|
||||
//Extra hearts
|
||||
this.mc.func_110434_K().func_110577_a(hearts);
|
||||
this.mc.getTextureManager().bindTexture(hearts);
|
||||
|
||||
int hp = MathHelper.ceiling_float_int(this.mc.thePlayer.func_110143_aJ());
|
||||
int hp = MathHelper.ceiling_float_int(this.mc.thePlayer.getHealth());
|
||||
for (int iter = 0; iter < hp / 20; iter++)
|
||||
{
|
||||
int renderHearts = (hp - 20 * (iter + 1)) / 2;
|
||||
@@ -205,7 +205,7 @@ public class TClientEvents
|
||||
}
|
||||
}
|
||||
|
||||
this.mc.func_110434_K().func_110577_a(icons);
|
||||
this.mc.getTextureManager().bindTexture(icons);
|
||||
GuiIngameForge.left_height += 10;
|
||||
if (absorb > 0)
|
||||
GuiIngameForge.left_height += 10;
|
||||
|
||||
@@ -113,8 +113,8 @@ public class ToolCoreRenderer implements IItemRenderer
|
||||
xMax[i] = icon.getMaxU();
|
||||
yMin[i] = icon.getMinV();
|
||||
yMax[i] = icon.getMaxV();
|
||||
sheetWidth[i] = icon.getOriginX();
|
||||
sheetHeight[i] = icon.getOriginY();
|
||||
sheetWidth[i] = icon.getIconWidth();
|
||||
sheetHeight[i] = icon.getIconHeight();
|
||||
xDiff[i] = xMin[i] - xMax[i];
|
||||
yDiff[i] = yMin[i] - yMax[i];
|
||||
width[i] = sheetWidth[i] * xDiff[i];
|
||||
|
||||
@@ -19,7 +19,7 @@ public class BreakingFX extends EntityFX
|
||||
public BreakingFX(World par1World, double par2, double par4, double par6, Item par8Item, int par9)
|
||||
{
|
||||
super(par1World, par2, par4, par6, 0.0D, 0.0D, 0.0D);
|
||||
this.func_110125_a(par8Item.getIconFromDamage(par9));
|
||||
this.setParticleIcon(par8Item.getIconFromDamage(par9));
|
||||
this.particleRed = this.particleGreen = this.particleBlue = 1.0F;
|
||||
this.particleGravity = Block.blockSnow.blockParticleGravity;
|
||||
this.particleScale /= 2.0F;
|
||||
|
||||
@@ -79,15 +79,15 @@ public class PaneRender implements ISimpleBlockRenderingHandler
|
||||
icon = renderblocks.getBlockIconFromSideAndMetadata(pane, 0, meta);
|
||||
icon1 = pane.getSideTextureIndex(meta);
|
||||
|
||||
meta = icon.getOriginX();
|
||||
int k1 = icon.getOriginY();
|
||||
meta = icon.getIconWidth();
|
||||
int k1 = icon.getIconHeight();
|
||||
double d = (double) icon.getMinU();
|
||||
double d1 = (double) icon.getInterpolatedU(8.0D);
|
||||
double d2 = (double) icon.getMaxU();
|
||||
double d3 = (double) icon.getMinV();
|
||||
double d4 = (double) icon.getMaxV();
|
||||
int l1 = icon1.getOriginX();
|
||||
int i2 = icon1.getOriginY();
|
||||
int l1 = icon1.getIconWidth();
|
||||
int i2 = icon1.getIconHeight();
|
||||
double d5 = (double) icon1.getInterpolatedU(7.0D);
|
||||
double d6 = (double) icon1.getInterpolatedU(9.0D);
|
||||
double d7 = (double) icon1.getMinV();
|
||||
|
||||
@@ -107,7 +107,7 @@ public class SmallFontRenderer implements ResourceManagerReloadListener
|
||||
this.field_111273_g = par2ResourceLocation;
|
||||
this.renderEngine = par3TextureManager;
|
||||
this.unicodeFlag = true;
|
||||
par3TextureManager.func_110577_a(this.field_111273_g);
|
||||
par3TextureManager.bindTexture(this.field_111273_g);
|
||||
|
||||
for (int i = 0; i < 32; ++i)
|
||||
{
|
||||
@@ -144,7 +144,7 @@ public class SmallFontRenderer implements ResourceManagerReloadListener
|
||||
this.readGlyphSizes();
|
||||
}
|
||||
|
||||
public void func_110549_a (ResourceManager par1ResourceManager)
|
||||
public void onResourceManagerReload (ResourceManager par1ResourceManager)
|
||||
{
|
||||
this.func_111272_d();
|
||||
}
|
||||
@@ -155,7 +155,7 @@ public class SmallFontRenderer implements ResourceManagerReloadListener
|
||||
|
||||
try
|
||||
{
|
||||
bufferedimage = ImageIO.read(Minecraft.getMinecraft().func_110442_L().func_110536_a(this.field_111273_g).func_110527_b());
|
||||
bufferedimage = ImageIO.read(Minecraft.getMinecraft().getResourceManager().getResource(this.field_111273_g).getInputStream());
|
||||
}
|
||||
catch (IOException ioexception)
|
||||
{
|
||||
@@ -220,7 +220,7 @@ public class SmallFontRenderer implements ResourceManagerReloadListener
|
||||
{
|
||||
try
|
||||
{
|
||||
InputStream inputstream = Minecraft.getMinecraft().func_110442_L().func_110536_a(new ResourceLocation("font/glyph_sizes.bin")).func_110527_b();
|
||||
InputStream inputstream = Minecraft.getMinecraft().getResourceManager().getResource(new ResourceLocation("font/glyph_sizes.bin")).getInputStream();
|
||||
inputstream.read(this.glyphWidth);
|
||||
}
|
||||
catch (IOException ioexception)
|
||||
@@ -245,7 +245,7 @@ public class SmallFontRenderer implements ResourceManagerReloadListener
|
||||
float f = (float) (par1 % 16 * 8);
|
||||
float f1 = (float) (par1 / 16 * 8);
|
||||
float f2 = par2 ? 1.0F : 0.0F;
|
||||
this.renderEngine.func_110577_a(this.field_111273_g);
|
||||
this.renderEngine.bindTexture(this.field_111273_g);
|
||||
float f3 = (float) this.charWidth[par1] - 0.01F;
|
||||
GL11.glBegin(GL11.GL_TRIANGLE_STRIP);
|
||||
GL11.glTexCoord2f(f / 128.0F, f1 / 128.0F);
|
||||
@@ -275,7 +275,7 @@ public class SmallFontRenderer implements ResourceManagerReloadListener
|
||||
*/
|
||||
private void loadGlyphTexture (int par1)
|
||||
{
|
||||
this.renderEngine.func_110577_a(this.func_111271_a(par1));
|
||||
this.renderEngine.bindTexture(this.func_111271_a(par1));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -1039,4 +1039,5 @@ public class SmallFontRenderer implements ResourceManagerReloadListener
|
||||
{
|
||||
return this.bidiFlag;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -132,7 +132,7 @@ public class CartRender extends Render
|
||||
this.renderPullcart((CartEntity) par1Entity, par2, par4, par6, par8, par9);
|
||||
}
|
||||
|
||||
protected ResourceLocation func_110775_a (Entity par1Entity)
|
||||
protected ResourceLocation getEntityTexture (Entity par1Entity)
|
||||
{
|
||||
return texture;
|
||||
}
|
||||
|
||||
@@ -186,7 +186,7 @@ public class CrystalGuardianRender extends RenderLiving
|
||||
}
|
||||
|
||||
@Override
|
||||
protected ResourceLocation func_110775_a (Entity par1Entity)
|
||||
protected ResourceLocation getEntityTexture (Entity par1Entity)
|
||||
{
|
||||
return texture;
|
||||
}
|
||||
|
||||
@@ -64,7 +64,7 @@ public class CrystalRender extends RenderLiving
|
||||
return this.func_77061_b((Crystal) par1EntityLiving, par2, par3);
|
||||
}
|
||||
|
||||
protected ResourceLocation func_110775_a (Entity par1Entity)
|
||||
protected ResourceLocation getEntityTexture (Entity par1Entity)
|
||||
{
|
||||
return texture;
|
||||
}
|
||||
|
||||
@@ -51,7 +51,7 @@ public class FancyItemRender extends Render
|
||||
*/
|
||||
public void doRenderItem (EntityItem par1EntityItem, double par2, double par4, double par6, float par8, float par9)
|
||||
{
|
||||
this.func_110777_b(par1EntityItem);
|
||||
this.bindEntityTexture(par1EntityItem);
|
||||
this.random.setSeed(187L);
|
||||
ItemStack itemstack = par1EntityItem.getEntityItem();
|
||||
|
||||
@@ -191,7 +191,7 @@ public class FancyItemRender extends Render
|
||||
|
||||
protected ResourceLocation func_110796_a (EntityItem par1EntityItem)
|
||||
{
|
||||
return this.renderManager.renderEngine.func_130087_a(par1EntityItem.getEntityItem().getItemSpriteNumber());
|
||||
return this.renderManager.renderEngine.getResourceLocation(par1EntityItem.getEntityItem().getItemSpriteNumber());
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -208,9 +208,9 @@ public class FancyItemRender extends Render
|
||||
|
||||
if (par2Icon == null)
|
||||
{
|
||||
TextureManager texturemanager = Minecraft.getMinecraft().func_110434_K();
|
||||
ResourceLocation resourcelocation = texturemanager.func_130087_a(par1EntityItem.getEntityItem().getItemSpriteNumber());
|
||||
par2Icon = ((TextureMap) texturemanager.func_110581_b(resourcelocation)).func_110572_b("missingno");
|
||||
TextureManager texturemanager = Minecraft.getMinecraft().getTextureManager();
|
||||
ResourceLocation resourcelocation = texturemanager.getResourceLocation(par1EntityItem.getEntityItem().getItemSpriteNumber());
|
||||
par2Icon = ((TextureMap) texturemanager.getTexture(resourcelocation)).getAtlasSprite("missingno");
|
||||
}
|
||||
|
||||
float f4 = ((Icon) par2Icon).getMinU();
|
||||
@@ -258,21 +258,21 @@ public class FancyItemRender extends Render
|
||||
|
||||
if (itemstack.getItemSpriteNumber() == 0)
|
||||
{
|
||||
this.func_110776_a(TextureMap.field_110575_b);
|
||||
this.bindTexture(TextureMap.locationBlocksTexture);
|
||||
}
|
||||
else
|
||||
{
|
||||
this.func_110776_a(TextureMap.field_110576_c);
|
||||
this.bindTexture(TextureMap.locationItemsTexture);
|
||||
}
|
||||
|
||||
GL11.glColor4f(par5, par6, par7, 1.0F);
|
||||
ItemRenderer.renderItemIn2D(tessellator, f5, f6, f4, f7, ((Icon) par2Icon).getOriginX(), ((Icon) par2Icon).getOriginY(), f12);
|
||||
ItemRenderer.renderItemIn2D(tessellator, f5, f6, f4, f7, ((Icon) par2Icon).getIconWidth(), ((Icon) par2Icon).getIconHeight(), f12);
|
||||
|
||||
if (itemstack.hasEffect(pass))
|
||||
{
|
||||
GL11.glDepthFunc(GL11.GL_EQUAL);
|
||||
GL11.glDisable(GL11.GL_LIGHTING);
|
||||
this.renderManager.renderEngine.func_110577_a(field_110798_h);
|
||||
this.renderManager.renderEngine.bindTexture(field_110798_h);
|
||||
GL11.glEnable(GL11.GL_BLEND);
|
||||
GL11.glBlendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE);
|
||||
float f13 = 0.76F;
|
||||
@@ -325,7 +325,7 @@ public class FancyItemRender extends Render
|
||||
Block block = (k < Block.blocksList.length ? Block.blocksList[k] : null);
|
||||
if (par3ItemStack.getItemSpriteNumber() == 0 && block != null && RenderBlocks.renderItemIn3d(Block.blocksList[k].getRenderType()))
|
||||
{
|
||||
par2TextureManager.func_110577_a(TextureMap.field_110575_b);
|
||||
par2TextureManager.bindTexture(TextureMap.locationBlocksTexture);
|
||||
GL11.glPushMatrix();
|
||||
GL11.glTranslatef((float) (par4 - 2), (float) (par5 + 3), -3.0F + this.zLevel);
|
||||
GL11.glScalef(10.0F, 10.0F, 10.0F);
|
||||
@@ -355,7 +355,7 @@ public class FancyItemRender extends Render
|
||||
|
||||
for (int j1 = 0; j1 < Item.itemsList[k].getRenderPasses(l); ++j1)
|
||||
{
|
||||
par2TextureManager.func_110577_a(par3ItemStack.getItemSpriteNumber() == 0 ? TextureMap.field_110575_b : TextureMap.field_110576_c);
|
||||
par2TextureManager.bindTexture(par3ItemStack.getItemSpriteNumber() == 0 ? TextureMap.locationBlocksTexture : TextureMap.locationItemsTexture);
|
||||
Icon icon = Item.itemsList[k].getIcon(par3ItemStack, j1);
|
||||
int k1 = Item.itemsList[k].getColorFromItemStack(par3ItemStack, j1);
|
||||
f1 = (float) (k1 >> 16 & 255) / 255.0F;
|
||||
@@ -380,12 +380,12 @@ public class FancyItemRender extends Render
|
||||
else
|
||||
{
|
||||
GL11.glDisable(GL11.GL_LIGHTING);
|
||||
ResourceLocation resourcelocation = par2TextureManager.func_130087_a(par3ItemStack.getItemSpriteNumber());
|
||||
par2TextureManager.func_110577_a(resourcelocation);
|
||||
ResourceLocation resourcelocation = par2TextureManager.getResourceLocation(par3ItemStack.getItemSpriteNumber());
|
||||
par2TextureManager.bindTexture(resourcelocation);
|
||||
|
||||
if (object == null)
|
||||
{
|
||||
object = ((TextureMap) Minecraft.getMinecraft().func_110434_K().func_110581_b(resourcelocation)).func_110572_b("missingno");
|
||||
object = ((TextureMap) Minecraft.getMinecraft().getTextureManager().getTexture(resourcelocation)).getAtlasSprite("missingno");
|
||||
}
|
||||
|
||||
i1 = Item.itemsList[k].getColorFromItemStack(par3ItemStack, 0);
|
||||
@@ -415,7 +415,7 @@ public class FancyItemRender extends Render
|
||||
GL11.glDepthFunc(GL11.GL_GREATER);
|
||||
GL11.glDisable(GL11.GL_LIGHTING);
|
||||
GL11.glDepthMask(false);
|
||||
manager.func_110577_a(field_110798_h);
|
||||
manager.bindTexture(field_110798_h);
|
||||
this.zLevel -= 50.0F;
|
||||
GL11.glEnable(GL11.GL_BLEND);
|
||||
GL11.glBlendFunc(GL11.GL_DST_COLOR, GL11.GL_DST_COLOR);
|
||||
@@ -446,7 +446,7 @@ public class FancyItemRender extends Render
|
||||
GL11.glDepthFunc(GL11.GL_GREATER);
|
||||
GL11.glDisable(GL11.GL_LIGHTING);
|
||||
GL11.glDepthMask(false);
|
||||
par2TextureManager.func_110577_a(field_110798_h);
|
||||
par2TextureManager.bindTexture(field_110798_h);
|
||||
this.zLevel -= 50.0F;
|
||||
GL11.glEnable(GL11.GL_BLEND);
|
||||
GL11.glBlendFunc(GL11.GL_DST_COLOR, GL11.GL_DST_COLOR);
|
||||
@@ -568,7 +568,7 @@ public class FancyItemRender extends Render
|
||||
tessellator.draw();
|
||||
}
|
||||
|
||||
protected ResourceLocation func_110775_a (Entity par1Entity)
|
||||
protected ResourceLocation getEntityTexture (Entity par1Entity)
|
||||
{
|
||||
return this.func_110796_a((EntityItem) par1Entity);
|
||||
}
|
||||
|
||||
@@ -177,7 +177,7 @@ public class MiniGardyRender extends RenderLiving
|
||||
}
|
||||
|
||||
@Override
|
||||
protected ResourceLocation func_110775_a (Entity par1Entity)
|
||||
protected ResourceLocation getEntityTexture (Entity par1Entity)
|
||||
{
|
||||
return texture;
|
||||
}
|
||||
|
||||
@@ -93,7 +93,7 @@ public class SlimeCloneRender extends RenderLiving
|
||||
}*/
|
||||
|
||||
@Override
|
||||
protected ResourceLocation func_110775_a (Entity entity)
|
||||
protected ResourceLocation getEntityTexture (Entity entity)
|
||||
{
|
||||
//return func_98191_a((SlimeClone)entity);
|
||||
return null;
|
||||
|
||||
@@ -36,7 +36,7 @@ public class SlimeRender extends RenderLiving
|
||||
public void renderBossHealth (BlueSlime slime)
|
||||
{
|
||||
if (slime.getSlimeSize() >= 8)
|
||||
BossStatus.func_82824_a(slime, true);
|
||||
BossStatus.setBossStatus(slime, true);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -99,7 +99,7 @@ public class SlimeRender extends RenderLiving
|
||||
}
|
||||
|
||||
@Override
|
||||
protected ResourceLocation func_110775_a (Entity par1Entity)
|
||||
protected ResourceLocation getEntityTexture (Entity par1Entity)
|
||||
{
|
||||
return texture;
|
||||
}
|
||||
|
||||
@@ -52,7 +52,7 @@ public class ArrowRender extends Render
|
||||
*/
|
||||
public void doRenderItem (ArrowEntity par1ArrowEntity, double par2, double par4, double par6, float par8, float par9)
|
||||
{
|
||||
this.func_110777_b(par1ArrowEntity);
|
||||
this.bindEntityTexture(par1ArrowEntity);
|
||||
this.random.setSeed(187L);
|
||||
ItemStack itemstack = par1ArrowEntity.getEntityItem();
|
||||
|
||||
@@ -188,7 +188,7 @@ public class ArrowRender extends Render
|
||||
|
||||
protected ResourceLocation func_110796_a (ArrowEntity par1ArrowEntity)
|
||||
{
|
||||
return this.renderManager.renderEngine.func_130087_a(par1ArrowEntity.getEntityItem().getItemSpriteNumber());
|
||||
return this.renderManager.renderEngine.getResourceLocation(par1ArrowEntity.getEntityItem().getItemSpriteNumber());
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -205,9 +205,9 @@ public class ArrowRender extends Render
|
||||
|
||||
if (par2Icon == null)
|
||||
{
|
||||
TextureManager texturemanager = Minecraft.getMinecraft().func_110434_K();
|
||||
ResourceLocation resourcelocation = texturemanager.func_130087_a(arrow.getEntityItem().getItemSpriteNumber());
|
||||
par2Icon = ((TextureMap) texturemanager.func_110581_b(resourcelocation)).func_110572_b("missingno");
|
||||
TextureManager texturemanager = Minecraft.getMinecraft().getTextureManager();
|
||||
ResourceLocation resourcelocation = texturemanager.getResourceLocation(arrow.getEntityItem().getItemSpriteNumber());
|
||||
par2Icon = ((TextureMap) texturemanager.getTexture(resourcelocation)).getAtlasSprite("missingno");
|
||||
}
|
||||
|
||||
float f4 = ((Icon) par2Icon).getMinU();
|
||||
@@ -257,21 +257,21 @@ public class ArrowRender extends Render
|
||||
|
||||
if (itemstack.getItemSpriteNumber() == 0)
|
||||
{
|
||||
this.func_110776_a(TextureMap.field_110575_b);
|
||||
this.bindTexture(TextureMap.locationBlocksTexture);
|
||||
}
|
||||
else
|
||||
{
|
||||
this.func_110776_a(TextureMap.field_110576_c);
|
||||
this.bindTexture(TextureMap.locationItemsTexture);
|
||||
}
|
||||
|
||||
GL11.glColor4f(par5, par6, par7, 1.0F);
|
||||
ItemRenderer.renderItemIn2D(tessellator, f5, f6, f4, f7, ((Icon) par2Icon).getOriginX(), ((Icon) par2Icon).getOriginY(), f12);
|
||||
ItemRenderer.renderItemIn2D(tessellator, f5, f6, f4, f7, ((Icon) par2Icon).getIconWidth(), ((Icon) par2Icon).getIconHeight(), f12);
|
||||
|
||||
if (itemstack.hasEffect(pass))
|
||||
{
|
||||
GL11.glDepthFunc(GL11.GL_EQUAL);
|
||||
GL11.glDisable(GL11.GL_LIGHTING);
|
||||
this.renderManager.renderEngine.func_110577_a(field_110798_h);
|
||||
this.renderManager.renderEngine.bindTexture(field_110798_h);
|
||||
GL11.glEnable(GL11.GL_BLEND);
|
||||
GL11.glBlendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE);
|
||||
float f13 = 0.76F;
|
||||
@@ -323,7 +323,7 @@ public class ArrowRender extends Render
|
||||
Block block = (k < Block.blocksList.length ? Block.blocksList[k] : null);
|
||||
if (par3ItemStack.getItemSpriteNumber() == 0 && block != null && RenderBlocks.renderItemIn3d(Block.blocksList[k].getRenderType()))
|
||||
{
|
||||
par2TextureManager.func_110577_a(TextureMap.field_110575_b);
|
||||
par2TextureManager.bindTexture(TextureMap.locationBlocksTexture);
|
||||
GL11.glPushMatrix();
|
||||
GL11.glTranslatef((float) (par4 - 2), (float) (par5 + 3), -3.0F + this.zLevel);
|
||||
GL11.glScalef(10.0F, 10.0F, 10.0F);
|
||||
@@ -353,7 +353,7 @@ public class ArrowRender extends Render
|
||||
|
||||
for (int j1 = 0; j1 < Item.itemsList[k].getRenderPasses(l); ++j1)
|
||||
{
|
||||
par2TextureManager.func_110577_a(par3ItemStack.getItemSpriteNumber() == 0 ? TextureMap.field_110575_b : TextureMap.field_110576_c);
|
||||
par2TextureManager.bindTexture(par3ItemStack.getItemSpriteNumber() == 0 ? TextureMap.locationBlocksTexture : TextureMap.locationItemsTexture);
|
||||
Icon icon = Item.itemsList[k].getIcon(par3ItemStack, j1);
|
||||
int k1 = Item.itemsList[k].getColorFromItemStack(par3ItemStack, j1);
|
||||
f1 = (float) (k1 >> 16 & 255) / 255.0F;
|
||||
@@ -378,12 +378,12 @@ public class ArrowRender extends Render
|
||||
else
|
||||
{
|
||||
GL11.glDisable(GL11.GL_LIGHTING);
|
||||
ResourceLocation resourcelocation = par2TextureManager.func_130087_a(par3ItemStack.getItemSpriteNumber());
|
||||
par2TextureManager.func_110577_a(resourcelocation);
|
||||
ResourceLocation resourcelocation = par2TextureManager.getResourceLocation(par3ItemStack.getItemSpriteNumber());
|
||||
par2TextureManager.bindTexture(resourcelocation);
|
||||
|
||||
if (object == null)
|
||||
{
|
||||
object = ((TextureMap) Minecraft.getMinecraft().func_110434_K().func_110581_b(resourcelocation)).func_110572_b("missingno");
|
||||
object = ((TextureMap) Minecraft.getMinecraft().getTextureManager().getTexture(resourcelocation)).getAtlasSprite("missingno");
|
||||
}
|
||||
|
||||
i1 = Item.itemsList[k].getColorFromItemStack(par3ItemStack, 0);
|
||||
@@ -413,7 +413,7 @@ public class ArrowRender extends Render
|
||||
GL11.glDepthFunc(GL11.GL_GREATER);
|
||||
GL11.glDisable(GL11.GL_LIGHTING);
|
||||
GL11.glDepthMask(false);
|
||||
manager.func_110577_a(field_110798_h);
|
||||
manager.bindTexture(field_110798_h);
|
||||
this.zLevel -= 50.0F;
|
||||
GL11.glEnable(GL11.GL_BLEND);
|
||||
GL11.glBlendFunc(GL11.GL_DST_COLOR, GL11.GL_DST_COLOR);
|
||||
@@ -444,7 +444,7 @@ public class ArrowRender extends Render
|
||||
GL11.glDepthFunc(GL11.GL_GREATER);
|
||||
GL11.glDisable(GL11.GL_LIGHTING);
|
||||
GL11.glDepthMask(false);
|
||||
par2TextureManager.func_110577_a(field_110798_h);
|
||||
par2TextureManager.bindTexture(field_110798_h);
|
||||
this.zLevel -= 50.0F;
|
||||
GL11.glEnable(GL11.GL_BLEND);
|
||||
GL11.glBlendFunc(GL11.GL_DST_COLOR, GL11.GL_DST_COLOR);
|
||||
@@ -566,7 +566,7 @@ public class ArrowRender extends Render
|
||||
tessellator.draw();
|
||||
}
|
||||
|
||||
protected ResourceLocation func_110775_a (Entity par1Entity)
|
||||
protected ResourceLocation getEntityTexture (Entity par1Entity)
|
||||
{
|
||||
return this.func_110796_a((ArrowEntity) par1Entity);
|
||||
}
|
||||
|
||||
@@ -91,13 +91,13 @@ public class ArrowRenderCustom extends Render
|
||||
this.doRenderItem((ArrowEntity) par1Entity, par2, par4, par6, par8, par9);
|
||||
}
|
||||
|
||||
protected ResourceLocation func_110775_a (Entity par1Entity)
|
||||
protected ResourceLocation getEntityTexture (Entity par1Entity)
|
||||
{
|
||||
return this.func_110796_a((ArrowEntity) par1Entity);
|
||||
}
|
||||
|
||||
protected ResourceLocation func_110796_a (ArrowEntity par1ArrowEntity)
|
||||
{
|
||||
return this.renderManager.renderEngine.func_130087_a(par1ArrowEntity.getEntityItem().getItemSpriteNumber());
|
||||
return this.renderManager.renderEngine.getResourceLocation(par1ArrowEntity.getEntityItem().getItemSpriteNumber());
|
||||
}
|
||||
}
|
||||
@@ -52,7 +52,7 @@ public class DaggerRender extends Render
|
||||
*/
|
||||
public void doRenderItem (DaggerEntity par1ArrowEntity, double par2, double par4, double par6, float par8, float par9)
|
||||
{
|
||||
this.func_110777_b(par1ArrowEntity);
|
||||
this.bindEntityTexture(par1ArrowEntity);
|
||||
this.random.setSeed(187L);
|
||||
ItemStack itemstack = par1ArrowEntity.getEntityItem();
|
||||
|
||||
@@ -188,7 +188,7 @@ public class DaggerRender extends Render
|
||||
|
||||
protected ResourceLocation func_110796_a (DaggerEntity par1ArrowEntity)
|
||||
{
|
||||
return this.renderManager.renderEngine.func_130087_a(par1ArrowEntity.getEntityItem().getItemSpriteNumber());
|
||||
return this.renderManager.renderEngine.getResourceLocation(par1ArrowEntity.getEntityItem().getItemSpriteNumber());
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -205,9 +205,9 @@ public class DaggerRender extends Render
|
||||
|
||||
if (par2Icon == null)
|
||||
{
|
||||
TextureManager texturemanager = Minecraft.getMinecraft().func_110434_K();
|
||||
ResourceLocation resourcelocation = texturemanager.func_130087_a(dagger.getEntityItem().getItemSpriteNumber());
|
||||
par2Icon = ((TextureMap) texturemanager.func_110581_b(resourcelocation)).func_110572_b("missingno");
|
||||
TextureManager texturemanager = Minecraft.getMinecraft().getTextureManager();
|
||||
ResourceLocation resourcelocation = texturemanager.getResourceLocation(dagger.getEntityItem().getItemSpriteNumber());
|
||||
par2Icon = ((TextureMap) texturemanager.getTexture(resourcelocation)).getAtlasSprite("missingno");
|
||||
}
|
||||
|
||||
float f4 = ((Icon) par2Icon).getMinU();
|
||||
@@ -249,23 +249,23 @@ public class DaggerRender extends Render
|
||||
|
||||
if (itemstack.getItemSpriteNumber() == 0)
|
||||
{
|
||||
this.func_110776_a(TextureMap.field_110575_b);
|
||||
this.bindTexture(TextureMap.locationBlocksTexture);
|
||||
}
|
||||
else
|
||||
{
|
||||
this.func_110776_a(TextureMap.field_110576_c);
|
||||
this.bindTexture(TextureMap.locationItemsTexture);
|
||||
}
|
||||
|
||||
GL11.glColor4f(par5, par6, par7, 1.0F);
|
||||
GL11.glRotatef(90, 0.0F, 1.0F, 0.0F);
|
||||
GL11.glRotatef(rotation, 0.0F, 0.0F, 1.0F);
|
||||
ItemRenderer.renderItemIn2D(tessellator, f5, f6, f4, f7, ((Icon) par2Icon).getOriginX(), ((Icon) par2Icon).getOriginY(), f12);
|
||||
ItemRenderer.renderItemIn2D(tessellator, f5, f6, f4, f7, ((Icon) par2Icon).getIconWidth(), ((Icon) par2Icon).getIconHeight(), f12);
|
||||
|
||||
/*if (itemstack.hasEffect(pass))
|
||||
{
|
||||
GL11.glDepthFunc(GL11.GL_EQUAL);
|
||||
GL11.glDisable(GL11.GL_LIGHTING);
|
||||
this.renderManager.renderEngine.func_110577_a(field_110798_h);
|
||||
this.renderManager.renderEngine.bindTexture(field_110798_h);
|
||||
GL11.glEnable(GL11.GL_BLEND);
|
||||
GL11.glBlendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE);
|
||||
float f13 = 0.76F;
|
||||
@@ -317,7 +317,7 @@ public class DaggerRender extends Render
|
||||
Block block = (k < Block.blocksList.length ? Block.blocksList[k] : null);
|
||||
if (par3ItemStack.getItemSpriteNumber() == 0 && block != null && RenderBlocks.renderItemIn3d(Block.blocksList[k].getRenderType()))
|
||||
{
|
||||
par2TextureManager.func_110577_a(TextureMap.field_110575_b);
|
||||
par2TextureManager.bindTexture(TextureMap.locationBlocksTexture);
|
||||
GL11.glPushMatrix();
|
||||
GL11.glTranslatef((float) (par4 - 2), (float) (par5 + 3), -3.0F + this.zLevel);
|
||||
GL11.glScalef(10.0F, 10.0F, 10.0F);
|
||||
@@ -347,7 +347,7 @@ public class DaggerRender extends Render
|
||||
|
||||
for (int j1 = 0; j1 < Item.itemsList[k].getRenderPasses(l); ++j1)
|
||||
{
|
||||
par2TextureManager.func_110577_a(par3ItemStack.getItemSpriteNumber() == 0 ? TextureMap.field_110575_b : TextureMap.field_110576_c);
|
||||
par2TextureManager.bindTexture(par3ItemStack.getItemSpriteNumber() == 0 ? TextureMap.locationBlocksTexture : TextureMap.locationItemsTexture);
|
||||
Icon icon = Item.itemsList[k].getIcon(par3ItemStack, j1);
|
||||
int k1 = Item.itemsList[k].getColorFromItemStack(par3ItemStack, j1);
|
||||
f1 = (float) (k1 >> 16 & 255) / 255.0F;
|
||||
@@ -372,12 +372,12 @@ public class DaggerRender extends Render
|
||||
else
|
||||
{
|
||||
GL11.glDisable(GL11.GL_LIGHTING);
|
||||
ResourceLocation resourcelocation = par2TextureManager.func_130087_a(par3ItemStack.getItemSpriteNumber());
|
||||
par2TextureManager.func_110577_a(resourcelocation);
|
||||
ResourceLocation resourcelocation = par2TextureManager.getResourceLocation(par3ItemStack.getItemSpriteNumber());
|
||||
par2TextureManager.bindTexture(resourcelocation);
|
||||
|
||||
if (object == null)
|
||||
{
|
||||
object = ((TextureMap) Minecraft.getMinecraft().func_110434_K().func_110581_b(resourcelocation)).func_110572_b("missingno");
|
||||
object = ((TextureMap) Minecraft.getMinecraft().getTextureManager().getTexture(resourcelocation)).getAtlasSprite("missingno");
|
||||
}
|
||||
|
||||
i1 = Item.itemsList[k].getColorFromItemStack(par3ItemStack, 0);
|
||||
@@ -407,7 +407,7 @@ public class DaggerRender extends Render
|
||||
GL11.glDepthFunc(GL11.GL_GREATER);
|
||||
GL11.glDisable(GL11.GL_LIGHTING);
|
||||
GL11.glDepthMask(false);
|
||||
manager.func_110577_a(field_110798_h);
|
||||
manager.bindTexture(field_110798_h);
|
||||
this.zLevel -= 50.0F;
|
||||
GL11.glEnable(GL11.GL_BLEND);
|
||||
GL11.glBlendFunc(GL11.GL_DST_COLOR, GL11.GL_DST_COLOR);
|
||||
@@ -438,7 +438,7 @@ public class DaggerRender extends Render
|
||||
GL11.glDepthFunc(GL11.GL_GREATER);
|
||||
GL11.glDisable(GL11.GL_LIGHTING);
|
||||
GL11.glDepthMask(false);
|
||||
par2TextureManager.func_110577_a(field_110798_h);
|
||||
par2TextureManager.bindTexture(field_110798_h);
|
||||
this.zLevel -= 50.0F;
|
||||
GL11.glEnable(GL11.GL_BLEND);
|
||||
GL11.glBlendFunc(GL11.GL_DST_COLOR, GL11.GL_DST_COLOR);
|
||||
@@ -560,7 +560,7 @@ public class DaggerRender extends Render
|
||||
tessellator.draw();
|
||||
}
|
||||
|
||||
protected ResourceLocation func_110775_a (Entity par1Entity)
|
||||
protected ResourceLocation getEntityTexture (Entity par1Entity)
|
||||
{
|
||||
return this.func_110796_a((DaggerEntity) par1Entity);
|
||||
}
|
||||
|
||||
@@ -98,13 +98,13 @@ public class DaggerRenderCustom extends Render
|
||||
this.doRenderItem((DaggerEntity) par1Entity, par2, par4, par6, par8, par9);
|
||||
}
|
||||
|
||||
protected ResourceLocation func_110775_a (Entity par1Entity)
|
||||
protected ResourceLocation getEntityTexture (Entity par1Entity)
|
||||
{
|
||||
return this.func_110796_a((DaggerEntity) par1Entity);
|
||||
}
|
||||
|
||||
protected ResourceLocation func_110796_a (DaggerEntity par1ArrowEntity)
|
||||
{
|
||||
return this.renderManager.renderEngine.func_130087_a(par1ArrowEntity.getEntityItem().getItemSpriteNumber());
|
||||
return this.renderManager.renderEngine.getResourceLocation(par1ArrowEntity.getEntityItem().getItemSpriteNumber());
|
||||
}
|
||||
}
|
||||
@@ -51,7 +51,7 @@ public class LaunchedItemRender extends Render
|
||||
GL11.glTranslatef((float) par2, (float) par4, (float) par6);
|
||||
GL11.glEnable(GL12.GL_RESCALE_NORMAL);
|
||||
GL11.glScalef(0.5F, 0.5F, 0.5F);
|
||||
this.func_110777_b(par1Entity);
|
||||
this.bindEntityTexture(par1Entity);
|
||||
Tessellator tessellator = Tessellator.instance;
|
||||
|
||||
if (icon == ItemPotion.func_94589_d("bottle_splash"))
|
||||
@@ -73,9 +73,9 @@ public class LaunchedItemRender extends Render
|
||||
}
|
||||
}
|
||||
|
||||
protected ResourceLocation func_110775_a (Entity par1Entity)
|
||||
protected ResourceLocation getEntityTexture (Entity par1Entity)
|
||||
{
|
||||
return TextureMap.field_110576_c;
|
||||
return TextureMap.locationItemsTexture;
|
||||
}
|
||||
|
||||
private void func_77026_a (Tessellator par1Tessellator, Icon par2Icon)
|
||||
@@ -97,4 +97,5 @@ public class LaunchedItemRender extends Render
|
||||
par1Tessellator.addVertexWithUV((double) (0.0F - f5), (double) (f4 - f6), 0.0D, (double) f, (double) f2);
|
||||
par1Tessellator.draw();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -54,7 +54,7 @@ public class EventCloakRender
|
||||
|
||||
capePlayers.add(abstractClientPlayer);
|
||||
|
||||
abstractClientPlayer.func_110310_o().field_110559_g = false;
|
||||
abstractClientPlayer.getTextureCape().textureUploaded = false;
|
||||
new Thread(new CloakThread(abstractClientPlayer, cloakURL)).start();
|
||||
event.renderCape = true;
|
||||
}
|
||||
@@ -123,7 +123,7 @@ public class EventCloakRender
|
||||
Image cape = new ImageIcon(new URL(cloakURL)).getImage();
|
||||
BufferedImage bo = new BufferedImage(cape.getWidth(null), cape.getHeight(null), BufferedImage.TYPE_INT_ARGB);
|
||||
bo.getGraphics().drawImage(cape, 0, 0, null);
|
||||
abstractClientPlayer.func_110310_o().field_110560_d = bo;
|
||||
abstractClientPlayer.getTextureCape().bufferedImage = bo;
|
||||
}
|
||||
catch (MalformedURLException e)
|
||||
{
|
||||
|
||||
@@ -85,7 +85,7 @@ public class ArmorExtendedGui extends InventoryEffectRenderer
|
||||
{
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
//mc.renderEngine.bindTexture("/mods/tinker/textures/gui/armorextended.png");
|
||||
this.mc.func_110434_K().func_110577_a(background);
|
||||
this.mc.getTextureManager().bindTexture(background);
|
||||
int cornerX = guiLeft;
|
||||
int cornerY = (height - ySize) / 2;
|
||||
drawTexturedModalRect(cornerX, cornerY, 0, 0, xSize, ySize);
|
||||
|
||||
@@ -35,7 +35,7 @@ public class CraftingStationGui extends GuiContainer
|
||||
protected void drawGuiContainerBackgroundLayer (float f, int i, int j)
|
||||
{
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
this.mc.func_110434_K().func_110577_a(background);
|
||||
this.mc.getTextureManager().bindTexture(background);
|
||||
int l = (width - xSize) / 2;
|
||||
int i1 = (height - ySize) / 2;
|
||||
drawTexturedModalRect(l, i1, 0, 0, xSize, ySize);
|
||||
|
||||
@@ -36,7 +36,7 @@ public class DrawbridgeButton extends GuiButton
|
||||
{
|
||||
boolean hovering = par2 >= this.xPosition && par3 >= this.yPosition && par2 < this.xPosition + this.width && par3 < this.yPosition + this.height;
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
mc.func_110434_K().func_110577_a(background);
|
||||
mc.getTextureManager().bindTexture(background);
|
||||
int offset = 0;
|
||||
if (!this.enabled)
|
||||
offset = 46;
|
||||
|
||||
@@ -38,7 +38,7 @@ public class DrawbridgeGui extends GuiContainer
|
||||
protected void drawGuiContainerBackgroundLayer (float f, int i, int j)
|
||||
{
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
this.mc.func_110434_K().func_110577_a(background);
|
||||
this.mc.getTextureManager().bindTexture(background);
|
||||
int cornerX = (width - xSize) / 2;
|
||||
int cornerY = (height - ySize) / 2;
|
||||
drawTexturedModalRect(cornerX, cornerY, 0, 0, xSize, ySize);
|
||||
|
||||
@@ -31,7 +31,7 @@ public class FrypanGui extends GuiContainer
|
||||
protected void drawGuiContainerBackgroundLayer (float f, int i, int j)
|
||||
{
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
this.mc.func_110434_K().func_110577_a(background);
|
||||
this.mc.getTextureManager().bindTexture(background);
|
||||
int cornerX = (width - xSize) / 2;
|
||||
int cornerY = (height - ySize) / 2;
|
||||
drawTexturedModalRect(cornerX, cornerY, 0, 0, xSize, ySize);
|
||||
|
||||
@@ -42,7 +42,7 @@ public class GuiButtonTool extends GuiButton
|
||||
{
|
||||
boolean var4 = mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.width && mouseY < this.yPosition + this.height;
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
mc.func_110434_K().func_110577_a(background);
|
||||
mc.getTextureManager().bindTexture(background);
|
||||
|
||||
this.field_82253_i = mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.width && mouseY < this.yPosition + this.height;
|
||||
int var5 = this.getHoverState(this.field_82253_i);
|
||||
|
||||
@@ -77,7 +77,7 @@ public class GuiLandmine extends GuiContainer
|
||||
protected void drawGuiContainerBackgroundLayer (float f, int i, int j)
|
||||
{
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
mc.renderEngine.func_110577_a(background);
|
||||
mc.renderEngine.bindTexture(background);
|
||||
int x = (width - xSize) / 2;
|
||||
int y = (height - ySize) / 2;
|
||||
this.drawTexturedModalRect(x, y, 0, 0, xSize, ySize);
|
||||
|
||||
@@ -158,13 +158,13 @@ public class GuiManual extends GuiScreen
|
||||
public void drawScreen (int par1, int par2, float par3)
|
||||
{
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
this.mc.func_110434_K().func_110577_a(bookRight);
|
||||
this.mc.getTextureManager().bindTexture(bookRight);
|
||||
int localWidth = (this.width) / 2;
|
||||
byte localHeight = 8;
|
||||
this.drawTexturedModalRect(localWidth, localHeight, 0, 0, this.bookImageWidth, this.bookImageHeight);
|
||||
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
this.mc.func_110434_K().func_110577_a(bookLeft);
|
||||
this.mc.getTextureManager().bindTexture(bookLeft);
|
||||
localWidth = localWidth - this.bookImageWidth;
|
||||
this.drawTexturedModalRect(localWidth, localHeight, 256 - this.bookImageWidth, 0, this.bookImageWidth, this.bookImageHeight);
|
||||
|
||||
|
||||
@@ -53,7 +53,7 @@ public class KnapsackGui extends GuiContainer
|
||||
protected void drawGuiContainerBackgroundLayer (float f, int i, int j)
|
||||
{
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
this.mc.func_110434_K().func_110577_a(background);
|
||||
this.mc.getTextureManager().bindTexture(background);
|
||||
int cornerX = guiLeft;
|
||||
int cornerY = (height - ySize) / 2;
|
||||
drawTexturedModalRect(cornerX, cornerY, 0, 0, xSize, ySize);
|
||||
|
||||
@@ -31,7 +31,7 @@ public class MiniGardyGui extends GuiContainer
|
||||
protected void drawGuiContainerBackgroundLayer (float f, int i, int j)
|
||||
{
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
this.mc.func_110434_K().func_110577_a(background);
|
||||
this.mc.getTextureManager().bindTexture(background);
|
||||
int cornerX = (width - xSize) / 2;
|
||||
int cornerY = (height - ySize) / 2;
|
||||
drawTexturedModalRect(cornerX, cornerY, 0, 0, xSize, ySize);
|
||||
|
||||
@@ -415,7 +415,7 @@ public abstract class NewContainerGui extends GuiScreen
|
||||
if (icon != null)
|
||||
{
|
||||
GL11.glDisable(GL11.GL_LIGHTING);
|
||||
this.mc.func_110434_K().func_110577_a(TextureMap.field_110576_c);
|
||||
this.mc.getTextureManager().bindTexture(TextureMap.locationItemsTexture);
|
||||
this.drawTexturedModelRectFromIcon(i, j, icon, 16, 16);
|
||||
GL11.glEnable(GL11.GL_LIGHTING);
|
||||
flag1 = true;
|
||||
|
||||
@@ -156,7 +156,7 @@ public class PartCrafterGui extends NewContainerGui
|
||||
{
|
||||
// Draw the background
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
this.mc.func_110434_K().func_110577_a(background);
|
||||
this.mc.getTextureManager().bindTexture(background);
|
||||
int cornerX = (this.width - this.xSize) / 2;
|
||||
int cornerY = (this.height - this.ySize) / 2;
|
||||
this.drawTexturedModalRect(cornerX, cornerY, 0, 0, this.xSize, this.ySize);
|
||||
@@ -184,13 +184,13 @@ public class PartCrafterGui extends NewContainerGui
|
||||
if (drawChestPart)
|
||||
{
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
this.mc.func_110434_K().func_110577_a(minichest);
|
||||
this.mc.getTextureManager().bindTexture(minichest);
|
||||
this.drawTexturedModalRect(cornerX - 116, cornerY + 11, 0, 0, this.xSize, this.ySize);
|
||||
}
|
||||
|
||||
// Draw description
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
this.mc.func_110434_K().func_110577_a(description);
|
||||
this.mc.getTextureManager().bindTexture(description);
|
||||
cornerX = (this.width + this.xSize) / 2;
|
||||
cornerY = (this.height - this.ySize) / 2;
|
||||
this.drawTexturedModalRect(cornerX, cornerY, 126, 0, 126, this.ySize);
|
||||
|
||||
@@ -33,7 +33,7 @@ public class PatternChestGui extends GuiContainer
|
||||
protected void drawGuiContainerBackgroundLayer (float f, int i, int j)
|
||||
{
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
this.mc.func_110434_K().func_110577_a(background);
|
||||
this.mc.getTextureManager().bindTexture(background);
|
||||
int cornerX = (width - xSize) / 2;
|
||||
int cornerY = (height - ySize) / 2;
|
||||
drawTexturedModalRect(cornerX, cornerY, 0, 0, xSize, ySize);
|
||||
|
||||
@@ -153,13 +153,13 @@ public class SmelteryGui extends NewContainerGui
|
||||
protected void drawGuiContainerBackgroundLayer (float f, int mouseX, int mouseY)
|
||||
{
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
this.mc.func_110434_K().func_110577_a(background);
|
||||
this.mc.getTextureManager().bindTexture(background);
|
||||
int cornerX = (width - xSize) / 2 + 36;
|
||||
int cornerY = (height - ySize) / 2;
|
||||
drawTexturedModalRect(cornerX + 46, cornerY, 0, 0, 176, ySize);
|
||||
|
||||
//Fuel - Lava
|
||||
this.mc.func_110434_K().func_110577_a(TextureMap.field_110575_b);
|
||||
this.mc.getTextureManager().bindTexture(TextureMap.locationBlocksTexture);
|
||||
if (logic.fuelGague > 0)
|
||||
{
|
||||
Icon lavaIcon = Block.lavaStill.getIcon(0, 0);
|
||||
@@ -206,12 +206,12 @@ public class SmelteryGui extends NewContainerGui
|
||||
//Liquid gague
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
|
||||
this.mc.func_110434_K().func_110577_a(background);
|
||||
this.mc.getTextureManager().bindTexture(background);
|
||||
drawTexturedModalRect(cornerX + 54, cornerY + 16, 176, 76, 52, 52);
|
||||
|
||||
//Side inventory
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
this.mc.func_110434_K().func_110577_a(backgroundSide);
|
||||
this.mc.getTextureManager().bindTexture(backgroundSide);
|
||||
if (logic.layers > 0)
|
||||
{
|
||||
if (logic.layers == 1)
|
||||
|
||||
@@ -49,7 +49,7 @@ public class StencilTableGui extends GuiContainer
|
||||
protected void drawGuiContainerBackgroundLayer (float par1, int par2, int par3)
|
||||
{
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
this.mc.func_110434_K().func_110577_a(background);
|
||||
this.mc.getTextureManager().bindTexture(background);
|
||||
int cornerX = (this.width - this.xSize) / 2;
|
||||
int cornerY = (this.height - this.ySize) / 2;
|
||||
this.drawTexturedModalRect(cornerX, cornerY, 0, 0, this.xSize, this.ySize);
|
||||
|
||||
@@ -431,7 +431,7 @@ public class ToolStationGui extends NewContainerGui
|
||||
{
|
||||
// Draw the background
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
this.mc.func_110434_K().func_110577_a(background);
|
||||
this.mc.getTextureManager().bindTexture(background);
|
||||
int cornerX = (this.width - this.xSize) / 2;
|
||||
int cornerY = (this.height - this.ySize) / 2;
|
||||
this.drawTexturedModalRect(cornerX, cornerY, 0, 0, this.xSize, this.ySize);
|
||||
@@ -442,7 +442,7 @@ public class ToolStationGui extends NewContainerGui
|
||||
}
|
||||
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
this.mc.func_110434_K().func_110577_a(icons);
|
||||
this.mc.getTextureManager().bindTexture(icons);
|
||||
// Draw the slots
|
||||
|
||||
for (int i = 0; i < slotX.length; i++)
|
||||
@@ -456,7 +456,7 @@ public class ToolStationGui extends NewContainerGui
|
||||
|
||||
// Draw description
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
this.mc.func_110434_K().func_110577_a(description);
|
||||
this.mc.getTextureManager().bindTexture(description);
|
||||
cornerX = (this.width + this.xSize) / 2;
|
||||
cornerY = (this.height - this.ySize) / 2;
|
||||
this.drawTexturedModalRect(cornerX, cornerY, 0, 0, 126, this.ySize + 30);
|
||||
|
||||
@@ -34,7 +34,7 @@ public class TurnPageButton extends GuiButton
|
||||
{
|
||||
boolean var4 = par2 >= this.xPosition && par3 >= this.yPosition && par2 < this.xPosition + this.width && par3 < this.yPosition + this.height;
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
par1Minecraft.func_110434_K().func_110577_a(background);
|
||||
par1Minecraft.getTextureManager().bindTexture(background);
|
||||
int var5 = 0;
|
||||
int var6 = 192;
|
||||
|
||||
|
||||
@@ -60,7 +60,7 @@ public class BlockCastPage extends BookPage
|
||||
|
||||
public void renderBackgroundLayer (int localWidth, int localHeight)
|
||||
{
|
||||
manual.getMC().func_110434_K().func_110577_a(background);
|
||||
manual.getMC().getTextureManager().bindTexture(background);
|
||||
manual.drawTexturedModalRect(localWidth, localHeight + 32, 0, 0, 174, 115);
|
||||
manual.drawTexturedModalRect(localWidth + 62, localHeight + 105, 2, 118, 45, 45);
|
||||
}
|
||||
|
||||
@@ -95,7 +95,7 @@ public class CraftingPage extends BookPage
|
||||
|
||||
public void drawBackground (int size, int localWidth, int localHeight)
|
||||
{
|
||||
manual.getMC().func_110434_K().func_110577_a(background);
|
||||
manual.getMC().getTextureManager().bindTexture(background);
|
||||
if (size == 2)
|
||||
manual.drawTexturedModalRect(localWidth + 8, localHeight + 46, 0, 116, 154, 78);
|
||||
if (size == 3)
|
||||
|
||||
@@ -56,7 +56,7 @@ public class FurnacePage extends BookPage
|
||||
|
||||
public void renderBackgroundLayer (int localWidth, int localHeight)
|
||||
{
|
||||
manual.getMC().func_110434_K().func_110577_a(background);
|
||||
manual.getMC().getTextureManager().bindTexture(background);
|
||||
manual.drawTexturedModalRect(localWidth + 32, localHeight + 32, 0, 0, 111, 114);
|
||||
}
|
||||
}
|
||||
@@ -57,7 +57,7 @@ public class ModifierPage extends BookPage
|
||||
|
||||
public void renderBackgroundLayer (int localWidth, int localHeight)
|
||||
{
|
||||
manual.getMC().func_110434_K().func_110577_a(background);
|
||||
manual.getMC().getTextureManager().bindTexture(background);
|
||||
manual.drawTexturedModalRect(localWidth + 12, localHeight + 32, 0, 0, 154, 78);
|
||||
}
|
||||
}
|
||||
@@ -34,7 +34,7 @@ public class PicturePage extends BookPage
|
||||
|
||||
public void renderBackgroundLayer (int localWidth, int localHeight)
|
||||
{
|
||||
manual.getMC().func_110434_K().func_110577_a(background);
|
||||
manual.getMC().getTextureManager().bindTexture(background);
|
||||
//manual.getMC().renderEngine.bindTexture(location);
|
||||
manual.drawTexturedModalRect(localWidth, localHeight + 12, 0, 0, 170, 144);
|
||||
}
|
||||
|
||||
@@ -32,7 +32,7 @@ public abstract class AbstractTab extends GuiButton
|
||||
int ySize = this.enabled ? 28 : 32;
|
||||
int xOffset = this.id == 2 ? 0 : 1;
|
||||
|
||||
mc.renderEngine.func_110577_a(this.texture);
|
||||
mc.renderEngine.bindTexture(this.texture);
|
||||
this.drawTexturedModalRect(this.xPosition, this.yPosition, xOffset * 28, yTexPos, 28, ySize);
|
||||
|
||||
RenderHelper.enableGUIStandardItemLighting();
|
||||
|
||||
@@ -547,10 +547,9 @@ public class TinkerChunkProvider implements IChunkProvider
|
||||
this.genNetherBridge.generate(this, this.worldObj, par1, par2, (byte[]) null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void func_104112_b ()
|
||||
{
|
||||
// TODO Auto-generated method stub
|
||||
|
||||
}
|
||||
@Override
|
||||
public void saveExtraData() {
|
||||
// TODO Auto-generated method stub
|
||||
|
||||
}
|
||||
}
|
||||
@@ -122,13 +122,13 @@ public class BlueSlime extends EntityLiving implements IMob, IBossDisplayData
|
||||
|
||||
public EntityLivingData func_110161_a (EntityLivingData par1EntityLivingData)
|
||||
{
|
||||
Object par1EntityLivingData1 = super.func_110161_a(par1EntityLivingData);
|
||||
Object par1EntityLivingData1 = super.onSpawnWithEgg(par1EntityLivingData);
|
||||
|
||||
if (getSlimeSize() == 2 && rand.nextInt(8) == 0)
|
||||
{
|
||||
EntitySkeleton entityskeleton = new EntitySkeleton(this.worldObj);
|
||||
entityskeleton.setLocationAndAngles(this.posX, this.posY, this.posZ, this.rotationYaw, 0.0F);
|
||||
entityskeleton.func_110161_a(par1EntityLivingData);
|
||||
entityskeleton.onSpawnWithEgg(par1EntityLivingData);
|
||||
this.worldObj.spawnEntityInWorld(entityskeleton);
|
||||
entityskeleton.mountEntity(this);
|
||||
}
|
||||
@@ -136,7 +136,7 @@ public class BlueSlime extends EntityLiving implements IMob, IBossDisplayData
|
||||
{
|
||||
EntityCreeper creeper = new EntityCreeper(this.worldObj);
|
||||
creeper.setLocationAndAngles(this.posX, this.posY, this.posZ, this.rotationYaw, 0.0F);
|
||||
creeper.func_110161_a(par1EntityLivingData);
|
||||
creeper.onSpawnWithEgg(par1EntityLivingData);
|
||||
this.worldObj.spawnEntityInWorld(creeper);
|
||||
creeper.mountEntity(this);
|
||||
}
|
||||
@@ -157,7 +157,7 @@ public class BlueSlime extends EntityLiving implements IMob, IBossDisplayData
|
||||
|
||||
EntitySkeleton skelton = new EntitySkeleton(this.worldObj);
|
||||
skelton.setLocationAndAngles(this.posX, this.posY, this.posZ, this.rotationYaw, 0.0F);
|
||||
skelton.func_110161_a(par1EntityLivingData);
|
||||
skelton.onSpawnWithEgg(par1EntityLivingData);
|
||||
this.worldObj.spawnEntityInWorld(skelton);
|
||||
skelton.mountEntity(slime);
|
||||
}
|
||||
@@ -274,22 +274,22 @@ public class BlueSlime extends EntityLiving implements IMob, IBossDisplayData
|
||||
this.dataWatcher.updateObject(16, new Byte((byte) size));
|
||||
this.setSize(0.6F * (float) size, 0.6F * (float) size);
|
||||
this.setPosition(this.posX, this.posY, this.posZ);
|
||||
this.func_110148_a(SharedMonsterAttributes.field_111267_a).func_111128_a(this.getMaxHealth());
|
||||
this.setEntityHealth(this.func_110138_aP());
|
||||
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setAttribute(this.getMaxHealth());
|
||||
this.setHealth(this.getMaxHealth());
|
||||
|
||||
this.experienceValue = size + 2 ^ (size);
|
||||
if (size >= 8)
|
||||
this.experienceValue = 500;
|
||||
}
|
||||
|
||||
public int getMaxHealth ()
|
||||
public float getMaxHealth ()
|
||||
{
|
||||
int i = this.getSlimeSize();
|
||||
if (i == 1)
|
||||
return 4;
|
||||
if (i == 8)
|
||||
return 100;
|
||||
return (int) Math.min(i * i + 8, 49);
|
||||
return (float) Math.min(i * i + 8, 49);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -461,7 +461,7 @@ public class BlueSlime extends EntityLiving implements IMob, IBossDisplayData
|
||||
{
|
||||
int size = this.getSlimeSize();
|
||||
|
||||
if (!this.worldObj.isRemote && size > 1 && this.func_110143_aJ() <= 0 && size < 8)
|
||||
if (!this.worldObj.isRemote && size > 1 && this.getHealth() <= 0 && size < 8)
|
||||
{
|
||||
float f = (-0.5F) * (float) size / 4.0F;
|
||||
float f1 = (-0.5F) * (float) size / 4.0F;
|
||||
|
||||
@@ -20,12 +20,12 @@ public class MetalSlime extends BlueSlime
|
||||
return super.attackEntityFrom(damageSource, damage);
|
||||
}
|
||||
|
||||
public int getMaxHealth ()
|
||||
public float getMaxHealth ()
|
||||
{
|
||||
int i = this.getSlimeSize();
|
||||
if (i == 1)
|
||||
return 4;
|
||||
return (int) Math.min(i * i + 20, 100);
|
||||
return (float) Math.min(i * i + 20, 100);
|
||||
}
|
||||
|
||||
public int getTotalArmorValue ()
|
||||
|
||||
@@ -183,7 +183,7 @@ public class ArrowEntity extends EntityArrow implements IEntityAdditionalSpawnDa
|
||||
{
|
||||
EntityPlayer entityplayer = (EntityPlayer) movingobjectposition.entityHit;
|
||||
|
||||
if (entityplayer.capabilities.disableDamage || this.shootingEntity instanceof EntityPlayer && !((EntityPlayer) this.shootingEntity).func_96122_a(entityplayer))
|
||||
if (entityplayer.capabilities.disableDamage || this.shootingEntity instanceof EntityPlayer && !((EntityPlayer) this.shootingEntity).canAttackPlayer(entityplayer))
|
||||
{
|
||||
movingobjectposition = null;
|
||||
}
|
||||
|
||||
@@ -152,7 +152,7 @@ public class TitleIcon extends Item
|
||||
if (!world.isRemote)
|
||||
{
|
||||
entity.setPosition(x, y, z);
|
||||
((EntityLiving) entity).func_110161_a((EntityLivingData) null);
|
||||
((EntityLiving) entity).onSpawnWithEgg((EntityLivingData) null);
|
||||
world.spawnEntityInWorld(entity);
|
||||
}
|
||||
}
|
||||
@@ -163,7 +163,7 @@ public class TitleIcon extends Item
|
||||
{
|
||||
entity.setPosition(x, y, z);
|
||||
entity.setAngles(player.cameraYaw, player.cameraYaw);
|
||||
((EntityLiving) entity).func_110161_a((EntityLivingData) null);
|
||||
((EntityLiving) entity).onSpawnWithEgg((EntityLivingData) null);
|
||||
world.spawnEntityInWorld(entity);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -41,7 +41,7 @@ public class FryingPan extends Weapon
|
||||
@Override
|
||||
public boolean onLeftClickEntity (ItemStack stack, EntityPlayer player, Entity mob)
|
||||
{
|
||||
if (mob.canAttackWithItem() && !mob.func_85031_j(player) && mob.hurtResistantTime < 14)
|
||||
if (mob.canAttackWithItem() && !mob.hitByEntity(player) && mob.hurtResistantTime < 14)
|
||||
AbilityHelper.onLeftClickEntity(stack, player, mob, this);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -73,7 +73,7 @@ public class AbilityHelper
|
||||
{
|
||||
if (entity.canAttackWithItem() && stack.hasTagCompound())
|
||||
{
|
||||
if (!entity.func_85031_j(player)) // can't attack this entity
|
||||
if (!entity.hitByEntity(player)) // can't attack this entity
|
||||
{
|
||||
NBTTagCompound tags = stack.getTagCompound();
|
||||
NBTTagCompound toolTags = stack.getTagCompound().getCompoundTag("InfiTool");
|
||||
@@ -206,7 +206,7 @@ public class AbilityHelper
|
||||
}
|
||||
//damageTool(stack, 1, player, false);
|
||||
tool.onEntityDamaged(player.worldObj, player, entity);
|
||||
if (!PHConstruct.necroticUHS || (entity instanceof IMob && entity instanceof EntityLivingBase && ((EntityLivingBase) entity).func_110143_aJ() <= 0))
|
||||
if (!PHConstruct.necroticUHS || (entity instanceof IMob && entity instanceof EntityLivingBase && ((EntityLivingBase) entity).getHealth() <= 0))
|
||||
{
|
||||
int drain = toolTags.getInteger("Necrotic") * 2;
|
||||
if (drain > 0)
|
||||
@@ -240,7 +240,7 @@ public class AbilityHelper
|
||||
}
|
||||
}
|
||||
|
||||
player.func_130011_c(entity);
|
||||
player.setLastAttacker(entity);
|
||||
|
||||
if (entity instanceof EntityLivingBase)
|
||||
{
|
||||
@@ -308,7 +308,7 @@ public class AbilityHelper
|
||||
}
|
||||
}
|
||||
|
||||
if (!(living instanceof EntityPlayer) || player.func_96122_a((EntityPlayer) living))
|
||||
if (!(living instanceof EntityPlayer) || player.canAttackPlayer((EntityPlayer) living))
|
||||
{
|
||||
List var6 = player.worldObj.getEntitiesWithinAABB(EntityWolf.class,
|
||||
AxisAlignedBB.getAABBPool().getAABB(player.posX, player.posY, player.posZ, player.posX + 1.0D, player.posY + 1.0D, player.posZ + 1.0D).expand(16.0D, 4.0D, 16.0D));
|
||||
|
||||
@@ -464,7 +464,7 @@ public class TEventHandler
|
||||
if (!world.isRemote)
|
||||
{
|
||||
entity.setPosition(x, y, z);
|
||||
entity.func_110161_a((EntityLivingData) null);
|
||||
entity.onSpawnWithEgg((EntityLivingData) null);
|
||||
world.spawnEntityInWorld(entity);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -176,16 +176,16 @@ public class ArmorExtended implements IInventory
|
||||
//System.out.println("healthChange: "+healthChange+" on side "+FMLCommonHandler.instance().getEffectiveSide());
|
||||
if (healthChange != 0)
|
||||
{
|
||||
AttributeInstance attributeinstance = player.func_110140_aT().func_111151_a(SharedMonsterAttributes.field_111267_a);
|
||||
AttributeInstance attributeinstance = player.getAttributeMap().getAttributeInstance(SharedMonsterAttributes.maxHealth);
|
||||
try
|
||||
{
|
||||
attributeinstance.func_111124_b(attributeinstance.func_111127_a(globalID));
|
||||
attributeinstance.removeModifier(attributeinstance.getModifier(globalID));
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
}
|
||||
|
||||
attributeinstance.func_111121_a(new AttributeModifier(globalID, "tconstruct.heartCanister", bonusHP, 0));
|
||||
attributeinstance.applyModifier(new AttributeModifier(globalID, "tconstruct.heartCanister", bonusHP, 0));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -202,10 +202,10 @@ public class ArmorExtended implements IInventory
|
||||
int healthChange = bonusHP - prevHealth;
|
||||
if (healthChange != 0)
|
||||
{
|
||||
AttributeInstance attributeinstance = player.func_110140_aT().func_111151_a(SharedMonsterAttributes.field_111267_a);
|
||||
AttributeInstance attributeinstance = player.getAttributeMap().getAttributeInstance(SharedMonsterAttributes.maxHealth);
|
||||
try
|
||||
{
|
||||
attributeinstance.func_111124_b(attributeinstance.func_111127_a(globalID));
|
||||
attributeinstance.removeModifier(attributeinstance.getModifier(globalID));
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user