From a5a0805f327e27f7a88e657beef22889e79101ee Mon Sep 17 00:00:00 2001
From: Robert Sosnitzka <robert.sosnitzka@gmail.com>
Date: Fri, 13 May 2016 16:35:55 +0200
Subject: Connected generic classes ore and ore_glow

---
 src/main/java/com/sosnitzka/ztic_addon/Blocks.java           |  3 +--
 .../com/sosnitzka/ztic_addon/blocks/BlockTiberiumOre.java    |  6 +++---
 .../java/com/sosnitzka/ztic_addon/generic/BasicBlockOre.java | 12 ++++++++++++
 .../com/sosnitzka/ztic_addon/generic/BasicBlockOreGlow.java  | 11 -----------
 4 files changed, 16 insertions(+), 16 deletions(-)
 delete mode 100644 src/main/java/com/sosnitzka/ztic_addon/generic/BasicBlockOreGlow.java

(limited to 'src/main/java/com')

diff --git a/src/main/java/com/sosnitzka/ztic_addon/Blocks.java b/src/main/java/com/sosnitzka/ztic_addon/Blocks.java
index 510b09e..a1ea822 100644
--- a/src/main/java/com/sosnitzka/ztic_addon/Blocks.java
+++ b/src/main/java/com/sosnitzka/ztic_addon/Blocks.java
@@ -4,7 +4,6 @@ import com.sosnitzka.ztic_addon.blocks.BlockLigniteOre;
 import com.sosnitzka.ztic_addon.blocks.BlockTiberiumOre;
 import com.sosnitzka.ztic_addon.generic.BasicBlockGround;
 import com.sosnitzka.ztic_addon.generic.BasicBlockOre;
-import com.sosnitzka.ztic_addon.generic.BasicBlockOreGlow;
 import com.sosnitzka.ztic_addon.util.Utils;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
@@ -29,7 +28,7 @@ public class Blocks {
     public static Block mindoriteOre = new BasicBlockOre("mindorite_ore", Material.ROCK, 12.0f, 12.0f, 2, "oreMindorite");
     public static Block mythrilOre = new BasicBlockOre("mythril_ore", Material.ROCK, 25.0f, 25.0f, 4, "oreMythril");
     public static Block palladiumOre = new BasicBlockOre("palladium_ore", Material.ROCK, 25.0f, 25.0f, 3, "orePalladium");
-    public static Block prometheumOre = new BasicBlockOreGlow("prometheum_ore", Material.ROCK, 35.0f, 35.0f, 4, 0.25f, null);
+    public static Block prometheumOre = new BasicBlockOre("prometheum_ore", Material.ROCK, 35.0f, 35.0f, 4, "orePrometheum", 0.8F);
     public static Block slagironOre = new BasicBlockOre("slagiron_ore", Material.ROCK, 3.0f, 5.0f, 1, "orePrometheum");
     public static Block slaggoldOre = new BasicBlockOre("slaggold_ore", Material.ROCK, 3.0f, 5.0f, 1, null);
     public static Block tiberiumOre = new BlockTiberiumOre();
diff --git a/src/main/java/com/sosnitzka/ztic_addon/blocks/BlockTiberiumOre.java b/src/main/java/com/sosnitzka/ztic_addon/blocks/BlockTiberiumOre.java
index db5ae65..f12d593 100644
--- a/src/main/java/com/sosnitzka/ztic_addon/blocks/BlockTiberiumOre.java
+++ b/src/main/java/com/sosnitzka/ztic_addon/blocks/BlockTiberiumOre.java
@@ -1,7 +1,7 @@
 package com.sosnitzka.ztic_addon.blocks;
 
 import com.sosnitzka.ztic_addon.Items;
-import com.sosnitzka.ztic_addon.generic.BasicBlockOreGlow;
+import com.sosnitzka.ztic_addon.generic.BasicBlockOre;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.item.Item;
@@ -12,10 +12,10 @@ import net.minecraft.world.World;
 
 import java.util.Random;
 
-public class BlockTiberiumOre extends BasicBlockOreGlow {
+public class BlockTiberiumOre extends BasicBlockOre {
 
     public BlockTiberiumOre() {
-        super("tiberium_ore", Material.ROCK, 30.0f, 30.0f, 3, 0.8f, "oreTiberium");
+        super("tiberium_ore", Material.ROCK, 30.0f, 30.0f, 3, "oreTiberium", 1.0F);
     }
 
     @Override
diff --git a/src/main/java/com/sosnitzka/ztic_addon/generic/BasicBlockOre.java b/src/main/java/com/sosnitzka/ztic_addon/generic/BasicBlockOre.java
index 34a4c57..070e4ee 100644
--- a/src/main/java/com/sosnitzka/ztic_addon/generic/BasicBlockOre.java
+++ b/src/main/java/com/sosnitzka/ztic_addon/generic/BasicBlockOre.java
@@ -6,6 +6,17 @@ import net.minecraft.block.material.Material;
 public class BasicBlockOre extends Block {
     public String oreDictName;
 
+    public BasicBlockOre(String name, Material material, float hardness, float resistance, int harvest, String oreDictName, float lightlevel) {
+        super(material);
+        setUnlocalizedName(name);
+        setRegistryName(name);
+        setHardness(hardness);
+        setResistance(resistance);
+        setHarvestLevel("pickaxe", harvest);
+        setLightLevel(lightlevel);
+        this.oreDictName = oreDictName;
+    }
+
     public BasicBlockOre(String name, Material material, float hardness, float resistance, int harvest, String oreDictName) {
         super(material);
         setUnlocalizedName(name);
@@ -16,6 +27,7 @@ public class BasicBlockOre extends Block {
         this.oreDictName = oreDictName;
     }
 
+
     public boolean isOreDict() {
         return this.oreDictName != null;
     }
diff --git a/src/main/java/com/sosnitzka/ztic_addon/generic/BasicBlockOreGlow.java b/src/main/java/com/sosnitzka/ztic_addon/generic/BasicBlockOreGlow.java
deleted file mode 100644
index 3a08210..0000000
--- a/src/main/java/com/sosnitzka/ztic_addon/generic/BasicBlockOreGlow.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.sosnitzka.ztic_addon.generic;
-
-import net.minecraft.block.material.Material;
-
-public class BasicBlockOreGlow extends BasicBlockOre {
-
-    public BasicBlockOreGlow(String name, Material material, float hardness, float resistance, int harvest, float glow, String oreDictName) {
-        super(name, material, hardness, resistance, harvest, oreDictName);
-        setLightLevel(glow);
-    }
-}
-- 
cgit v1.2.3