diff --git a/src/mantle/blocks/abstracts/AdaptiveInventoryLogic.java b/src/mantle/blocks/abstracts/AdaptiveInventoryLogic.java index 95114c0..d6d9e90 100644 --- a/src/mantle/blocks/abstracts/AdaptiveInventoryLogic.java +++ b/src/mantle/blocks/abstracts/AdaptiveInventoryLogic.java @@ -76,8 +76,8 @@ public abstract class AdaptiveInventoryLogic extends InventoryLogic implements I } stack.stackSize -= itemSize; - EntityItem entityitem = new EntityItem(getWorld(), (double) ((float) xCoord + jumpX + offsetX), (double) ((float) yCoord + jumpY), - (double) ((float) zCoord + jumpZ + offsetZ), new ItemStack(stack.getItem(), itemSize, stack.getItemDamage())); + EntityItem entityitem = new EntityItem(getWorld(), (double) ((float) field_145851_c + jumpX + offsetX), (double) ((float) field_145848_d + jumpY), + (double) ((float) field_145849_e + jumpZ + offsetZ), new ItemStack(stack.getItem(), itemSize, stack.getItemDamage())); if (stack.hasTagCompound()) { diff --git a/src/mantle/blocks/abstracts/ExpandableInventoryLogic.java b/src/mantle/blocks/abstracts/ExpandableInventoryLogic.java index 76312e2..d252ddb 100644 --- a/src/mantle/blocks/abstracts/ExpandableInventoryLogic.java +++ b/src/mantle/blocks/abstracts/ExpandableInventoryLogic.java @@ -106,11 +106,11 @@ public abstract class ExpandableInventoryLogic extends InventoryLogic implements @Override public boolean isUseableByPlayer (EntityPlayer entityplayer) { - if (this.getBlockTileEntity(xCoord, yCoord, zCoord) != this) + if (this.getBlockTileEntity(field_145851_c, field_145848_d, field_145849_e) != this) return false; else - return entityplayer.getDistance((double) xCoord + 0.5D, (double) yCoord + 0.5D, (double) zCoord + 0.5D) <= 64D; + return entityplayer.getDistance((double) field_145851_c + 0.5D, (double) field_145848_d + 0.5D, (double) field_145849_e + 0.5D) <= 64D; } diff --git a/src/mantle/blocks/abstracts/InventoryLogic.java b/src/mantle/blocks/abstracts/InventoryLogic.java index a0d3469..50bcc63 100644 --- a/src/mantle/blocks/abstracts/InventoryLogic.java +++ b/src/mantle/blocks/abstracts/InventoryLogic.java @@ -103,11 +103,11 @@ public abstract class InventoryLogic extends TileEntity implements IInventory, I @Override public boolean isUseableByPlayer (EntityPlayer entityplayer) { - if (this.getBlockTileEntity(xCoord, yCoord, zCoord) != this) + if (this.getBlockTileEntity(field_145851_c, field_145848_d, field_145849_e) != this) return false; else - return entityplayer.getDistance((double) xCoord + 0.5D, (double) yCoord + 0.5D, (double) zCoord + 0.5D) <= 64D; + return entityplayer.getDistance((double) field_145851_c + 0.5D, (double) field_145848_d + 0.5D, (double) field_145849_e + 0.5D) <= 64D; } diff --git a/src/mantle/blocks/abstracts/MultiServantLogic.java b/src/mantle/blocks/abstracts/MultiServantLogic.java index 382206c..d711649 100644 --- a/src/mantle/blocks/abstracts/MultiServantLogic.java +++ b/src/mantle/blocks/abstracts/MultiServantLogic.java @@ -97,7 +97,7 @@ public class MultiServantLogic extends TileEntity implements IServantLogic, IDeb if (hasValidMaster()) { IMasterLogic logic = (IMasterLogic) getWorld().getBlockTileEntity(master.x, master.y, master.z); - logic.notifyChange(this, xCoord, yCoord, zCoord); + logic.notifyChange(this, field_145851_c, field_145848_d, field_145849_e); } } @@ -153,14 +153,15 @@ public class MultiServantLogic extends TileEntity implements IServantLogic, IDeb { NBTTagCompound tag = new NBTTagCompound(); writeCustomNBT(tag); - return new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, 1, tag); + //TODO xCoord, yCoord, zCoord + return new S35PacketUpdateTileEntity(field_145851_c, field_145848_d, field_145849_e, 1, tag); } @Override public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet) { readCustomNBT(packet.func_148857_g()); - this.markBlockForRenderUpdate(xCoord, yCoord, zCoord); + this.markBlockForRenderUpdate(field_145851_c, field_145848_d, field_145849_e); } /* IDebuggable */ @@ -168,7 +169,7 @@ public class MultiServantLogic extends TileEntity implements IServantLogic, IDeb public DebugData getDebugInfo (EntityPlayer player) { String[] strs = new String[2]; - strs[0] = "Location: x" + xCoord + ", y" + yCoord + ", z" + zCoord; + strs[0] = "Location: x" + field_145851_c + ", y" + field_145848_d + ", z" + field_145849_e; if (hasMaster) { strs[1] = "masterBlock: " + masterBlock.toString() + ", masterMeat: " + masterMeat; diff --git a/src/mantle/client/block/SmallFontRenderer.java b/src/mantle/client/block/SmallFontRenderer.java index 4bea5a5..da86689 100644 --- a/src/mantle/client/block/SmallFontRenderer.java +++ b/src/mantle/client/block/SmallFontRenderer.java @@ -520,7 +520,15 @@ public class SmallFontRenderer implements IResourceManagerReloadListener } else { - j = ChatAllowedCharacters.allowedCharactersArray.indexOf(c0); + j = ' '; + for (char c : ChatAllowedCharacters.allowedCharactersArray) + { + if (c == c0) + { + j = c0; + break; + } + } if (this.randomStyle && j > 0) { diff --git a/src/mantle/client/gui/TurnPageButton.java b/src/mantle/client/gui/TurnPageButton.java index 3a67779..33533ac 100644 --- a/src/mantle/client/gui/TurnPageButton.java +++ b/src/mantle/client/gui/TurnPageButton.java @@ -32,7 +32,8 @@ public class TurnPageButton extends GuiButton { 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; + //TODO xPosition, yPosition, zPosition, width, height + boolean var4 = par2 >= this.field_146128_h && par3 >= this.field_146129_i && par2 < this.field_146128_h + this.field_146120_f && par3 < this.field_146129_i + this.field_146121_g; GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); par1Minecraft.getTextureManager().bindTexture(background); int var5 = 0; @@ -48,7 +49,7 @@ public class TurnPageButton extends GuiButton var6 += 13; } - this.drawTexturedModalRect(this.xPosition, this.yPosition, var5, var6, 23, 13); + this.drawTexturedModalRect(this.field_146128_h, this.field_146129_i, var5, var6, 23, 13); } } }