- Added Textures of all 16 ingot types

- Tweaked ore hardness
- Inititalized lignit as furnace burning material

13 files changed, 66 insertions, 28 deletions

diff --git a/src/main/java/blocks/BlockAardiumOre.java b/src/main/java/blocks/BlockAardiumOre.java
index 1669fa0..13c1b0e 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, 53.0f, 53.0f, 3       );
+        super("aardium_ore", Material.ROCK, 55.0f, 400.0f, 3       );
     }
 }
diff --git a/src/main/java/blocks/BlockAdamantiteOre.java b/src/main/java/blocks/BlockAdamantiteOre.java
index a4706c7..17cdc6e 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, 55.0f, 55.0f,4);
+        super("adamantite_ore", Material.ROCK, 80.0f, 1000.0f,4);
     }
 }
diff --git a/src/main/java/blocks/BlockIgnititeOre.java b/src/main/java/blocks/BlockIgnititeOre.java
index 72822cf..b57224e 100644
--- a/src/main/java/blocks/BlockIgnititeOre.java
+++ b/src/main/java/blocks/BlockIgnititeOre.java
@@ -7,5 +7,6 @@ public class BlockIgnititeOre extends BasicBlockOre {
 
     public BlockIgnititeOre() {
         super("ignitite_ore", Material.ROCK, 23.0f, 25.0f,3);
+
     }
 }
diff --git a/src/main/java/blocks/BlockLigniteOre.java b/src/main/java/blocks/BlockLigniteOre.java
index 67bf74d..205ed1f 100644
--- a/src/main/java/blocks/BlockLigniteOre.java
+++ b/src/main/java/blocks/BlockLigniteOre.java
@@ -8,4 +8,6 @@ public class BlockLigniteOre extends BasicBlockOre {
     public BlockLigniteOre() {
         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 b9b7583..b5fa01a 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, 43.0f,45.0f,4);
+        super("meteorite_ore", Material.ROCK, 60.0f,500.0f,4);
     }
 }
