Registered additional liquids from vanilla items (e.g. glowstone, lapis etc)

3 files changed, 26 insertions, 5 deletions

diff --git a/src/main/java/com/sosnitzka/ztic_addon/Blocks.java b/src/main/java/com/sosnitzka/ztic_addon/Blocks.java
index bb1d94b..c2a9645 100644
--- a/src/main/java/com/sosnitzka/ztic_addon/Blocks.java
+++ b/src/main/java/com/sosnitzka/ztic_addon/Blocks.java
@@ -21,6 +21,7 @@ import static com.sosnitzka.ztic_addon.util.Utils.PREFIX_ORE;
 public class Blocks {
 
     //regular Ores / Blocks without extra abilites
+
     public static Block basalt = new BasicBlock("basalt", Material.ROCK, 45.0f, 35.0f, 3);
     public static Block rottenGround = new BasicBlockGround("rotten_ground", Material.GROUND, 2.0f, 2.0f, 0);
     public static Block ligniteOre = new BlockLignite();
diff --git a/src/main/java/com/sosnitzka/ztic_addon/Fluids.java b/src/main/java/com/sosnitzka/ztic_addon/Fluids.java
index 4c483c2..5e229a6 100644
--- a/src/main/java/com/sosnitzka/ztic_addon/Fluids.java
+++ b/src/main/java/com/sosnitzka/ztic_addon/Fluids.java
@@ -3,10 +3,16 @@ 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 slimeknights.tconstruct.library.TinkerRegistry.registerMelting;
+
 public class Fluids {
 
     public static BasicTinkerFluid arcaniteFluid = new BasicTinkerFluid("arcanite", 0xFF272354, true, 200, 10, 4000);
@@ -46,7 +52,7 @@ public class Fluids {
     // 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", 0xBBBBBB, false, 300, 2, 5000);
+    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);
@@ -69,4 +75,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);
+    }
 }
diff --git a/src/main/java/com/sosnitzka/ztic_addon/ZTiC.java b/src/main/java/com/sosnitzka/ztic_addon/ZTiC.java
index 89820b2..62720bd 100644
--- a/src/main/java/com/sosnitzka/ztic_addon/ZTiC.java
+++ b/src/main/java/com/sosnitzka/ztic_addon/ZTiC.java
@@ -17,6 +17,7 @@ import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 import net.minecraftforge.fml.common.registry.GameRegistry;
 import slimeknights.tconstruct.library.MaterialIntegration;
+import slimeknights.tconstruct.library.TinkerRegistry;
 import slimeknights.tconstruct.library.materials.ExtraMaterialStats;
 import slimeknights.tconstruct.library.materials.HandleMaterialStats;
 import slimeknights.tconstruct.library.materials.HeadMaterialStats;
@@ -51,6 +52,7 @@ public class ZTiC {
         Items.register();
         Blocks.register();
         Fluids.register();
+        Fluids.registerToo();
 
         // TConstruct Alloys
         registerTinkerAlloys(astriumFluid, 1, arcaniteFluid, 3, karmesineFluid, 2);
@@ -136,10 +138,10 @@ public class ZTiC {
     }
 
     private void registerTinkerMaterial(String oreSuffix, slimeknights.tconstruct.library.materials.Material material, Fluid fluid, int headDura, float headSpeed, float headAttack, float handleMod, int handleDura, int extra, int headLevel, boolean craft, boolean cast) {
-        material.addStats(new HeadMaterialStats(headDura, headSpeed, headAttack, headLevel))
-                .addStats(new HandleMaterialStats(handleMod, handleDura))
-                .addStats(new ExtraMaterialStats(extra)).setFluid(fluid)
-                .setCraftable(craft).setCastable(cast);
+        TinkerRegistry.addMaterialStats(material, new HeadMaterialStats(headDura, headSpeed, headAttack, headLevel));
+        TinkerRegistry.addMaterialStats(material, new HandleMaterialStats(handleMod, handleDura));
+        TinkerRegistry.addMaterialStats(material, new ExtraMaterialStats(extra));
+        material.setFluid(fluid).setCraftable(craft).setCastable(cast);
         if (material.isCraftable()) {
             material.addItem(Blocks.tiberiumBlock, Material.VALUE_Block);
             material.setRepresentativeItem(Blocks.tiberiumBlock);
@@ -149,5 +151,6 @@ public class ZTiC {
         MaterialIntegration integration = new MaterialIntegration(material, fluid, oreSuffix);
         integration.integrate();
         integrateList.add(integration);
+
     }
 }
\ No newline at end of file