Fixed and balanced hardness of blocks and put in harvest levels.

26 files changed, 48 insertions, 30 deletions

diff --git a/src/main/java/blocks/BlockAardiumOre.java b/src/main/java/blocks/BlockAardiumOre.java
index e9b9925..1669fa0 100644
--- a/src/main/java/blocks/BlockAardiumOre.java
+++ b/src/main/java/blocks/BlockAardiumOre.java
@@ -6,6 +6,6 @@ import net.minecraft.block.material.Material;
 public class BlockAardiumOre extends BasicBlockOre {
 
     public BlockAardiumOre() {
-        super("aardium_ore", Material.ROCK, 3.0f, 5.0f);
+        super("aardium_ore", Material.ROCK, 53.0f, 53.0f, 3       );
     }
 }
diff --git a/src/main/java/blocks/BlockAdamantiteOre.java b/src/main/java/blocks/BlockAdamantiteOre.java
index 2d015b3..a4706c7 100644
--- a/src/main/java/blocks/BlockAdamantiteOre.java
+++ b/src/main/java/blocks/BlockAdamantiteOre.java
@@ -6,6 +6,6 @@ import net.minecraft.block.material.Material;
 public class BlockAdamantiteOre extends BasicBlockOre {
 
     public BlockAdamantiteOre() {
-        super("adamantite_ore", Material.ROCK, 3.0f, 5.0f);
+        super("adamantite_ore", Material.ROCK, 55.0f, 55.0f,4);
     }
 }
diff --git a/src/main/java/blocks/BlockArcaniteOre.java b/src/main/java/blocks/BlockArcaniteOre.java
index 46de274..bcf2f87 100644
--- a/src/main/java/blocks/BlockArcaniteOre.java
+++ b/src/main/java/blocks/BlockArcaniteOre.java
@@ -6,6 +6,6 @@ import net.minecraft.block.material.Material;
 public class BlockArcaniteOre extends BasicBlockOre {
 
     public BlockArcaniteOre() {
-        super("arcanite_ore", Material.ROCK, 3.0f, 5.0f);
+        super("arcanite_ore", Material.ROCK, 23.0f, 25.0f,2);
     }
 }
diff --git a/src/main/java/blocks/BlockAxiidianOre.java b/src/main/java/blocks/BlockAxiidianOre.java
index 73f81bd..912f9bf 100644
--- a/src/main/java/blocks/BlockAxiidianOre.java
+++ b/src/main/java/blocks/BlockAxiidianOre.java
@@ -6,6 +6,6 @@ import net.minecraft.block.material.Material;
 public class BlockAxiidianOre extends BasicBlockOre {
 
     public BlockAxiidianOre() {
-        super("axiidian_ore", Material.ROCK, 3.0f, 5.0f);
+        super("axiidian_ore", Material.ROCK, 13.0f, 13.0f,3);
     }
 }
diff --git a/src/main/java/blocks/BlockBasalt.java b/src/main/java/blocks/BlockBasalt.java
index b0eb5ae..cc85c93 100644
--- a/src/main/java/blocks/BlockBasalt.java
+++ b/src/main/java/blocks/BlockBasalt.java
@@ -6,6 +6,6 @@ import net.minecraft.block.material.Material;
 public class BlockBasalt extends BasicBlockOre {
 
     public BlockBasalt() {
-        super("basalt", Material.ROCK, 12.0f, 2.0f);
+        super("basalt", Material.ROCK, 35.0f, 35.0f,3);
     }
 }
diff --git a/src/main/java/blocks/BlockBismuthOre.java b/src/main/java/blocks/BlockBismuthOre.java
index a3386b6..bc720f7 100644
--- a/src/main/java/blocks/BlockBismuthOre.java
+++ b/src/main/java/blocks/BlockBismuthOre.java
@@ -6,6 +6,6 @@ import net.minecraft.block.material.Material;
 public class BlockBismuthOre extends BasicBlockOre {
 
     public BlockBismuthOre() {
-        super("bismuth_ore", Material.ROCK, 3.0f, 5.0f);
+        super("bismuth_ore", Material.ROCK, 8.0f, 8.0f,1);
     }
 }
