Added a bunch of new items + additional textures for better alloying.

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

@@ -1,7 +1,30 @@
 package com.sosnitzka.ztic_addon;
 
 
+import net.minecraftforge.fluids.FluidRegistry;
+
+import static com.sosnitzka.ztic_addon.Fluids.*;
+import static com.sosnitzka.ztic_addon.util.Utils.registerTinkerAlloys;
+
 public class Alloys {
 
+    static void register() {
+        registerTinkerAlloys(astriumFluid, 1, arcaniteFluid, 3, karmesineFluid, 2, energy_enderium, 3);
+        registerTinkerAlloys(nitroniteFluid, 2, tiberiumFluid, 4, vibraniumFluid, 3, nitroFluid, 3);
+        registerTinkerAlloys(proxideumFluid, 1, prometheumFluid, 3, violiumFluid, 2, radiant_enderium, 3);
+        registerTinkerAlloys(noctunyxFluid, 1, rubiumFluid, 3, meteoriteFluid, 2, anthraciteFluid, 3);
+        registerTinkerAlloys(imperomiteFluid, 2, titaniteFluid, 3, prometheumFluid, 3, FluidRegistry.LAVA, 3);
+        registerTinkerAlloys(cryptogenFluid, 1, meteoriteFluid, 3, mythrilFluid, 2, spectrumFluid, 3);
+        registerTinkerAlloys(fractoryteFluid, 2, adamantiteFluid, 4, arcaniteFluid, 2, FluidRegistry.LAVA, 3);
+        registerTinkerAlloys(seismodiumFluid, 2, vibraniumFluid, 4, palladiumFluid, 4, nitroFluid, 3);
+        registerTinkerAlloys(terramiteFluid, 2, violiumFluid, 4, eterniteFluid, 2, energy_enderium, 3);
+        registerTinkerAlloys(lumixylFluid, 1, bismuthFluid, 3, rubiumFluid, 2, glimming_enderium, 3);
+        registerTinkerAlloys(solariumFluid, 1, karmesineFluid, 3, ignititeFluid, 2, glimmercoalFluid, 3);
+        registerTinkerAlloys(dyoniteFluid, 1, mindoriteFluid, 4, tiberiumFluid, 2, anthraciteFluid, 3);
+        registerTinkerAlloys(ultraniteFluid, 1, ignititeFluid, 5, adamantiteFluid, 3, glimming_enderium, 3);
+        registerTinkerAlloys(nucleumFluid, 1, palladiumFluid, 3, mindoriteFluid, 3, radiant_enderium, 3);
+        registerTinkerAlloys(aegisaltFluid, 1, eterniteFluid, 3, titaniteFluid, 3, glimmercoalFluid, 3);
+        registerTinkerAlloys(bysmuidFluid, 1, mythrilFluid, 4, bismuthFluid, 2, spectrumFluid, 3);
+    }
 
 }

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

@@ -4,13 +4,12 @@ package com.sosnitzka.ztic_addon;
 import com.sosnitzka.ztic_addon.generic.BasicTinkerFluid;
 import com.sosnitzka.ztic_addon.util.Utils;
 import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidRegistry;
 import org.apache.commons.lang3.StringUtils;
 
 import java.lang.reflect.Field;
 
