general code cleanup

added new StateMatcher

17 files changed, 74 insertions, 123 deletions

diff --git a/src/main/java/blocks/BasicBlock.java b/src/main/java/blocks/BasicBlock.java
index 2f61291..3e4810e 100644
--- a/src/main/java/blocks/BasicBlock.java
+++ b/src/main/java/blocks/BasicBlock.java
@@ -3,14 +3,13 @@ package blocks;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 
-public class BasicBlock extends Block{
-
-	public BasicBlock(String name, Material material, float hardness, float resistance) {
-		super(material);
-		setUnlocalizedName(name);
-		setRegistryName(name);
-		setHardness(hardness);
-		setResistance(resistance);
-	}
-
+public class BasicBlock extends Block {
+
+    public BasicBlock(String name, Material material, float hardness, float resistance) {
+        super(material);
+        setUnlocalizedName(name);
+        setRegistryName(name);
+        setHardness(hardness);
+        setResistance(resistance);
+    }
 }
diff --git a/src/main/java/blocks/BlockAdamantiteOre.java b/src/main/java/blocks/BlockAdamantiteOre.java
index eaab00d..75931e9 100644
--- a/src/main/java/blocks/BlockAdamantiteOre.java
+++ b/src/main/java/blocks/BlockAdamantiteOre.java
@@ -2,12 +2,9 @@ package blocks;
 
 import net.minecraft.block.material.Material;
 
-public class BlockAdamantiteOre extends BasicBlock{
-
-	public BlockAdamantiteOre() {
-		super("adamantite_ore", Material.ROCK, 3.0f, 5.0f);
-	}
-	
-	
+public class BlockAdamantiteOre extends BasicBlock {
 
+    public BlockAdamantiteOre() {
+        super("adamantite_ore", Material.ROCK, 3.0f, 5.0f);
+    }
 }
diff --git a/src/main/java/blocks/BlockArcaniteOre.java b/src/main/java/blocks/BlockArcaniteOre.java
index 6be72a7..014f563 100644
--- a/src/main/java/blocks/BlockArcaniteOre.java
+++ b/src/main/java/blocks/BlockArcaniteOre.java
@@ -2,12 +2,9 @@ package blocks;
 
 import net.minecraft.block.material.Material;
 
-public class BlockArcaniteOre extends BasicBlock{
-
-	public BlockArcaniteOre() {
-		super("arcanite_ore", Material.ROCK, 3.0f, 5.0f);
-	}
-	
-	
+public class BlockArcaniteOre extends BasicBlock {
 
+    public BlockArcaniteOre() {
+        super("arcanite_ore", Material.ROCK, 3.0f, 5.0f);
+    }
 }
diff --git a/src/main/java/blocks/BlockBasalt.java b/src/main/java/blocks/BlockBasalt.java
index 16ff9c3..73ae463 100644
--- a/src/main/java/blocks/BlockBasalt.java
+++ b/src/main/java/blocks/BlockBasalt.java
@@ -2,12 +2,9 @@ package blocks;
 
 import net.minecraft.block.material.Material;
 
-public class BlockBasalt extends BasicBlock{
-
-	public BlockBasalt() {
-		super("basalt", Material.ROCK, 12.0f, 2.0f);
-	}
-	
-	
+public class BlockBasalt extends BasicBlock {
 
+    public BlockBasalt() {
+        super("basalt", Material.ROCK, 12.0f, 2.0f);
+    }
 }
diff --git a/src/main/java/blocks/BlockBismuthOre.java b/src/main/java/blocks/BlockBismuthOre.java
index c8b0632..b58cecf 100644
--- a/src/main/java/blocks/BlockBismuthOre.java
+++ b/src/main/java/blocks/BlockBismuthOre.java
@@ -2,12 +2,9 @@ package blocks;
 
 import net.minecraft.block.material.Material;
 
-public class BlockBismuthOre extends BasicBlock{
-
-	public BlockBismuthOre() {
-		super("bismuth_ore", Material.ROCK, 3.0f, 5.0f);
-	}
-	
-	
+public class BlockBismuthOre extends BasicBlock {
 
+    public BlockBismuthOre() {
+        super("bismuth_ore", Material.ROCK, 3.0f, 5.0f);
+    }
 }
diff --git a/src/main/java/blocks/BlockEterniteOre.java b/src/main/java/blocks/BlockEterniteOre.java
index 30c1143..8854b91 100644
--- a/src/main/java/blocks/BlockEterniteOre.java
+++ b/src/main/java/blocks/BlockEterniteOre.java
@@ -2,12 +2,9 @@ package blocks;
 
 import net.minecraft.block.material.Material;
 
-public class BlockEterniteOre extends BasicBlock{
-
-	public BlockEterniteOre() {
-		super("eternite_ore", Material.ROCK, 3.0f, 5.0f);
-	}
-	
-	
+public class BlockEterniteOre extends BasicBlock {
 
+    public BlockEterniteOre() {
+        super("eternite_ore", Material.ROCK, 3.0f, 5.0f);
+    }
 }
diff --git a/src/main/java/blocks/BlockKarmesineOre.java b/src/main/java/blocks/BlockKarmesineOre.java
index 21d1c74..9c4f5f0 100644
--- a/src/main/java/blocks/BlockKarmesineOre.java
+++ b/src/main/java/blocks/BlockKarmesineOre.java
@@ -2,12 +2,9 @@ package blocks;
 
 import net.minecraft.block.material.Material;
 
-public class BlockKarmesineOre extends BasicBlock{
-
-	public BlockKarmesineOre() {
-		super("karmesine_ore", Material.ROCK, 3.0f, 5.0f);
-	}
-	
-	
+public class BlockKarmesineOre extends BasicBlock {
 
+    public BlockKarmesineOre() {
+        super("karmesine_ore", Material.ROCK, 3.0f, 5.0f);
+    }
 }
diff --git a/src/main/java/blocks/BlockLigniteOre.java b/src/main/java/blocks/BlockLigniteOre.java
index 77f0f74..5064b5f 100644
--- a/src/main/java/blocks/BlockLigniteOre.java
+++ b/src/main/java/blocks/BlockLigniteOre.java
@@ -2,12 +2,9 @@ package blocks;
 
 import net.minecraft.block.material.Material;
 
-public class BlockLigniteOre extends BasicBlock{
-
-	public BlockLigniteOre() {
-		super("lignite_ore", Material.ROCK, 3.0f, 5.0f);
-	}
-	
-	
+public class BlockLigniteOre extends BasicBlock {
 
+    public BlockLigniteOre() {
+        super("lignite_ore", Material.ROCK, 3.0f, 5.0f);
+    }
 }
diff --git a/src/main/java/blocks/BlockMeteoriteOre.java b/src/main/java/blocks/BlockMeteoriteOre.java
index 76e23c8..a074316 100644
--- a/src/main/java/blocks/BlockMeteoriteOre.java
+++ b/src/main/java/blocks/BlockMeteoriteOre.java
@@ -2,12 +2,9 @@ package blocks;
 
 import net.minecraft.block.material.Material;
 
-public class BlockMeteoriteOre extends BasicBlock{
-
-	public BlockMeteoriteOre() {
-		super("meteorite_ore", Material.ROCK, 3.0f, 5.0f);
-	}
-	
-	
+public class BlockMeteoriteOre extends BasicBlock {
 
+    public BlockMeteoriteOre() {
+        super("meteorite_ore", Material.ROCK, 3.0f, 5.0f);
+    }
 }
diff --git a/src/main/java/blocks/BlockMindoriteOre.java b/src/main/java/blocks/BlockMindoriteOre.java
index 1ace48b..07b04ff 100644
--- a/src/main/java/blocks/BlockMindoriteOre.java
+++ b/src/main/java/blocks/BlockMindoriteOre.java
@@ -2,12 +2,9 @@ package blocks;
 
 import net.minecraft.block.material.Material;
 
-public class BlockMindoriteOre extends BasicBlock{
-
-	public BlockMindoriteOre() {
-		super("mindorite_ore", Material.ROCK, 3.0f, 5.0f);
-	}
-	
-	
+public class BlockMindoriteOre extends BasicBlock {
 
+    public BlockMindoriteOre() {
+        super("mindorite_ore", Material.ROCK, 3.0f, 5.0f);
+    }
 }
diff --git a/src/main/java/blocks/BlockMythrilOre.java b/src/main/java/blocks/BlockMythrilOre.java
index 8e3975c..4a19c57 100644
--- a/src/main/java/blocks/BlockMythrilOre.java
+++ b/src/main/java/blocks/BlockMythrilOre.java
@@ -2,12 +2,9 @@ package blocks;
 
 import net.minecraft.block.material.Material;
 
-public class BlockMythrilOre extends BasicBlock{
-
-	public BlockMythrilOre() {
-		super("mythril_ore", Material.ROCK, 3.0f, 5.0f);
-	}
-	
-	
+public class BlockMythrilOre extends BasicBlock {
 
+    public BlockMythrilOre() {
+        super("mythril_ore", Material.ROCK, 3.0f, 5.0f);
+    }
 }
diff --git a/src/main/java/blocks/BlockPalladiumOre.java b/src/main/java/blocks/BlockPalladiumOre.java
index 61d8488..7e6d146 100644
--- a/src/main/java/blocks/BlockPalladiumOre.java
+++ b/src/main/java/blocks/BlockPalladiumOre.java
@@ -2,12 +2,9 @@ package blocks;
 
 import net.minecraft.block.material.Material;
 
-public class BlockPalladiumOre extends BasicBlock{
-
-	public BlockPalladiumOre() {
-		super("palladium_ore", Material.ROCK, 3.0f, 5.0f);
-	}
-	
-	
+public class BlockPalladiumOre extends BasicBlock {
 
+    public BlockPalladiumOre() {
+        super("palladium_ore", Material.ROCK, 3.0f, 5.0f);
+    }
 }
diff --git a/src/main/java/blocks/BlockPrometheumOre.java b/src/main/java/blocks/BlockPrometheumOre.java
index e278783..7093806 100644
--- a/src/main/java/blocks/BlockPrometheumOre.java
+++ b/src/main/java/blocks/BlockPrometheumOre.java
@@ -2,12 +2,9 @@ package blocks;
 
 import net.minecraft.block.material.Material;
 
-public class BlockPrometheumOre extends BasicBlock{
-
-	public BlockPrometheumOre() {
-		super("prometheum_ore", Material.ROCK, 3.0f, 5.0f);
-	}
-	
-	
+public class BlockPrometheumOre extends BasicBlock {
 
+    public BlockPrometheumOre() {
+        super("prometheum_ore", Material.ROCK, 3.0f, 5.0f);
+    }
 }
diff --git a/src/main/java/blocks/BlockRottenGround.java b/src/main/java/blocks/BlockRottenGround.java
index c3f4723..a751a86 100644
--- a/src/main/java/blocks/BlockRottenGround.java
+++ b/src/main/java/blocks/BlockRottenGround.java
@@ -2,12 +2,9 @@ package blocks;
 
 import net.minecraft.block.material.Material;
 
-public class BlockRottenGround extends BasicBlock{
-
-	public BlockRottenGround() {
-		super("rotten_ground", Material.GROUND, 1.0f, 1.0f);
-	}
-	
-	
+public class BlockRottenGround extends BasicBlock {
 
+    public BlockRottenGround() {
+        super("rotten_ground", Material.GROUND, 1.0f, 1.0f);
+    }
 }
diff --git a/src/main/java/blocks/BlockSlagironOre.java b/src/main/java/blocks/BlockSlagironOre.java
index 7023bc8..61860c5 100644
--- a/src/main/java/blocks/BlockSlagironOre.java
+++ b/src/main/java/blocks/BlockSlagironOre.java
@@ -2,12 +2,9 @@ package blocks;
 
 import net.minecraft.block.material.Material;
 
-public class BlockSlagironOre extends BasicBlock{
-
-	public BlockSlagironOre() {
-		super("slagiron_ore", Material.ROCK, 3.0f, 5.0f);
-	}
-	
-	
+public class BlockSlagironOre extends BasicBlock {
 
+    public BlockSlagironOre() {
+        super("slagiron_ore", Material.ROCK, 3.0f, 5.0f);
+    }
 }
diff --git a/src/main/java/blocks/BlockTiberiumOre.java b/src/main/java/blocks/BlockTiberiumOre.java
index d143846..5efbd55 100644
--- a/src/main/java/blocks/BlockTiberiumOre.java
+++ b/src/main/java/blocks/BlockTiberiumOre.java
@@ -2,12 +2,9 @@ package blocks;
 
 import net.minecraft.block.material.Material;
 
-public class BlockTiberiumOre extends BasicBlock{
-
-	public BlockTiberiumOre() {
-		super("tiberium_ore", Material.ROCK, 3.0f, 5.0f);
-	}
-	
-	
+public class BlockTiberiumOre extends BasicBlock {
 
+    public BlockTiberiumOre() {
+        super("tiberium_ore", Material.ROCK, 3.0f, 5.0f);
+    }
 }
diff --git a/src/main/java/blocks/BlockVibraniumre.java b/src/main/java/blocks/BlockVibraniumre.java
index 792cad9..2e9ab54 100644
--- a/src/main/java/blocks/BlockVibraniumre.java
+++ b/src/main/java/blocks/BlockVibraniumre.java
@@ -2,12 +2,9 @@ package blocks;
 
 import net.minecraft.block.material.Material;
 
-public class BlockVibraniumre extends BasicBlock{
+public class BlockVibraniumre extends BasicBlock {
 
-	public BlockVibraniumre() {
-		super("vibranium_ore", Material.ROCK, 3.0f, 5.0f);
-	}
-	
-	
-
-}
+    public BlockVibraniumre() {
+        super("vibranium_ore", Material.ROCK, 3.0f, 5.0f);
+    }
+}
\ No newline at end of file