diff --git a/src/main/java/blocks/BlockEterniteOre.java b/src/main/java/blocks/BlockEterniteOre.java
index 91132a0..e56e95c 100644
--- a/src/main/java/blocks/BlockEterniteOre.java
+++ b/src/main/java/blocks/BlockEterniteOre.java
@@ -6,6 +6,6 @@ import net.minecraft.block.material.Material;
 public class BlockEterniteOre extends BasicBlockOre {
 
     public BlockEterniteOre() {
-        super("eternite_ore", Material.ROCK, 3.0f, 5.0f);
+        super("eternite_ore", Material.ROCK, 24.0f, 25.0f,3);
     }
 }
diff --git a/src/main/java/blocks/BlockIgnititeOre.java b/src/main/java/blocks/BlockIgnititeOre.java
index 845b784..72822cf 100644
--- a/src/main/java/blocks/BlockIgnititeOre.java
+++ b/src/main/java/blocks/BlockIgnititeOre.java
@@ -6,6 +6,6 @@ import net.minecraft.block.material.Material;
 public class BlockIgnititeOre extends BasicBlockOre {
 
     public BlockIgnititeOre() {
-        super("ignitite_ore", Material.ROCK, 3.0f, 5.0f);
+        super("ignitite_ore", Material.ROCK, 23.0f, 25.0f,3);
     }
 }
diff --git a/src/main/java/blocks/BlockKarmesineOre.java b/src/main/java/blocks/BlockKarmesineOre.java
index 1c16a5c..d8b7a59 100644
--- a/src/main/java/blocks/BlockKarmesineOre.java
+++ b/src/main/java/blocks/BlockKarmesineOre.java
@@ -6,6 +6,6 @@ import net.minecraft.block.material.Material;
 public class BlockKarmesineOre extends BasicBlockOre {
 
     public BlockKarmesineOre() {
-        super("karmesine_ore", Material.ROCK, 3.0f, 5.0f);
+        super("karmesine_ore", Material.ROCK, 13.0f, 15.0f,1);
     }
 }
diff --git a/src/main/java/blocks/BlockLigniteOre.java b/src/main/java/blocks/BlockLigniteOre.java
index d2507bf..67bf74d 100644
--- a/src/main/java/blocks/BlockLigniteOre.java
+++ b/src/main/java/blocks/BlockLigniteOre.java
@@ -6,6 +6,6 @@ import net.minecraft.block.material.Material;
 public class BlockLigniteOre extends BasicBlockOre {
 
     public BlockLigniteOre() {
-        super("lignite_ore", Material.ROCK, 3.0f, 5.0f);
+        super("lignite_ore", Material.ROCK, 4.0f, 5.0f,1);
     }
 }
diff --git a/src/main/java/blocks/BlockMeteoriteOre.java b/src/main/java/blocks/BlockMeteoriteOre.java
index 3604e3d..b9b7583 100644
--- a/src/main/java/blocks/BlockMeteoriteOre.java
+++ b/src/main/java/blocks/BlockMeteoriteOre.java
@@ -6,6 +6,6 @@ import net.minecraft.block.material.Material;
 public class BlockMeteoriteOre extends BasicBlockOre {
 
     public BlockMeteoriteOre() {
-        super("meteorite_ore", Material.ROCK, 3.0f, 5.0f);
+        super("meteorite_ore", Material.ROCK, 43.0f,45.0f,4);
     }
 }
diff --git a/src/main/java/blocks/BlockMindoriteOre.java b/src/main/java/blocks/BlockMindoriteOre.java
index 32f6c1c..63c5f35 100644
--- a/src/main/java/blocks/BlockMindoriteOre.java
+++ b/src/main/java/blocks/BlockMindoriteOre.java
@@ -6,6 +6,6 @@ import net.minecraft.block.material.Material;
 public class BlockMindoriteOre extends BasicBlockOre {
 
     public BlockMindoriteOre() {
-        super("mindorite_ore", Material.ROCK, 3.0f, 5.0f);
+        super("mindorite_ore", Material.ROCK, 12.0f, 12.0f,2);
     }
 }
