more 1.7 work

This commit is contained in:
Progwml6 committed 2013-12-30 05:18:14 -05:00
1 parent d00618474b
commit 98947afdb6
7 files changed
+27 -22

No files matched your search

@@ -118,11 +118,11 @@ public abstract class ExpandableInventoryLogic extends InventoryLogic implements
/* NBT */
@Override
public void readFromNBT (NBTTagCompound tags)
public void func_145841_b (NBTTagCompound tags)
{
super.readFromNBT(tags);
super.func_145841_b(tags);
this.invName = tags.getString("InvName");
NBTTagList nbttaglist = tags.getTagList("Items");
NBTTagList nbttaglist = tags.func_150295_c("Items", 000); //TODO wtf goes here???
inventory = new ArrayList<ItemStack>();
inventory.ensureCapacity(nbttaglist.tagCount() > getMaxSize() ? getMaxSize() : nbttaglist.tagCount());
for (int iter = 0; iter < nbttaglist.tagCount(); iter++)
@@ -137,9 +137,9 @@ public abstract class ExpandableInventoryLogic extends InventoryLogic implements
}
@Override
public void writeToNBT (NBTTagCompound tags)
public void func_145839_a (NBTTagCompound tags)
{
super.writeToNBT(tags);
super.func_145839_a(tags);
if (invName != null)
tags.setString("InvName", invName);
NBTTagList nbttaglist = new NBTTagList();
@@ -4,6 +4,7 @@ import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.relauncher.Side;
import mantle.debug.DebugHelper;
import mantle.debug.IDebuggable;
import net.minecraft.block.Block;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
@@ -115,15 +115,15 @@ public abstract class InventoryLogic extends TileEntity implements IInventory, I
/* NBT */
@Override
public void readFromNBT (NBTTagCompound tags)
public void func_145841_b (NBTTagCompound tags)
{
super.readFromNBT(tags);
super.func_145841_b(tags);
readInventoryFromNBT(tags);
}
public void readInventoryFromNBT (NBTTagCompound tags)
{
super.readFromNBT(tags);
super.func_145841_b(tags);
this.invName = tags.getString("InvName");
NBTTagList nbttaglist = tags.func_150295_c("Items", 0); //TODO WTF goes here <-
inventory = new ItemStack[getSizeInventory()];
@@ -139,9 +139,9 @@ public abstract class InventoryLogic extends TileEntity implements IInventory, I
}
@Override
public void writeToNBT (NBTTagCompound tags)
public void func_145839_a (NBTTagCompound tags)
{
super.writeToNBT(tags);
super.func_145839_a(tags);
writeInventoryToNBT(tags);
}
@@ -130,22 +130,26 @@ public class MultiServantLogic extends TileEntity implements IServantLogic, IDeb
}
@Override
public void readFromNBT (NBTTagCompound tags)
public void func_145841_b (NBTTagCompound tags)
{
super.readFromNBT(tags);
//TODO readFromNBT(tags) ???
super.func_145841_b(tags);
func_145841_b(tags);
readCustomNBT(tags);
}
@Override
public void writeToNBT (NBTTagCompound tags)
public void func_145839_a (NBTTagCompound tags)
{
super.writeToNBT(tags);
//TODO writeToNBT(tags) ???
super.func_145839_a(tags);
writeCustomNBT(tags);
}
/* Packets */
//TODO getDescriptionPacket()??
@Override
public Packet getDescriptionPacket ()
public Packet func_145844_m ()
{
NBTTagCompound tag = new NBTTagCompound();
writeCustomNBT(tag);
@@ -14,8 +14,8 @@ import javax.imageio.ImageIO;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.texture.TextureManager;
import net.minecraft.client.resources.ResourceManager;
import net.minecraft.client.resources.ResourceManagerReloadListener;
import net.minecraft.client.resources.IResourceManager;
import net.minecraft.client.resources.IResourceManagerReloadListener;
import net.minecraft.client.settings.GameSettings;
import net.minecraft.util.ChatAllowedCharacters;
import net.minecraft.util.ResourceLocation;
@@ -26,7 +26,7 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class SmallFontRenderer implements ResourceManagerReloadListener
public class SmallFontRenderer implements IResourceManagerReloadListener
{
private static final ResourceLocation[] field_111274_c = new ResourceLocation[256];
@@ -144,7 +144,7 @@ public class SmallFontRenderer implements ResourceManagerReloadListener
this.readGlyphSizes();
}
public void onResourceManagerReload (ResourceManager par1ResourceManager)
public void onResourceManagerReload (IResourceManager par1ResourceManager)
{
this.func_111272_d();
}
+2 -2
View File
@@ -64,7 +64,7 @@ public class GuiManual extends GuiScreen
{
maxPages = manual.getElementsByTagName("page").getLength();
updateText();
int xPos = (this.width) / 2;
int xPos = (this.field_146294_l) / 2; //TODO Width?
this.buttonList.add(this.buttonNextPage = new TurnPageButton(1, xPos + bookImageWidth - 50, 180, true));
this.buttonList.add(this.buttonPreviousPage = new TurnPageButton(2, xPos - bookImageWidth + 24, 180, false));
}
@@ -159,7 +159,7 @@ public class GuiManual extends GuiScreen
{
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
this.field_146297_k.getTextureManager().bindTexture(bookRight);
int localWidth = (this.width) / 2;
int localWidth = (this.field_146294_l / 2);
byte localHeight = 8;
this.drawTexturedModalRect(localWidth, localHeight, 0, 0, this.bookImageWidth, this.bookImageHeight);
+1 -1
View File
@@ -30,7 +30,7 @@ public class TurnPageButton extends GuiButton
*/
public void drawButton (Minecraft par1Minecraft, int par2, int par3)
{
if (this.drawButton)
if (this.field_146125_m)//TODO drawButton?
{
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);