diff --git a/src/main/java/blocks/BlockVibraniumOre.java b/src/main/java/blocks/BlockVibraniumOre.java
new file mode 100644
index 0000000..c535480
--- /dev/null
+++ b/src/main/java/blocks/BlockVibraniumOre.java
@@ -0,0 +1,11 @@
+package blocks;
+
+import blocks.category.BasicBlockOre;
+import net.minecraft.block.material.Material;
+
+public class BlockVibraniumOre extends BasicBlockOre {
+
+    public BlockVibraniumOre() {
+        super("vibranium_ore", Material.ROCK, 70.0f, 800.0f,4);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/blocks/BlockVibraniumre.java b/src/main/java/blocks/BlockVibraniumre.java
deleted file mode 100644
index 1650985..0000000
--- a/src/main/java/blocks/BlockVibraniumre.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package blocks;
-
-import blocks.category.BasicBlockOre;
-import net.minecraft.block.material.Material;
-
-public class BlockVibraniumre extends BasicBlockOre {
-
-    public BlockVibraniumre() {
-        super("vibranium_ore", Material.ROCK, 43.0f, 45.0f,4);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/items/ItemLignite.java b/src/main/java/items/ItemLignite.java
new file mode 100644
index 0000000..342dea0
--- /dev/null
+++ b/src/main/java/items/ItemLignite.java
@@ -0,0 +1,9 @@
+package items;
+
+public class ItemLignite extends BasicItem {
+
+    public ItemLignite() {
+        super("lignite");
+    }
+
+}
diff --git a/src/main/java/items/ItemSlagiron.java b/src/main/java/items/ItemSlagiron.java
deleted file mode 100644
index 6a99725..0000000
--- a/src/main/java/items/ItemSlagiron.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package items;
-
-public class ItemSlagiron extends BasicItem {
-
-    public ItemSlagiron() {
-        super("slagiron");
-    }
-}
diff --git a/src/main/java/items/ItemSlagironIngot.java b/src/main/java/items/ItemSlagironIngot.java
new file mode 100644
index 0000000..d0086f3
--- /dev/null
+++ b/src/main/java/items/ItemSlagironIngot.java
@@ -0,0 +1,8 @@
+package items;
+
+public class ItemSlagironIngot extends BasicItem {
+
+    public ItemSlagironIngot() {
+        super("slagiron_ingot");
+    }
+}
diff --git a/src/main/java/main/ZCompression.java b/src/main/java/main/ZCompression.java
index 2bbc664..1292240 100644
--- a/src/main/java/main/ZCompression.java
+++ b/src/main/java/main/ZCompression.java
@@ -2,7 +2,9 @@ package main;
 
 import blocks.*;
 import blocks.category.BasicBlockOreGlow;
-import items.ItemSlagiron;
+import items.ItemLignite;
+import items.ItemSlagironIngot;
+import main.util.LigniteFuelHandler;
 import main.world.ZWorldGen;
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemBlock;
@@ -21,7 +23,8 @@ public class ZCompression {
     static final String MODID = "zcompression";
     static final String VERSION = "1.0";
     // Items
-    public static ItemSlagiron slagiron = new ItemSlagiron();
+    public static ItemSlagironIngot slagironIngot = new ItemSlagironIngot();
+    public static ItemLignite lignite = new ItemLignite();
     //Blocks, esp. for tconstruct
     public static BlockAardiumOre aardiumOre = new BlockAardiumOre();
     public static BlockAdamantiteOre adamantiteOre = new BlockAdamantiteOre();
@@ -42,7 +45,7 @@ public class ZCompression {
     public static BlockSlagironOre slagironOre = new BlockSlagironOre();
     public static BlockSlaggoldOre slaggoldOre = new BlockSlaggoldOre();
     public static BlockTiberiumOre tiberiumOre = new BlockTiberiumOre();
-    public static BlockVibraniumre vibraniumOre = new BlockVibraniumre();
+    public static BlockVibraniumOre vibraniumOre = new BlockVibraniumOre();
     public static BlockYrdeanOre yrdeanOre = new BlockYrdeanOre();
     @SidedProxy(clientSide = "proxy.ClientProxy", serverSide = "proxy.ServerProxy")
     private static ServerProxy proxy;
@@ -59,7 +62,10 @@ public class ZCompression {
 
     @EventHandler
     public void preInit(FMLPreInitializationEvent e) {
-        GameRegistry.register(slagiron);
+        //Items
+        GameRegistry.register(slagironIngot);
+        GameRegistry.register(lignite);
+        //Blocks
         registerBlock(aardiumOre);
         registerBlock(adamantiteOre);
         registerBlock(arcaniteOre);
@@ -82,13 +88,15 @@ public class ZCompression {
         registerBlock(vibraniumOre);
         registerBlock(yrdeanOre);
 
+
+
     }
 
     @EventHandler
     public void init(FMLInitializationEvent e) {
         proxy.registerClientStuff();
         GameRegistry.registerWorldGenerator(new ZWorldGen(), 100);
-
+        GameRegistry.registerFuelHandler(new LigniteFuelHandler());
     }
 
     @EventHandler
diff --git a/src/main/java/main/util/LigniteFuelHandler.java b/src/main/java/main/util/LigniteFuelHandler.java
new file mode 100644
index 0000000..6fbb5c8
--- /dev/null
+++ b/src/main/java/main/util/LigniteFuelHandler.java
@@ -0,0 +1,17 @@
+package main.util;
+
+import main.ZCompression;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fml.common.IFuelHandler;
+
+public class LigniteFuelHandler implements IFuelHandler {
+
+    @Override
+    public  int getBurnTime(ItemStack fuel){
+        if(fuel.getItem().equals(ZCompression.lignite)) {
+            return 200*2;
+        }
+        return 0;
+    }
+
+}
diff --git a/src/main/java/proxy/ClientProxy.java b/src/main/java/proxy/ClientProxy.java
index 3f64d77..da0558c 100644
--- a/src/main/java/proxy/ClientProxy.java
+++ b/src/main/java/proxy/ClientProxy.java
@@ -11,7 +11,8 @@ public class ClientProxy extends ServerProxy {
     @Override
     public void registerClientStuff() {
         // Items
-        registerItemModel(ZCompression.slagiron);
+        registerItemModel(ZCompression.slagironIngot);
+        registerItemModel(ZCompression.lignite);
 
         // Blocks
         registerBlockModel(ZCompression.aardiumOre);