Again some stuff... still learning git ;)

23 files changed, 109 insertions, 21 deletions

diff --git a/src/main/java/blocks/BlockAardiumOre.java b/src/main/java/blocks/BlockAardiumOre.java
new file mode 100644
index 0000000..e9b9925
--- /dev/null
+++ b/src/main/java/blocks/BlockAardiumOre.java
@@ -0,0 +1,11 @@
+package blocks;
+
+import blocks.category.BasicBlockOre;
+import net.minecraft.block.material.Material;
+
+public class BlockAardiumOre extends BasicBlockOre {
+
+    public BlockAardiumOre() {
+        super("aardium_ore", Material.ROCK, 3.0f, 5.0f);
+    }
+}
diff --git a/src/main/java/blocks/BlockAdamantiteOre.java b/src/main/java/blocks/BlockAdamantiteOre.java
index 75931e9..2d015b3 100644
--- a/src/main/java/blocks/BlockAdamantiteOre.java
+++ b/src/main/java/blocks/BlockAdamantiteOre.java
@@ -1,8 +1,9 @@
 package blocks;
 
+import blocks.category.BasicBlockOre;
 import net.minecraft.block.material.Material;
 
-public class BlockAdamantiteOre extends BasicBlock {
+public class BlockAdamantiteOre extends BasicBlockOre {
 
     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 014f563..46de274 100644
--- a/src/main/java/blocks/BlockArcaniteOre.java
+++ b/src/main/java/blocks/BlockArcaniteOre.java
@@ -1,8 +1,9 @@
 package blocks;
 
+import blocks.category.BasicBlockOre;
 import net.minecraft.block.material.Material;
 
-public class BlockArcaniteOre extends BasicBlock {
+public class BlockArcaniteOre extends BasicBlockOre {
 
     public BlockArcaniteOre() {
         super("arcanite_ore", Material.ROCK, 3.0f, 5.0f);
diff --git a/src/main/java/blocks/BlockAxiidianOre.java b/src/main/java/blocks/BlockAxiidianOre.java
new file mode 100644
index 0000000..73f81bd
--- /dev/null
+++ b/src/main/java/blocks/BlockAxiidianOre.java
@@ -0,0 +1,11 @@
+package blocks;
+
+import blocks.category.BasicBlockOre;
+import net.minecraft.block.material.Material;
+
+public class BlockAxiidianOre extends BasicBlockOre {
+
+    public BlockAxiidianOre() {
+        super("axiidian_ore", Material.ROCK, 3.0f, 5.0f);
+    }
+}
diff --git a/src/main/java/blocks/BlockBasalt.java b/src/main/java/blocks/BlockBasalt.java
index 73ae463..b0eb5ae 100644
--- a/src/main/java/blocks/BlockBasalt.java
+++ b/src/main/java/blocks/BlockBasalt.java
@@ -1,8 +1,9 @@
 package blocks;
 
+import blocks.category.BasicBlockOre;
 import net.minecraft.block.material.Material;
 
-public class BlockBasalt extends BasicBlock {
+public class BlockBasalt extends BasicBlockOre {
 
     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 b58cecf..a3386b6 100644
--- a/src/main/java/blocks/BlockBismuthOre.java
+++ b/src/main/java/blocks/BlockBismuthOre.java
@@ -1,8 +1,9 @@
 package blocks;
 
+import blocks.category.BasicBlockOre;
 import net.minecraft.block.material.Material;
 
-public class BlockBismuthOre extends BasicBlock {
+public class BlockBismuthOre extends BasicBlockOre {
 
     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 8854b91..91132a0 100644
--- a/src/main/java/blocks/BlockEterniteOre.java
+++ b/src/main/java/blocks/BlockEterniteOre.java
@@ -1,8 +1,9 @@
 package blocks;
 
+import blocks.category.BasicBlockOre;
 import net.minecraft.block.material.Material;
 
-public class BlockEterniteOre extends BasicBlock {
+public class BlockEterniteOre extends BasicBlockOre {
 
     public BlockEterniteOre() {
         super("eternite_ore", Material.ROCK, 3.0f, 5.0f);
diff --git a/src/main/java/blocks/BlockIgnititeOre.java b/src/main/java/blocks/BlockIgnititeOre.java
new file mode 100644
index 0000000..845b784
--- /dev/null
+++ b/src/main/java/blocks/BlockIgnititeOre.java
@@ -0,0 +1,11 @@
+package blocks;
+
+import blocks.category.BasicBlockOre;
+import net.minecraft.block.material.Material;
+
+public class BlockIgnititeOre extends BasicBlockOre {
+
+    public BlockIgnititeOre() {
+        super("ignitite_ore", Material.ROCK, 3.0f, 5.0f);
+    }
+}
diff --git a/src/main/java/blocks/BlockKarmesineOre.java b/src/main/java/blocks/BlockKarmesineOre.java
index 9c4f5f0..1c16a5c 100644
--- a/src/main/java/blocks/BlockKarmesineOre.java
+++ b/src/main/java/blocks/BlockKarmesineOre.java
@@ -1,8 +1,9 @@
 package blocks;
 
+import blocks.category.BasicBlockOre;
 import net.minecraft.block.material.Material;
 
-public class BlockKarmesineOre extends BasicBlock {
+public class BlockKarmesineOre extends BasicBlockOre {
 
     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 5064b5f..d2507bf 100644
--- a/src/main/java/blocks/BlockLigniteOre.java
+++ b/src/main/java/blocks/BlockLigniteOre.java
@@ -1,8 +1,9 @@
 package blocks;
 
+import blocks.category.BasicBlockOre;
 import net.minecraft.block.material.Material;
 
-public class BlockLigniteOre extends BasicBlock {
+public class BlockLigniteOre extends BasicBlockOre {
 
     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 a074316..3604e3d 100644
--- a/src/main/java/blocks/BlockMeteoriteOre.java
+++ b/src/main/java/blocks/BlockMeteoriteOre.java
@@ -1,8 +1,9 @@
 package blocks;
 
+import blocks.category.BasicBlockOre;
 import net.minecraft.block.material.Material;
 
-public class BlockMeteoriteOre extends BasicBlock {
+public class BlockMeteoriteOre extends BasicBlockOre {
 
     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 07b04ff..32f6c1c 100644
--- a/src/main/java/blocks/BlockMindoriteOre.java
+++ b/src/main/java/blocks/BlockMindoriteOre.java
@@ -1,8 +1,9 @@
 package blocks;
 
+import blocks.category.BasicBlockOre;
 import net.minecraft.block.material.Material;
 
-public class BlockMindoriteOre extends BasicBlock {
+public class BlockMindoriteOre extends BasicBlockOre {
 
     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 4a19c57..0bf2b23 100644
--- a/src/main/java/blocks/BlockMythrilOre.java
+++ b/src/main/java/blocks/BlockMythrilOre.java
@@ -1,8 +1,9 @@
 package blocks;
 
+import blocks.category.BasicBlockOre;
 import net.minecraft.block.material.Material;
 
-public class BlockMythrilOre extends BasicBlock {
+public class BlockMythrilOre extends BasicBlockOre {
 
     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 7e6d146..5dc5b15 100644
--- a/src/main/java/blocks/BlockPalladiumOre.java
+++ b/src/main/java/blocks/BlockPalladiumOre.java
@@ -1,8 +1,9 @@
 package blocks;
 
+import blocks.category.BasicBlockOre;
 import net.minecraft.block.material.Material;
 
-public class BlockPalladiumOre extends BasicBlock {
+public class BlockPalladiumOre extends BasicBlockOre {
 
     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 7093806..f3fee45 100644
--- a/src/main/java/blocks/BlockPrometheumOre.java
+++ b/src/main/java/blocks/BlockPrometheumOre.java
@@ -1,10 +1,12 @@
 package blocks;
 
+import blocks.category.BasicBlockOre;
+import blocks.category.BasicBlockOreGlow;
 import net.minecraft.block.material.Material;
 
-public class BlockPrometheumOre extends BasicBlock {
+public class BlockPrometheumOre extends BasicBlockOreGlow {
 
     public BlockPrometheumOre() {
-        super("prometheum_ore", Material.ROCK, 3.0f, 5.0f);
+        super("prometheum_ore", Material.ROCK, 3.0f, 5.0f, 0.25f);
     }
 }
diff --git a/src/main/java/blocks/BlockRottenGround.java b/src/main/java/blocks/BlockRottenGround.java
index a751a86..fc4e60c 100644
--- a/src/main/java/blocks/BlockRottenGround.java
+++ b/src/main/java/blocks/BlockRottenGround.java
@@ -1,8 +1,9 @@
 package blocks;
 
+import blocks.category.BasicBlockOre;
 import net.minecraft.block.material.Material;
 
-public class BlockRottenGround extends BasicBlock {
+public class BlockRottenGround extends BasicBlockOre {
 
     public BlockRottenGround() {
         super("rotten_ground", Material.GROUND, 1.0f, 1.0f);
diff --git a/src/main/java/blocks/BlockSlaggoldOre.java b/src/main/java/blocks/BlockSlaggoldOre.java
new file mode 100644
index 0000000..67cc801
--- /dev/null
+++ b/src/main/java/blocks/BlockSlaggoldOre.java
@@ -0,0 +1,11 @@
+package blocks;
+
+import blocks.category.BasicBlockOre;
+import net.minecraft.block.material.Material;
+
+public class BlockSlaggoldOre extends BasicBlockOre {
+
+    public BlockSlaggoldOre() {
+        super("slaggold_ore", Material.ROCK, 3.0f, 5.0f);
+    }
+}
diff --git a/src/main/java/blocks/BlockSlagironOre.java b/src/main/java/blocks/BlockSlagironOre.java
index 61860c5..d1c283b 100644
--- a/src/main/java/blocks/BlockSlagironOre.java
+++ b/src/main/java/blocks/BlockSlagironOre.java
@@ -1,8 +1,9 @@
 package blocks;
 
+import blocks.category.BasicBlockOre;
 import net.minecraft.block.material.Material;
 
-public class BlockSlagironOre extends BasicBlock {
+public class BlockSlagironOre extends BasicBlockOre {
 
     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 5efbd55..3d19565 100644
--- a/src/main/java/blocks/BlockTiberiumOre.java
+++ b/src/main/java/blocks/BlockTiberiumOre.java
@@ -1,10 +1,11 @@
 package blocks;
 
+import blocks.category.BasicBlockOreGlow;
 import net.minecraft.block.material.Material;
 
-public class BlockTiberiumOre extends BasicBlock {
+public class BlockTiberiumOre extends BasicBlockOreGlow {
 
     public BlockTiberiumOre() {
-        super("tiberium_ore", Material.ROCK, 3.0f, 5.0f);
+        super("tiberium_ore", Material.ROCK, 3.0f, 5.0f, 0.66f);
     }
 }
diff --git a/src/main/java/blocks/BlockVibraniumre.java b/src/main/java/blocks/BlockVibraniumre.java
index 2e9ab54..203e4b2 100644
--- a/src/main/java/blocks/BlockVibraniumre.java
+++ b/src/main/java/blocks/BlockVibraniumre.java
@@ -1,8 +1,9 @@
 package blocks;
 
+import blocks.category.BasicBlockOre;
 import net.minecraft.block.material.Material;
 
-public class BlockVibraniumre extends BasicBlock {
+public class BlockVibraniumre extends BasicBlockOre {
 
     public BlockVibraniumre() {
         super("vibranium_ore", Material.ROCK, 3.0f, 5.0f);
diff --git a/src/main/java/blocks/BlockYrdeanOre.java b/src/main/java/blocks/BlockYrdeanOre.java
new file mode 100644
index 0000000..ef676d0
--- /dev/null
+++ b/src/main/java/blocks/BlockYrdeanOre.java
@@ -0,0 +1,11 @@
+package blocks;
+
+import blocks.category.BasicBlockOre;
+import net.minecraft.block.material.Material;
+
+public class BlockYrdeanOre extends BasicBlockOre {
+
+    public BlockYrdeanOre() {
+        super("yrdean_ore", Material.ROCK, 3.0f, 5.0f);
+    }
+}
diff --git a/src/main/java/blocks/category/BasicBlockOre.java b/src/main/java/blocks/category/BasicBlockOre.java
index 3e4810e..fa5cca1 100644
--- a/src/main/java/blocks/category/BasicBlockOre.java
+++ b/src/main/java/blocks/category/BasicBlockOre.java
@@ -1,11 +1,11 @@
-package blocks;
+package blocks.category;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 
-public class BasicBlock extends Block {
+public class BasicBlockOre extends Block {
 
-    public BasicBlock(String name, Material material, float hardness, float resistance) {
+    public BasicBlockOre(String name, Material material, float hardness, float resistance) {
         super(material);
         setUnlocalizedName(name);
         setRegistryName(name);
diff --git a/src/main/java/blocks/category/BasicBlockOreGlow.java b/src/main/java/blocks/category/BasicBlockOreGlow.java
new file mode 100644
index 0000000..a3ca81d
--- /dev/null
+++ b/src/main/java/blocks/category/BasicBlockOreGlow.java
@@ -0,0 +1,16 @@
+package blocks.category;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+
+public class BasicBlockOreGlow extends Block {
+
+    public BasicBlockOreGlow(String name, Material material, float hardness, float resistance, float glow) {
+        super(material);
+        setUnlocalizedName(name);
+        setRegistryName(name);
+        setHardness(hardness);
+        setResistance(resistance);
+        setLightLevel(glow);
+    }
+}