From 3cc541e87280feaa2d5cb57a902c9ad307a8f122 Mon Sep 17 00:00:00 2001 From: Progwml6 Date: Mon, 6 Jan 2014 00:03:05 -0500 Subject: [PATCH] moar fixes --- resources/TConstruct_at.cfg | 5 +++-- src/main/java/tconstruct/blocks/MultiBrick.java | 16 ++++++++-------- .../java/tconstruct/blocks/MultiBrickFancy.java | 17 ++++++++++------- .../java/tconstruct/blocks/SmelteryBlock.java | 3 ++- .../java/tconstruct/blocks/TConstructBlock.java | 5 +++-- .../client/event/EventCloakRender.java | 2 +- .../items/blocks/OreberryBushItem.java | 2 +- 7 files changed, 28 insertions(+), 22 deletions(-) diff --git a/resources/TConstruct_at.cfg b/resources/TConstruct_at.cfg index 746d3e461b8..c74dc5c8ee4 100644 --- a/resources/TConstruct_at.cfg +++ b/resources/TConstruct_at.cfg @@ -21,6 +21,7 @@ public awy.q #guiTop # GuiScreen public awe.i #buttonList # ThreadDownloadImageData -public bic.g #field_110559_g -public bic.d #field_110560_d +public ThreadDownloadImageData.field_110559_g #field_110559_g +public ThreadDownloadImageData.field_110560_d #field_110560_d + # needs to have a space at the end of every line or SS will derp \ No newline at end of file diff --git a/src/main/java/tconstruct/blocks/MultiBrick.java b/src/main/java/tconstruct/blocks/MultiBrick.java index 16d7fb67ce9..8bde671def3 100644 --- a/src/main/java/tconstruct/blocks/MultiBrick.java +++ b/src/main/java/tconstruct/blocks/MultiBrick.java @@ -17,9 +17,9 @@ public class MultiBrick extends TConstructBlock static String blockTextures[] = { "brick_obsidian", "brick_sandstone", "brick_netherrack", "brick_stone_refined", "brick_iron", "brick_gold", "brick_lapis", "brick_diamond", "brick_redstone", "brick_bone", "brick_slime", "brick_blueslime", "brick_endstone", "brick_obsidian_ingot" }; - public MultiBrick(int id) + public MultiBrick() { - super(id, Material.rock, 3f, blockTextures); + super(Material.field_151576_e, 3f, blockTextures); } @Override @@ -57,7 +57,7 @@ public float func_149712_f (World world, int x, int y, int z) case 13: return Blocks.obsidian.func_149712_f(world, x, y, z); default: - return blockHardness; + return field_149782_v; } } @@ -100,7 +100,7 @@ public float getExplosionResistance (Entity entity, World world, int x, int y, i } @Override - public void onEntityCollidedWithBlock (World world, int x, int y, int z, Entity entity) + public void func_149670_a (World world, int x, int y, int z, Entity entity) { int meta = world.getBlockMetadata(x, y, z); if (meta == 10 || meta == 11) @@ -110,14 +110,14 @@ public void onEntityCollidedWithBlock (World world, int x, int y, int z, Entity entity.fallDistance = 0; } } - + //TODO getCollisionBoundingBoxFromPool @Override - public AxisAlignedBB getCollisionBoundingBoxFromPool (World world, int x, int y, int z) + public AxisAlignedBB func_149668_a (World world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); if (meta == 10 || meta == 11) return AxisAlignedBB.getBoundingBox(x, y, z, (double) x + 1.0D, (double) y + 0.625D, (double) z + 1.0D); - return super.getCollisionBoundingBoxFromPool(world, x, y, z); + return super.func_149668_a(world, x, y, z); } /*@Override @@ -133,7 +133,7 @@ public boolean isBlockNormalCube (World world, int x, int y, int z) } @Override - public int isProvidingWeakPower (IBlockAccess world, int x, int y, int z, int side) + public int func_149709_b (IBlockAccess world, int x, int y, int z, int side) { if (world.getBlockMetadata(x, y, z) == 8) return 4; diff --git a/src/main/java/tconstruct/blocks/MultiBrickFancy.java b/src/main/java/tconstruct/blocks/MultiBrickFancy.java index d9b9532b76c..95ad58fe8f6 100644 --- a/src/main/java/tconstruct/blocks/MultiBrickFancy.java +++ b/src/main/java/tconstruct/blocks/MultiBrickFancy.java @@ -20,7 +20,7 @@ public class MultiBrickFancy extends TConstructBlock public MultiBrickFancy() { - super(material.rock, 3f, blockTextures); + super(Material.field_151576_e, 3f, blockTextures); } //TODO func_149712_f @Override @@ -60,7 +60,7 @@ public float func_149712_f (World world, int x, int y, int z) case 15: return Blocks.stone.func_149712_f(world, x, y, z); default: - return blockHardness; + return field_149782_v; } } @@ -104,8 +104,9 @@ public float getExplosionResistance (Entity entity, World world, int x, int y, i } } + //TODO onEntityCollidedWithBlock @Override - public void onEntityCollidedWithBlock (World world, int x, int y, int z, Entity entity) + public void func_149670_a (World world, int x, int y, int z, Entity entity) { int meta = world.getBlockMetadata(x, y, z); if (meta == 10 || meta == 11) @@ -117,12 +118,12 @@ public void onEntityCollidedWithBlock (World world, int x, int y, int z, Entity } @Override - public AxisAlignedBB getCollisionBoundingBoxFromPool (World world, int x, int y, int z) + public AxisAlignedBB func_149668_a (World world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); if (meta == 10 || meta == 11) return AxisAlignedBB.getBoundingBox(x, y, z, (double) x + 1.0D, (double) y + 0.625D, (double) z + 1.0D); - return super.getCollisionBoundingBoxFromPool(world, x, y, z); + return super.func_149668_a(world, x, y, z); } /*@Override @@ -137,14 +138,16 @@ public boolean isBlockNormalCube (World world, int x, int y, int z) return world.getBlockMetadata(x, y, z) != 8; } + //TODO canProvidePower @Override - public boolean canProvidePower () + public boolean func_149744_f () { return false; } + //TODO isProvindingWeakPower @Override - public int isProvidingWeakPower (IBlockAccess world, int x, int y, int z, int side) + public int func_149709_b (IBlockAccess world, int x, int y, int z, int side) { if (world.getBlockMetadata(x, y, z) == 8) return 4; diff --git a/src/main/java/tconstruct/blocks/SmelteryBlock.java b/src/main/java/tconstruct/blocks/SmelteryBlock.java index 96d00b92ce1..6c3accbbe43 100644 --- a/src/main/java/tconstruct/blocks/SmelteryBlock.java +++ b/src/main/java/tconstruct/blocks/SmelteryBlock.java @@ -8,6 +8,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; @@ -269,7 +270,7 @@ public void breakBlock (World world, int x, int y, int z, int par5, int par6) // }*/ @Override - public void getSubBlocks (Block b, CreativeTabs tab, List list) + public void getSubBlocks (Item b, CreativeTabs tab, List list) { for (int iter = 0; iter < 12; iter++) { diff --git a/src/main/java/tconstruct/blocks/TConstructBlock.java b/src/main/java/tconstruct/blocks/TConstructBlock.java index 22fb7a501c1..bbf4db728c7 100644 --- a/src/main/java/tconstruct/blocks/TConstructBlock.java +++ b/src/main/java/tconstruct/blocks/TConstructBlock.java @@ -4,11 +4,11 @@ import mantle.blocks.MantleBlock; import tconstruct.library.TConstructRegistry; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import cpw.mods.fml.relauncher.Side; @@ -63,8 +63,9 @@ public int getSideTextureIndex (int side) return 1; } + //TODO getSubBlocks @Override - public void getSubBlocks (Block block, CreativeTabs tab, List list) + public void func_149666_a (Item block, CreativeTabs tab, List list) { for (int iter = 0; iter < icons.length; iter++) { diff --git a/src/main/java/tconstruct/client/event/EventCloakRender.java b/src/main/java/tconstruct/client/event/EventCloakRender.java index 4a1a36949bd..7a872551778 100644 --- a/src/main/java/tconstruct/client/event/EventCloakRender.java +++ b/src/main/java/tconstruct/client/event/EventCloakRender.java @@ -46,7 +46,7 @@ public void onPreRenderSpecials (RenderPlayerEvent.Specials.Pre event) if (!capePlayers.contains(abstractClientPlayer)) { - String cloakURL = cloaks.get(event.entityPlayer.username); + String cloakURL = cloaks.get(event.entityPlayer.getDisplayName()); if (cloakURL == null) { diff --git a/src/main/java/tconstruct/items/blocks/OreberryBushItem.java b/src/main/java/tconstruct/items/blocks/OreberryBushItem.java index 7e691f31b97..58b828143e1 100644 --- a/src/main/java/tconstruct/items/blocks/OreberryBushItem.java +++ b/src/main/java/tconstruct/items/blocks/OreberryBushItem.java @@ -40,7 +40,7 @@ public boolean onItemUse (ItemStack stack, EntityPlayer player, World world, int else if (player.canPlayerEdit(x, y, z, side, stack) && player.canPlayerEdit(x, y + 1, z, side, stack)) { - Block block = Block.blocksList[world.getBlockId(x, y, z)]; + Block block = world.getBlock(x, y, z); if (block != null && block.canSustainPlant(world, x, y, z, ForgeDirection.UP, (IPlantable) TRepo.oreBerry) && world.isAirBlock(x, y + 1, z)) {