+import static com.sosnitzka.ztic_addon.Items.*;
 import static slimeknights.tconstruct.library.TinkerRegistry.registerMelting;
 
 public class Fluids {
@@ -50,14 +49,14 @@ public class Fluids {
     public static BasicTinkerFluid bysmuidFluid = new BasicTinkerFluid("bysmuid", 0xFF7b97b0, true, 200, 10, 4000);
 
     // Additional Fluid without traits / materials
-    public static BasicTinkerFluid endstoneFluid = new BasicTinkerFluid("endstone", 0xFFdddd22, false, 800, 10, 2500);
-    public static BasicTinkerFluid enderFluid = new BasicTinkerFluid("ender", 0xFF227777, false, 600, 5, 1000);
-    public static BasicTinkerFluid nitroFluid = new BasicTinkerFluid("nitro", 0xFFBBBBBB, false, 300, 2, 5000);
-    public static BasicTinkerFluid obsidianFluid = new BasicTinkerFluid("obsidian", 0xFF660044, false, 1200, 3, 5000);
-    public static BasicTinkerFluid redstoneFluid = new BasicTinkerFluid("redstone", 0xFFFF0000, false, 350, 3, 900);
-    public static BasicTinkerFluid glowstoneFluid = new BasicTinkerFluid("glowstone", 0xFFEEEE00, false, 400, 10, 1000);
-    public static BasicTinkerFluid lapisFluid = new BasicTinkerFluid("lapis", 0xFF1005FF, false, 400, 2, 1000);
-    public static BasicTinkerFluid netherFluid = new BasicTinkerFluid("nether", 0xFF881111, false, 900, 5, 1500);
+    public static BasicTinkerFluid radiant_enderium = new BasicTinkerFluid("radiant_enderium", 0xFFbcea5d, false, 850, 10, 800);
+    public static BasicTinkerFluid glimming_enderium = new BasicTinkerFluid("glimming_enderium", 0xFFfffc98, false, 800, 10, 2500);
+    public static BasicTinkerFluid energy_enderium = new BasicTinkerFluid("energy_enderium", 0xFFffb498, false, 600, 10, 5000);
+    public static BasicTinkerFluid glimmercoalFluid = new BasicTinkerFluid("glimmercoal", 0xFFee7c28, false, 600, 10, 5000);
+    public static BasicTinkerFluid nitroFluid = new BasicTinkerFluid("nitro", 0xFF223512, false, 700, 5, 900);
+    public static BasicTinkerFluid anthraciteFluid = new BasicTinkerFluid("anthracite", 0xFF111111, false, 900, 0, 1000);
+    public static BasicTinkerFluid spectrumFluid = new BasicTinkerFluid("spectrum", 0xFF64748f, false, 900, 0, 1000);
+
 
 
     static void register() {
@@ -77,13 +76,15 @@ public class Fluids {
     }
 
     static void registerToo() {
-        registerMelting(new ItemStack(Items.ENDER_PEARL), enderFluid, 144);
-        registerMelting(new ItemStack(Items.REDSTONE), redstoneFluid, 144);
-        registerMelting(new ItemStack(Items.GUNPOWDER), nitroFluid, 144);
-        registerMelting(Blocks.OBSIDIAN, obsidianFluid, 144);
-        registerMelting(Blocks.NETHERRACK, netherFluid, 4);
-        registerMelting(new ItemStack(Items.DYE, 1, 4), lapisFluid, 144);
-        registerMelting(new ItemStack(Items.GLOWSTONE_DUST), glowstoneFluid, 144);
-        registerMelting(Blocks.STONE, FluidRegistry.LAVA, 4);
+        registerMelting(radiant_pearl, radiant_enderium, 72);
+        registerMelting(glimmer_pearl, glimming_enderium, 72);
+        registerMelting(energy_pearl, energy_enderium, 72);
+        registerMelting(glimmercoal, glimmercoalFluid, 72);
+        registerMelting(nitro_brick, nitroFluid, 72);
+        registerMelting(anthracite_dust, anthraciteFluid, 72);
+        registerMelting(spectrum_dust, spectrumFluid, 72);
+        registerMelting(Blocks.OBSIDIAN, FluidRegistry.LAVA, 432);
+        registerMelting(Blocks.NETHERRACK, FluidRegistry.LAVA, 48);
+        registerMelting(Blocks.STONE, FluidRegistry.LAVA, 144);
     }
 }

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

@@ -25,6 +25,17 @@ public class Items {
     public static ItemSlaggoldIngot slaggoldIngot = new ItemSlaggoldIngot();
     public static Item fuel_brick = new BasicItem("fuel_brick");
 
+    public static Item glimmercoal = new BasicItem("glimmercoal");
+    public static Item radiant_pearl = new BasicItem("radiant_pearl");
+    public static Item glimmer_pearl = new BasicItem("glimmer_pearl");
+    public static Item energy_pearl = new BasicItem("energy_pearl");
+    public static Item glimmerstone_dust = new BasicItem("glimmerstone_dust");
+    public static Item luminar_dust = new BasicItem("luminar_dust");
+    public static Item spectrum_dust = new BasicItem("spectrum_dust");
+    public static Item anthracite_dust = new BasicItem("anthracite_dust");
+    public static Item nitro_brick = new BasicItem("nitro_brick");
+
+
     public static Item titaniteIngot = new BasicItem("titanite_ingot", PREFIX_INGOT);
     public static Item adamantiteIngot = new BasicItem("adamantite_ingot", PREFIX_INGOT);
     public static Item arcaniteIngot = new BasicItem("arcanite_ingot", PREFIX_INGOT);

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

@@ -29,7 +29,6 @@ import java.util.List;
 
 import static com.sosnitzka.ztic_addon.Fluids.*;
 import static com.sosnitzka.ztic_addon.Materials.*;
-import static com.sosnitzka.ztic_addon.util.Utils.registerTinkerAlloys;
 import static slimeknights.tconstruct.library.utils.HarvestLevels.*;
 
 @Mod(modid = ZTiC.MODID, version = ZTiC.VERSION)
@@ -53,24 +52,8 @@ public class ZTiC {
         Blocks.register();
         Fluids.register();
         Fluids.registerToo();
+        Alloys.register();
 
-        // TConstruct Alloys
-        registerTinkerAlloys(astriumFluid, 1, arcaniteFluid, 3, karmesineFluid, 2);
-        registerTinkerAlloys(nitroniteFluid, 1, tiberiumFluid, 5, vibraniumFluid, 3);
-        registerTinkerAlloys(proxideumFluid, 1, prometheumFluid, 3, violiumFluid, 2);
-        registerTinkerAlloys(noctunyxFluid, 1, rubiumFluid, 3, meteoriteFluid, 2);
-        registerTinkerAlloys(imperomiteFluid, 2, titaniteFluid, 3, prometheumFluid, 3);
-        registerTinkerAlloys(cryptogenFluid, 1, meteoriteFluid, 3, mythrilFluid, 2);
-        registerTinkerAlloys(fractoryteFluid, 1, adamantiteFluid, 4, arcaniteFluid, 2);
-        registerTinkerAlloys(seismodiumFluid, 1, vibraniumFluid, 4, palladiumFluid, 4);
-        registerTinkerAlloys(terramiteFluid, 2, violiumFluid, 4, eterniteFluid, 2);
-        registerTinkerAlloys(lumixylFluid, 1, bismuthFluid, 3, rubiumFluid, 2);
-        registerTinkerAlloys(solariumFluid, 1, karmesineFluid, 3, ignititeFluid, 2);
-        registerTinkerAlloys(dyoniteFluid, 1, mindoriteFluid, 4, tiberiumFluid, 2);
-        registerTinkerAlloys(ultraniteFluid, 1, ignititeFluid, 5, adamantiteFluid, 3);
-        registerTinkerAlloys(nucleumFluid, 1, palladiumFluid, 3, mindoriteFluid, 3);
-        registerTinkerAlloys(aegisaltFluid, 1, eterniteFluid, 3, titaniteFluid, 3);
-        registerTinkerAlloys(bysmuidFluid, 1, mythrilFluid, 4, bismuthFluid, 2);
 
         // # Head Durability, Speed, Attack, Modifier, Handle Durability, Extra Durability
         // ARCANE ORES

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

@@ -8,11 +8,30 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.fml.common.registry.GameRegistry;
 
 import static com.sosnitzka.ztic_addon.Items.*;
+import static slimeknights.tconstruct.shared.TinkerCommons.matNecroticBone;
 
 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)));
+
+        GameRegistry.addShapelessRecipe(new ItemStack(luminar_dust), Items.REDSTONE, Items.GLOWSTONE_DUST);
+        GameRegistry.addShapelessRecipe(new ItemStack(glimmerstone_dust), luminar_dust, Items.BLAZE_POWDER);
+        GameRegistry.addShapelessRecipe(new ItemStack(glimmerstone_dust), Items.REDSTONE, Items.GLOWSTONE_DUST, Items.BLAZE_POWDER);
+
+        GameRegistry.addShapelessRecipe(new ItemStack(glimmercoal), Items.COAL, glimmerstone_dust);
+        GameRegistry.addShapelessRecipe(new ItemStack(glimmercoal), lignite, glimmerstone_dust);
+
+        GameRegistry.addShapelessRecipe(new ItemStack(radiant_pearl), Items.ENDER_PEARL, luminar_dust, new ItemStack(Items.DYE, 1, 4));
+        GameRegistry.addShapelessRecipe(new ItemStack(glimmer_pearl), Items.ENDER_PEARL, glimmerstone_dust);
+        GameRegistry.addShapelessRecipe(new ItemStack(energy_pearl), Items.ENDER_PEARL, luminar_dust, Items.GUNPOWDER);
+
+        GameRegistry.addShapelessRecipe(new ItemStack(nitro_brick), fuel_brick, Items.GUNPOWDER, Items.BLAZE_POWDER);
+        GameRegistry.addShapelessRecipe(new ItemStack(anthracite_dust), matNecroticBone, Items.COAL, Items.GUNPOWDER);
+        GameRegistry.addShapelessRecipe(new ItemStack(spectrum_dust), matNecroticBone, glimmerstone_dust);
+
+
+
     }
 }

