From e28524864d722b4d9fd971356e92cd75b515cbcd Mon Sep 17 00:00:00 2001
From: Robert Sosnitzka <robert.sosnitzka@gmail.com>
Date: Sun, 24 Jul 2016 22:42:25 +0200
Subject: Corrected rest of generated material textures.

---
 src/main/java/com/sosnitzka/taiga/Blocks.java               |  1 +
 src/main/java/com/sosnitzka/taiga/items/ItemNugget.java     | 11 -----------
 src/main/java/com/sosnitzka/taiga/proxy/ClientProxy.java    |  9 +++++++--
 src/main/java/com/sosnitzka/taiga/traits/TraitGarishly.java |  2 +-
 4 files changed, 9 insertions(+), 14 deletions(-)
 delete mode 100644 src/main/java/com/sosnitzka/taiga/items/ItemNugget.java

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

diff --git a/src/main/java/com/sosnitzka/taiga/Blocks.java b/src/main/java/com/sosnitzka/taiga/Blocks.java
index 1e1bf18..46f4c67 100644
--- a/src/main/java/com/sosnitzka/taiga/Blocks.java
+++ b/src/main/java/com/sosnitzka/taiga/Blocks.java
@@ -26,6 +26,7 @@ public class Blocks {
     public static Block basalt = new BasicBlock("basalt", Material.ROCK, 45.0f, 35.0f, OBSIDIAN);
     public static Block rottenGround = new BasicBlockGround("rotten_ground", Material.GROUND, 2.0f, 2.0f, STONE);
     public static Block ligniteOre = new BlockLignite();
+    // will be optional / config
     public static Block slagironOre = new BasicBlock("slagiron_ore", Material.ROCK, 3.0f, 5.0f, IRON);
     public static Block slaggoldOre = new BasicBlock("slaggold_ore", Material.ROCK, 3.0f, 5.0f, IRON);
 
diff --git a/src/main/java/com/sosnitzka/taiga/items/ItemNugget.java b/src/main/java/com/sosnitzka/taiga/items/ItemNugget.java
deleted file mode 100644
index f054d9a..0000000
--- a/src/main/java/com/sosnitzka/taiga/items/ItemNugget.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.sosnitzka.taiga.items;
-
-import com.sosnitzka.taiga.generic.BasicItem;
-
-public class ItemNugget extends BasicItem {
-
-    public ItemNugget(String name) {
-        super(name);
-    }
-
-}
diff --git a/src/main/java/com/sosnitzka/taiga/proxy/ClientProxy.java b/src/main/java/com/sosnitzka/taiga/proxy/ClientProxy.java
index 6350a30..e22db4e 100644
--- a/src/main/java/com/sosnitzka/taiga/proxy/ClientProxy.java
+++ b/src/main/java/com/sosnitzka/taiga/proxy/ClientProxy.java
@@ -66,12 +66,17 @@ public class ClientProxy extends ServerProxy {
     public void setRenderInfo(final Material material) {
 
         if (material == adamantite) specialRender(material, 0xd55cdf, 0.5f, 2.0f, 0.2f);
-        else if (material == solarium) specialRender(material, 0xffff00, 0.3f, 1.0f, 0.0f);
+        else if (material == solarium) specialRender(material, 0xFFDD11, 0.4f, 0.3f, 0.1f);
         else if (material == proxideum) specialRender(material, 0x2d8f8b, 0.4f, 0.3f, 0.1f);
+        else if (material == prometheum) specialRender(material, 0x555555, 1.2f, 0.6f, 0.1f);
         else if (material == tiberium) specialRender(material, 0x33ff33, 0.5f, 0.2f, 0.1f);
         else if (material == bismuth) specialRender(material, 0xffffff, 0.3f, 0.0f, 0.0f);
+        else if (material == bysmuid) specialRender(material, 0xccccee, 0.6f, 0.2f, 0.0f);
+        else if (material == imperomite) specialRender(material, 0x8decaf, 1.2f, 0.5f, -0.1f);
+        else if (material == noctunyx) specialRender(material, 0xce70e8, 0.5f, 0.2f, 0.3f);
+        else if (material == nucleum) specialRender(material, 0xd9f446, 1.6f, 0.4f, 0.3f);
         else if (material == dyonite) specialRender(material, 0xffe240, 0.6f, 1.8f, 0.2f);
-        else if (material == arcanite) specialRender(material, 0xBBBBBB, 0.6f, 1.8f, 0.2f); // TODO: Fix Textures
+        else if (material == arcanite) specialRender(material, 0x5e5499, 0.6f, 0.8f, 0.2f);
         else {
             material.setRenderInfo(new MaterialRenderInfo.BlockTexture("taiga:blocks/" + material.getIdentifier() + "_block"));
         }
diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitGarishly.java b/src/main/java/com/sosnitzka/taiga/traits/TraitGarishly.java
index e074bd4..90fe19d 100644
--- a/src/main/java/com/sosnitzka/taiga/traits/TraitGarishly.java
+++ b/src/main/java/com/sosnitzka/taiga/traits/TraitGarishly.java
@@ -67,7 +67,7 @@ public class TraitGarishly extends AbstractTrait {
         float r = random.nextFloat();
         if (r > 0.5f) event.getDrops().clear();
         else if (r < 0.1 && event.getWorld().getBlockState(event.getPos()).getMaterial() == Material.ROCK) {
-            ItemStack stack = new ItemStack(Item.getItemFromBlock(event.getWorld().getBlockState(event.getPos()).getBlock()), random.nextInt(5));
+            ItemStack stack = new ItemStack(Item.getItemFromBlock(event.getWorld().getBlockState(event.getPos()).getBlock()), random.nextInt(3));
             event.getDrops().add(0, stack);
             ToolHelper.damageTool(tool, random.nextInt(6) + 1, event.getHarvester());
         }
-- 
cgit v1.2.3