diff --git a/src/main/java/blocks/BlockMythrilOre.java b/src/main/java/blocks/BlockMythrilOre.java
index 0bf2b23..6db186f 100644
--- a/src/main/java/blocks/BlockMythrilOre.java
+++ b/src/main/java/blocks/BlockMythrilOre.java
@@ -6,6 +6,6 @@ import net.minecraft.block.material.Material;
 public class BlockMythrilOre extends BasicBlockOre {
 
     public BlockMythrilOre() {
-        super("mythril_ore", Material.ROCK, 3.0f, 5.0f);
+        super("mythril_ore", Material.ROCK, 25.0f, 25.0f,4);
     }
 }
diff --git a/src/main/java/blocks/BlockPalladiumOre.java b/src/main/java/blocks/BlockPalladiumOre.java
index 5dc5b15..5dc2d94 100644
--- a/src/main/java/blocks/BlockPalladiumOre.java
+++ b/src/main/java/blocks/BlockPalladiumOre.java
@@ -6,6 +6,6 @@ import net.minecraft.block.material.Material;
 public class BlockPalladiumOre extends BasicBlockOre {
 
     public BlockPalladiumOre() {
-        super("palladium_ore", Material.ROCK, 3.0f, 5.0f);
+        super("palladium_ore", Material.ROCK, 25.0f, 25.0f,3);
     }
 }
diff --git a/src/main/java/blocks/BlockPrometheumOre.java b/src/main/java/blocks/BlockPrometheumOre.java
index f3fee45..b767eb8 100644
--- a/src/main/java/blocks/BlockPrometheumOre.java
+++ b/src/main/java/blocks/BlockPrometheumOre.java
@@ -1,12 +1,11 @@
 package blocks;
 
-import blocks.category.BasicBlockOre;
 import blocks.category.BasicBlockOreGlow;
 import net.minecraft.block.material.Material;
 
 public class BlockPrometheumOre extends BasicBlockOreGlow {
 
     public BlockPrometheumOre() {
-        super("prometheum_ore", Material.ROCK, 3.0f, 5.0f, 0.25f);
+        super("prometheum_ore", Material.ROCK, 35.0f, 35.0f, 4, 0.25f);
     }
 }
diff --git a/src/main/java/blocks/BlockRottenGround.java b/src/main/java/blocks/BlockRottenGround.java
index fc4e60c..f8ad605 100644
--- a/src/main/java/blocks/BlockRottenGround.java
+++ b/src/main/java/blocks/BlockRottenGround.java
@@ -1,11 +1,11 @@
 package blocks;
 
-import blocks.category.BasicBlockOre;
+import blocks.category.BasicBlockGround;
 import net.minecraft.block.material.Material;
 