src/main/java/com/sosnitzka/ztic_addon/util/FuelHandler.java

@@ -5,6 +5,7 @@ import net.minecraftforge.fml.common.IFuelHandler;
 import org.apache.commons.lang3.RandomUtils;
 
 import static com.sosnitzka.ztic_addon.Items.fuel_brick;
+import static com.sosnitzka.ztic_addon.Items.glimmercoal;
 import static com.sosnitzka.ztic_addon.Items.lignite;
 
 public class FuelHandler implements IFuelHandler {
@@ -15,7 +16,10 @@ public class FuelHandler implements IFuelHandler {
             return 200 * 2;
         }
         if (fuel.getItem().equals(fuel_brick)) {
-            return RandomUtils.nextInt(1, RandomUtils.nextInt(1, RandomUtils.nextInt(1, 64))) * 200;
+            return RandomUtils.nextInt(1, RandomUtils.nextInt(1, RandomUtils.nextInt(1, 32))) * 100;
+        }
+        if (fuel.getItem().equals(glimmercoal)) {
+            return RandomUtils.nextInt(1, RandomUtils.nextInt(1, RandomUtils.nextInt(16, 64))) * 200;
         }
         return 0;
     }

src/main/java/com/sosnitzka/ztic_addon/util/Utils.java

@@ -60,4 +60,28 @@ public class Utils {
         message.setTag("alloy", tagList);
         FMLInterModComms.sendMessage("tconstruct", "alloy", message);
     }
+
+    public static void registerTinkerAlloys(Fluid alloy, int out, Fluid first, int inOne, Fluid second, int inTwo, Fluid third, int inThree) {
+        NBTTagList tagList = new NBTTagList();
+        NBTTagCompound fluid = new NBTTagCompound();
+        fluid.setString("FluidName", alloy.getName());
+        fluid.setInteger("Amount", out);
+        tagList.appendTag(fluid);
+        fluid = new NBTTagCompound();
+        fluid.setString("FluidName", first.getName());
+        fluid.setInteger("Amount", inOne);
+        tagList.appendTag(fluid);
+        fluid = new NBTTagCompound();
+        fluid.setString("FluidName", second.getName());
+        fluid.setInteger("Amount", inTwo);
+        tagList.appendTag(fluid);
+        fluid = new NBTTagCompound();
+        fluid.setString("FluidName", third.getName());
+        fluid.setInteger("Amount", inThree);
+        tagList.appendTag(fluid);
+
+        NBTTagCompound message = new NBTTagCompound();
+        message.setTag("alloy", tagList);
+        FMLInterModComms.sendMessage("tconstruct", "alloy", message);
+    }
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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