diff --git a/tconstruct/blocks/logic/LightAggregator.java b/tconstruct/blocks/logic/LightAggregator.java index f589ada9..a800188b 100644 --- a/tconstruct/blocks/logic/LightAggregator.java +++ b/tconstruct/blocks/logic/LightAggregator.java @@ -50,7 +50,7 @@ public class LightAggregator extends AggregatorLogic implements IActiveLogic if (currentLightLevel > 3) { currentTime += currentLightLevel / 3 + 1; - if (currentTime >= 1) //180 ticks * max light (15) 540 + if (currentTime >= 540) //180 ticks * max light (15) 540 { currentTime = 0; crystalValue++; diff --git a/tconstruct/client/ToolCoreRenderer.java b/tconstruct/client/ToolCoreRenderer.java index ea59feda..76a54b6f 100644 --- a/tconstruct/client/ToolCoreRenderer.java +++ b/tconstruct/client/ToolCoreRenderer.java @@ -20,7 +20,6 @@ public class ToolCoreRenderer implements IItemRenderer switch (type) { case ENTITY: - GL11.glRotatef(180, 0, 1, 0); return true; case EQUIPPED: GL11.glTranslatef(0.03f, 0F, -0.09375F); diff --git a/tconstruct/common/TContent.java b/tconstruct/common/TContent.java index dfb3d66a..88809cce 100644 --- a/tconstruct/common/TContent.java +++ b/tconstruct/common/TContent.java @@ -1480,6 +1480,7 @@ public class TContent implements IFuelHandler Smeltery.addMelting(new ItemStack(blankPattern, 4, 2), metalBlock.blockID, 7, 150, new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 2)); Smeltery.addMelting(new ItemStack(Item.enderPearl, 4), metalBlock.blockID, 10, 500, new FluidStack(moltenEnderFluid, 250)); + Smeltery.addMelting(new ItemStack(metalBlock, 1, 10), metalBlock.blockID, 10, 500, new FluidStack(moltenEnderFluid, 1000)); //Blocks Smeltery.addMelting(Block.blockIron, 0, 600, new FluidStack(moltenIronFluid, TConstruct.ingotLiquidValue * 9)); diff --git a/tconstruct/items/tools/Hammer.java b/tconstruct/items/tools/Hammer.java index 88fe42c6..9a22554e 100644 --- a/tconstruct/items/tools/Hammer.java +++ b/tconstruct/items/tools/Hammer.java @@ -258,7 +258,9 @@ public class Hammer extends HarvestTool xRange = 0; break; } + NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); + int toolLevel = tags.getInteger("HarvestLevel"); for (int xPos = x - xRange; xPos <= x + xRange; xPos++) { for (int yPos = y - yRange; yPos <= y + yRange; yPos++) @@ -273,7 +275,7 @@ public class Hammer extends HarvestTool int hlvl = MinecraftForge.getBlockHarvestLevel(localBlock, meta, getHarvestType()); float localHardness = localBlock == null ? Float.MAX_VALUE : localBlock.getBlockHardness(world, xPos, yPos, zPos); - if (hlvl <= tags.getInteger("HarvestLevel") && localHardness - 1.5 <= blockHardness) + if (hlvl <= toolLevel && localHardness - 1.5 <= blockHardness) { boolean cancelHarvest = false; for (ActiveToolMod mod : TConstructRegistry.activeModifiers) @@ -288,12 +290,16 @@ public class Hammer extends HarvestTool { for (int iter = 0; iter < materials.length; iter++) { - if (materials[iter] == localBlock.blockMaterial) + if (materials[iter] == localBlock.blockMaterial || localBlock == Block.silverfish) { if (!player.capabilities.isCreativeMode) { + if (localBlock.removeBlockByPlayer(world, player, xPos, yPos, zPos)) + { + localBlock.onBlockDestroyedByPlayer(world, xPos, yPos, zPos, localMeta); + } localBlock.harvestBlock(world, player, xPos, yPos, zPos, localMeta); - localBlock.onBlockHarvested(world, x, y, z, localMeta, player); + localBlock.onBlockHarvested(world, xPos, yPos, zPos, localMeta, player); if (blockHardness > 0f) onBlockDestroyed(stack, world, localblockID, xPos, yPos, zPos, player); }