-public class BlockRottenGround extends BasicBlockOre {
+public class BlockRottenGround extends BasicBlockGround {
 
     public BlockRottenGround() {
-        super("rotten_ground", Material.GROUND, 1.0f, 1.0f);
+        super("rotten_ground", Material.GROUND, 2.0f, 2.0f,0);
     }
 }
diff --git a/src/main/java/blocks/BlockSlaggoldOre.java b/src/main/java/blocks/BlockSlaggoldOre.java
index 67cc801..bcf7b17 100644
--- a/src/main/java/blocks/BlockSlaggoldOre.java
+++ b/src/main/java/blocks/BlockSlaggoldOre.java
@@ -6,6 +6,6 @@ import net.minecraft.block.material.Material;
 public class BlockSlaggoldOre extends BasicBlockOre {
 
     public BlockSlaggoldOre() {
-        super("slaggold_ore", Material.ROCK, 3.0f, 5.0f);
+        super("slaggold_ore", Material.ROCK, 3.0f, 5.0f,1);
     }
 }
diff --git a/src/main/java/blocks/BlockSlagironOre.java b/src/main/java/blocks/BlockSlagironOre.java
index d1c283b..fcf60a8 100644
--- a/src/main/java/blocks/BlockSlagironOre.java
+++ b/src/main/java/blocks/BlockSlagironOre.java
@@ -6,6 +6,6 @@ import net.minecraft.block.material.Material;
 public class BlockSlagironOre extends BasicBlockOre {
 
     public BlockSlagironOre() {
-        super("slagiron_ore", Material.ROCK, 3.0f, 5.0f);
+        super("slagiron_ore", Material.ROCK, 3.0f, 5.0f,1);
     }
 }
diff --git a/src/main/java/blocks/BlockTiberiumOre.java b/src/main/java/blocks/BlockTiberiumOre.java
index 3d19565..c493742 100644
--- a/src/main/java/blocks/BlockTiberiumOre.java
+++ b/src/main/java/blocks/BlockTiberiumOre.java
@@ -6,6 +6,6 @@ import net.minecraft.block.material.Material;
 public class BlockTiberiumOre extends BasicBlockOreGlow {
 
     public BlockTiberiumOre() {
-        super("tiberium_ore", Material.ROCK, 3.0f, 5.0f, 0.66f);
+        super("tiberium_ore", Material.ROCK, 30.0f, 30.0f, 3,0.66f);
     }
 }
diff --git a/src/main/java/blocks/BlockVibraniumre.java b/src/main/java/blocks/BlockVibraniumre.java
index 203e4b2..1650985 100644
--- a/src/main/java/blocks/BlockVibraniumre.java
+++ b/src/main/java/blocks/BlockVibraniumre.java
@@ -6,6 +6,6 @@ import net.minecraft.block.material.Material;
 public class BlockVibraniumre extends BasicBlockOre {
 
     public BlockVibraniumre() {
-        super("vibranium_ore", Material.ROCK, 3.0f, 5.0f);
+        super("vibranium_ore", Material.ROCK, 43.0f, 45.0f,4);
     }
 }
\ No newline at end of file
diff --git a/src/main/java/blocks/BlockYrdeanOre.java b/src/main/java/blocks/BlockYrdeanOre.java
index ef676d0..e403e4b 100644
--- a/src/main/java/blocks/BlockYrdeanOre.java
+++ b/src/main/java/blocks/BlockYrdeanOre.java
@@ -6,6 +6,6 @@ import net.minecraft.block.material.Material;
 public class BlockYrdeanOre extends BasicBlockOre {
 
     public BlockYrdeanOre() {
-        super("yrdean_ore", Material.ROCK, 3.0f, 5.0f);
+        super("yrdean_ore", Material.ROCK, 13.0f, 15.0f,3);
     }
 }
diff --git a/src/main/java/blocks/category/BasicBlockGround.java b/src/main/java/blocks/category/BasicBlockGround.java
new file mode 100644
index 0000000..516abbe
--- /dev/null
+++ b/src/main/java/blocks/category/BasicBlockGround.java
@@ -0,0 +1,16 @@
+package blocks.category;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+
+public class BasicBlockGround extends Block {
+
+    public BasicBlockGround(String name, Material material, float hardness, float resistance, int harvest) {
+        super(material);
+        setUnlocalizedName(name);
+        setRegistryName(name);
+        setHardness(hardness);
+        setResistance(resistance);
+        setHarvestLevel("shovel",harvest);
+    }
+}
diff --git a/src/main/java/blocks/category/BasicBlockOre.java b/src/main/java/blocks/category/BasicBlockOre.java
index fa5cca1..a65a7be 100644
--- a/src/main/java/blocks/category/BasicBlockOre.java
+++ b/src/main/java/blocks/category/BasicBlockOre.java
@@ -5,11 +5,12 @@ import net.minecraft.block.material.Material;
 
 public class BasicBlockOre extends Block {
 
-    public BasicBlockOre(String name, Material material, float hardness, float resistance) {
+    public BasicBlockOre(String name, Material material, float hardness, float resistance, int harvest) {
         super(material);
         setUnlocalizedName(name);
         setRegistryName(name);
         setHardness(hardness);
         setResistance(resistance);
+        setHarvestLevel("pickaxe",harvest);
     }
 }
diff --git a/src/main/java/blocks/category/BasicBlockOreGlow.java b/src/main/java/blocks/category/BasicBlockOreGlow.java
index a3ca81d..f407650 100644
--- a/src/main/java/blocks/category/BasicBlockOreGlow.java
+++ b/src/main/java/blocks/category/BasicBlockOreGlow.java
@@ -5,12 +5,13 @@ import net.minecraft.block.material.Material;
 
 public class BasicBlockOreGlow extends Block {
 
-    public BasicBlockOreGlow(String name, Material material, float hardness, float resistance, float glow) {
+    public BasicBlockOreGlow(String name, Material material, float hardness, float resistance, int harvest, float glow) {
         super(material);
         setUnlocalizedName(name);
         setRegistryName(name);
         setHardness(hardness);
         setResistance(resistance);
+        setHarvestLevel("pickaxe", harvest);
         setLightLevel(glow);
     }
 }
diff --git a/src/main/java/main/util/StateMatcher.java b/src/main/java/main/util/StateMatcher.java
index 09a9bc0..933cce0 100644
--- a/src/main/java/main/util/StateMatcher.java
+++ b/src/main/java/main/util/StateMatcher.java
@@ -64,7 +64,8 @@ public class StateMatcher implements Predicate<IBlockState> {
 
                 IBlockState bState = world.getBlockState(blockPos);
                 if (bState.getBlock() == this.state.getBlock() && bState.getValue(property) == value) {
-                    System.out.println(String.format("Found block with desired state! (%s), try #%s, y=%s", blockPos, i, Y));
+                    // Check if a replacable block is near origin block - show pos in console
+                    // System.out.println(String.format("Found block with desired state! (%s), Block: %s, try #%s, y=%s",  i, Y));
                     return true;
                 }
             }
diff --git a/src/main/java/main/world/ZWorldGen.java b/src/main/java/main/world/ZWorldGen.java
index d33f119..abb6c47 100644
--- a/src/main/java/main/world/ZWorldGen.java
+++ b/src/main/java/main/world/ZWorldGen.java
@@ -34,9 +34,9 @@ public class ZWorldGen implements IWorldGenerator {
         Generator.generateOre(ZCompression.bismuthOre.getDefaultState(), 	random, x, z, world, 30, 32, 64, 2, 4);
         Generator.generateOre(ZCompression.mythrilOre.getDefaultState(), 	random, x, z, world, 18, 16, 32, 2, 4);
         Generator.generateOre(ZCompression.meteoriteOre.getDefaultState(),	random, x, z, world, 25, 0, 32, 3, 6);
-        Generator.generateOre(ZCompression.mindoriteOre.getDefaultState(),	Blocks.STONE.getDefaultState(), BlockStone.VARIANT, BlockStone.EnumType.DIORITE, random, x, z, world, 150, 16, 96, 2, 4);
-        Generator.generateOre(ZCompression.arcaniteOre.getDefaultState(),	Blocks.STONE.getDefaultState(), BlockStone.VARIANT, BlockStone.EnumType.GRANITE, random, x, z, world, 150, 16, 96, 2, 4);
-        Generator.generateOre(ZCompression.eterniteOre.getDefaultState(),	Blocks.STONE.getDefaultState(), BlockStone.VARIANT, BlockStone.EnumType.ANDESITE, random, x, z, world, 150, 16, 96, 2, 4);
+        Generator.generateOre(ZCompression.mindoriteOre.getDefaultState(),	Blocks.STONE.getDefaultState(), BlockStone.VARIANT, BlockStone.EnumType.DIORITE, random, x, z, world, 200, 16, 96, 2, 4);
+        Generator.generateOre(ZCompression.arcaniteOre.getDefaultState(),	Blocks.STONE.getDefaultState(), BlockStone.VARIANT, BlockStone.EnumType.GRANITE, random, x, z, world, 200, 16, 96, 2, 4);
+        Generator.generateOre(ZCompression.eterniteOre.getDefaultState(),	Blocks.STONE.getDefaultState(), BlockStone.VARIANT, BlockStone.EnumType.ANDESITE, random, x, z, world, 200, 16, 96, 2, 4);
     }
 
     private void end(Random random, int x, int z, World world) {