Pull fix from 1.10.2, Nether Logs, Tainted Soil, Redwood Logs and the…

… Overworld Logs do not have a tool set for their harvesting level.
progwml6 · May 9, 2017 · e07f33f · e07f33f
1 parent c014e50
commit e07f33f
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 4 deletions.
diff --git a/src/main/java/com/progwml6/natura/nether/block/logs/BlockNetherLog.java b/src/main/java/com/progwml6/natura/nether/block/logs/BlockNetherLog.java
@@ -28,9 +28,11 @@ public BlockNetherLog()
 
         this.setHardness(3.5F);
         this.setResistance(40F);
-        Blocks.FIRE.setFireInfo(this, 0, 0);
-
+        this.setHarvestLevel("axe", 1, this.blockState.getBaseState().withProperty(TYPE, BlockNetherLog.LogType.FUSEWOOD));
+        this.setHarvestLevel("axe", -1, this.blockState.getBaseState().withProperty(TYPE, BlockNetherLog.LogType.DARKWOOD));
         this.setDefaultState(this.blockState.getBaseState().withProperty(LOG_AXIS, BlockEnumLog.EnumAxis.Y));
+
+        Blocks.FIRE.setFireInfo(this, 0, 0);
     }
 
     @Override

diff --git a/src/main/java/com/progwml6/natura/nether/block/logs/BlockNetherLog2.java b/src/main/java/com/progwml6/natura/nether/block/logs/BlockNetherLog2.java
@@ -33,7 +33,7 @@ public BlockNetherLog2()
         this.setHardness(8.0F);
         this.setSoundType(SoundType.METAL);
         this.setCreativeTab(NaturaRegistry.tabWorld);
-
+        this.setHarvestLevel("axe", 2);
         this.setDefaultState(this.blockState.getBaseState().withProperty(META, Integer.valueOf(0)));
     }
 

diff --git a/src/main/java/com/progwml6/natura/nether/block/soil/BlockTaintedSoil.java b/src/main/java/com/progwml6/natura/nether/block/soil/BlockTaintedSoil.java
@@ -28,6 +28,7 @@ public BlockTaintedSoil()
         this.setHardness(2.2f);
         this.setResistance(25F);
         this.setSoundType(SoundType.GROUND);
+        this.setHarvestLevel("shovel", 0);
     }
 
     @Override

diff --git a/src/main/java/com/progwml6/natura/overworld/block/logs/BlockOverworldLog.java b/src/main/java/com/progwml6/natura/overworld/block/logs/BlockOverworldLog.java
@@ -22,6 +22,7 @@ public BlockOverworldLog()
         super(TYPE, BlockOverworldLog.LogType.class);
 
         this.setDefaultState(this.blockState.getBaseState().withProperty(LOG_AXIS, BlockEnumLog.EnumAxis.Y));
+        this.setHarvestLevel("axe", -1);
     }
 
     /**

diff --git a/src/main/java/com/progwml6/natura/overworld/block/logs/BlockOverworldLog2.java b/src/main/java/com/progwml6/natura/overworld/block/logs/BlockOverworldLog2.java
@@ -20,7 +20,9 @@ public class BlockOverworldLog2 extends BlockEnumLog<BlockOverworldLog2.LogType>
     public BlockOverworldLog2()
     {
         super(TYPE, BlockOverworldLog2.LogType.class);
+
         this.setDefaultState(this.blockState.getBaseState().withProperty(LOG_AXIS, BlockEnumLog.EnumAxis.Y));
+        this.setHarvestLevel("axe", -1);
     }
 
     /**

diff --git a/src/main/java/com/progwml6/natura/overworld/block/logs/BlockRedwoodLog.java b/src/main/java/com/progwml6/natura/overworld/block/logs/BlockRedwoodLog.java
@@ -20,10 +20,12 @@ public class BlockRedwoodLog extends EnumBlock<BlockRedwoodLog.RedwoodType>
     public BlockRedwoodLog()
     {
         super(Material.WOOD, TYPE, RedwoodType.class);
-        Blocks.FIRE.setFireInfo(this, 5, 20);
+
         this.setHardness(2.0f);
         this.setCreativeTab(NaturaRegistry.tabWorld);
         this.setSoundType(SoundType.WOOD);
+        this.setHarvestLevel("axe", -1);
+        Blocks.FIRE.setFireInfo(this, 5, 20);
     }
 
     //@formatter:off