From a5862aae2049950373f8b9742bdade7c8db5ea86 Mon Sep 17 00:00:00 2001 From: Progwml6 Date: Wed, 8 Jan 2014 00:45:09 -0500 Subject: [PATCH] fixed a whole bunch of client side stuff --- src/main/java/tconstruct/blocks/PaneBase.java | 31 +- .../blocks/logic/DryingRackLogic.java | 2 +- .../java/tconstruct/client/TClientEvents.java | 4 +- .../java/tconstruct/client/TProxyClient.java | 24 +- .../tconstruct/client/ToolCoreRenderer.java | 4 +- .../block/BlockRenderCastingChannel.java | 16 +- .../client/block/BlockSkinRenderHelper.java | 6 +- .../tconstruct/client/block/BreakingFX.java | 3 +- .../client/block/DryingRackRender.java | 12 +- .../tconstruct/client/block/PaneRender.java | 16 +- .../tconstruct/client/block/PunjiRender.java | 12 +- .../client/block/RenderLandmine.java | 8 +- .../tconstruct/client/block/SearedRender.java | 14 +- .../client/block/SlimeChannelRender.java | 2 +- .../client/block/SmelteryRender.java | 4 +- .../client/block/TableForgeRender.java | 12 +- .../tconstruct/client/block/TableRender.java | 12 +- .../client/block/TankAirRender.java | 6 +- .../tconstruct/client/block/TankRender.java | 20 +- .../entity/projectile/ArrowRenderCustom.java | 2 +- .../entity/projectile/DaggerRenderCustom.java | 2 +- .../client/gui/ArmorExtendedGui.java | 4 +- .../client/gui/CraftingStationGui.java | 86 ++-- .../java/tconstruct/client/gui/FrypanGui.java | 6 +- .../tconstruct/client/gui/GuiLandmine.java | 12 +- .../tconstruct/client/gui/KnapsackGui.java | 6 +- .../client/gui/NewContainerGui.java | 12 +- .../tconstruct/client/gui/PartCrafterGui.java | 52 +-- .../client/gui/PatternChestGui.java | 6 +- .../tconstruct/client/gui/SmelteryGui.java | 18 +- .../client/gui/StencilTableGui.java | 6 +- .../tconstruct/util/EnvironmentChecks.java | 4 +- .../java/tconstruct/util/EnvironmentGui.java | 16 +- .../tconstruct/util/TCraftingHandler.java | 4 +- .../util/config/DimensionBlacklist.java | 4 +- .../tconstruct/util/config/PHConstruct.java | 411 +----------------- .../landmine/behavior/BehaviorExplosive.java | 4 +- .../landmine/behavior/BehaviorFirecharge.java | 4 +- .../tconstruct/util/player/ArmorExtended.java | 10 +- .../util/player/KnapsackInventory.java | 5 +- .../util/player/TPlayerHandler.java | 23 +- .../tconstruct/worldgen/SlimeIslandGen.java | 2 +- 42 files changed, 251 insertions(+), 656 deletions(-) diff --git a/src/main/java/tconstruct/blocks/PaneBase.java b/src/main/java/tconstruct/blocks/PaneBase.java index dffb65ba38b..7eef110be16 100644 --- a/src/main/java/tconstruct/blocks/PaneBase.java +++ b/src/main/java/tconstruct/blocks/PaneBase.java @@ -3,13 +3,14 @@ import java.util.List; import tconstruct.client.block.PaneRender; - import net.minecraft.block.Block; import net.minecraft.block.BlockPane; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; +import net.minecraft.init.Blocks; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.IIcon; @@ -32,10 +33,10 @@ public PaneBase(Material material, String folder, String[] blockTextures) this.folder = folder; } - public boolean canConnectTo (int blockID) + public boolean canConnectTo (Block block2) { - Block block = Block.blocksList[blockID]; - return Block.opaqueCubeLookup[blockID] || block instanceof PaneBase || block instanceof BlockPane || blockID == Block.glass.blockID; + Block block = block2; + return Block.opaqueCubeLookup[block2] || block instanceof PaneBase || block instanceof BlockPane || block2 == Blocks.glass; } public IIcon getSideTextureIndex (int meta) @@ -65,7 +66,7 @@ public IIcon getIcon (int side, int meta) } @Override - public void getSubBlocks (Block b, CreativeTabs tab, List list) + public void getSubBlocks (Item b, CreativeTabs tab, List list) { for (int iter = 0; iter < textureNames.length; iter++) { @@ -90,8 +91,8 @@ public int getRenderType () public boolean shouldSideBeRendered (IBlockAccess iblockaccess, int i, int j, int k, int l) { - int bID = iblockaccess.getBlockId(i, j, k); - if (Block.blocksList[bID] instanceof PaneBase || Block.blocksList[bID] instanceof BlockPane) + Block b = iblockaccess.func_147439_a(i, j, k); + if (b instanceof PaneBase || b instanceof BlockPane) { return false; } @@ -104,10 +105,10 @@ public boolean shouldSideBeRendered (IBlockAccess iblockaccess, int i, int j, in @Override public void addCollisionBoxesToList (World world, int x, int y, int z, AxisAlignedBB axisalignedbb, List arraylist, Entity entity) { - boolean south = canConnectTo(world.getBlockId(x, y, z - 1)); - boolean north = canConnectTo(world.getBlockId(x, y, z + 1)); - boolean east = canConnectTo(world.getBlockId(x - 1, y, z)); - boolean west = canConnectTo(world.getBlockId(x + 1, y, z)); + boolean south = canConnectTo(world.func_147439_a(x, y, z - 1)); + boolean north = canConnectTo(world.func_147439_a(x, y, z + 1)); + boolean east = canConnectTo(world.func_147439_a(x - 1, y, z)); + boolean west = canConnectTo(world.func_147439_a(x + 1, y, z)); if (east && west || !east && !west && !south && !north) { setBlockBounds(0.0F, 0.0F, 0.4375F, 1.0F, 1.0F, 0.5625F); @@ -151,10 +152,10 @@ public void setBlockBoundsBasedOnState (IBlockAccess iblockaccess, int i, int j, float f1 = 0.5625F; float f2 = 0.4375F; float f3 = 0.5625F; - boolean flag = canConnectTo(iblockaccess.getBlockId(i, j, k - 1)); - boolean flag1 = canConnectTo(iblockaccess.getBlockId(i, j, k + 1)); - boolean flag2 = canConnectTo(iblockaccess.getBlockId(i - 1, j, k)); - boolean flag3 = canConnectTo(iblockaccess.getBlockId(i + 1, j, k)); + boolean flag = canConnectTo(iblockaccess.func_147439_a(i, j, k - 1)); + boolean flag1 = canConnectTo(iblockaccess.func_147439_a(i, j, k + 1)); + boolean flag2 = canConnectTo(iblockaccess.func_147439_a(i - 1, j, k)); + boolean flag3 = canConnectTo(iblockaccess.func_147439_a(i + 1, j, k)); if (flag2 && flag3 || !flag2 && !flag3 && !flag && !flag1) { f = 0.0F; diff --git a/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java b/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java index d7ed52c156e..dceb7e4bfd2 100644 --- a/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java +++ b/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java @@ -7,7 +7,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.INetworkManager; -import net.minecraft.network.packet.Packet; +import net.minecraft.network.Packet; import net.minecraft.network.packet.Packet132TileEntityData; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; diff --git a/src/main/java/tconstruct/client/TClientEvents.java b/src/main/java/tconstruct/client/TClientEvents.java index fd524b0de68..13d3e04f8ff 100644 --- a/src/main/java/tconstruct/client/TClientEvents.java +++ b/src/main/java/tconstruct/client/TClientEvents.java @@ -57,7 +57,7 @@ public void onSound (SoundLoadEvent event) } catch (Exception e) { - TConstruct.logger.warning("Failed to register one or more sounds"); + TConstruct.logger.error("Failed to register one or more sounds"); } } } @@ -253,7 +253,7 @@ public void fovModifier(FOVUpdateEvent event) f *= 1.1F; } - if (event.entity.isUsingItem() && event.entity.getItemInUse().itemID == Items.bow.itemID) + if (event.entity.isUsingItem() && event.entity.getItemInUse() == Items.bow) { int i = event.entity.getItemInUseDuration(); float f1 = (float) i / 20.0F; diff --git a/src/main/java/tconstruct/client/TProxyClient.java b/src/main/java/tconstruct/client/TProxyClient.java index 70975ecf697..da57ca508f4 100644 --- a/src/main/java/tconstruct/client/TProxyClient.java +++ b/src/main/java/tconstruct/client/TProxyClient.java @@ -74,31 +74,31 @@ public class TProxyClient extends TProxyCommon public Object getClientGuiElement (int ID, EntityPlayer player, World world, int x, int y, int z) { if (ID == toolStationID) - return new ToolStationGui(player.inventory, (ToolStationLogic) world.getBlockTileEntity(x, y, z), world, x, y, z); + return new ToolStationGui(player.inventory, (ToolStationLogic) world.func_147438_o(x, y, z), world, x, y, z); if (ID == partBuilderID) - return new PartCrafterGui(player.inventory, (PartBuilderLogic) world.getBlockTileEntity(x, y, z), world, x, y, z); + return new PartCrafterGui(player.inventory, (PartBuilderLogic) world.func_147438_o(x, y, z), world, x, y, z); if (ID == patternChestID) - return new PatternChestGui(player.inventory, (PatternChestLogic) world.getBlockTileEntity(x, y, z), world, x, y, z); + return new PatternChestGui(player.inventory, (PatternChestLogic) world.func_147438_o(x, y, z), world, x, y, z); if (ID == frypanGuiID) - return new FrypanGui(player.inventory, (FrypanLogic) world.getBlockTileEntity(x, y, z), world, x, y, z); + return new FrypanGui(player.inventory, (FrypanLogic) world.func_147438_o(x, y, z), world, x, y, z); if (ID == smelteryGuiID) { if (PHConstruct.newSmeltery) - return new AdaptiveSmelteryGui(player.inventory, (AdaptiveSmelteryLogic) world.getBlockTileEntity(x, y, z), world, x, y, z); + return new AdaptiveSmelteryGui(player.inventory, (AdaptiveSmelteryLogic) world.func_147438_o(x, y, z), world, x, y, z); else - return new SmelteryGui(player.inventory, (SmelteryLogic) world.getBlockTileEntity(x, y, z), world, x, y, z); + return new SmelteryGui(player.inventory, (SmelteryLogic) world.func_147438_o(x, y, z), world, x, y, z); } if (ID == stencilTableID) - return new StencilTableGui(player.inventory, (StencilTableLogic) world.getBlockTileEntity(x, y, z), world, x, y, z); + return new StencilTableGui(player.inventory, (StencilTableLogic) world.func_147438_o(x, y, z), world, x, y, z); if (ID == toolForgeID) - return new ToolForgeGui(player.inventory, (ToolForgeLogic) world.getBlockTileEntity(x, y, z), world, x, y, z); + return new ToolForgeGui(player.inventory, (ToolForgeLogic) world.func_147438_o(x, y, z), world, x, y, z); if (ID == landmineID) - return new GuiLandmine(new ContainerLandmine(player, (TileEntityLandmine) world.getBlockTileEntity(x, y, z))); + return new GuiLandmine(new ContainerLandmine(player, (TileEntityLandmine) world.func_147438_o(x, y, z))); if (ID == craftingStationID) - return new CraftingStationGui(player.inventory, (CraftingStationLogic) world.getBlockTileEntity(x, y, z), world, x, y, z); + return new CraftingStationGui(player.inventory, (CraftingStationLogic) world.func_147438_o(x, y, z), world, x, y, z); if (ID == furnaceID) - return new FurnaceGui(player.inventory, (FurnaceLogic) world.getBlockTileEntity(x, y, z)); + return new FurnaceGui(player.inventory, (FurnaceLogic) world.func_147438_o(x, y, z)); if (ID == inventoryGui) { @@ -360,7 +360,7 @@ public void initManualIcons () MantleClientRegistry.registerManualIcon("broadaxehead", new ItemStack(TRepo.broadAxeHead, 1, 2)); MantleClientRegistry.registerManualIcon("largeswordblade", new ItemStack(TRepo.largeSwordBlade, 1, 2)); - MantleClientRegistry.registerManualIcon("toolrod", new ItemStack(Item.stick)); + MantleClientRegistry.registerManualIcon("toolrod", new ItemStack(Items.stick)); MantleClientRegistry.registerManualIcon("binding", new ItemStack(TRepo.binding, 1, 4)); MantleClientRegistry.registerManualIcon("wideguard", new ItemStack(TRepo.wideGuard, 1, 4)); diff --git a/src/main/java/tconstruct/client/ToolCoreRenderer.java b/src/main/java/tconstruct/client/ToolCoreRenderer.java index be6ea0b2791..ab85a60e9a6 100644 --- a/src/main/java/tconstruct/client/ToolCoreRenderer.java +++ b/src/main/java/tconstruct/client/ToolCoreRenderer.java @@ -28,7 +28,7 @@ public boolean handleRenderType (ItemStack item, ItemRenderType type) case INVENTORY: return true; default: - TConstruct.logger.warning("[TCon] Unhandled render case!"); + TConstruct.logger.warn("[TCon] Unhandled render case!"); case FIRST_PERSON_MAP: return false; } @@ -70,7 +70,7 @@ public void renderItem (ItemRenderType type, ItemStack item, Object... data) } } for (int i = iconParts; i-- > 0;) - tempParts[i] = tool.getIIcon(item, i); + tempParts[i] = tool.getIcon(item, i); } int count = 0; diff --git a/src/main/java/tconstruct/client/block/BlockRenderCastingChannel.java b/src/main/java/tconstruct/client/block/BlockRenderCastingChannel.java index 57c74445f9d..a24c6bdfe24 100644 --- a/src/main/java/tconstruct/client/block/BlockRenderCastingChannel.java +++ b/src/main/java/tconstruct/client/block/BlockRenderCastingChannel.java @@ -57,7 +57,7 @@ public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block { if (modelID == renderID) { - CastingChannelLogic tile = (CastingChannelLogic) world.getBlockTileEntity(x, y, z); + CastingChannelLogic tile = (CastingChannelLogic) world.func_147438_o(x, y, z); if (!tile.hasTankConnected(ForgeDirection.DOWN))//CentrePiece, floor is removed if tank below is found { @@ -318,7 +318,7 @@ private void renderLiquidPart (IBlockAccess world, int x, int y, int z, Block bl float blue = (color & 0xFF) / 255.0F; Fluid fluid = liquid.getFluid(); if (fluid.canBePlacedInWorld()) - BlockSkinRenderHelper.renderMetadataBlock(Block.blocksList[fluid.getBlockID()], 0, x, y, z, renderer, world); + BlockSkinRenderHelper.renderMetadataBlock(fluid.getBlock(), 0, x, y, z, renderer, world); else BlockSkinRenderHelper.renderLiquidBlock(fluid.getStillIcon(), fluid.getFlowingIcon(), x, y, z, renderer, world); } @@ -329,27 +329,27 @@ private void func_147784_q (Block block, int meta, RenderBlocks renderer) GL11.glTranslatef(-0.5F, -0.5F, -0.5F); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, -1.0F, 0.0F); - renderer.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(0, meta)); + renderer.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(0, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 1.0F, 0.0F); - renderer.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(1, meta)); + renderer.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(1, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, -1.0F); - renderer.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(2, meta)); + renderer.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(2, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, 1.0F); - renderer.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(3, meta)); + renderer.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(3, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(-1.0F, 0.0F, 0.0F); - renderer.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(4, meta)); + renderer.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(4, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(1.0F, 0.0F, 0.0F); - renderer.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(5, meta)); + renderer.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(5, meta)); tessellator.draw(); GL11.glTranslatef(0.5F, 0.5F, 0.5F); } diff --git a/src/main/java/tconstruct/client/block/BlockSkinRenderHelper.java b/src/main/java/tconstruct/client/block/BlockSkinRenderHelper.java index 36d152237d6..77ebdcb7682 100644 --- a/src/main/java/tconstruct/client/block/BlockSkinRenderHelper.java +++ b/src/main/java/tconstruct/client/block/BlockSkinRenderHelper.java @@ -28,7 +28,7 @@ public static boolean renderMetadataBlock (Block block, int metadata, int x, int var8 = var11; } - return Minecraft.isAmbientOcclusionEnabled() && Block.lightValue[block.blockID] == 0 ? renderMetadataBlockWithAmbientOcclusion(block, metadata, x, y, z, var6, var7, var8, renderer, world) + return Minecraft.isAmbientOcclusionEnabled() && block.lightValue == 0 ? renderMetadataBlockWithAmbientOcclusion(block, metadata, x, y, z, var6, var7, var8, renderer, world) : renderMetadataBlockWithColorMultiplier(block, metadata, x, y, z, var6, var7, var8, renderer, world); } @@ -778,7 +778,7 @@ static boolean renderMetadataBlockWithColorMultiplier (Block block, int metadata float f17 = f5; float f18 = f6; - if (block != Block.grass) + if (block != Blocks.grass) { f10 = f3 * colorRed; f11 = f5 * colorRed; @@ -1614,7 +1614,7 @@ static boolean renderFakeBlockWithColorMultiplier (IIcon stillIcon, IIcon flowin float f17 = f5; float f18 = f6; - if (block != Block.grass) + if (block != Blocks.grass) { f10 = f3 * colorRed; f11 = f5 * colorRed; diff --git a/src/main/java/tconstruct/client/block/BreakingFX.java b/src/main/java/tconstruct/client/block/BreakingFX.java index 52df10680f3..ecf3b7e45ac 100644 --- a/src/main/java/tconstruct/client/block/BreakingFX.java +++ b/src/main/java/tconstruct/client/block/BreakingFX.java @@ -3,6 +3,7 @@ import net.minecraft.block.Block; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; @@ -21,7 +22,7 @@ public BreakingFX(World par1World, double par2, double par4, double par6, Item p super(par1World, par2, par4, par6, 0.0D, 0.0D, 0.0D); this.setParticleIcon(par8Item.getIconFromDamage(par9)); this.particleRed = this.particleGreen = this.particleBlue = 1.0F; - this.particleGravity = Block.blockSnow.blockParticleGravity; + this.particleGravity = Blocks.snow.blockParticleGravity; this.particleScale /= 2.0F; } diff --git a/src/main/java/tconstruct/client/block/DryingRackRender.java b/src/main/java/tconstruct/client/block/DryingRackRender.java index 351c71d7255..db33f61cf38 100644 --- a/src/main/java/tconstruct/client/block/DryingRackRender.java +++ b/src/main/java/tconstruct/client/block/DryingRackRender.java @@ -80,27 +80,27 @@ public static void renderStandardInvBlock (RenderBlocks renderblocks, Block bloc GL11.glTranslatef(-0.5F, -0.5F, -0.5F); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, -1F, 0.0F); - renderblocks.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(0, meta)); + renderblocks.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(0, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 1.0F, 0.0F); - renderblocks.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(1, meta)); + renderblocks.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(1, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, -1F); - renderblocks.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(2, meta)); + renderblocks.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(2, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, 1.0F); - renderblocks.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(3, meta)); + renderblocks.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(3, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(-1F, 0.0F, 0.0F); - renderblocks.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(4, meta)); + renderblocks.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(4, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(1.0F, 0.0F, 0.0F); - renderblocks.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(5, meta)); + renderblocks.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(5, meta)); tessellator.draw(); GL11.glTranslatef(0.5F, 0.5F, 0.5F); } diff --git a/src/main/java/tconstruct/client/block/PaneRender.java b/src/main/java/tconstruct/client/block/PaneRender.java index 1f5ef19254c..e24ffeff7c3 100644 --- a/src/main/java/tconstruct/client/block/PaneRender.java +++ b/src/main/java/tconstruct/client/block/PaneRender.java @@ -75,8 +75,8 @@ public static boolean renderPaneInWorld (RenderBlocks renderblocks, IBlockAccess boolean flag1 = false; IIcon icon; IIcon icon1; - int meta = iblockaccess.getBlockMetadata(x, y, z); - icon = renderblocks.getBlockIconFromSideAndMetadata(pane, 0, meta); + int meta = iblockaccess.func_147439_aMetadata(x, y, z); + icon = renderblocks.func_147439_aIconFromSideAndMetadata(pane, 0, meta); icon1 = pane.getSideTextureIndex(meta); meta = icon.getIconWidth(); @@ -97,8 +97,8 @@ public static boolean renderPaneInWorld (RenderBlocks renderblocks, IBlockAccess /*int blockTextureIndex; int blockSideIndex; - int j1 = iblockaccess.getBlockMetadata(x, y, z); - blockTextureIndex = pane.getBlockTextureFromSideAndMetadata(0, j1); + int j1 = iblockaccess.func_147439_aMetadata(x, y, z); + blockTextureIndex = pane.func_147439_aTextureFromSideAndMetadata(0, j1); blockSideIndex = pane.getSideTextureIndex(j1); int k1 = (blockTextureIndex & 0xf) << 4; @@ -126,10 +126,10 @@ public static boolean renderPaneInWorld (RenderBlocks renderblocks, IBlockAccess double xMidUp = (double) x + 0.5D + 0.0625D; double zMidDown = ((double) z + 0.5D) - 0.0625D; double zMidUp = (double) z + 0.5D + 0.0625D; - boolean west = pane.canConnectTo(iblockaccess.getBlock(x, y, z - 1)); - boolean east = pane.canConnectTo(iblockaccess.getBlock(x, y, z + 1)); - boolean south = pane.canConnectTo(iblockaccess.getBlock(x - 1, y, z)); - boolean north = pane.canConnectTo(iblockaccess.getBlock(x + 1, y, z)); + boolean west = pane.canConnectTo(iblockaccess.func_147439_a(x, y, z - 1)); + boolean east = pane.canConnectTo(iblockaccess.func_147439_a(x, y, z + 1)); + boolean south = pane.canConnectTo(iblockaccess.func_147439_a(x - 1, y, z)); + boolean north = pane.canConnectTo(iblockaccess.func_147439_a(x + 1, y, z)); boolean renderAbove = pane.shouldSideBeRendered(iblockaccess, x, y + 1, z, 1); boolean renderBelow = pane.shouldSideBeRendered(iblockaccess, x, y - 1, z, 0); if ((!south || !north) && (south || north || west || east)) diff --git a/src/main/java/tconstruct/client/block/PunjiRender.java b/src/main/java/tconstruct/client/block/PunjiRender.java index edde861c195..e37ffc2be34 100644 --- a/src/main/java/tconstruct/client/block/PunjiRender.java +++ b/src/main/java/tconstruct/client/block/PunjiRender.java @@ -92,27 +92,27 @@ public static void renderStandardInvBlock (RenderBlocks renderblocks, Block bloc GL11.glTranslatef(-0.5F, -0.5F, -0.5F); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, -1F, 0.0F); - renderblocks.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(0, meta)); + renderblocks.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(0, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 1.0F, 0.0F); - renderblocks.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(1, meta)); + renderblocks.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(1, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, -1F); - renderblocks.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(2, meta)); + renderblocks.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(2, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, 1.0F); - renderblocks.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(3, meta)); + renderblocks.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(3, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(-1F, 0.0F, 0.0F); - renderblocks.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(4, meta)); + renderblocks.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(4, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(1.0F, 0.0F, 0.0F); - renderblocks.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(5, meta)); + renderblocks.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(5, meta)); tessellator.draw(); GL11.glTranslatef(0.5F, 0.5F, 0.5F); } diff --git a/src/main/java/tconstruct/client/block/RenderLandmine.java b/src/main/java/tconstruct/client/block/RenderLandmine.java index 49e327d41b4..2cc6b502186 100644 --- a/src/main/java/tconstruct/client/block/RenderLandmine.java +++ b/src/main/java/tconstruct/client/block/RenderLandmine.java @@ -84,15 +84,15 @@ public void renderBasedOnSide (IBlockAccess world, int x, int y, int z, Block bl } @Override - public boolean shouldRender3DInInventory () + public int getRenderId () { - return true; + return model; } @Override - public int getRenderId () + public boolean shouldRender3DInInventory (int modelId) { - return model; + return true; } } diff --git a/src/main/java/tconstruct/client/block/SearedRender.java b/src/main/java/tconstruct/client/block/SearedRender.java index f9dab41691b..3faf72c18d3 100644 --- a/src/main/java/tconstruct/client/block/SearedRender.java +++ b/src/main/java/tconstruct/client/block/SearedRender.java @@ -159,9 +159,9 @@ public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block renderer.func_147782_a(0.6875, 0.0F, 0.6875, 1.0F, 0.625F, 1.0F); renderer.func_147784_q(block, x, y, z); - if (world.getBlockTileEntity(x, y, z) instanceof CastingTableLogic) + if (world.func_147438_o(x, y, z) instanceof CastingTableLogic) { - CastingTableLogic logic = (CastingTableLogic) world.getBlockTileEntity(x, y, z); + CastingTableLogic logic = (CastingTableLogic) world.func_147438_o(x, y, z); if (logic.liquid != null) { float minHeight = 0.9375F; @@ -200,9 +200,9 @@ public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block } else if (metadata == 1) { - if (world.getBlockTileEntity(x, y, z) instanceof FaucetLogic) + if (world.func_147438_o(x, y, z) instanceof FaucetLogic) { - FaucetLogic logic = (FaucetLogic) world.getBlockTileEntity(x, y, z); + FaucetLogic logic = (FaucetLogic) world.func_147438_o(x, y, z); float xMin = 0.375F, zMin = 0.375F, xMax = 0.625F, zMax = 0.625F; switch (logic.getRenderDirection()) { @@ -250,7 +250,7 @@ else if (metadata == 1) } float yMin = 0F; - Block uBlock= world.getBlockId(x, y - 1, z); + Block uBlock= world.func_147439_a(x, y - 1, z); int uMeta = world.getBlockMetadata(x, y - 1, z); if (uBlock== TRepo.searedBlock && uMeta == 0) { @@ -364,9 +364,9 @@ else if (metadata == 2) renderer.func_147784_q(block, x, y, z); //Liquids - if (world.getBlockTileEntity(x, y, z) instanceof CastingBasinLogic) + if (world.func_147438_o(x, y, z) instanceof CastingBasinLogic) { - CastingBasinLogic logic = (CastingBasinLogic) world.getBlockTileEntity(x, y, z); + CastingBasinLogic logic = (CastingBasinLogic) world.func_147438_o(x, y, z); if (logic.liquid != null) { float minHeight = 0.25F; diff --git a/src/main/java/tconstruct/client/block/SlimeChannelRender.java b/src/main/java/tconstruct/client/block/SlimeChannelRender.java index e12fd1544c3..f1a41735600 100644 --- a/src/main/java/tconstruct/client/block/SlimeChannelRender.java +++ b/src/main/java/tconstruct/client/block/SlimeChannelRender.java @@ -45,7 +45,7 @@ public boolean renderRotatedBlock (Block block, int x, int y, int z, IBlockAcces { Tessellator tessellator = Tessellator.instance; int bMeta = world.getBlockMetadata(x, y, z); - IIcon iconStill = block.getIcon(1, bMeta); + IIcon iconStill = block.func_149691_a(1, bMeta); float flowDir = (float) (bMeta / 8f * 2 * Math.PI); //Tau, radians double u1, u2, u3, u4, v1, v2, v3, v4; diff --git a/src/main/java/tconstruct/client/block/SmelteryRender.java b/src/main/java/tconstruct/client/block/SmelteryRender.java index 76e5462611f..3cab139a874 100644 --- a/src/main/java/tconstruct/client/block/SmelteryRender.java +++ b/src/main/java/tconstruct/client/block/SmelteryRender.java @@ -43,7 +43,7 @@ public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block public boolean renderSmeltery (IBlockAccess world, int x, int y, int z, Block block, int modelID, RenderBlocks renderer) { renderer.func_147784_q(block, x, y, z); - SmelteryLogic logic = (SmelteryLogic) world.getBlockTileEntity(x, y, z); + SmelteryLogic logic = (SmelteryLogic) world.func_147438_o(x, y, z); if (logic.validStructure) { int posX = logic.centerPos.x - 1, posY = logic.centerPos.y, posZ = logic.centerPos.z - 1; @@ -85,7 +85,7 @@ public boolean renderSmeltery (IBlockAccess world, int x, int y, int z, Block bl float maxZ = i / 3 == 2 ? 1.001F : 1F; renderer.func_147782_a(minX, renderBase, minZ, maxX, renderHeight, maxZ); if (fluid.canBePlacedInWorld()) - BlockSkinRenderHelper.renderMetadataBlock(Block.blocksList[fluid.getBlockID()], 0, posX + i % 3, posY + yBase, posZ + i / 3, renderer, world); + BlockSkinRenderHelper.renderMetadataBlock(fluid.getBlock(), 0, posX + i % 3, posY + yBase, posZ + i / 3, renderer, world); else BlockSkinRenderHelper.renderLiquidBlock(fluid.getStillIcon(), fluid.getFlowingIcon(), posX + i % 3, posY + yBase, posZ + i / 3, renderer, world); } diff --git a/src/main/java/tconstruct/client/block/TableForgeRender.java b/src/main/java/tconstruct/client/block/TableForgeRender.java index e5ff10e3e62..2a19c79cc0a 100644 --- a/src/main/java/tconstruct/client/block/TableForgeRender.java +++ b/src/main/java/tconstruct/client/block/TableForgeRender.java @@ -69,27 +69,27 @@ public static void renderStandardInvBlock (RenderBlocks renderblocks, Block bloc GL11.glTranslatef(-0.5F, -0.5F, -0.5F); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, -1F, 0.0F); - renderblocks.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(0, meta)); + renderblocks.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(0, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 1.0F, 0.0F); - renderblocks.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(1, meta)); + renderblocks.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(1, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, -1F); - renderblocks.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(2, meta)); + renderblocks.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(2, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, 1.0F); - renderblocks.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(3, meta)); + renderblocks.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(3, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(-1F, 0.0F, 0.0F); - renderblocks.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(4, meta)); + renderblocks.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(4, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(1.0F, 0.0F, 0.0F); - renderblocks.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(5, meta)); + renderblocks.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(5, meta)); tessellator.draw(); GL11.glTranslatef(0.5F, 0.5F, 0.5F); } diff --git a/src/main/java/tconstruct/client/block/TableRender.java b/src/main/java/tconstruct/client/block/TableRender.java index d28884194d2..c3b6619ebf5 100644 --- a/src/main/java/tconstruct/client/block/TableRender.java +++ b/src/main/java/tconstruct/client/block/TableRender.java @@ -86,27 +86,27 @@ public static void renderStandardInvBlock (RenderBlocks renderblocks, Block bloc GL11.glTranslatef(-0.5F, -0.5F, -0.5F); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, -1F, 0.0F); - renderblocks.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(0, meta)); + renderblocks.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(0, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 1.0F, 0.0F); - renderblocks.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(1, meta)); + renderblocks.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(1, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, -1F); - renderblocks.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(2, meta)); + renderblocks.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(2, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, 1.0F); - renderblocks.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(3, meta)); + renderblocks.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(3, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(-1F, 0.0F, 0.0F); - renderblocks.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(4, meta)); + renderblocks.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(4, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(1.0F, 0.0F, 0.0F); - renderblocks.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(5, meta)); + renderblocks.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(5, meta)); tessellator.draw(); GL11.glTranslatef(0.5F, 0.5F, 0.5F); } diff --git a/src/main/java/tconstruct/client/block/TankAirRender.java b/src/main/java/tconstruct/client/block/TankAirRender.java index 3eeb057c2c1..8feaca52a44 100644 --- a/src/main/java/tconstruct/client/block/TankAirRender.java +++ b/src/main/java/tconstruct/client/block/TankAirRender.java @@ -28,14 +28,14 @@ public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block { if (modelID == model) { - TankAirLogic logic = (TankAirLogic) world.getBlockTileEntity(x, y, z); + TankAirLogic logic = (TankAirLogic) world.func_147438_o(x, y, z); if (logic.hasItem()) { ItemStack item = logic.getStackInSlot(0); if (item.getItem() instanceof ItemBlock) { Block inv = Block.blocksList[item.itemID]; - renderer.setOverrideBlockTexture(inv.getIcon(1, item.getItemDamage())); + renderer.setOverrideBlockTexture(inv.func_149691_a(1, item.getItemDamage())); renderer.renderBlockByRenderType(inv, x, y, z); renderer.clearOverrideBlockTexture(); } @@ -49,7 +49,7 @@ else if (logic.hasFluids()) //System.out.println("Base: "+getBaseAmount(base)+", Height: "+getHeightAmount(base, fluidstack.amount)+", fluid amount: "+fluidstack.amount); renderer.func_147782_a(0.0, getBaseAmount(base), 0.0, 1.0, getHeightAmount(base, fluidstack.amount), 1.0); if (fluid.canBePlacedInWorld()) - BlockSkinRenderHelper.renderMetadataBlock(Block.blocksList[fluid.getBlockID()], 0, x, y, z, renderer, world); + BlockSkinRenderHelper.renderMetadataBlock(fluid.getBlock(), 0, x, y, z, renderer, world); else BlockSkinRenderHelper.renderLiquidBlock(fluid.getStillIcon(), fluid.getFlowingIcon(), x, y, z, renderer, world); base += fluidstack.amount; diff --git a/src/main/java/tconstruct/client/block/TankRender.java b/src/main/java/tconstruct/client/block/TankRender.java index c680894fe42..243382d6e5a 100644 --- a/src/main/java/tconstruct/client/block/TankRender.java +++ b/src/main/java/tconstruct/client/block/TankRender.java @@ -3,6 +3,7 @@ import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.world.IBlockAccess; import net.minecraftforge.fluids.Fluid; @@ -12,7 +13,6 @@ import tconstruct.blocks.logic.LavaTankLogic; import tconstruct.client.TProxyClient; - import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; @@ -40,14 +40,14 @@ public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block if (modelID == tankModelID) { //Liquid - LavaTankLogic logic = (LavaTankLogic) world.getBlockTileEntity(x, y, z); + LavaTankLogic logic = (LavaTankLogic) world.func_147438_o(x, y, z); if (logic.containsFluid()) { FluidStack liquid = logic.tank.getFluid(); renderer.func_147782_a(0.001, 0.001, 0.001, 0.999, logic.getFluidAmountScaled(), 0.999); Fluid fluid = liquid.getFluid(); if (fluid.canBePlacedInWorld()) - BlockSkinRenderHelper.renderMetadataBlock(Block.blocksList[fluid.getBlockID()], 0, x, y, z, renderer, world); + BlockSkinRenderHelper.renderMetadataBlock(fluid.getBlock(), 0, x, y, z, renderer, world); else BlockSkinRenderHelper.renderLiquidBlock(fluid.getStillIcon(), fluid.getFlowingIcon(), x, y, z, renderer, world); @@ -56,7 +56,7 @@ public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block //Block int meta = world.getBlockMetadata(x, y, z); - if (meta == 0 && world.getBlockId(x, y + 1, z) == 0) + if (meta == 0 && world.func_147439_a(x, y + 1, z) == Blocks.air) { renderer.func_147782_a(0.1875, 0, 0.1875, 0.8125, 0.125, 0.8125); renderer.func_147784_q(block, x, y + 1, z); @@ -85,27 +85,27 @@ private void renderDoRe (RenderBlocks renderblocks, Block block, int meta) GL11.glTranslatef(-0.5F, 0.5F, -0.5F); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, -1F, 0.0F); - renderblocks.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(0, meta)); + renderblocks.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(0, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 1.0F, 0.0F); - renderblocks.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(1, meta)); + renderblocks.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(1, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, -1F); - renderblocks.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(2, meta)); + renderblocks.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(2, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(0.0F, 0.0F, 1.0F); - renderblocks.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(3, meta)); + renderblocks.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(3, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(-1F, 0.0F, 0.0F); - renderblocks.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(4, meta)); + renderblocks.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(4, meta)); tessellator.draw(); tessellator.startDrawingQuads(); tessellator.setNormal(1.0F, 0.0F, 0.0F); - renderblocks.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(5, meta)); + renderblocks.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, block.func_149691_a(5, meta)); tessellator.draw(); GL11.glTranslatef(0.5F, 0.5F, 0.5F); } diff --git a/src/main/java/tconstruct/client/entity/projectile/ArrowRenderCustom.java b/src/main/java/tconstruct/client/entity/projectile/ArrowRenderCustom.java index 90ab955b9eb..9e8eba05f6b 100644 --- a/src/main/java/tconstruct/client/entity/projectile/ArrowRenderCustom.java +++ b/src/main/java/tconstruct/client/entity/projectile/ArrowRenderCustom.java @@ -47,7 +47,7 @@ public void doRenderItem (ArrowEntity arrow, double par2, double par4, double pa GL11.glTranslatef(-7 / 16f, -8 / 16f, -1 / 32f); float scale = 1.35f; GL11.glScalef(scale, scale, scale); - ForgeHooksClient.renderEntityItem(null, item, 0, 0, random, renderManager.renderEngine, renderBlocks); + ForgeHooksClient.renderEntityItem(null, item, 0, 0, random, renderManager.renderEngine, field_147909_c); GL11.glDisable(GL12.GL_RESCALE_NORMAL); GL11.glPopMatrix(); } diff --git a/src/main/java/tconstruct/client/entity/projectile/DaggerRenderCustom.java b/src/main/java/tconstruct/client/entity/projectile/DaggerRenderCustom.java index fbfc947315b..fa57b1947f3 100644 --- a/src/main/java/tconstruct/client/entity/projectile/DaggerRenderCustom.java +++ b/src/main/java/tconstruct/client/entity/projectile/DaggerRenderCustom.java @@ -54,7 +54,7 @@ public void doRenderItem (DaggerEntity dagger, double par2, double par4, double GL11.glTranslatef(-7 / 16f, -8 / 16f, -1 / 32f); float scale = 1.35f; GL11.glScalef(scale, scale, scale); - ForgeHooksClient.renderEntityItem(null, item, 0, 0, random, renderManager.renderEngine, renderBlocks); + ForgeHooksClient.renderEntityItem(null, item, 0, 0, random, renderManager.renderEngine, field_147909_c); GL11.glDisable(GL12.GL_RESCALE_NORMAL); GL11.glPopMatrix(); } diff --git a/src/main/java/tconstruct/client/gui/ArmorExtendedGui.java b/src/main/java/tconstruct/client/gui/ArmorExtendedGui.java index 2de013bcc6c..9239ebab576 100644 --- a/src/main/java/tconstruct/client/gui/ArmorExtendedGui.java +++ b/src/main/java/tconstruct/client/gui/ArmorExtendedGui.java @@ -85,7 +85,7 @@ protected void drawGuiContainerBackgroundLayer (float f, int i, int j) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); //mc.renderEngine.bindTexture("/mods/tinker/textures/gui/armorextended.png"); - this.mc.getTextureManager().bindTexture(background); + this.field_146297_k.getTextureManager().bindTexture(background); int cornerX = guiLeft; int cornerY = (height - ySize) / 2; drawTexturedModalRect(cornerX, cornerY, 0, 0, xSize, ySize); @@ -107,7 +107,7 @@ protected void drawGuiContainerBackgroundLayer (float f, int i, int j) cornerX = this.guiLeft; cornerY = this.guiTop; - drawPlayerOnGui(this.mc, cornerX + 33, cornerY + 75, 30, (float) (cornerX + 51) - this.xSize_lo, (float) (cornerY + 75 - 50) - this.ySize_lo); + drawPlayerOnGui(this.field_146297_k, cornerX + 33, cornerY + 75, 30, (float) (cornerX + 51) - this.xSize_lo, (float) (cornerY + 75 - 50) - this.ySize_lo); } public static void drawPlayerOnGui (Minecraft par0Minecraft, int par1, int par2, int par3, float par4, float par5) diff --git a/src/main/java/tconstruct/client/gui/CraftingStationGui.java b/src/main/java/tconstruct/client/gui/CraftingStationGui.java index fdceffa277b..1e1183f7a71 100644 --- a/src/main/java/tconstruct/client/gui/CraftingStationGui.java +++ b/src/main/java/tconstruct/client/gui/CraftingStationGui.java @@ -32,7 +32,7 @@ public CraftingStationGui(InventoryPlayer inventory, CraftingStationLogic logic, { super(logic.getGuiContainer(inventory, world, x, y, z)); this.logic = logic; - //text = new GuiTextField(this.fontRenderer, this.xSize / 2 - 5, 8, 30, 12); + //text = new GuiTextField(this.field_146289_q, this.xSize / 2 - 5, 8, 30, 12); //this.text.setText(""); title = "\u00A7nRepair and Modification"; body = "The main way to repair or change your tools or armor.\n\nPlace an item and a material on the left to get started."; @@ -42,11 +42,11 @@ public CraftingStationGui(InventoryPlayer inventory, CraftingStationLogic logic, @Override protected void drawGuiContainerForegroundLayer (int par1, int par2) { - this.fontRenderer.drawString(StatCollector.translateToLocal(logic.tinkerTable ? "crafters.TinkerTable" : logic.getInvName()), 8, 6, 0x202020); - this.fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 8, this.ySize - 96 + 2, 0x202020); + this.field_146289_q.drawString(StatCollector.translateToLocal(logic.tinkerTable ? "crafters.TinkerTable" : logic.getInvName()), 8, 6, 0x202020); + this.field_146289_q.drawString(StatCollector.translateToLocal("container.inventory"), 8, this.ySize - 96 + 2, 0x202020); if (logic.chest != null) - this.fontRenderer.drawString(StatCollector.translateToLocal(logic.chest.get().getInvName()), -108, this.ySize - 160, 0x202020); - //this.fontRenderer.drawString(toolName + "_", this.xSize / 2 - 18, 8, 0xffffff); + this.field_146289_q.drawString(StatCollector.translateToLocal(logic.chest.get().getInvName()), -108, this.ySize - 160, 0x202020); + //this.field_146289_q.drawString(toolName + "_", this.xSize / 2 - 18, 8, 0xffffff); if (logic.tinkerTable) { @@ -64,7 +64,7 @@ void drawToolStats () { ToolCore tool = (ToolCore) stack.getItem(); NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); - this.drawCenteredString(fontRenderer, "\u00A7n" + tool.getToolName(), xSize + 63, 8, 0xffffff); + this.drawCenteredString(field_146289_q, "\u00A7n" + tool.getToolName(), xSize + 63, 8, 0xffffff); drawModularToolStats(stack, tool, tags); } @@ -72,7 +72,7 @@ else if (stack.getItem() instanceof ArmorCore) { ArmorCore armor = (ArmorCore) stack.getItem(); NBTTagCompound tags = stack.getTagCompound().getCompoundTag("TinkerArmor"); - this.drawCenteredString(fontRenderer, "\u00A7n" + armor.getClass().getSimpleName(), xSize + 63, 8, 0xffffff); + this.drawCenteredString(field_146289_q, "\u00A7n" + armor.getClass().getSimpleName(), xSize + 63, 8, 0xffffff); drawModularArmorStats(stack, armor, tags); } @@ -85,7 +85,7 @@ void drawModularArmorStats (ItemStack stack, ArmorCore tool, NBTTagCompound tags int offset = 0; if (modifiers > 0) { - fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation18") + tags.getInteger("Modifiers"), xSize + 8, base + offset * 10, 0xffffff); + field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation18") + tags.getInteger("Modifiers"), xSize + 8, base + offset * 10, 0xffffff); offset++; } } @@ -104,14 +104,14 @@ void drawModularToolStats (ItemStack stack, ToolCore tool, NBTTagCompound tags) { if (maxDur >= 10000) { - fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation1"), xSize + 8, base + offset * 11, 0xffffff); + field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation1"), xSize + 8, base + offset * 11, 0xffffff); offset++; - fontRenderer.drawString("- " + availableDurability + "/" + maxDur, xSize + 8, base + offset * 10, 0xffffff); + field_146289_q.drawString("- " + availableDurability + "/" + maxDur, xSize + 8, base + offset * 10, 0xffffff); offset++; } else { - fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation2") + availableDurability + "/" + maxDur, xSize + 8, base + offset * 10, 0xffffff); + field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation2") + availableDurability + "/" + maxDur, xSize + 8, base + offset * 10, 0xffffff); offset++; } } @@ -129,16 +129,16 @@ void drawModularToolStats (ItemStack stack, ToolCore tool, NBTTagCompound tags) String heart = attack == 2 ? StatCollector.translateToLocal("gui.partcrafter9") : StatCollector.translateToLocal("gui.partcrafter10"); if (attack % 2 == 0) - this.fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation3") + attack / 2 + heart, xSize + 8, base + offset * 10, 0xffffff); + this.field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation3") + attack / 2 + heart, xSize + 8, base + offset * 10, 0xffffff); else - this.fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation3") + attack / 2f + heart, xSize + 8, base + offset * 10, 0xffffff); + this.field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation3") + attack / 2f + heart, xSize + 8, base + offset * 10, 0xffffff); offset++; if (stoneboundDamage != 0) { heart = stoneboundDamage == 2 ? StatCollector.translateToLocal("gui.partcrafter9") : StatCollector.translateToLocal("gui.partcrafter10"); String bloss = stoneboundDamage > 0 ? StatCollector.translateToLocal("gui.toolstation4") : StatCollector.translateToLocal("gui.toolstation5"); - this.fontRenderer.drawString(bloss + (int) stoneboundDamage / 2 + heart, xSize + 8, base + offset * 10, 0xffffff); + this.field_146289_q.drawString(bloss + (int) stoneboundDamage / 2 + heart, xSize + 8, base + offset * 10, 0xffffff); offset++; } offset++; @@ -151,9 +151,9 @@ void drawModularToolStats (ItemStack stack, ToolCore tool, NBTTagCompound tags) int drawSpeed = tags.getInteger("DrawSpeed"); float flightSpeed = tags.getFloat("FlightSpeed"); float trueDraw = drawSpeed / 20f * flightSpeed; - this.fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation6") + df.format(trueDraw) + "s", xSize + 8, base + offset * 10, 0xffffff); + this.field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation6") + df.format(trueDraw) + "s", xSize + 8, base + offset * 10, 0xffffff); offset++; - this.fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation7") + df.format(flightSpeed) + "x", xSize + 8, base + offset * 10, 0xffffff); + this.field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation7") + df.format(flightSpeed) + "x", xSize + 8, base + offset * 10, 0xffffff); offset++; offset++; } @@ -167,28 +167,28 @@ void drawModularToolStats (ItemStack stack, ToolCore tool, NBTTagCompound tags) float shatter = tags.getFloat("BreakChance"); float accuracy = tags.getFloat("Accuracy"); - this.fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation10"), xSize + 8, base + offset * 10, 0xffffff); + this.field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation10"), xSize + 8, base + offset * 10, 0xffffff); offset++; String heart = attack == 2 ? StatCollector.translateToLocal("gui.partcrafter9") : StatCollector.translateToLocal("gui.partcrafter10"); if (attack % 2 == 0) - this.fontRenderer.drawString("- " + attack / 2 + heart, xSize + 8, base + offset * 10, 0xffffff); + this.field_146289_q.drawString("- " + attack / 2 + heart, xSize + 8, base + offset * 10, 0xffffff); else - this.fontRenderer.drawString("- " + attack / 2f + heart, xSize + 8, base + offset * 10, 0xffffff); + this.field_146289_q.drawString("- " + attack / 2f + heart, xSize + 8, base + offset * 10, 0xffffff); offset++; int minAttack = attack; int maxAttack = attack * 2; heart = StatCollector.translateToLocal("gui.partcrafter10"); - this.fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation11"), xSize + 8, base + offset * 10, 0xffffff); + this.field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation11"), xSize + 8, base + offset * 10, 0xffffff); offset++; - this.fontRenderer.drawString(df.format(minAttack / 2f) + "-" + df.format(maxAttack / 2f) + heart, xSize + 8, base + offset * 10, 0xffffff); + this.field_146289_q.drawString(df.format(minAttack / 2f) + "-" + df.format(maxAttack / 2f) + heart, xSize + 8, base + offset * 10, 0xffffff); offset++; offset++; - this.fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation8") + df.format(mass), xSize + 8, base + offset * 10, 0xffffff); + this.field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation8") + df.format(mass), xSize + 8, base + offset * 10, 0xffffff); offset++; - this.fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation9") + df.format(accuracy - 4) + "%", xSize + 8, base + offset * 10, 0xffffff); + this.field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation9") + df.format(accuracy - 4) + "%", xSize + 8, base + offset * 10, 0xffffff); offset++; - /*this.fontRenderer.drawString("Chance to break: " + df.format(shatter)+"%", xSize + 8, base + offset * 10, 0xffffff); + /*this.field_146289_q.drawString("Chance to break: " + df.format(shatter)+"%", xSize + 8, base + offset * 10, 0xffffff); offset++;*/ offset++; } @@ -204,20 +204,20 @@ void drawModularToolStats (ItemStack stack, ToolCore tool, NBTTagCompound tags) float trueSpeed = mineSpeed + stoneboundSpeed; float trueSpeed2 = mineSpeed + stoneboundSpeed; - fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation12"), xSize + 8, base + offset * 10, 0xffffff); + field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation12"), xSize + 8, base + offset * 10, 0xffffff); offset++; - fontRenderer.drawString("- " + df.format(trueSpeed) + ", " + df.format(trueSpeed2), xSize + 8, base + offset * 10, 0xffffff); + field_146289_q.drawString("- " + df.format(trueSpeed) + ", " + df.format(trueSpeed2), xSize + 8, base + offset * 10, 0xffffff); offset++; if (stoneboundSpeed != 0) { String bloss = stoneboundSpeed > 0 ? StatCollector.translateToLocal("gui.toolstation4") : StatCollector.translateToLocal("gui.toolstation5"); - fontRenderer.drawString(bloss + df.format(stoneboundSpeed), xSize + 8, base + offset * 10, 0xffffff); + field_146289_q.drawString(bloss + df.format(stoneboundSpeed), xSize + 8, base + offset * 10, 0xffffff); offset++; } offset++; - fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation13"), xSize + 8, base + offset * 10, 0xffffff); + field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation13"), xSize + 8, base + offset * 10, 0xffffff); offset++; - fontRenderer + field_146289_q .drawString("- " + getHarvestLevelName(tags.getInteger("HarvestLevel")) + ", " + getHarvestLevelName(tags.getInteger("HarvestLevel2")), xSize + 8, base + offset * 10, 0xffffff); offset++; offset++; @@ -253,15 +253,15 @@ else if (categories.contains("harvest")) trueSpeed += stoneboundSpeed; if (trueSpeed < 0) trueSpeed = 0; - fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation14") + df.format(trueSpeed), xSize + 8, base + offset * 10, 0xffffff); + field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation14") + df.format(trueSpeed), xSize + 8, base + offset * 10, 0xffffff); offset++; if (stoneboundSpeed != 0) { String bloss = stoneboundSpeed > 0 ? StatCollector.translateToLocal("gui.toolstation4") : StatCollector.translateToLocal("gui.toolstation5"); - fontRenderer.drawString(bloss + df.format(stoneboundSpeed), xSize + 8, base + offset * 10, 0xffffff); + field_146289_q.drawString(bloss + df.format(stoneboundSpeed), xSize + 8, base + offset * 10, 0xffffff); offset++; } - fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation15") + getHarvestLevelName(tags.getInteger("HarvestLevel")), xSize + 8, base + offset * 10, 0xffffff); + field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation15") + getHarvestLevelName(tags.getInteger("HarvestLevel")), xSize + 8, base + offset * 10, 0xffffff); offset++; offset++; } @@ -269,7 +269,7 @@ else if (categories.contains("utility")) { float mineSpeed = tags.getInteger("MiningSpeed"); float trueSpeed = mineSpeed / (100f); - fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation16") + trueSpeed, xSize + 8, base + offset * 10, 0xffffff); + field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation16") + trueSpeed, xSize + 8, base + offset * 10, 0xffffff); offset++; offset++; } @@ -277,12 +277,12 @@ else if (categories.contains("utility")) int modifiers = tags.getInteger("Modifiers"); if (modifiers > 0) { - fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation18") + tags.getInteger("Modifiers"), xSize + 8, base + offset * 10, 0xffffff); + field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation18") + tags.getInteger("Modifiers"), xSize + 8, base + offset * 10, 0xffffff); offset++; } if (tags.hasKey("Tooltip1")) { - fontRenderer.drawString(StatCollector.translateToLocal("gui.toolstation17"), xSize + 8, base + offset * 10, 0xffffff); + field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation17"), xSize + 8, base + offset * 10, 0xffffff); } boolean displayToolTips = true; @@ -294,7 +294,7 @@ else if (categories.contains("utility")) if (tags.hasKey(tooltip)) { String tipName = tags.getString(tooltip); - fontRenderer.drawString("- " + tipName, xSize + 8, base + (offset + tipNum) * 10, 0xffffff); + field_146289_q.drawString("- " + tipName, xSize + 8, base + (offset + tipNum) * 10, 0xffffff); } else displayToolTips = false; @@ -324,8 +324,8 @@ protected String getHarvestLevelName (int num) void drawToolInformation () { - this.drawCenteredString(fontRenderer, title, xSize + 63, 8, 0xffffff); - fontRenderer.drawSplitString(body, xSize + 8, 24, 115, 0xffffff); + this.drawCenteredString(field_146289_q, title, xSize + 63, 8, 0xffffff); + field_146289_q.drawSplitString(body, xSize + 8, 24, 115, 0xffffff); } private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/tinkertable.png"); @@ -338,7 +338,7 @@ protected void drawGuiContainerBackgroundLayer (float par1, int par2, int par3) { // Draw the background GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.getTextureManager().bindTexture(background); + this.field_146297_k.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); @@ -348,20 +348,20 @@ protected void drawGuiContainerBackgroundLayer (float par1, int par2, int par3) this.drawTexturedModalRect(cornerX + 62, cornerY, 0, this.ySize, 112, 22); } - this.mc.getTextureManager().bindTexture(icons); + this.field_146297_k.getTextureManager().bindTexture(icons); // Draw the slots if (logic.tinkerTable && !logic.isStackInSlot(5)) this.drawTexturedModalRect(cornerX + 47, cornerY + 33, 0, 233, 18, 18); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.getTextureManager().bindTexture(icons); + this.field_146297_k.getTextureManager().bindTexture(icons); //Draw chest side if (logic.chest != null) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.getTextureManager().bindTexture(chest); + this.field_146297_k.getTextureManager().bindTexture(chest); if (logic.doubleChest == null) this.drawTexturedModalRect(cornerX - 116, cornerY, 0, 0, 121, this.ySize); else @@ -372,7 +372,7 @@ protected void drawGuiContainerBackgroundLayer (float par1, int par2, int par3) if (logic.tinkerTable) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.getTextureManager().bindTexture(description); + this.field_146297_k.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); diff --git a/src/main/java/tconstruct/client/gui/FrypanGui.java b/src/main/java/tconstruct/client/gui/FrypanGui.java index 8506551a5fe..da5d2161099 100644 --- a/src/main/java/tconstruct/client/gui/FrypanGui.java +++ b/src/main/java/tconstruct/client/gui/FrypanGui.java @@ -22,8 +22,8 @@ public FrypanGui(InventoryPlayer inventoryplayer, FrypanLogic frypan, World worl protected void drawGuiContainerForegroundLayer (int par1, int par2) { - fontRenderer.drawString(StatCollector.translateToLocal("crafters.Frypan"), 60, 6, 0x404040); - fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 8, (ySize - 96) + 2, 0x404040); + field_146289_q.drawString(StatCollector.translateToLocal("crafters.Frypan"), 60, 6, 0x404040); + field_146289_q.drawString(StatCollector.translateToLocal("container.inventory"), 8, (ySize - 96) + 2, 0x404040); } private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/frypan.png"); @@ -31,7 +31,7 @@ protected void drawGuiContainerForegroundLayer (int par1, int par2) protected void drawGuiContainerBackgroundLayer (float f, int i, int j) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.getTextureManager().bindTexture(background); + this.field_146297_k.getTextureManager().bindTexture(background); int cornerX = (width - xSize) / 2; int cornerY = (height - ySize) / 2; drawTexturedModalRect(cornerX, cornerY, 0, 0, xSize, ySize); diff --git a/src/main/java/tconstruct/client/gui/GuiLandmine.java b/src/main/java/tconstruct/client/gui/GuiLandmine.java index cd0c70f5644..f75bec338b1 100644 --- a/src/main/java/tconstruct/client/gui/GuiLandmine.java +++ b/src/main/java/tconstruct/client/gui/GuiLandmine.java @@ -35,7 +35,7 @@ public GuiLandmine(ContainerLandmine par1Container) @Override protected void drawItemStackTooltip (ItemStack par1ItemStack, int par2, int par3) { - List list = par1ItemStack.getTooltip(this.mc.thePlayer, this.mc.gameSettings.advancedItemTooltips); + List list = par1ItemStack.getTooltip(this.field_146297_k.thePlayer, this.field_146297_k.gameSettings.advancedItemTooltips); Behavior b = Behavior.getBehaviorFromStack(par1ItemStack); if (b != null) @@ -56,7 +56,7 @@ protected void drawItemStackTooltip (ItemStack par1ItemStack, int par2, int par3 } FontRenderer font = par1ItemStack.getItem().getFontRenderer(par1ItemStack); - drawHoveringText(list, par2, par3, (font == null ? fontRenderer : font)); + drawHoveringText(list, par2, par3, (font == null ? field_146289_q : font)); } @Override @@ -64,20 +64,20 @@ protected void drawGuiContainerForegroundLayer (int i, int j) { if (container.te != null) { - fontRenderer.drawString(container.te.getInvName(), 8, 5, 4210752); + field_146289_q.drawString(container.te.getInvName(), 8, 5, 4210752); } else { - fontRenderer.drawString("Landmine", 8, 5, 4210752); + field_146289_q.drawString("Landmine", 8, 5, 4210752); } - fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 8, ySize - 96 + 3, 4210752); + field_146289_q.drawString(StatCollector.translateToLocal("container.inventory"), 8, ySize - 96 + 3, 4210752); } @Override protected void drawGuiContainerBackgroundLayer (float f, int i, int j) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture(background); + field_146297_k.renderEngine.bindTexture(background); int x = (width - xSize) / 2; int y = (height - ySize) / 2; this.drawTexturedModalRect(x, y, 0, 0, xSize, ySize); diff --git a/src/main/java/tconstruct/client/gui/KnapsackGui.java b/src/main/java/tconstruct/client/gui/KnapsackGui.java index c7a37295eaa..9a31df2dae1 100644 --- a/src/main/java/tconstruct/client/gui/KnapsackGui.java +++ b/src/main/java/tconstruct/client/gui/KnapsackGui.java @@ -44,8 +44,8 @@ public void initGui () protected void drawGuiContainerForegroundLayer (int par1, int par2) { - fontRenderer.drawString(StatCollector.translateToLocal("inventory.knapsack"), 8, 6, 0x404040); - fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 8, (ySize - 96) + 4, 0x404040); + field_146289_q.drawString(StatCollector.translateToLocal("inventory.knapsack"), 8, 6, 0x404040); + field_146289_q.drawString(StatCollector.translateToLocal("container.inventory"), 8, (ySize - 96) + 4, 0x404040); } private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/knapsack.png"); @@ -53,7 +53,7 @@ protected void drawGuiContainerForegroundLayer (int par1, int par2) protected void drawGuiContainerBackgroundLayer (float f, int i, int j) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.getTextureManager().bindTexture(background); + this.field_146297_k.getTextureManager().bindTexture(background); int cornerX = guiLeft; int cornerY = (height - ySize) / 2; drawTexturedModalRect(cornerX, cornerY, 0, 0, xSize, ySize); diff --git a/src/main/java/tconstruct/client/gui/NewContainerGui.java b/src/main/java/tconstruct/client/gui/NewContainerGui.java index ecd146ba6f2..f8b63b47849 100644 --- a/src/main/java/tconstruct/client/gui/NewContainerGui.java +++ b/src/main/java/tconstruct/client/gui/NewContainerGui.java @@ -231,8 +231,8 @@ protected void drawItemStack (ItemStack par1ItemStack, int par2, int par3, Strin GL11.glTranslatef(0.0F, 0.0F, 32.0F); this.zLevel = 200.0F; itemRenderer.zLevel = 200.0F; - itemRenderer.renderItemAndEffectIntoGUI(this.fontRenderer, this.field_146297_k.renderEngine, par1ItemStack, par2, par3); - itemRenderer.renderItemOverlayIntoGUI(this.fontRenderer, this.field_146297_k.renderEngine, par1ItemStack, par2, par3 - (this.draggedStack == null ? 0 : 8), par4Str); + itemRenderer.renderItemAndEffectIntoGUI(this.field_146289_q, this.field_146297_k.renderEngine, par1ItemStack, par2, par3); + itemRenderer.renderItemOverlayIntoGUI(this.field_146289_q, this.field_146297_k.renderEngine, par1ItemStack, par2, par3 - (this.draggedStack == null ? 0 : 8), par4Str); this.zLevel = 0.0F; itemRenderer.zLevel = 0.0F; } @@ -279,7 +279,7 @@ protected void func_102021_a (List par1List, int par2, int par3) while (iterator.hasNext()) { String s = (String) iterator.next(); - int l = this.fontRenderer.getStringWidth(s); + int l = this.field_146289_q.getStringWidth(s); if (l > k) { @@ -324,7 +324,7 @@ protected void func_102021_a (List par1List, int par2, int par3) for (int k2 = 0; k2 < par1List.size(); ++k2) { String s1 = (String) par1List.get(k2); - this.fontRenderer.drawStringWithShadow(s1, i1, j1, -1); + this.field_146289_q.drawStringWithShadow(s1, i1, j1, -1); if (k2 == 0) { @@ -430,8 +430,8 @@ else if (this.field_94076_q && this.field_94077_p.contains(par1Slot) && itemstac } GL11.glEnable(GL11.GL_DEPTH_TEST); - itemRenderer.renderItemAndEffectIntoGUI(this.fontRenderer, this.field_146297_k.renderEngine, itemstack, i, j); - itemRenderer.renderItemOverlayIntoGUI(this.fontRenderer, this.field_146297_k.renderEngine, itemstack, i, j, s); + itemRenderer.renderItemAndEffectIntoGUI(this.field_146289_q, this.field_146297_k.renderEngine, itemstack, i, j); + itemRenderer.renderItemOverlayIntoGUI(this.field_146289_q, this.field_146297_k.renderEngine, itemstack, i, j, s); } itemRenderer.zLevel = 0.0F; diff --git a/src/main/java/tconstruct/client/gui/PartCrafterGui.java b/src/main/java/tconstruct/client/gui/PartCrafterGui.java index 4747e35c703..6f70eeb59a5 100644 --- a/src/main/java/tconstruct/client/gui/PartCrafterGui.java +++ b/src/main/java/tconstruct/client/gui/PartCrafterGui.java @@ -39,10 +39,10 @@ public PartCrafterGui(InventoryPlayer inventoryplayer, PartBuilderLogic partlogi protected void drawGuiContainerForegroundLayer (int par1, int par2) { - this.fontRenderer.drawString(StatCollector.translateToLocal("crafters.PartBuilder"), 6, 6, 4210752); - this.fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 8, this.ySize - 96 + 2, 4210752); + this.field_146289_q.drawString(StatCollector.translateToLocal("crafters.PartBuilder"), 6, 6, 4210752); + this.field_146289_q.drawString(StatCollector.translateToLocal("container.inventory"), 8, this.ySize - 96 + 2, 4210752); if (drawChestPart) - this.fontRenderer.drawString(StatCollector.translateToLocal("inventory.PatternChest"), -108, this.ySize - 148, 4210752); + this.field_146289_q.drawString(StatCollector.translateToLocal("inventory.PatternChest"), -108, this.ySize - 148, 4210752); drawMaterialInformation(); } @@ -50,8 +50,8 @@ protected void drawGuiContainerForegroundLayer (int par1, int par2) void drawDefaultInformation () { title = "\u00A7n" + StatCollector.translateToLocal("gui.partcrafter2"); - this.drawCenteredString(fontRenderer, title, xSize + 63, 8, 16777215); - fontRenderer.drawSplitString(StatCollector.translateToLocal("gui.partcrafter3"), xSize + 8, 24, 115, 16777215); + this.drawCenteredString(field_146289_q, title, xSize + 63, 8, 16777215); + field_146289_q.drawSplitString(StatCollector.translateToLocal("gui.partcrafter3"), xSize + 8, 24, 115, 16777215); } void drawMaterialInformation () @@ -93,34 +93,34 @@ void drawMaterialInformation () int offset = 8; if (hasTop) { - this.drawCenteredString(fontRenderer, title, xSize + 63, offset, 16777215); - this.fontRenderer.drawString(StatCollector.translateToLocal("gui.partcrafter4") + topEnum.durability(), xSize + 8, offset + 16, 16777215); - this.fontRenderer.drawString(StatCollector.translateToLocal("gui.partcrafter5") + topEnum.handleDurability() + "x", xSize + 8, offset + 27, 16777215); - this.fontRenderer.drawString(StatCollector.translateToLocal("gui.partcrafter6") + topEnum.toolSpeed() / 100f, xSize + 8, offset + 38, 16777215); - this.fontRenderer.drawString(StatCollector.translateToLocal("gui.partcrafter7") + getHarvestLevelName(topEnum.harvestLevel()), xSize + 8, offset + 49, 16777215); + this.drawCenteredString(field_146289_q, title, xSize + 63, offset, 16777215); + this.field_146289_q.drawString(StatCollector.translateToLocal("gui.partcrafter4") + topEnum.durability(), xSize + 8, offset + 16, 16777215); + this.field_146289_q.drawString(StatCollector.translateToLocal("gui.partcrafter5") + topEnum.handleDurability() + "x", xSize + 8, offset + 27, 16777215); + this.field_146289_q.drawString(StatCollector.translateToLocal("gui.partcrafter6") + topEnum.toolSpeed() / 100f, xSize + 8, offset + 38, 16777215); + this.field_146289_q.drawString(StatCollector.translateToLocal("gui.partcrafter7") + getHarvestLevelName(topEnum.harvestLevel()), xSize + 8, offset + 49, 16777215); int attack = topEnum.attack(); String heart = attack == 2 ? StatCollector.translateToLocal("gui.partcrafter8") : StatCollector.translateToLocal("gui.partcrafter9"); if (attack % 2 == 0) - this.fontRenderer.drawString(StatCollector.translateToLocal("gui.partcrafter10") + attack / 2 + heart, xSize + 8, offset + 60, 0xffffff); + this.field_146289_q.drawString(StatCollector.translateToLocal("gui.partcrafter10") + attack / 2 + heart, xSize + 8, offset + 60, 0xffffff); else - this.fontRenderer.drawString(StatCollector.translateToLocal("gui.partcrafter10") + attack / 2f + heart, xSize + 8, offset + 60, 0xffffff); + this.field_146289_q.drawString(StatCollector.translateToLocal("gui.partcrafter10") + attack / 2f + heart, xSize + 8, offset + 60, 0xffffff); } offset = 90; if (hasBottom) { - this.drawCenteredString(fontRenderer, otherTitle, xSize + 63, offset, 16777215); - this.fontRenderer.drawString(StatCollector.translateToLocal("gui.partcrafter4") + bottomEnum.durability(), xSize + 8, offset + 16, 16777215); - this.fontRenderer.drawString(StatCollector.translateToLocal("gui.partcrafter5") + bottomEnum.handleDurability() + "x", xSize + 8, offset + 27, 16777215); - this.fontRenderer.drawString(StatCollector.translateToLocal("gui.partcrafter6") + bottomEnum.toolSpeed() / 100f, xSize + 8, offset + 38, 16777215); - this.fontRenderer.drawString(StatCollector.translateToLocal("gui.partcrafter7") + getHarvestLevelName(bottomEnum.harvestLevel()), xSize + 8, offset + 49, 16777215); + this.drawCenteredString(field_146289_q, otherTitle, xSize + 63, offset, 16777215); + this.field_146289_q.drawString(StatCollector.translateToLocal("gui.partcrafter4") + bottomEnum.durability(), xSize + 8, offset + 16, 16777215); + this.field_146289_q.drawString(StatCollector.translateToLocal("gui.partcrafter5") + bottomEnum.handleDurability() + "x", xSize + 8, offset + 27, 16777215); + this.field_146289_q.drawString(StatCollector.translateToLocal("gui.partcrafter6") + bottomEnum.toolSpeed() / 100f, xSize + 8, offset + 38, 16777215); + this.field_146289_q.drawString(StatCollector.translateToLocal("gui.partcrafter7") + getHarvestLevelName(bottomEnum.harvestLevel()), xSize + 8, offset + 49, 16777215); int attack = bottomEnum.attack(); String heart = attack == 2 ? StatCollector.translateToLocal("gui.partcrafter8") : StatCollector.translateToLocal("gui.partcrafter9"); if (attack % 2 == 0) - this.fontRenderer.drawString(StatCollector.translateToLocal("gui.partcrafter10") + attack / 2 + heart, xSize + 8, offset + 60, 0xffffff); + this.field_146289_q.drawString(StatCollector.translateToLocal("gui.partcrafter10") + attack / 2 + heart, xSize + 8, offset + 60, 0xffffff); else - this.fontRenderer.drawString(StatCollector.translateToLocal("gui.partcrafter10") + attack / 2f + heart, xSize + 8, offset + 60, 0xffffff); + this.field_146289_q.drawString(StatCollector.translateToLocal("gui.partcrafter10") + attack / 2f + heart, xSize + 8, offset + 60, 0xffffff); } if (!hasTop && !hasBottom) @@ -156,7 +156,7 @@ protected void drawGuiContainerBackgroundLayer (float par1, int par2, int par3) { // Draw the background GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.getTextureManager().bindTexture(background); + this.field_146297_k.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); @@ -190,7 +190,7 @@ protected void drawGuiContainerBackgroundLayer (float par1, int par2, int par3) // Draw description GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.getTextureManager().bindTexture(description); + this.field_146297_k.getTextureManager().bindTexture(description); cornerX = (this.width + this.xSize) / 2; cornerY = (this.height - this.ySize) / 2; this.drawTexturedModalRect(cornerX, cornerY, 126, 0, 126, this.ySize); @@ -224,15 +224,15 @@ protected void mouseClicked (int mouseX, int mouseY, int clickNum) k1 = -999; } - if (this.mc.gameSettings.touchscreen && flag1 && this.mc.thePlayer.inventory.getItemStack() == null) + if (this.field_146297_k.gameSettings.touchscreen && flag1 && this.mc.thePlayer.inventory.getItemStack() == null) { - this.mc.displayGuiScreen((GuiScreen) null); + this.field_146297_k.displayGuiScreen((GuiScreen) null); return; } if (k1 != -1) { - if (this.mc.gameSettings.touchscreen) + if (this.field_146297_k.gameSettings.touchscreen) { if (slot != null && slot.getHasStack()) { @@ -247,9 +247,9 @@ protected void mouseClicked (int mouseX, int mouseY, int clickNum) } else if (!this.field_94076_q) { - if (this.mc.thePlayer.inventory.getItemStack() == null) + if (this.field_146297_k.thePlayer.inventory.getItemStack() == null) { - if (clickNum == this.mc.gameSettings.keyBindPickBlock.keyCode + 100) + if (clickNum == this.field_146297_k.gameSettings.keyBindPickBlock.keyCode + 100) { this.handleMouseClick(slot, k1, clickNum, 3); } diff --git a/src/main/java/tconstruct/client/gui/PatternChestGui.java b/src/main/java/tconstruct/client/gui/PatternChestGui.java index b4b57f5c15e..69f5aafe845 100644 --- a/src/main/java/tconstruct/client/gui/PatternChestGui.java +++ b/src/main/java/tconstruct/client/gui/PatternChestGui.java @@ -24,8 +24,8 @@ public PatternChestGui(InventoryPlayer inventoryplayer, PatternChestLogic holder protected void drawGuiContainerForegroundLayer (int par1, int par2) { - fontRenderer.drawString(StatCollector.translateToLocal("inventory.PatternChest"), 60, 6, 0x404040); - fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 17, (ySize - 96) + 2, 0x404040); + field_146289_q.drawString(StatCollector.translateToLocal("inventory.PatternChest"), 60, 6, 0x404040); + field_146289_q.drawString(StatCollector.translateToLocal("container.inventory"), 17, (ySize - 96) + 2, 0x404040); } private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/patternchest.png"); @@ -33,7 +33,7 @@ protected void drawGuiContainerForegroundLayer (int par1, int par2) protected void drawGuiContainerBackgroundLayer (float f, int i, int j) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.getTextureManager().bindTexture(background); + this.field_146297_k.getTextureManager().bindTexture(background); int cornerX = (width - xSize) / 2; int cornerY = (height - ySize) / 2; drawTexturedModalRect(cornerX, cornerY, 0, 0, xSize, ySize); diff --git a/src/main/java/tconstruct/client/gui/SmelteryGui.java b/src/main/java/tconstruct/client/gui/SmelteryGui.java index 2fc380e69e7..15dfbfb72bb 100644 --- a/src/main/java/tconstruct/client/gui/SmelteryGui.java +++ b/src/main/java/tconstruct/client/gui/SmelteryGui.java @@ -37,7 +37,7 @@ public SmelteryGui(InventoryPlayer inventoryplayer, SmelteryLogic smeltery, Worl { super((ActiveContainer) smeltery.getGuiContainer(inventoryplayer, world, x, y, z)); logic = smeltery; - username = inventoryplayer.player.username; + username = inventoryplayer.player.getDisplayName(); xSize = 248; smeltery.updateFuelDisplay(); } @@ -102,8 +102,8 @@ protected void updateScrollbar (int mouseX, int mouseY, float par3) @Override protected void drawGuiContainerForegroundLayer (int mouseX, int mouseY) { - fontRenderer.drawString(StatCollector.translateToLocal("crafters.Smeltery"), 86, 5, 0x404040); - fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 90, (ySize - 96) + 2, 0x404040); + field_146289_q.drawString(StatCollector.translateToLocal("crafters.Smeltery"), 86, 5, 0x404040); + field_146289_q.drawString(StatCollector.translateToLocal("container.inventory"), 90, (ySize - 96) + 2, 0x404040); int base = 0; int cornerX = (width - xSize) / 2 + 36; @@ -158,7 +158,7 @@ protected void drawGuiContainerForegroundLayer (int mouseX, int mouseY) protected void drawGuiContainerBackgroundLayer (float f, int mouseX, int mouseY) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.getTextureManager().bindTexture(background); + this.field_146297_k.getTextureManager().bindTexture(background); int cornerX = (width - xSize) / 2 + 36; int cornerY = (height - ySize) / 2; drawTexturedModalRect(cornerX + 46, cornerY, 0, 0, 176, ySize); @@ -214,12 +214,12 @@ protected void drawGuiContainerBackgroundLayer (float f, int mouseX, int mouseY) //Liquid gague GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.getTextureManager().bindTexture(background); + this.field_146297_k.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.getTextureManager().bindTexture(backgroundSide); + this.field_146297_k.getTextureManager().bindTexture(backgroundSide); if (logic.layers > 0) { if (logic.layers == 1) @@ -258,7 +258,7 @@ else if (logic.layers == 2) protected void drawFluidStackTooltip (FluidStack par1ItemStack, int par2, int par3) { this.zLevel = 100; - List list = getLiquidTooltip(par1ItemStack, this.mc.gameSettings.advancedItemTooltips); + List list = getLiquidTooltip(par1ItemStack, this.field_146297_k.gameSettings.advancedItemTooltips); for (int k = 0; k < list.size(); ++k) { @@ -344,7 +344,7 @@ protected void drawToolTip (List par1List, int par2, int par3) while (iterator.hasNext()) { String s = (String) iterator.next(); - int l = this.fontRenderer.getStringWidth(s); + int l = this.field_146289_q.getStringWidth(s); if (l > k) { @@ -389,7 +389,7 @@ protected void drawToolTip (List par1List, int par2, int par3) for (int k2 = 0; k2 < par1List.size(); ++k2) { String s1 = (String) par1List.get(k2); - this.fontRenderer.drawStringWithShadow(s1, i1, j1, -1); + this.field_146289_q.drawStringWithShadow(s1, i1, j1, -1); if (k2 == 0) { diff --git a/src/main/java/tconstruct/client/gui/StencilTableGui.java b/src/main/java/tconstruct/client/gui/StencilTableGui.java index 764ac23a38d..de667c5ecef 100644 --- a/src/main/java/tconstruct/client/gui/StencilTableGui.java +++ b/src/main/java/tconstruct/client/gui/StencilTableGui.java @@ -41,8 +41,8 @@ public void onGuiClosed () @Override protected void drawGuiContainerForegroundLayer (int par1, int par2) { - fontRenderer.drawString(StatCollector.translateToLocal("crafters.PatternShaper"), 50, 6, 0x404040); - fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 8, (ySize - 96) + 2, 0x404040); + field_146289_q.drawString(StatCollector.translateToLocal("crafters.PatternShaper"), 50, 6, 0x404040); + field_146289_q.drawString(StatCollector.translateToLocal("container.inventory"), 8, (ySize - 96) + 2, 0x404040); } private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/patternshaper.png"); @@ -50,7 +50,7 @@ protected void drawGuiContainerForegroundLayer (int par1, int par2) protected void drawGuiContainerBackgroundLayer (float par1, int par2, int par3) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.getTextureManager().bindTexture(background); + this.field_146297_k.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); diff --git a/src/main/java/tconstruct/util/EnvironmentChecks.java b/src/main/java/tconstruct/util/EnvironmentChecks.java index 05eae69890f..bf2f83b9677 100644 --- a/src/main/java/tconstruct/util/EnvironmentChecks.java +++ b/src/main/java/tconstruct/util/EnvironmentChecks.java @@ -36,8 +36,8 @@ public static void verifyEnvironmentSanity () if (Loader.isModLoaded("gregtech_addon")) { - TConstruct.logger.severe("Tinkers' Construct and GregTech are incompatible for the following reasons:"); - TConstruct.logger.severe(modCompatDetails("GregTech", true)); + TConstruct.logger.error("Tinkers' Construct and GregTech are incompatible for the following reasons:"); + TConstruct.logger.error(modCompatDetails("GregTech", true)); modIds.add("gregtech_addon"); incompatibilities.add("GregTech"); } diff --git a/src/main/java/tconstruct/util/EnvironmentGui.java b/src/main/java/tconstruct/util/EnvironmentGui.java index f790437fbf0..743e3b9a7ec 100644 --- a/src/main/java/tconstruct/util/EnvironmentGui.java +++ b/src/main/java/tconstruct/util/EnvironmentGui.java @@ -36,8 +36,8 @@ public void initGui () { Keyboard.enableRepeatEvents(true); this.buttonList.clear(); - this.buttonList.add(new GuiButton(0, this.width / 2 - 175, this.height / 4 + 96 + 24, 350, 20, I18n.getString("I accept responsibility for all cross-mod bugs in this modpack."))); - this.buttonList.add(new GuiButton(1, this.width / 2 - 175, this.height / 4 + 120 + 24, 350, 20, I18n.getString("I do not want to run these mods together. (Exits Minecraft)"))); + this.buttonList.add(new GuiButton(0, this.width / 2 - 175, this.height / 4 + 96 + 24, 350, 20, I18n.getStringParams("I accept responsibility for all cross-mod bugs in this modpack."))); + this.buttonList.add(new GuiButton(1, this.width / 2 - 175, this.height / 4 + 120 + 24, 350, 20, I18n.getStringParams("I do not want to run these mods together. (Exits Minecraft)"))); } /** @@ -59,7 +59,7 @@ protected void actionPerformed (GuiButton button) { count++; if (count >= mods.size()) - this.mc.displayGuiScreen(this.parentGuiScreen); + this.field_146297_k.displayGuiScreen(this.parentGuiScreen); } if (button.id == 1) { @@ -76,12 +76,12 @@ public void drawScreen (int par1, int par2, float par3) builder.setLength(0); this.drawDefaultBackground(); String mod = mods.get(count); - this.drawCenteredString(this.fontRenderer, I18n.getString("Tinkers' Construct is not compatible with "+mod), this.width / 2, 20, 0xFFFFFF); - this.drawCenteredString(this.fontRenderer, I18n.getString("The following reasons are given:"), this.width / 2, 32, 0xFFFFFF); - fontRenderer.drawSplitString(I18n.getString(EnvironmentChecks.modCompatDetails(mod, false)), 20, 52, 400, 0xffffff); + this.drawCenteredString(this.field_146289_q, I18n.getStringParams("Tinkers' Construct is not compatible with "+mod), this.width / 2, 20, 0xFFFFFF); + this.drawCenteredString(this.field_146289_q, I18n.getStringParams("The following reasons are given:"), this.width / 2, 32, 0xFFFFFF); + field_146289_q.drawSplitString(I18n.getStringParams(EnvironmentChecks.modCompatDetails(mod, false)), 20, 52, 400, 0xffffff); - this.drawCenteredString(this.fontRenderer, I18n.getString("The Tinkers' Construct team will not accept bug reports with this mod installed."), this.width / 2, 153, 0xFFFFFF); - this.drawCenteredString(this.fontRenderer, I18n.getString("We apologize for any inconvenience this may cause you."), this.width / 2, 165, 0xFFFFFF); + this.drawCenteredString(this.field_146289_q, I18n.getStringParams("The Tinkers' Construct team will not accept bug reports with this mod installed."), this.width / 2, 153, 0xFFFFFF); + this.drawCenteredString(this.field_146289_q, I18n.getStringParams("We apologize for any inconvenience this may cause you."), this.width / 2, 165, 0xFFFFFF); super.drawScreen(par1, par2, par3); } } diff --git a/src/main/java/tconstruct/util/TCraftingHandler.java b/src/main/java/tconstruct/util/TCraftingHandler.java index 54feeab9571..79f3f4b8a91 100644 --- a/src/main/java/tconstruct/util/TCraftingHandler.java +++ b/src/main/java/tconstruct/util/TCraftingHandler.java @@ -23,7 +23,7 @@ public void onCrafting (EntityPlayer player, ItemStack item, IInventory craftMat { if (itemID == TRepo.toolStationWood.blockID) { - TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(player.username); + TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(player.getDisplayName()); NBTTagCompound tags = player.getEntityData().getCompoundTag("TConstruct"); if (!tags.getBoolean("materialManual") || !stats.materialManual) { @@ -34,7 +34,7 @@ public void onCrafting (EntityPlayer player, ItemStack item, IInventory craftMat } if (itemID == TRepo.smeltery.blockID || itemID == TRepo.lavaTank.blockID) { - TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(player.username); + TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(player.getDisplayName()); NBTTagCompound tags = player.getEntityData().getCompoundTag("TConstruct"); if (!tags.getBoolean("smelteryManual") || !stats.smelteryManual) { diff --git a/src/main/java/tconstruct/util/config/DimensionBlacklist.java b/src/main/java/tconstruct/util/config/DimensionBlacklist.java index 89768f55084..f276934b306 100644 --- a/src/main/java/tconstruct/util/config/DimensionBlacklist.java +++ b/src/main/java/tconstruct/util/config/DimensionBlacklist.java @@ -78,7 +78,7 @@ private static void updateTwiForestID() config.load(); twilightForestDimensionID = config.get("dimension", "dimensionID", -100).getInt(); - TConstruct.logger.fine("Twilight Forest Dim ID: " + twilightForestDimensionID); + TConstruct.logger.trace("Twilight Forest Dim ID: " + twilightForestDimensionID); } else twilightForestDimensionID = -100; } @@ -94,7 +94,7 @@ private static void updateBoPID() config.load(); promisedLandDimensionID = config.get("dimension settings", "Promised Land Dimension ID", -200).getInt(); - TConstruct.logger.fine("Promised Lands Dim ID: " + promisedLandDimensionID); + TConstruct.logger.trace("Promised Lands Dim ID: " + promisedLandDimensionID); } else promisedLandDimensionID = -100; } diff --git a/src/main/java/tconstruct/util/config/PHConstruct.java b/src/main/java/tconstruct/util/config/PHConstruct.java index dfff198d0a6..223969ddee0 100644 --- a/src/main/java/tconstruct/util/config/PHConstruct.java +++ b/src/main/java/tconstruct/util/config/PHConstruct.java @@ -19,11 +19,7 @@ public static void initProps (File confFile) Configuration config = new Configuration(confFile); /* Load the configuration file */ config.load(); - - /* Define the mod's IDs. - * Avoid values below 4096 for items and in the 250-450 range for blocks - */ - + superfunWorld = config.get("Superfun", "All the world is Superfun", false).getBoolean(false); keepHunger = config.get("Difficulty Changes", "Keep hunger on death", true).getBoolean(true); @@ -55,209 +51,6 @@ public static void initProps (File confFile) ingotsManyullynAlloy = config.get("Smeltery Output Modification", "Manyullyn ingot return", 1, "Number of ingots returned from smelting Manyullyn in the smeltery").getDouble(1); ingotsPigironAlloy = config.get("Smeltery Output Modification", "Pig Iron ingot return", 1, "Number of ingots returned from smelting Pig Iron in the smeltery").getDouble(1); - //1467-1489 - woodStation = config.getBlock("Wood Tool Station", 1471).getInt(1471); - heldItemBlock = config.getBlock("Held Item Block", 1472).getInt(1472); - lavaTank = config.getBlock("Lava Tank", 1473).getInt(1473); - smeltery = config.getBlock("Smeltery", 1474).getInt(1474); - oreSlag = config.getBlock("Ores Slag", 1475).getInt(1475); - craftedSoil = config.getBlock("Special Soil", 1476).getInt(1476); - searedTable = config.getBlock("Seared Table", 1477).getInt(1477); - metalBlock = config.getBlock("Metal Storage", 1478).getInt(1478); - /*metalFlowing = config.getBlock("Liquid Metal Flowing", 1479).getInt(1479); - metalStill = config.getBlock("Liquid Metal Still", 1480).getInt(1480);*/ - - multiBrick = config.getBlock("Multi Brick", 1481).getInt(1481); - - stoneTorch = config.getBlock("Stone Torch", 1484).getInt(1484); - stoneLadder = config.getBlock("Stone Ladder", 1479).getInt(1479); - oreBerry = config.getBlock("Ore Berry One", 1485).getInt(1485); - oreBerrySecond = config.getBlock("Ore Berry Two", 1486).getInt(1486); - - oreGravel = config.getBlock("Ores Gravel", 1488).getInt(1488); - speedBlock = config.getBlock("Speed Block", 1489).getInt(1489); - - landmine = config.getBlock("Landmine", 1470).getInt(1470); - toolForge = config.getBlock("Tool Forge", 1468).getInt(1468); - multiBrickFancy = config.getBlock("Multi Brick Fancy", 1467).getInt(1467); - - barricadeOak = config.getBlock("Oak Barricade", 1469).getInt(1469); - barricadeSpruce = config.getBlock("Spruce Barricade", 1482).getInt(1482); - barricadeBirch = config.getBlock("Birch Barricade", 1483).getInt(1483); - barricadeJungle = config.getBlock("Jungle Barricade", 1487).getInt(1487); - - lavaTankNether = config.getBlock("Nether Lava Tank", 3186).getInt(3186); - smelteryNether = config.getBlock("Nether Smeltery", 3187).getInt(3187); - searedTableNether = config.getBlock("Nether Seared Block", 3188).getInt(3188); - - bloodChannel = config.getBlock("Blood Channel", 3189).getInt(3189); - slimeChannel = config.getBlock("Slime Channel", 3190).getInt(3190); - slimePad = config.getBlock("Slime Pad", 3191).getInt(3191); - - furnaceSlab = config.getBlock("Furnace Slab", 3192).getInt(3192); - - //Thermal Expansion - moltenSilver = config.getBlock("Molten Silver", 3195).getInt(3195); - moltenLead = config.getBlock("Molten Lead", 3196).getInt(3196); - moltenNickel = config.getBlock("Molten Nickel", 3197).getInt(3197); - moltenShiny = config.getBlock("Molten Platinum", 3198).getInt(3198); - moltenInvar = config.getBlock("Molten Invar", 3199).getInt(3199); - moltenElectrum = config.getBlock("Molten Electrum", 3200).getInt(3200); - moltenIron = config.getBlock("Molten Iron", 3201).getInt(3201); - moltenGold = config.getBlock("Molten Gold", 3202).getInt(3202); - moltenCopper = config.getBlock("Molten Copper", 3203).getInt(3203); - moltenTin = config.getBlock("Molten Tin", 3204).getInt(3204); - moltenAluminum = config.getBlock("Molten Aluminum", 3205).getInt(3205); - moltenCobalt = config.getBlock("Molten Cobalt", 3206).getInt(3206); - moltenArdite = config.getBlock("Molten Ardite", 3207).getInt(3207); - moltenBronze = config.getBlock("Molten Bronze", 3208).getInt(3208); - moltenAlubrass = config.getBlock("Molten Aluminum Brass", 3209).getInt(3209); - moltenManyullyn = config.getBlock("Molten Manyullyn", 3210).getInt(3210); - moltenAlumite = config.getBlock("Molten Alumite", 3211).getInt(3211); - moltenObsidian = config.getBlock("Molten Obsidian", 3212).getInt(3212); - moltenSteel = config.getBlock("Molten Steel", 3213).getInt(3213); - moltenGlass = config.getBlock("Molten Glass", 3214).getInt(3214); - moltenStone = config.getBlock("Molten Stone", 3215).getInt(3215); - moltenEmerald = config.getBlock("Molten Emerald", 3216).getInt(3216); - blood = config.getBlock("Liquid Cow", 3217).getInt(3217); - moltenEnder = config.getBlock("Molten Ender", 3218).getInt(3218); - - glueBlock = config.getBlock("Glue Block", 3219).getInt(3219); - glueFluidBlock = config.getBlock("Glue Fluid Block", 3220).getInt(3220); - - // signalBus = config.getBlock("Signal Bus", 3221).getInt(3221); - // signalTerminal = config.getBlock("Signal Terminal", 3222).getInt(3222); - glass = config.getBlock("Clear Glass", 3223).getInt(3223); - stainedGlass = config.getBlock("Stained Glass", 3224).getInt(3224); - stainedGlassClear = config.getBlock("Clear Stained Glass", 3225).getInt(3225); - // redstoneMachine = config.getBlock("Redstone Machines", 3226).getInt(3226); // Migrated to TMechworks - dryingRack = config.getBlock("Drying Rack", 3227).getInt(3227); - glassPane = config.getBlock("Glass Pane", 3228).getInt(3228); - stainedGlassClearPane = config.getBlock("Clear Stained Glass Pane", 3229).getInt(3229); - - searedSlab = config.getBlock("Seared Slab", 3230).getInt(3230); - speedSlab = config.getBlock("Speed Slab", 3231).getInt(3231); - - punji = config.getBlock("Punji", 3232).getInt(3232); - woodCrafter = config.getBlock("Crafting Station", 3233).getInt(3233); - - slimePoolBlue = config.getBlock("Liquid Blue Slime", 3235).getInt(3235); - slimeGel = config.getBlock("Congealed Slime", 3237).getInt(3237); - slimeGrass = config.getBlock("Slime Grass", 3238).getInt(3238); - slimeTallGrass = config.getBlock("Slime Tall Grass", 3239).getInt(3239); - slimeLeaves = config.getBlock("Slime Grass Leaves", 3240).getInt(3240); - slimeSapling = config.getBlock("Slime Tree Sapling", 3241).getInt(3241); - - meatBlock = config.getBlock("Meat Block", 3242).getInt(3242); - woodCrafterSlab = config.getBlock("Crafting Slab", 3243).getInt(3243); - woolSlab1 = config.getBlock("Wool Slab 1", 3244).getInt(3244); - woolSlab2 = config.getBlock("Wool Slab 2", 3245).getInt(3245); - castingChannel = config.getBlock("Casting Channel", 3249).getInt(3249); - - slimePoolBlue = config.getBlock("Liquid Blue Slime", 3235).getInt(3235); - slimeGel = config.getBlock("Congealed Slime", 3237).getInt(3237); - slimeGrass = config.getBlock("Slime Grass", 3238).getInt(3238); - slimeTallGrass = config.getBlock("Slime Tall Grass", 3239).getInt(3239); - slimeLeaves = config.getBlock("Slime Grass Leaves", 3240).getInt(3240); - slimeSapling = config.getBlock("Slime Tree Sapling", 3241).getInt(3241); - - meatBlock = config.getBlock("Meat Block", 3242).getInt(3242); - woodCrafterSlab = config.getBlock("Crafting Slab", 3243).getInt(3243); - woolSlab1 = config.getBlock("Wool Slab 1", 3244).getInt(3244); - woolSlab2 = config.getBlock("Wool Slab 2", 3245).getInt(3245); - airTank = config.getBlock("Air Tank", 3246).getInt(3246); - slimeExplosive = config.getBlock("SDX", 3247).getInt(3247); - castingChannel = config.getBlock("Casting Channel", 3249).getInt(3249); - woodenRail = config.getBlock("Wooden Rail", 3250).getInt(3250); - //3251+ belongs to Natura. Go backwards! - - manual = config.getItem("Patterns and Misc", "Tinker's Manual", 14018).getInt(14018); - blankPattern = config.getItem("Patterns and Misc", "Blank Patterns", 14019).getInt(14019); - materials = config.getItem("Patterns and Misc", "Materials", 14020).getInt(14020); - toolRod = config.getItem("Patterns and Misc", "Tool Rod", 14021).getInt(14021); - toolShard = config.getItem("Patterns and Misc", "Tool Shard", 14022).getInt(14022); - woodPattern = config.getItem("Patterns and Misc", "Wood Pattern", 14023).getInt(14023); - metalPattern = config.getItem("Patterns and Misc", "Metal Pattern", 14024).getInt(14024); - armorPattern = config.getItem("Patterns and Misc", "Armor Pattern", 14025).getInt(14025); - - pickaxeHead = config.getItem("Tool Parts", "Pickaxe Head", 14026).getInt(14026); - shovelHead = config.getItem("Tool Parts", "Shovel Head", 14027).getInt(14027); - axeHead = config.getItem("Tool Parts", "Axe Head", 14028).getInt(14028); - hoeHead = config.getItem("Tool Parts", "Hoe Head", 14029).getInt(14029); - - swordBlade = config.getItem("Tool Parts", "Sword Blade", 14030).getInt(14030); - largeGuard = config.getItem("Tool Parts", "Large Guard", 14031).getInt(14031); - medGuard = config.getItem("Tool Parts", "Medium Guard", 14032).getInt(14032); - crossbar = config.getItem("Tool Parts", "Crossbar", 14033).getInt(14033); - binding = config.getItem("Tool Parts", "Tool Binding", 14034).getInt(14034); - - frypanHead = config.getItem("Tool Parts", "Frypan Head", 14035).getInt(14035); - signHead = config.getItem("Tool Parts", "Sign Head", 14036).getInt(14036); - - lumberHead = config.getItem("Tool Parts", "Lumber Axe Head", 14037).getInt(14037); - knifeBlade = config.getItem("Tool Parts", "Knife Blade", 14038).getInt(14038); - chiselHead = config.getItem("Tool Parts", "Chisel Head", 14039).getInt(14039); - scytheBlade = config.getItem("Tool Parts", "Scythe Head", 14040).getInt(14040); - toughBinding = config.getItem("Tool Parts", "Tough Binding", 14041).getInt(14041); - toughRod = config.getItem("Tool Parts", "Tough Rod", 14042).getInt(14042); - largeSwordBlade = config.getItem("Tool Parts", "Large Sword Blade", 14043).getInt(14043); - largePlate = config.getItem("Tool Parts", "Large Plate", 14044).getInt(14044); - excavatorHead = config.getItem("Tool Parts", "Excavator Head", 14045).getInt(14045); - hammerHead = config.getItem("Tool Parts", "Hammer Head", 14046).getInt(14046); - fullGuard = config.getItem("Tool Parts", "Full Guard", 14047).getInt(14047); - bowstring = config.getItem("Tool Parts", "Bowstring", 14048).getInt(14048); - arrowhead = config.getItem("Tool Parts", "Arrowhead", 14049).getInt(14049); - fletching = config.getItem("Tool Parts", "Fletching", 14050).getInt(14050); - - pickaxe = config.getItem("Tools", "Pickaxe", 14051).getInt(14051); - shovel = config.getItem("Tools", "Shovel", 14052).getInt(14052); - axe = config.getItem("Tools", "Axe", 14053).getInt(14053); - hoe = config.getItem("Tools", "Hoe", 14054).getInt(14054); - - broadsword = config.getItem("Tools", "Broadsword", 14055).getInt(14055); - rapier = config.getItem("Tools", "Rapier", 14057).getInt(14057); - longsword = config.getItem("Tools", "Longsword", 14056).getInt(14056); - dagger = config.getItem("Tools", "Dagger", 14065).getInt(14065); - - frypan = config.getItem("Tools", "Frying Pan", 14058).getInt(14058); - battlesign = config.getItem("Tools", "Battlesign", 14059).getInt(14059); - mattock = config.getItem("Tools", "Mattock", 14060).getInt(14060); - lumberaxe = config.getItem("Tools", "Lumber Axe", 14061).getInt(14061); - longbow = config.getItem("Tools", "Longbow", 14062).getInt(14062); - shortbow = config.getItem("Tools", "Shortbow", 14063).getInt(14063); - potionLauncher = config.getItem("Tools", "Potion Launcher", 14064).getInt(14064); - - chisel = config.getItem("Tools", "Chisel", 14066).getInt(14066); - scythe = config.getItem("Tools", "Scythe", 14067).getInt(14067); - cleaver = config.getItem("Tools", "Cleaver", 14068).getInt(14068); - excavator = config.getItem("Tools", "Excavator", 14069).getInt(14069); - hammer = config.getItem("Tools", "Hammer", 14070).getInt(14070); - battleaxe = config.getItem("Tools", "Battleaxe", 14071).getInt(14071); - - cutlass = config.getItem("Tools", "Cutlass", 14072).getInt(14072); - arrow = config.getItem("Tools", "Arrow", 14073).getInt(14073); - - buckets = config.getItem("Patterns and Misc", "Buckets", 14101).getInt(14101); - uselessItem = config.getItem("Patterns and Misc", "Title Icon", 14102).getInt(14102); - slimefood = config.getItem("Patterns and Misc", "Strange Food", 14103).getInt(14103); - oreChunks = config.getItem("Patterns and Misc", "Ore Chunks", 14104).getInt(14104); - - heartCanister = config.getItem("Equipables", "Heart Canister", 14105).getInt(14105); - diamondApple = config.getItem("Patterns and Misc", "Jeweled Apple", 14107).getInt(14107); - woodHelmet = config.getItem("Equipables", "Wooden Helmet", 14106).getInt(14106); - woodChestplate = config.getItem("Equipables", "Wooden Chestplate", 14108).getInt(14108); - woodPants = config.getItem("Equipables", "Wooden Pants", 14109).getInt(14109); - woodBoots = config.getItem("Equipables", "Wooden Boots", 14110).getInt(14110); - glove = config.getItem("Equipables", "Gloves", 14111).getInt(14111); - knapsack = config.getItem("Equipables", "Knapsack", 14112).getInt(14112); - goldHead = config.getItem("Patterns and Misc", "Golden Head", 14113).getInt(14113); - jerky = config.getItem("Patterns and Misc", "Jerky", 14115).getInt(14115); - - exoGoggles = config.getItem("Equipables", "Exo-Goggles", 14116).getInt(14116); - exoChest = config.getItem("Equipables", "Exo-Chestpiece", 14117).getInt(14117); - exoPants = config.getItem("Equipables", "Exo-Legs", 14118).getInt(14118); - exoShoes = config.getItem("Equipables", "Exo-Boots", 14119).getInt(14119); - boolean ic2 = true; boolean xycraft = true; try @@ -388,208 +181,6 @@ public static void initProps (File confFile) } } - //Blocks - public static int woodStation; - public static int toolForge; - public static int heldItemBlock; - public static int woodCrafter; - public static int woodCrafterSlab; - public static int furnaceSlab; - - public static int ores; - public static int lavaTank; - public static int smeltery; - public static int searedTable; - public static int lavaTankNether; - public static int smelteryNether; - public static int searedTableNether; - public static int castingChannel; - public static int airTank; - - public static int craftedSoil; - public static int oreSlag; - public static int oreGravel; - public static int metalBlock; - - public static int redstoneMachine; - public static int dryingRack; - - public static int woodenRail; - - //Crops - public static int oreBerry; - public static int oreBerrySecond; - public static int netherOreBerry; - - //Traps - public static int landmine; - public static int punji; - public static int barricadeOak; - public static int barricadeSpruce; - public static int barricadeBirch; - public static int barricadeJungle; - public static int slimeExplosive; - - //InfiBlocks - public static int speedBlock; - public static int glass; - public static int glassPane; - public static int stainedGlass; - public static int stainedGlassClear; - public static int stainedGlassClearPane; - - //Liquids - public static int metalFlowing; - public static int metalStill; - - public static int moltenIron; - public static int moltenGold; - public static int moltenCopper; - public static int moltenTin; - public static int moltenAluminum; - public static int moltenCobalt; - public static int moltenArdite; - public static int moltenBronze; - public static int moltenAlubrass; - public static int moltenManyullyn; - public static int moltenAlumite; - public static int moltenObsidian; - public static int moltenSteel; - public static int moltenGlass; - public static int moltenStone; - public static int moltenEmerald; - public static int blood; - public static int moltenEnder; - public static int moltenSilver; //Thermal Expansion - public static int moltenLead; - public static int moltenNickel; - public static int moltenShiny; - public static int moltenInvar; - public static int moltenElectrum; - - //Slime - public static int slimePoolBlue; - public static int slimeGel; - public static int slimeGrass; - public static int slimeTallGrass; - public static int slimeLeaves; - public static int slimeSapling; - - public static int slimeChannel; - public static int slimePad; - public static int bloodChannel; - - // Glue - public static int glueFluidBlock; - public static int glueBlock; - - //Decoration - public static int stoneTorch; - public static int stoneLadder; - public static int multiBrick; - public static int multiBrickFancy; - public static int redstoneBallRepeater; - public static int searedSlab; - public static int speedSlab; - public static int meatBlock; - public static int woolSlab1; - public static int woolSlab2; - - //Patterns and misc - public static int blankPattern; - public static int materials; - public static int toolRod; - public static int toolShard; - public static int woodPattern; - public static int metalPattern; - public static int armorPattern; - - public static int manual; - public static int buckets; - public static int uselessItem; - public static int oreChunks; - - //Food - public static int diamondApple; - public static int slimefood; - public static int jerky; - - //Tools - public static int pickaxe; - public static int shovel; - public static int axe; - public static int hoe; - - public static int broadsword; - public static int longsword; - public static int rapier; - public static int dagger; - public static int cutlass; - - public static int frypan; - public static int battlesign; - public static int longbow; - public static int shortbow; - public static int potionLauncher; - public static int mattock; - - public static int lumberaxe; - public static int scythe; - public static int cleaver; - public static int excavator; - public static int hammer; - public static int battleaxe; - - public static int chisel; - public static int arrow; - - //Tool parts - public static int swordBlade; - public static int largeGuard; - public static int medGuard; - public static int crossbar; - public static int knifeBlade; - public static int fullGuard; - - public static int pickaxeHead; - public static int axeHead; - public static int shovelHead; - public static int hoeHead; - - public static int frypanHead; - public static int signHead; - public static int chiselHead; - - public static int scytheBlade; - public static int lumberHead; - public static int largeSwordBlade; - public static int excavatorHead; - public static int hammerHead; - - public static int binding; - public static int toughBinding; - public static int toughRod; - public static int largePlate; - - public static int bowstring; - public static int arrowhead; - public static int fletching; - - //Wearables - public static int woodHelmet; - public static int woodChestplate; - public static int woodPants; - public static int woodBoots; - public static int glove; - public static int knapsack; - - public static int heartCanister; - - public static int exoGoggles; - public static int exoChest; - public static int exoPants; - public static int exoShoes; - //Ore values public static boolean generateCopper; public static boolean generateTin; diff --git a/src/main/java/tconstruct/util/landmine/behavior/BehaviorExplosive.java b/src/main/java/tconstruct/util/landmine/behavior/BehaviorExplosive.java index 74bf0f6c351..ea010f28c4e 100644 --- a/src/main/java/tconstruct/util/landmine/behavior/BehaviorExplosive.java +++ b/src/main/java/tconstruct/util/landmine/behavior/BehaviorExplosive.java @@ -28,7 +28,7 @@ public void executeLogic (World par1World, int par2, int par3, int par4, ItemSta { explodeStrenght = 4.0F * par5ItemStack.stackSize; } - else if (par5ItemStack.itemID == Items.gunpowder.itemID) + else if (par5ItemStack.getItem() == Items.gunpowder) { explodeStrenght = 0.8F * par5ItemStack.stackSize; } @@ -44,7 +44,7 @@ public void getInformation (ItemStack par1ItemStack, List par2List) { str = "medium"; } - else if (par1ItemStack.itemID == Items.gunpowder.itemID) + else if (par1ItemStack.getItem() == Items.gunpowder) { str = "small"; } diff --git a/src/main/java/tconstruct/util/landmine/behavior/BehaviorFirecharge.java b/src/main/java/tconstruct/util/landmine/behavior/BehaviorFirecharge.java index a33cb7e0a7f..e8149606bd7 100644 --- a/src/main/java/tconstruct/util/landmine/behavior/BehaviorFirecharge.java +++ b/src/main/java/tconstruct/util/landmine/behavior/BehaviorFirecharge.java @@ -43,10 +43,10 @@ public void executeLogic (World par1World, int par2, int par3, int par4, ItemSta { for (int j = par4 - 2; j <= (par4 + 2); j++) { - if ((par1World.getBlockId(i, par3, j) == 0 || (Block.blocksList[par1World.getBlockId(i, par3, j)] != null && Block.blocksList[par1World.getBlockId(i, par3, j)].isBlockReplaceable( + if ((par1World.getBlockId(i, par3, j) == 0 || (par1World.getBlock(i, par3, j) != null && par1World.getBlock(i, par3, j).isBlockReplaceable( par1World, i, par3, j))) && ItemBlockLandmine.getRandom().nextInt(5) == 0 && Blocks.fire.canPlaceBlockAt(par1World, i, par3, j)) { - par1World.setBlock(i, par3, j, Blocks.fire.blockID); + par1World.setBlock(i, par3, j, Blocks.fire); } } } diff --git a/src/main/java/tconstruct/util/player/ArmorExtended.java b/src/main/java/tconstruct/util/player/ArmorExtended.java index c3110514dc7..0bd8484731c 100644 --- a/src/main/java/tconstruct/util/player/ArmorExtended.java +++ b/src/main/java/tconstruct/util/player/ArmorExtended.java @@ -63,7 +63,7 @@ public ItemStack decrStackSize (int slot, int quantity) inventory[slot] = null; } EntityPlayer player = parent.get(); - TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(player.username); + TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(player.getDisplayName()); recalculateHealth(player, stats); return split; } @@ -90,18 +90,18 @@ public void setInventorySlotContents (int slot, ItemStack itemstack) } EntityPlayer player = parent.get(); - TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(player.username); + TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(player.getDisplayName()); recalculateHealth(player, stats); } @Override - public String getInvName () + public String func_145825_b () { return ""; } @Override - public boolean isInvNameLocalized () + public boolean func_145818_k_ () { return false; } @@ -116,7 +116,7 @@ public int getInventoryStackLimit () public void onInventoryChanged () { EntityPlayer player = parent.get(); - TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(player.username); + TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(player.getDisplayName()); //recalculateSkills(player, stats); recalculateHealth(player, stats); diff --git a/src/main/java/tconstruct/util/player/KnapsackInventory.java b/src/main/java/tconstruct/util/player/KnapsackInventory.java index 45af3ce31e4..22acf9aed49 100644 --- a/src/main/java/tconstruct/util/player/KnapsackInventory.java +++ b/src/main/java/tconstruct/util/player/KnapsackInventory.java @@ -83,13 +83,13 @@ public ItemStack decrStackSize (int slot, int quantity) } @Override - public String getInvName () + public String func_145825_b () { return "tconstruct.knapsack"; } @Override - public boolean isInvNameLocalized () + public boolean func_145818_k_ () { return false; } @@ -194,4 +194,5 @@ void dropItemEntity (Entity dropper, ItemStack dropStack) EntityItem entityitem = new EntityItem(dropper.worldObj, dropper.posX, dropper.posY, dropper.posZ, dropStack); dropper.worldObj.spawnEntityInWorld(entityitem); } + } \ No newline at end of file diff --git a/src/main/java/tconstruct/util/player/TPlayerHandler.java b/src/main/java/tconstruct/util/player/TPlayerHandler.java index 501f30fa648..b9a60a1377f 100644 --- a/src/main/java/tconstruct/util/player/TPlayerHandler.java +++ b/src/main/java/tconstruct/util/player/TPlayerHandler.java @@ -5,6 +5,7 @@ import java.util.Random; import java.util.concurrent.ConcurrentHashMap; +import mantle.player.PlayerUtils; import net.minecraft.entity.Entity; import net.minecraft.entity.Entity.EnumEntitySize; import net.minecraft.entity.player.EntityPlayer; @@ -75,7 +76,7 @@ public void onPlayerLogin (EntityPlayer entityplayer) } } - if (entityplayer.username.toLowerCase().equals("fudgy_fetus")) + if (entityplayer.getDisplayName().toLowerCase().equals("fudgy_fetus")) { ItemStack pattern = new ItemStack(TRepo.woodPattern, 1, 22); @@ -91,7 +92,7 @@ public void onPlayerLogin (EntityPlayer entityplayer) AbilityHelper.spawnItemAtPlayer(entityplayer, pattern); } - if (entityplayer.username.toLowerCase().equals("zerokyuuni")) + if (entityplayer.getDisplayName().toLowerCase().equals("zerokyuuni")) { ItemStack pattern = new ItemStack(Items.stick); @@ -107,16 +108,16 @@ public void onPlayerLogin (EntityPlayer entityplayer) } } - playerStats.put(entityplayer.username, stats); + playerStats.put(entityplayer.getDisplayName(), stats); if (PHConstruct.gregtech && Loader.isModLoaded("GregTech-Addon")) { PHConstruct.gregtech = false; if (PHConstruct.lavaFortuneInteraction) { - entityplayer.addChatMessage("Warning: Cross-mod Exploit Present!"); - entityplayer.addChatMessage("Solution 1: Disable Reverse Smelting recipes from GregTech."); - entityplayer.addChatMessage("Solution 2: Disable Auto-Smelt/Fortune interaction from TConstruct."); + PlayerUtils.sendChatMessage(entityplayer,"Warning: Cross-mod Exploit Present!"); + PlayerUtils.sendChatMessage(entityplayer,"Solution 1: Disable Reverse Smelting recipes from GregTech."); + PlayerUtils.sendChatMessage(entityplayer,"Solution 2: Disable Auto-Smelt/Fortune interaction from TConstruct."); } } @@ -154,13 +155,13 @@ void savePlayerStats (EntityPlayer player, boolean clean) { if (player != null) { - TPlayerStats stats = getPlayerStats(player.username); + TPlayerStats stats = getPlayerStats(player.getDisplayName()); if (stats != null && stats.armor != null) { stats.armor.saveToNBT(player); stats.knapsack.saveToNBT(player); if (clean) - playerStats.remove(player.username); + playerStats.remove(player.getDisplayName()); } else //Revalidate all players @@ -174,7 +175,7 @@ void savePlayerStats (EntityPlayer player, boolean clean) public void onPlayerRespawn (EntityPlayer entityplayer) { //Boom! - TPlayerStats stats = getPlayerStats(entityplayer.username); + TPlayerStats stats = getPlayerStats(entityplayer.getDisplayName()); stats.player = new WeakReference(entityplayer); stats.armor.recalculateHealth(entityplayer, stats); @@ -217,7 +218,7 @@ public void livingUpdate (LivingUpdateEvent evt) if (side == Side.CLIENT && evt.entityLiving instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) evt.entityLiving; - TPlayerStats stats = playerStats.get(player.username); + TPlayerStats stats = playerStats.get(player.getDisplayName()); if (player.onGround != stats.prevOnGround) { if (player.onGround)// && -stats.prevMotionY > 0.1) @@ -235,7 +236,7 @@ public void livingUpdate (LivingUpdateEvent evt) @SubscribeEvent public void playerDrops (PlayerDropsEvent evt) { - TPlayerStats stats = getPlayerStats(evt.entityPlayer.username); + TPlayerStats stats = getPlayerStats(evt.entityPlayer.getDisplayName()); stats.level = evt.entityPlayer.experienceLevel / 2; //stats.health = 20; int hunger = evt.entityPlayer.getFoodStats().getFoodLevel(); diff --git a/src/main/java/tconstruct/worldgen/SlimeIslandGen.java b/src/main/java/tconstruct/worldgen/SlimeIslandGen.java index bc7c61b4f38..6c5054001f4 100644 --- a/src/main/java/tconstruct/worldgen/SlimeIslandGen.java +++ b/src/main/java/tconstruct/worldgen/SlimeIslandGen.java @@ -271,7 +271,7 @@ public boolean generate (World world, Random rand, int x, int y, int z) //WorldG } //Generate blocks around - if (Block.blocksList[this.liquidBlock].blockMaterial == Material.water) + if (this.liquidBlock.blockMaterial == Material.water) { for (xPos = 0; xPos < 16; ++xPos) {