diff --git a/src/main/java/tconstruct/TConstruct.java b/src/main/java/tconstruct/TConstruct.java index 915b478a..22309d16 100644 --- a/src/main/java/tconstruct/TConstruct.java +++ b/src/main/java/tconstruct/TConstruct.java @@ -87,9 +87,6 @@ public class TConstruct public TConstruct() { - LoggerConfig fml = new LoggerConfig(FMLCommonHandler.instance().getFMLLogger().getName(), Level.ALL, true); - LoggerConfig modConf = new LoggerConfig(logger.getName(), Level.ALL, true); - modConf.setParent(fml); //logger.setParent(FMLCommonHandler.instance().getFMLLogger()); if (Loader.isModLoaded("Natura")) diff --git a/src/main/java/tconstruct/library/tools/DualHarvestTool.java b/src/main/java/tconstruct/library/tools/DualHarvestTool.java index 402f96b2..3448b97e 100644 --- a/src/main/java/tconstruct/library/tools/DualHarvestTool.java +++ b/src/main/java/tconstruct/library/tools/DualHarvestTool.java @@ -29,8 +29,12 @@ public abstract class DualHarvestTool extends HarvestTool Block block = player.worldObj.getBlock(x, y, z); if (block == null || block == Blocks.air) return false; - int hlvl = block.getHarvestLevel(meta); - int shlvl = block.getHarvestLevel(meta); + int hlvl = -1; + int shlvl = -1; + if (block.getHarvestTool(meta).equals(getHarvestType())) + hlvl = block.getHarvestLevel(meta); + if (block.getHarvestTool(meta).equals(getSecondHarvestType())) + shlvl = block.getHarvestLevel(meta); if (hlvl <= tags.getInteger("HarvestLevel") && shlvl <= tags.getInteger("HarvestLevel2")) { diff --git a/src/main/java/tconstruct/library/tools/HarvestTool.java b/src/main/java/tconstruct/library/tools/HarvestTool.java index db7cdb7e..03f78779 100644 --- a/src/main/java/tconstruct/library/tools/HarvestTool.java +++ b/src/main/java/tconstruct/library/tools/HarvestTool.java @@ -33,8 +33,10 @@ public abstract class HarvestTool extends ToolCore //Block block = Block.blocksList[bID]; if (block == null || block == Blocks.air) return false; - int hlvl = block.getHarvestLevel(meta); - + int hlvl = -1; + if (block.getHarvestTool(meta).equals(getHarvestType())) + hlvl = block.getHarvestLevel(meta); + // int hlvl = MinecraftForge.getBlockHarvestLevel(block, meta, getHarvestType()); if (hlvl <= tags.getInteger("HarvestLevel")) { boolean cancelHarvest = false;