From fffe2800bd7a35ba78b0845a3fe23b27fef2471e Mon Sep 17 00:00:00 2001 From: Alexander Date: Mon, 3 Feb 2014 10:02:49 -0500 Subject: [PATCH] Fix the errors that were left, I commeneted our some code in SmelteryLogic for right now, Also changed the way ArrowEntity Sends the ChangeGameState --- resources/TConstruct_at.cfg | 2 +- .../java/tconstruct/blocks/OreberryBush.java | 9 +++++++++ .../tconstruct/blocks/logic/SmelteryLogic.java | 5 +++-- .../blocks/logic/ToolStationLogic.java | 2 +- .../blocks/slime/SlimeTallGrass.java | 5 +++-- .../entity/projectile/ArrowEntity.java | 3 ++- .../tconstruct/items/blocks/WoolSlab1Item.java | 2 +- .../tconstruct/items/blocks/WoolSlab2Item.java | 2 +- .../java/tconstruct/items/tools/Excavator.java | 4 ++-- .../java/tconstruct/items/tools/Hammer.java | 4 ++-- .../java/tconstruct/items/tools/LumberAxe.java | 4 ++-- .../tconstruct/library/crafting/Smeltery.java | 18 +++++++++--------- .../library/tools/DualHarvestTool.java | 4 ++-- .../tconstruct/library/tools/HarvestTool.java | 4 ++-- .../tconstruct/library/tools/ToolCore.java | 2 +- .../java/tconstruct/library/tools/Weapon.java | 2 +- .../tconstruct/worldgen/OreberryBushGen.java | 4 ++-- .../tconstruct/worldgen/SurfaceOreGen.java | 2 +- 18 files changed, 45 insertions(+), 33 deletions(-) diff --git a/resources/TConstruct_at.cfg b/resources/TConstruct_at.cfg index d1a2eecdb16..6522e48c6e0 100644 --- a/resources/TConstruct_at.cfg +++ b/resources/TConstruct_at.cfg @@ -18,7 +18,7 @@ public net.minecraft.client.renderer.RenderGlobal field_147592_B # Entity public net.minecraft.entity.Entity field_145783_c # Blocks -public net.minecraft.block.Block field_149764_J +public-f net.minecraft.block.Block field_149764_J public net.minecraft.block.BlockLeavesBase field_150121_P public net.minecraft.block.BlockRailBase$Rail func_150650_a()I # GuiContainer diff --git a/src/main/java/tconstruct/blocks/OreberryBush.java b/src/main/java/tconstruct/blocks/OreberryBush.java index 360c06c671e..50da0350f86 100644 --- a/src/main/java/tconstruct/blocks/OreberryBush.java +++ b/src/main/java/tconstruct/blocks/OreberryBush.java @@ -37,6 +37,8 @@ public class OreberryBush extends BlockLeavesBase implements IPlantable public String[] oreTypes; public int itemMeat; private int subitems; + @SideOnly(Side.CLIENT) + protected int field_150127_b; public OreberryBush(String[] textureNames, int meta, int sub, String[] oreTypes) { @@ -324,5 +326,12 @@ public EnumPlantType getPlantType (IBlockAccess world, int x, int y, int z) { return EnumPlantType.Cave; } + + @SideOnly(Side.CLIENT) + public void func_150122_b(boolean p_150122_1_) + { + this.field_150121_P = p_150122_1_; + this.field_150127_b = (p_150122_1_ ? 0 : 1); + } } diff --git a/src/main/java/tconstruct/blocks/logic/SmelteryLogic.java b/src/main/java/tconstruct/blocks/logic/SmelteryLogic.java index 45229dc51ba..9461f83b709 100644 --- a/src/main/java/tconstruct/blocks/logic/SmelteryLogic.java +++ b/src/main/java/tconstruct/blocks/logic/SmelteryLogic.java @@ -918,10 +918,11 @@ else if (te instanceof MultiServantLogic) if (servant.verifyMaster(this, field_145850_b, this.field_145851_c, this.field_145848_d, this.field_145849_e)) tempBricks++; } - else if (servant.setMaster(this.field_145851_c, this.field_145848_d, this.field_145849_e)) + // Temp comment out + /*else if (servant.setMaster(this.field_145851_c, this.field_145848_d, this.field_145849_e)) { tempBricks++; - } + }*/ if (te instanceof LavaTankLogic) { diff --git a/src/main/java/tconstruct/blocks/logic/ToolStationLogic.java b/src/main/java/tconstruct/blocks/logic/ToolStationLogic.java index 7c7ce8089d3..b63e68f60e5 100644 --- a/src/main/java/tconstruct/blocks/logic/ToolStationLogic.java +++ b/src/main/java/tconstruct/blocks/logic/ToolStationLogic.java @@ -61,7 +61,7 @@ public void onInventoryChanged () if (this.getWorld() != null) { this.field_145847_g = this.getWorld().getBlockMetadata(this.field_145851_c, this.field_145848_d, this.field_145849_e); - this.getWorld().markTileEntityChunkModified(this.field_145851_c, this.field_145848_d, this.field_145849_e, this); + this.getWorld().func_147476_b(this.field_145851_c, this.field_145848_d, this.field_145849_e, this); } } diff --git a/src/main/java/tconstruct/blocks/slime/SlimeTallGrass.java b/src/main/java/tconstruct/blocks/slime/SlimeTallGrass.java index 3ee320cfb0b..659a67b7573 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeTallGrass.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeTallGrass.java @@ -5,6 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; +import net.minecraft.block.BlockBush; import net.minecraft.block.BlockFlower; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -19,7 +20,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class SlimeTallGrass extends BlockFlower implements IShearable +public class SlimeTallGrass extends BlockBush implements IShearable { private static final String[] grassTypes = new String[] { "slimegrass_blue_tall" }; @SideOnly(Side.CLIENT) @@ -99,7 +100,7 @@ public void registerIcons (IIconRegister par1IconRegister) } @Override - public ArrayList getBlockDropped (World world, int x, int y, int z, int meta, int fortune) + public ArrayList getDrops (World world, int x, int y, int z, int meta, int fortune) { ArrayList ret = new ArrayList(); if (world.rand.nextInt(8) != 0) diff --git a/src/main/java/tconstruct/entity/projectile/ArrowEntity.java b/src/main/java/tconstruct/entity/projectile/ArrowEntity.java index 8aacefb5e63..7ee0d6f42e4 100644 --- a/src/main/java/tconstruct/entity/projectile/ArrowEntity.java +++ b/src/main/java/tconstruct/entity/projectile/ArrowEntity.java @@ -297,7 +297,8 @@ public void onUpdate () if (this.shootingEntity != null && movingobjectposition.entityHit != this.shootingEntity && movingobjectposition.entityHit instanceof EntityPlayer && this.shootingEntity instanceof EntityPlayerMP) { - TConstruct.packetPipeline.sendTo(new S2BPacketChangeGameState(6, 0), (EntityPlayerMP) this.shootingEntity); + ((EntityPlayerMP) this.shootingEntity).playerNetServerHandler.func_147359_a(new S2BPacketChangeGameState(6, 0)); + //TConstruct.packetPipeline.sendTo(new S2BPacketChangeGameState(6, 0), (EntityPlayerMP) this.shootingEntity); } } diff --git a/src/main/java/tconstruct/items/blocks/WoolSlab1Item.java b/src/main/java/tconstruct/items/blocks/WoolSlab1Item.java index d4b13498cb1..79c231013b5 100644 --- a/src/main/java/tconstruct/items/blocks/WoolSlab1Item.java +++ b/src/main/java/tconstruct/items/blocks/WoolSlab1Item.java @@ -27,7 +27,7 @@ public boolean onItemUse (ItemStack stack, EntityPlayer player, World world, int Block b = world.func_147439_a(x, y, z); int meta = world.getBlockMetadata(x, y, z); int trueMeta = meta % 8; - boolean flag = (id & 8) != 0; + boolean flag = (b) != null; if ((side == 1 && flag || side == 0 && !flag) && b == this.block && trueMeta == stack.getItemDamage()) { diff --git a/src/main/java/tconstruct/items/blocks/WoolSlab2Item.java b/src/main/java/tconstruct/items/blocks/WoolSlab2Item.java index 48756476c83..910d3cd4e62 100644 --- a/src/main/java/tconstruct/items/blocks/WoolSlab2Item.java +++ b/src/main/java/tconstruct/items/blocks/WoolSlab2Item.java @@ -27,7 +27,7 @@ public boolean onItemUse (ItemStack stack, EntityPlayer player, World world, int Block block = world.func_147439_a(x, y, z); int meta = world.getBlockMetadata(x, y, z); int trueMeta = meta % 8; - boolean flag = (id & 8) != 0; + boolean flag = (block) != null; if ((side == 1 && flag || side == 0 && !flag) && block == this.block && trueMeta == stack.getItemDamage()) { diff --git a/src/main/java/tconstruct/items/tools/Excavator.java b/src/main/java/tconstruct/items/tools/Excavator.java index 13aef590e0a..7314829a62f 100644 --- a/src/main/java/tconstruct/items/tools/Excavator.java +++ b/src/main/java/tconstruct/items/tools/Excavator.java @@ -245,7 +245,7 @@ public boolean onBlockStartBreak (ItemStack stack, int x, int y, int z, EntityPl } @Override - public float getStrVsBlock (ItemStack stack, Block block, int meta) + public float getDigSpeed (ItemStack stack, Block block, int meta) { if (!stack.hasTagCompound()) return 1.0f; @@ -291,7 +291,7 @@ public float getStrVsBlock (ItemStack stack, Block block, int meta) return 0.1f; } } - return super.getStrVsBlock(stack, block, meta); + return super.getDigSpeed(stack, block, meta); } @Override diff --git a/src/main/java/tconstruct/items/tools/Hammer.java b/src/main/java/tconstruct/items/tools/Hammer.java index c6bccd4cb94..58abda472c7 100644 --- a/src/main/java/tconstruct/items/tools/Hammer.java +++ b/src/main/java/tconstruct/items/tools/Hammer.java @@ -342,7 +342,7 @@ public boolean onBlockStartBreak (ItemStack stack, int x, int y, int z, EntityPl } @Override - public float getStrVsBlock (ItemStack stack, Block block, int meta) + public float getDigSpeed (ItemStack stack, Block block, int meta) { if (!stack.hasTagCompound()) return 1.0f; @@ -363,7 +363,7 @@ public float getStrVsBlock (ItemStack stack, Block block, int meta) /*if (block == Block.silverfish) return getblockSpeed(tags, block, meta);*/ - return super.getStrVsBlock(stack, block, meta); + return super.getDigSpeed(stack, block, meta); } float getblockSpeed (NBTTagCompound tags, Block block, int meta) diff --git a/src/main/java/tconstruct/items/tools/LumberAxe.java b/src/main/java/tconstruct/items/tools/LumberAxe.java index 1284c7ec83c..222d8b7f051 100644 --- a/src/main/java/tconstruct/items/tools/LumberAxe.java +++ b/src/main/java/tconstruct/items/tools/LumberAxe.java @@ -83,7 +83,7 @@ public void onUpdate (ItemStack stack, World world, Entity entity, int par4, boo }*/ @Override - public float getStrVsBlock (ItemStack stack, Block block, int meta) + public float getDigSpeed (ItemStack stack, Block block, int meta) { if (!stack.hasTagCompound()) return 1.0f; @@ -129,7 +129,7 @@ public float getStrVsBlock (ItemStack stack, Block block, int meta) return 0.1f; } } - return super.getStrVsBlock(stack, block, meta); + return super.getDigSpeed(stack, block, meta); } @Override diff --git a/src/main/java/tconstruct/library/crafting/Smeltery.java b/src/main/java/tconstruct/library/crafting/Smeltery.java index 2011cb3d61e..10f17cb2e37 100644 --- a/src/main/java/tconstruct/library/crafting/Smeltery.java +++ b/src/main/java/tconstruct/library/crafting/Smeltery.java @@ -13,9 +13,9 @@ public class Smeltery { public static Smeltery instance = new Smeltery(); - private final HashMap, FluidStack> smeltingList = new HashMap, FluidStack>(); - private final HashMap, Integer> temperatureList = new HashMap, Integer>(); - private final HashMap, ItemStack> renderIndex = new HashMap, ItemStack>(); + private final HashMap, FluidStack> smeltingList = new HashMap, FluidStack>(); + private final HashMap, Integer> temperatureList = new HashMap, Integer>(); + private final HashMap, ItemStack> renderIndex = new HashMap, ItemStack>(); private final ArrayList alloys = new ArrayList(); /** Adds mappings between an itemstack and an output liquid @@ -67,9 +67,9 @@ public static void addMelting (Block block, int metadata, int temperature, Fluid */ public static void addMelting (ItemStack input, Item item, int metadata, int temperature, FluidStack liquid) { - instance.smeltingList.put(Arrays.asList((Item)input.getItem(), input.getItemDamage()), liquid); - instance.temperatureList.put(Arrays.asList((Item)input.getItem(), input.getItemDamage()), temperature); - instance.renderIndex.put(Arrays.asList((Item)input.getItem(), input.getItemDamage()), new ItemStack(item, input.stackSize, metadata)); + instance.smeltingList.put(Arrays.asList(new ItemStack(input.getItem(), input.getItemDamage())), liquid); + instance.temperatureList.put(Arrays.asList(new ItemStack(input.getItem(), input.getItemDamage())), temperature); + instance.renderIndex.put(Arrays.asList(new ItemStack(input.getItem(), input.getItemDamage())), new ItemStack(item, input.stackSize, metadata)); } /** Adds an alloy mixing recipe. @@ -161,17 +161,17 @@ public static ArrayList mixMetals (ArrayList moltenMetal) return liquids; } - public static HashMap, FluidStack> getSmeltingList () + public static HashMap, FluidStack> getSmeltingList () { return instance.smeltingList; } - public static HashMap, Integer> getTemperatureList () + public static HashMap, Integer> getTemperatureList () { return instance.temperatureList; } - public static HashMap, ItemStack> getRenderIndex () + public static HashMap, ItemStack> getRenderIndex () { return instance.renderIndex; } diff --git a/src/main/java/tconstruct/library/tools/DualHarvestTool.java b/src/main/java/tconstruct/library/tools/DualHarvestTool.java index 193bf99777b..5c6ea9f3188 100644 --- a/src/main/java/tconstruct/library/tools/DualHarvestTool.java +++ b/src/main/java/tconstruct/library/tools/DualHarvestTool.java @@ -56,7 +56,7 @@ public boolean onBlockStartBreak (ItemStack stack, int x, int y, int z, EntityPl } @Override - public float getStrVsBlock (ItemStack stack, Block block, int meta) + public float getDigSpeed (ItemStack stack, Block block, int meta) { NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); @@ -99,7 +99,7 @@ public float getStrVsBlock (ItemStack stack, Block block, int meta) return 0.1f; } } - return super.getStrVsBlock(stack, block, meta); + return super.getDigSpeed(stack, block, meta); } public boolean canHarvestBlock (Block block) diff --git a/src/main/java/tconstruct/library/tools/HarvestTool.java b/src/main/java/tconstruct/library/tools/HarvestTool.java index 12185034ca5..3a0edf91654 100644 --- a/src/main/java/tconstruct/library/tools/HarvestTool.java +++ b/src/main/java/tconstruct/library/tools/HarvestTool.java @@ -58,7 +58,7 @@ public boolean onBlockStartBreak (ItemStack stack, int x, int y, int z, EntityPl } @Override - public float getStrVsBlock (ItemStack stack, Block block, int meta) + public float getDigSpeed (ItemStack stack, Block block, int meta) { if (!stack.hasTagCompound()) return 1.0f; @@ -79,7 +79,7 @@ public float getStrVsBlock (ItemStack stack, Block block, int meta) { return calculateStrength(tags, block, meta); //No issue if the harvest level is too low } - return super.getStrVsBlock(stack, block, meta); + return super.getDigSpeed(stack, block, meta); } float calculateStrength (NBTTagCompound tags, Block block, int meta) diff --git a/src/main/java/tconstruct/library/tools/ToolCore.java b/src/main/java/tconstruct/library/tools/ToolCore.java index 4b3df272650..513021fd9b1 100644 --- a/src/main/java/tconstruct/library/tools/ToolCore.java +++ b/src/main/java/tconstruct/library/tools/ToolCore.java @@ -621,7 +621,7 @@ public boolean func_150894_a (ItemStack itemstack, World world, Block block, int } @Override - public float getStrVsBlock (ItemStack stack, Block block, int meta) + public float getDigSpeed (ItemStack stack, Block block, int meta) { NBTTagCompound tags = stack.getTagCompound(); if (tags.getCompoundTag("InfiTool").getBoolean("Broken")) diff --git a/src/main/java/tconstruct/library/tools/Weapon.java b/src/main/java/tconstruct/library/tools/Weapon.java index 934b46a0ba4..48bb70490cf 100644 --- a/src/main/java/tconstruct/library/tools/Weapon.java +++ b/src/main/java/tconstruct/library/tools/Weapon.java @@ -30,7 +30,7 @@ protected float effectiveSpeed () } @Override - public float getStrVsBlock (ItemStack stack, Block block, int meta) + public float getDigSpeed (ItemStack stack, Block block, int meta) { if (stack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Broken")) return 0.1f; diff --git a/src/main/java/tconstruct/worldgen/OreberryBushGen.java b/src/main/java/tconstruct/worldgen/OreberryBushGen.java index 739185241a7..98e3ff760e0 100644 --- a/src/main/java/tconstruct/worldgen/OreberryBushGen.java +++ b/src/main/java/tconstruct/worldgen/OreberryBushGen.java @@ -94,13 +94,13 @@ void generateBerryBlock (World world, int x, int y, int z, Random random) }*/ Block block = world.func_147439_a(x, y, z); - if (block == null || (block != Blocks.end_portal_frame && !world.func_147439_a(x, y, z).isGenMineableReplaceable)) + if (block == null || (block != Blocks.end_portal_frame && !world.func_147439_a(x, y, z).func_149730_j())) world.func_147465_d(x, y, z, this.blockB, metadata, 2); else { for (int iter = 0; iter < replaceBlocks.length; iter++) { - if (block.isGenMineableReplaceable(world, x, y, z, replaceBlocks[iter])) + if (world.func_147439_a(x, y, z).isReplaceableOreGen(world, x, y, z, replaceBlocks[iter])) { world.func_147465_d(x, y, z, this.blockB, metadata, 2); break; diff --git a/src/main/java/tconstruct/worldgen/SurfaceOreGen.java b/src/main/java/tconstruct/worldgen/SurfaceOreGen.java index 4e85fbe11f7..379ed8d7b1d 100644 --- a/src/main/java/tconstruct/worldgen/SurfaceOreGen.java +++ b/src/main/java/tconstruct/worldgen/SurfaceOreGen.java @@ -123,7 +123,7 @@ public boolean generate (World world, Random random, int startX, int startY, int { for (int iter = 0; iter < replaceBlocks.length; iter++) { - if (block.isGenMineableReplaceable(world, k2, l2, i3, replaceBlocks[iter])) + if (world.func_147439_a(k2, l2, i3).isReplaceableOreGen(world, k2, l2, i3, replaceBlocks[iter])) { world.func_147465_d(k2, l2, i3, this.minableBlock, minableBlockMeta, 2); break;