diff options
Diffstat (limited to 'src/Java/gtPlusPlus/xmod')
3 files changed, 228 insertions, 125 deletions
| diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Assembler.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Assembler.java new file mode 100644 index 0000000000..6e2b90a775 --- /dev/null +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Assembler.java @@ -0,0 +1,60 @@ +package gtPlusPlus.xmod.gregtech.loaders; + +import gregtech.api.enums.GT_Values; +import gtPlusPlus.core.material.Material; +import gtPlusPlus.core.util.fluid.FluidUtils; +import gtPlusPlus.core.util.item.ItemUtils; + +public class RecipeGen_Assembler  implements Runnable{ + +	final Material toGenerate; +	 +	public RecipeGen_Assembler(final Material M){ +		this.toGenerate = M; +	} +	 +	@Override +	public void run() { +		generateRecipes(toGenerate);		 +	} +	 +	public static void generateRecipes(final Material material){ +			 +		//Frame Box +		GT_Values.RA.addAssemblerRecipe( +				material.getRod(4), +				ItemUtils.getGregtechCircuit(4), +				material.getBlock(1), +				60, +				8);          +		 +		//Rotor - Soldering Alloy +		GT_Values.RA.addAssemblerRecipe( +				material.getPlate(4), +				material.getRing(1), +				FluidUtils.getFluidStack("molten.solderingalloy", 16), +				material.getRotor(1), +				240, +				24);       + +		//Rotor - Lead +		GT_Values.RA.addAssemblerRecipe( +				material.getPlate(4), +				material.getRing(1), +				FluidUtils.getFluidStack("molten.lead", 48), +				material.getRotor(1), +				240, +				24);       + +		//Rotor - Tin +		GT_Values.RA.addAssemblerRecipe( +				material.getPlate(4), +				material.getRing(1), +				FluidUtils.getFluidStack("molten.tin", 32), +				material.getRotor(1), +				240, +				24);       +		 +	} +} + diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java index e986a4283c..27ec8d4111 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java @@ -1,7 +1,6 @@  package gtPlusPlus.xmod.gregtech.loaders;  import gregtech.api.enums.GT_Values; -import gregtech.api.enums.ItemList;  import gregtech.api.util.GT_ModHandler;  import gtPlusPlus.core.material.Material;  import gtPlusPlus.core.util.Utils; @@ -96,130 +95,6 @@ public class RecipeGen_DustGeneration  implements Runnable{  		else {  			Utils.LOG_WARNING("4 Small dust from 1 Dust Recipe: "+material.getLocalizedName()+" - Failed");			  		} -		 -		//Melting Shapes to fluid -		if (GT_Values.RA.addFluidExtractionRecipe(normalDust, //Input -				null, //Input 2 -				material.getFluid(144), //Fluid Output -				0, //Chance -				1*20, //Duration -				16 //Eu Tick -				)){ -			Utils.LOG_WARNING("144l fluid extractor from 1 Dust Recipe: "+material.getLocalizedName()+" - Success"); -		} -		else { -			Utils.LOG_WARNING("144l fluid extractor from 1 Dust Recipe: "+material.getLocalizedName()+" - Failed");			 -		}	 -		if (GT_Values.RA.addFluidExtractionRecipe(material.getIngot(1), //Input -				null, //Input 2 -				material.getFluid(144), //Fluid Output -				0, //Chance -				1*20, //Duration -				16 //Eu Tick -				)){ -			Utils.LOG_WARNING("144l fluid extractor from 1 ingot Recipe: "+material.getLocalizedName()+" - Success"); -		} -		else { -			Utils.LOG_WARNING("144l fluid extractor from 1 ingot Recipe: "+material.getLocalizedName()+" - Failed");			 -		} -		if (GT_Values.RA.addFluidExtractionRecipe(material.getPlate(1), //Input -				null, //Input 2 -				material.getFluid(144), //Fluid Output -				0, //Chance -				1*20, //Duration -				16 //Eu Tick -				)){ -			Utils.LOG_WARNING("144l fluid extractor from 1 plate Recipe: "+material.getLocalizedName()+" - Success"); -		} -		else { -			Utils.LOG_WARNING("144l fluid extractor from 1 plate Recipe: "+material.getLocalizedName()+" - Failed");			 -		}	 -		if (GT_Values.RA.addFluidExtractionRecipe(material.getPlateDouble(1), //Input -				null, //Input 2 -				material.getFluid(288), //Fluid Output -				0, //Chance -				1*20, //Duration -				16 //Eu Tick -				)){ -			Utils.LOG_WARNING("144l fluid extractor from 1 double plate Recipe: "+material.getLocalizedName()+" - Success"); -		} -		else { -			Utils.LOG_WARNING("144l fluid extractor from 1 double plate Recipe: "+material.getLocalizedName()+" - Failed");			 -		} -		if (GT_Values.RA.addFluidExtractionRecipe(material.getNugget(1), //Input -				null, //Input 2 -				material.getFluid(16), //Fluid Output -				0, //Chance -				1*20, //Duration -				16 //Eu Tick -				)){ -			Utils.LOG_WARNING("16l fluid extractor from 1 nugget Recipe: "+material.getLocalizedName()+" - Success"); -		} -		else { -			Utils.LOG_WARNING("16l fluid extractor from 1 nugget Recipe: "+material.getLocalizedName()+" - Failed");			 -		} -		if (GT_Values.RA.addFluidExtractionRecipe(material.getBlock(1), //Input -				null, //Input 2 -				material.getFluid(144*9), //Fluid Output -				0, //Chance -				1*20, //Duration -				16 //Eu Tick -				)){ -			Utils.LOG_WARNING((144*9)+"l fluid extractor from 1 block Recipe: "+material.getLocalizedName()+" - Success"); -		} -		else { -			Utils.LOG_WARNING((144*9)+"l fluid extractor from 1 block Recipe: "+material.getLocalizedName()+" - Failed");			 -		} -		 -		//Making Shapes from fluid -		if (GT_Values.RA.addFluidSolidifierRecipe( -				ItemList.Shape_Mold_Ingot.get(0), //Item Shape		 -				material.getFluid(144), //Fluid Input -				material.getIngot(1), //output				 -				1*20, //Duration -				16 //Eu Tick -				)){ -			Utils.LOG_WARNING("144l fluid molder for 1 ingot Recipe: "+material.getLocalizedName()+" - Success"); -		} -		else { -			Utils.LOG_WARNING("144l fluid molder for 1 ingot Recipe: "+material.getLocalizedName()+" - Failed");			 -		}	 -		if (GT_Values.RA.addFluidSolidifierRecipe( -				ItemList.Shape_Mold_Plate.get(1), //Item Shape		 -				material.getFluid(144), //Fluid Input -				material.getPlate(1), //output				 -				1*20, //Duration -				16 //Eu Tick -				)){ -			Utils.LOG_WARNING("144l fluid molder for 1 plate Recipe: "+material.getLocalizedName()+" - Success"); -		} -		else { -			Utils.LOG_WARNING("144l fluid molder for 1 plate Recipe: "+material.getLocalizedName()+" - Failed");			 -		} -		if (GT_Values.RA.addFluidSolidifierRecipe( -				ItemList.Shape_Mold_Nugget.get(0), //Item Shape		 -				material.getFluid(16), //Fluid Input -				material.getNugget(1), //output				 -				1*20, //Duration -				16 //Eu Tick -				)){ -			Utils.LOG_WARNING("16l fluid molder for 1 nugget Recipe: "+material.getLocalizedName()+" - Success"); -		} -		else { -			Utils.LOG_WARNING("16l fluid molder for 1 nugget Recipe: "+material.getLocalizedName()+" - Failed");			 -		} -		if (GT_Values.RA.addFluidSolidifierRecipe( -				ItemList.Shape_Mold_Block.get(0), //Item Shape		 -				material.getFluid(144*9), //Fluid Input -				material.getBlock(1), //output				 -				1*20, //Duration -				16 //Eu Tick -				)){ -			Utils.LOG_WARNING((144*9)+"l fluid molder from 1 block Recipe: "+material.getLocalizedName()+" - Success"); -		} -		else { -			Utils.LOG_WARNING((144*9)+"l fluid molder from 1 block Recipe: "+material.getLocalizedName()+" - Failed");			 -		}  		//Macerate blocks back to dusts.  		ItemStack materialBlock = material.getBlock(1); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java new file mode 100644 index 0000000000..5129a81a67 --- /dev/null +++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java @@ -0,0 +1,168 @@ +package gtPlusPlus.xmod.gregtech.loaders; + +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.ItemList; +import gtPlusPlus.core.material.Material; +import gtPlusPlus.core.util.Utils; + +public class RecipeGen_Fluids  implements Runnable{ + +	final Material toGenerate; +	 +	public RecipeGen_Fluids(final Material M){ +		this.toGenerate = M; +	} +	 +	@Override +	public void run() { +		generateRecipes(toGenerate);		 +	} +	 +	public static void generateRecipes(final Material material){ +		generateRecipes(material, false); +	} + +	public static void generateRecipes(final Material material, boolean disableOptional){ +				 +		//Melting Shapes to fluid +		if (GT_Values.RA.addFluidExtractionRecipe(material.getDust(1), //Input +				null, //Input 2 +				material.getFluid(144), //Fluid Output +				0, //Chance +				1*20, //Duration +				16 //Eu Tick +				)){ +			Utils.LOG_WARNING("144l fluid extractor from 1 Dust Recipe: "+material.getLocalizedName()+" - Success"); +		} +		else { +			Utils.LOG_WARNING("144l fluid extractor from 1 Dust Recipe: "+material.getLocalizedName()+" - Failed");			 +		}	 +		if (GT_Values.RA.addFluidExtractionRecipe(material.getIngot(1), //Input +				null, //Input 2 +				material.getFluid(144), //Fluid Output +				0, //Chance +				1*20, //Duration +				16 //Eu Tick +				)){ +			Utils.LOG_WARNING("144l fluid extractor from 1 ingot Recipe: "+material.getLocalizedName()+" - Success"); +		} +		else { +			Utils.LOG_WARNING("144l fluid extractor from 1 ingot Recipe: "+material.getLocalizedName()+" - Failed");			 +		} +		if (GT_Values.RA.addFluidExtractionRecipe(material.getPlate(1), //Input +				null, //Input 2 +				material.getFluid(144), //Fluid Output +				0, //Chance +				1*20, //Duration +				16 //Eu Tick +				)){ +			Utils.LOG_WARNING("144l fluid extractor from 1 plate Recipe: "+material.getLocalizedName()+" - Success"); +		} +		else { +			Utils.LOG_WARNING("144l fluid extractor from 1 plate Recipe: "+material.getLocalizedName()+" - Failed");			 +		}	 +		if (GT_Values.RA.addFluidExtractionRecipe(material.getPlateDouble(1), //Input +				null, //Input 2 +				material.getFluid(288), //Fluid Output +				0, //Chance +				1*20, //Duration +				16 //Eu Tick +				)){ +			Utils.LOG_WARNING("144l fluid extractor from 1 double plate Recipe: "+material.getLocalizedName()+" - Success"); +		} +		else { +			Utils.LOG_WARNING("144l fluid extractor from 1 double plate Recipe: "+material.getLocalizedName()+" - Failed");			 +		} +		if (GT_Values.RA.addFluidExtractionRecipe(material.getNugget(1), //Input +				null, //Input 2 +				material.getFluid(16), //Fluid Output +				0, //Chance +				1*20, //Duration +				16 //Eu Tick +				)){ +			Utils.LOG_WARNING("16l fluid extractor from 1 nugget Recipe: "+material.getLocalizedName()+" - Success"); +		} +		else { +			Utils.LOG_WARNING("16l fluid extractor from 1 nugget Recipe: "+material.getLocalizedName()+" - Failed");			 +		} +		if (GT_Values.RA.addFluidExtractionRecipe(material.getBlock(1), //Input +				null, //Input 2 +				material.getFluid(144*9), //Fluid Output +				0, //Chance +				1*20, //Duration +				16 //Eu Tick +				)){ +			Utils.LOG_WARNING((144*9)+"l fluid extractor from 1 block Recipe: "+material.getLocalizedName()+" - Success"); +		} +		else { +			Utils.LOG_WARNING((144*9)+"l fluid extractor from 1 block Recipe: "+material.getLocalizedName()+" - Failed");			 +		} +		 +		//Making Shapes from fluid +		if (GT_Values.RA.addFluidSolidifierRecipe( +				ItemList.Shape_Mold_Ingot.get(0), //Item Shape		 +				material.getFluid(144), //Fluid Input +				material.getIngot(1), //output				 +				1*20, //Duration +				16 //Eu Tick +				)){ +			Utils.LOG_WARNING("144l fluid molder for 1 ingot Recipe: "+material.getLocalizedName()+" - Success"); +		} +		else { +			Utils.LOG_WARNING("144l fluid molder for 1 ingot Recipe: "+material.getLocalizedName()+" - Failed");			 +		}	 +		if (GT_Values.RA.addFluidSolidifierRecipe( +				ItemList.Shape_Mold_Plate.get(1), //Item Shape		 +				material.getFluid(144), //Fluid Input +				material.getPlate(1), //output				 +				1*20, //Duration +				16 //Eu Tick +				)){ +			Utils.LOG_WARNING("144l fluid molder for 1 plate Recipe: "+material.getLocalizedName()+" - Success"); +		} +		else { +			Utils.LOG_WARNING("144l fluid molder for 1 plate Recipe: "+material.getLocalizedName()+" - Failed");			 +		} +		if (GT_Values.RA.addFluidSolidifierRecipe( +				ItemList.Shape_Mold_Nugget.get(0), //Item Shape		 +				material.getFluid(16), //Fluid Input +				material.getNugget(1), //output				 +				1*20, //Duration +				16 //Eu Tick +				)){ +			Utils.LOG_WARNING("16l fluid molder for 1 nugget Recipe: "+material.getLocalizedName()+" - Success"); +		} +		else { +			Utils.LOG_WARNING("16l fluid molder for 1 nugget Recipe: "+material.getLocalizedName()+" - Failed");			 +		} +		 +		//Gears +		if (GT_Values.RA.addFluidSolidifierRecipe( +				ItemList.Shape_Mold_Gear.get(0), //Item Shape		 +				material.getFluid(576), //Fluid Input +				material.getGear(1), //output				 +				6*20, //Duration +				8 //Eu Tick +				)){ +			Utils.LOG_WARNING("16l fluid molder for 1 nugget Recipe: "+material.getLocalizedName()+" - Success"); +		} +		else { +			Utils.LOG_WARNING("16l fluid molder for 1 nugget Recipe: "+material.getLocalizedName()+" - Failed");			 +		} +		 +		//Blocks +		if (GT_Values.RA.addFluidSolidifierRecipe( +				ItemList.Shape_Mold_Block.get(0), //Item Shape		 +				material.getFluid(144*9), //Fluid Input +				material.getBlock(1), //output				 +				1*20, //Duration +				16 //Eu Tick +				)){ +			Utils.LOG_WARNING((144*9)+"l fluid molder from 1 block Recipe: "+material.getLocalizedName()+" - Success"); +		} +		else { +			Utils.LOG_WARNING((144*9)+"l fluid molder from 1 block Recipe: "+material.getLocalizedName()+" - Failed");			 +		} +	} +} + | 
