+ Added fluid solidifier recipes for Rods, Long Rods, Bolts, Screws and Rings in GTNH. Closes #310.

2 files changed, 108 insertions, 12 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSifter.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSifter.java
index f1ff7fe0a1..fa1a0a3aae 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSifter.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSifter.java
@@ -2,10 +2,6 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing;
 
 import java.util.Random;
 
-import net.minecraft.block.Block;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.item.ItemStack;
-
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.TAE;
 import gregtech.api.enums.Textures;
@@ -19,9 +15,11 @@ import gregtech.api.util.GT_Utility;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.api.gui.GUI_MultiMachine;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.ForgeDirection;
 
 public class GregtechMetaTileEntity_IndustrialSifter
@@ -222,11 +220,11 @@ extends GregtechMeta_MultiBlockBase {
 		}
 		if ((this.mInputBusses.size() != 1) || (this.mOutputBusses.size() != 4)
 				|| (this.mMaintenanceHatches.size() != 1) || (this.mEnergyHatches.size() < 1)) {
-			Logger.INFO("Returned False 3");
-			Logger.INFO("Input Buses: "+this.mInputBusses.size()+" | expected: 1");
-			Logger.INFO("Output Buses: "+this.mOutputBusses.size()+" | expected: 4");
-			Logger.INFO("Energy Hatches: "+this.mEnergyHatches.size()+" | expected: 1");
-			Logger.INFO("Maint. hatches: "+this.mMaintenanceHatches.size()+" | expected: 1");
+			Logger.MACHINE_INFO("Returned False 3");
+			Logger.MACHINE_INFO("Input Buses: "+this.mInputBusses.size()+" | expected: 1");
+			Logger.MACHINE_INFO("Output Buses: "+this.mOutputBusses.size()+" | expected: 4");
+			Logger.MACHINE_INFO("Energy Hatches: "+this.mEnergyHatches.size()+" | expected: 1");
+			Logger.MACHINE_INFO("Maint. hatches: "+this.mMaintenanceHatches.size()+" | expected: 1");
 			return false;
 		}
 		final int height = this.getBaseMetaTileEntity().getYCoord();
@@ -246,7 +244,7 @@ extends GregtechMeta_MultiBlockBase {
 			this.mOutputBusses.add(tmpHatches[i]);
 		}
 
-		Logger.INFO("Industrial Sifter - Structure Built? "+(tAmount>=35));
+		Logger.MACHINE_INFO("Industrial Sifter - Structure Built? "+(tAmount>=35));
 
 		return tAmount >= 35;
 	}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java
index 5ff646eee2..931f3022a4 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java
@@ -5,9 +5,9 @@ import java.util.Set;
 
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;
-
 import gtPlusPlus.api.interfaces.RunnableWithInfo;
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.MaterialGenerator;
 
@@ -187,6 +187,104 @@ public class RecipeGen_Fluids extends RecipeGen_Base {
 			else {
 				Logger.WARNING((144*9)+"l fluid molder from 1 block Recipe: "+material.getLocalizedName()+" - Failed");
 			}
+			
+			
+			
+			
+			if (CORE.GTNH){
+			
+			//GTNH
+			
+			//Shape_Mold_Rod
+			//Shape_Mold_Rod_Long
+		    //Shape_Mold_Bolt,
+		    //Shape_Mold_Screw,
+		    //Shape_Mold_Ring,
+
+				ItemList mold_Rod = ItemList.valueOf("Shape_Mold_Rod");
+				ItemList mold_Rod_Long = ItemList.valueOf("Shape_Mold_Rod_Long");
+				ItemList mold_Bolt = ItemList.valueOf("Shape_Mold_Bolt");
+				ItemList mold_Screw = ItemList.valueOf("Shape_Mold_Screw");
+				ItemList mold_Ring = ItemList.valueOf("Shape_Mold_Ring");
+				
+			//Rod
+			if (mold_Rod != null && GT_Values.RA.addFluidSolidifierRecipe(
+					mold_Rod.get(0), //Item Shape
+					material.getFluid(72), //Fluid Input
+					material.getRod(1), //output
+					150, //Duration
+					24 //Eu Tick
+					)){
+				Logger.WARNING((144*9)+"l fluid molder from 1 rod Recipe: "+material.getLocalizedName()+" - Success");
+			}
+			else {
+				Logger.WARNING((144*9)+"l fluid molder from 1 rod Recipe: "+material.getLocalizedName()+" - Failed");
+			}
+			
+			//Rod Long
+			if (mold_Rod_Long != null && GT_Values.RA.addFluidSolidifierRecipe(
+					mold_Rod_Long.get(0), //Item Shape
+					material.getFluid(144), //Fluid Input
+					material.getLongRod(1), //output
+					300, //Duration
+					24 //Eu Tick
+					)){
+				Logger.WARNING((144*9)+"l fluid molder from 1 rod long Recipe: "+material.getLocalizedName()+" - Success");
+			}
+			else {
+				Logger.WARNING((144*9)+"l fluid molder from 1 rod long Recipe: "+material.getLocalizedName()+" - Failed");
+			}
+			
+			//Bolt
+			if (mold_Bolt != null && GT_Values.RA.addFluidSolidifierRecipe(
+					mold_Bolt.get(0), //Item Shape
+					material.getFluid(18), //Fluid Input
+					material.getBolt(1), //output
+					50, //Duration
+					6 //Eu Tick
+					)){
+				Logger.WARNING((144*9)+"l fluid molder from 1 bolt Recipe: "+material.getLocalizedName()+" - Success");
+			}
+			else {
+				Logger.WARNING((144*9)+"l fluid molder from 1 bolt Recipe: "+material.getLocalizedName()+" - Failed");
+			}
+			
+			//Screw
+			if (mold_Screw != null && GT_Values.RA.addFluidSolidifierRecipe(
+					mold_Screw.get(0), //Item Shape
+					material.getFluid(18), //Fluid Input
+					material.getScrew(1), //output
+					50, //Duration
+					6 //Eu Tick
+					)){
+				Logger.WARNING((144*9)+"l fluid molder from 1 screw Recipe: "+material.getLocalizedName()+" - Success");
+			}
+			else {
+				Logger.WARNING((144*9)+"l fluid molder from 1 screw Recipe: "+material.getLocalizedName()+" - Failed");
+			}
+			
+			//Ring
+			if (mold_Ring != null && GT_Values.RA.addFluidSolidifierRecipe(
+					mold_Ring.get(0), //Item Shape
+					material.getFluid(36), //Fluid Input
+					material.getRing(1), //output
+					100, //Duration
+					12 //Eu Tick
+					)){
+				Logger.WARNING((144*9)+"l fluid molder from 1 ring Recipe: "+material.getLocalizedName()+" - Success");
+			}
+			else {
+				Logger.WARNING((144*9)+"l fluid molder from 1 ring Recipe: "+material.getLocalizedName()+" - Failed");
+			}
+			
+			
+			
+			
+			
+			
+			
+			
+			}
 		}
 	}
 }