Fixed some blocks and colors! Put back in integration of materials - something's wrong here

src/main/java/com/sosnitzka/ztic_addon/Fluids.java

@@ -10,37 +10,37 @@ import java.lang.reflect.Field;
 public class Fluids {
 
     public static BasicTinkerFluid arcaniteFluid = new BasicTinkerFluid("arcanite", 0xFF272354, true, 200, 10, 4000);
-    public static BasicTinkerFluid titaniteFluid = new BasicTinkerFluid("titanite", 0xFFC3F93D, true, 200, 10, 4000);
+    public static BasicTinkerFluid titaniteFluid = new BasicTinkerFluid("titanite", 0xFFe0ede7, true, 200, 10, 4000);
     public static BasicTinkerFluid adamantiteFluid = new BasicTinkerFluid("adamantite", 0xFFc45c82, true, 200, 10, 4000);
-    public static BasicTinkerFluid violiumFluid = new BasicTinkerFluid("violium", 0xFF77a19a, true, 200, 10, 4000);
+    public static BasicTinkerFluid violiumFluid = new BasicTinkerFluid("violium", 0xFF264c4f, true, 200, 10, 4000);
     public static BasicTinkerFluid bismuthFluid = new BasicTinkerFluid("bismuth", 0xFF555555, true, 200, 10, 4000);
     public static BasicTinkerFluid eterniteFluid = new BasicTinkerFluid("eternite", 0xFFfafa98, true, 200, 10, 4000);
-    public static BasicTinkerFluid ignititeFluid = new BasicTinkerFluid("ignitite", 0xFFd29453, true, 200, 10, 4000);
+    public static BasicTinkerFluid ignititeFluid = new BasicTinkerFluid("ignitite", 0xFFff6642, true, 200, 10, 4000);
     public static BasicTinkerFluid karmesineFluid = new BasicTinkerFluid("karmesine", 0xFFc16d6d, true, 200, 10, 4000);
     public static BasicTinkerFluid meteoriteFluid = new BasicTinkerFluid("meteorite", 0xFF6e6a62, true, 200, 10, 4000);
     public static BasicTinkerFluid mindoriteFluid = new BasicTinkerFluid("mindorite", 0xFF6bbbbf, true, 200, 10, 4000);
     public static BasicTinkerFluid mythrilFluid = new BasicTinkerFluid("mythril", 0xFFa8c0ba, true, 200, 10, 4000);
     public static BasicTinkerFluid palladiumFluid = new BasicTinkerFluid("palladium", 0xFFfe5c05, true, 200, 10, 4000);
     public static BasicTinkerFluid prometheumFluid = new BasicTinkerFluid("prometheum", 0xFF2b282f, true, 200, 10, 4000);
-    public static BasicTinkerFluid tiberiumFluid = new BasicTinkerFluid("tiberium", 0xFF86bd5a, true, 200, 10, 4000);
-    public static BasicTinkerFluid vibraniumFluid = new BasicTinkerFluid("vibranium", 0xFFb6bba8, true, 200, 10, 4000);
-    public static BasicTinkerFluid rubiumFluid = new BasicTinkerFluid("rubium", 0xFF3e3c6f, true, 200, 10, 4000);
+    public static BasicTinkerFluid tiberiumFluid = new BasicTinkerFluid("tiberium", 0xFF5f9e2d, true, 200, 10, 4000);
+    public static BasicTinkerFluid vibraniumFluid = new BasicTinkerFluid("vibranium", 0xFFc4ddc8, true, 200, 10, 4000);
+    public static BasicTinkerFluid rubiumFluid = new BasicTinkerFluid("rubium", 0xFFe371b0, true, 200, 10, 4000);
 
     public static BasicTinkerFluid astriumFluid = new BasicTinkerFluid("astrium", 0xFF7a3b74, true, 200, 10, 4000);
-    public static BasicTinkerFluid nitroniteFluid = new BasicTinkerFluid("nitronite", 0xFF659933, true, 200, 10, 4000);
-    public static BasicTinkerFluid proxideumFluid = new BasicTinkerFluid("proxideum", 0xFF416565, true, 200, 10, 4000);
-    public static BasicTinkerFluid noctunyxFluid = new BasicTinkerFluid("noctunyx", 0xFF6c6aa3, true, 200, 10, 4000);
-    public static BasicTinkerFluid imperomiteFluid = new BasicTinkerFluid("imperomite", 0xFF339966, true, 200, 10, 4000);
+    public static BasicTinkerFluid nitroniteFluid = new BasicTinkerFluid("nitronite", 0xFFdfe553, true, 200, 10, 4000);
+    public static BasicTinkerFluid proxideumFluid = new BasicTinkerFluid("proxideum", 0xFF2f7177, true, 200, 10, 4000);
+    public static BasicTinkerFluid noctunyxFluid = new BasicTinkerFluid("noctunyx", 0xFF5f5081, true, 200, 10, 4000);
+    public static BasicTinkerFluid imperomiteFluid = new BasicTinkerFluid("imperomite", 0xFFff6642, true, 200, 10, 4000);
     public static BasicTinkerFluid cryptogenFluid = new BasicTinkerFluid("cryptogen", 0xFF9f8a4a, true, 200, 10, 4000);
-    public static BasicTinkerFluid fractoryteFluid = new BasicTinkerFluid("fractoryte", 0xFFb44a14, true, 200, 10, 4000);
+    public static BasicTinkerFluid fractoryteFluid = new BasicTinkerFluid("fractoryte", 0xFF983f11, true, 200, 10, 4000);
     public static BasicTinkerFluid seismodiumFluid = new BasicTinkerFluid("seismodium", 0xFF46131D, true, 200, 10, 4000);
     public static BasicTinkerFluid terramiteFluid = new BasicTinkerFluid("terramite", 0xFFa6b27a, true, 200, 10, 4000);
-    public static BasicTinkerFluid lumixylFluid = new BasicTinkerFluid("lumixyl", 0xFFbde398, true, 200, 10, 4000);
+    public static BasicTinkerFluid lumixylFluid = new BasicTinkerFluid("lumixyl", 0xFFfbe8cb, true, 200, 10, 4000);
     public static BasicTinkerFluid solariumFluid = new BasicTinkerFluid("solarium", 0xFFffc81d, true, 200, 10, 4000);
     public static BasicTinkerFluid dyoniteFluid = new BasicTinkerFluid("dyonite", 0xFFff6743, true, 200, 10, 4000);
-    public static BasicTinkerFluid ultraniteFluid = new BasicTinkerFluid("ultranite", 0xFFfff69b, true, 200, 10, 4000);
-    public static BasicTinkerFluid nucleumFluid = new BasicTinkerFluid("nucleum", 0xFFc1ff68, true, 200, 10, 4000);
-    public static BasicTinkerFluid aegisaltFluid = new BasicTinkerFluid("aegisalt", 0xFFb7a2bd, true, 200, 10, 4000);
+    public static BasicTinkerFluid ultraniteFluid = new BasicTinkerFluid("ultranite", 0xFFf5f294, true, 200, 10, 4000);
+    public static BasicTinkerFluid nucleumFluid = new BasicTinkerFluid("nucleum", 0xFFa8ea3b, true, 200, 10, 4000);
+    public static BasicTinkerFluid aegisaltFluid = new BasicTinkerFluid("aegisalt", 0xFFb6af74, true, 200, 10, 4000);
     public static BasicTinkerFluid bysmuidFluid = new BasicTinkerFluid("bysmuid", 0xFF7b97b0, true, 200, 10, 4000);
 
 

src/main/java/com/sosnitzka/ztic_addon/Items.java

@@ -59,8 +59,8 @@ public class Items {
     public static Item aegisaltIngot = new BasicItem("aegisalt_ingot", PREFIX_INGOT);
     public static Item bysmuidIngot = new BasicItem("bysmuid_ingot", PREFIX_INGOT);
 
-    public static Item tiberiumShardInstable = new BasicItem("tiberium_shard_instable", PREFIX_NUGGET);
-    public static Item tiberiumShardStable = new BasicItem("tiberium_shard_stable", PREFIX_NUGGET);
+    public static Item tiberiumShardInstable = new BasicItem("tiberium_shard_instable");
+    public static Item tiberiumShardStable = new BasicItem("tiberium_nugget", PREFIX_NUGGET);
 
     public static void register() {
         Field[] declaredFields = Items.class.getDeclaredFields();

src/main/java/com/sosnitzka/ztic_addon/ZTiC.java

@@ -109,7 +109,9 @@ public class ZTiC {
         registerTinkerMaterial("InstableDyonite", dyonite, dyoniteFluid, 1, 5, 6, 3, 0.8f, 0, 100, false, true);
 
 
-
+        for (MaterialIntegration m : integrateList) {
+            m.integrateRecipes();
+        }
     }
 
     @EventHandler

src/main/java/com/sosnitzka/ztic_addon/blocks/BlockTiberium.java

@@ -14,6 +14,7 @@ import net.minecraft.world.World;
 import java.util.Random;
 
 import static com.sosnitzka.ztic_addon.util.Utils.PREFIX_ORE;
+import static slimeknights.tconstruct.TConstruct.random;
 
 public class BlockTiberium extends BasicBlock {
 
@@ -32,7 +33,7 @@ public class BlockTiberium extends BasicBlock {
 
     @Override
     public int quantityDropped(IBlockState state, int fortune, Random random) {
-        return MathHelper.getRandomIntegerInRange(random, 1, MathHelper.getRandomIntegerInRange(random, 1, 31 + fortune));
+        return MathHelper.getRandomIntegerInRange(random, 1, MathHelper.getRandomIntegerInRange(random, 1, 5 + fortune));
     }
 
     @Override
@@ -42,15 +43,15 @@ public class BlockTiberium extends BasicBlock {
 
     @Override
     public void onBlockDestroyedByExplosion(World worldIn, BlockPos pos, Explosion explosionIn) {
-        if (new Random().nextBoolean() || new Random().nextBoolean()) {
-            worldIn.newExplosion(null, pos.getX(), pos.getY(), pos.getZ(), 1f, true, true);
+        if (MathHelper.getRandomIntegerInRange(random, 1, 15) > 10) {
+            worldIn.newExplosion(null, pos.getX(), pos.getY(), pos.getZ(), 1.3f, true, true);
         }
     }
 
     @Override
     public void onBlockDestroyedByPlayer(World worldIn, BlockPos pos, IBlockState state) {
-        if (new Random().nextBoolean() && new Random().nextBoolean() && new Random().nextBoolean()) {
-            worldIn.newExplosion(null, pos.getX(), pos.getY(), pos.getZ(), 1f, true, true);
+        if (MathHelper.getRandomIntegerInRange(random, 1, 30) < 3) {
+            worldIn.newExplosion(null, pos.getX(), pos.getY(), pos.getZ(), 1.0f, true, true);
         }
     }
 

src/main/java/com/sosnitzka/ztic_addon/recipes/Crafting.java

@@ -1,15 +1,18 @@
 package com.sosnitzka.ztic_addon.recipes;
 
 
+import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fml.common.registry.GameRegistry;
 
-import static com.sosnitzka.ztic_addon.Items.fuel_brick;
-import static com.sosnitzka.ztic_addon.Items.lignite;
+import static com.sosnitzka.ztic_addon.Items.*;
 
 public class Crafting {
     public static void register() {
         GameRegistry.addShapelessRecipe(new ItemStack(fuel_brick), Items.COAL, Items.COAL, Items.COAL, lignite, lignite, lignite);
+        GameRegistry.addShapedRecipe(new ItemStack((tiberiumShardStable), 3), "STS", "TST", "STS", 'T', new ItemStack(tiberiumShardInstable), 'S', new ItemStack(Item.getItemFromBlock(Blocks.SAND)));
+        GameRegistry.addShapedRecipe(new ItemStack((tiberiumShardStable), 2), "GTG", "TGT", "GTG", 'T', new ItemStack(tiberiumShardInstable), 'G', new ItemStack(Item.getItemFromBlock(Blocks.GRAVEL)));
     }
 }

src/main/java/com/sosnitzka/ztic_addon/recipes/Smelting.java

@@ -12,8 +12,8 @@ import static com.sosnitzka.ztic_addon.Items.*;
 public class Smelting {
     public static void register() {
         GameRegistry.addSmelting(slagironOre, new ItemStack(slagironIngot), 1.0F);
-        GameRegistry.addSmelting(new ItemStack(slagironIngot, 3), new ItemStack(iron_nugget), 0);
-        GameRegistry.addSmelting(new ItemStack(slaggoldIngot, 3), new ItemStack(Items.GOLD_NUGGET), 0);
+        GameRegistry.addSmelting(new ItemStack(slagironIngot), new ItemStack(iron_nugget), 0);
+        GameRegistry.addSmelting(new ItemStack(slaggoldIngot), new ItemStack(Items.GOLD_NUGGET), 0);
         GameRegistry.addSmelting(new ItemStack(tiberiumShardInstable), new ItemStack(tiberiumShardStable), 0.2F);
 
         GameRegistry.addSmelting(titaniteOre, new ItemStack(titaniteIngot), RandomUtils.nextFloat(0F, 2F));

src/main/resources/assets/ztic_addon/models/item/tiberium_nugget.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "ztic_addon:items/tiberium_nugget"
+  }
+}

src/main/resources/assets/ztic_addon/models/item/tiberium_shard_stable.json

@@ -1,6 +0,0 @@
-{
-  "parent": "item/generated",
-  "textures": {
-    "layer0": "ztic_addon:items/tiberium_shard_stable"
-  }
-}