aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/xmod/gregtech/loaders
diff options
context:
space:
mode:
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/loaders')
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java101
1 files changed, 71 insertions, 30 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java
index 7c986ad9bb..bca7861d58 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java
@@ -1,5 +1,7 @@
package gtPlusPlus.xmod.gregtech.loaders;
+import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.enums.SubTag;
@@ -21,9 +23,9 @@ public class RecipeGen_BlastSmelter {
if (M.equals(Materials.Iridium) || M.equals(Materials.Osmium) || M.equals(Materials.Osmiridium)
|| !M.equals(Materials.Osmiridium) || !M.equals(Materials.Osmiridium) || !M.equals(Materials.Osmiridium)
- || !M.equals(Materials.Osmiridium) || !M.equals(Materials.Osmiridium) || !M.equals(Materials.Osmiridium)
- || !M.equals(Materials.Osmiridium) || !M.equals(Materials.Osmiridium) || !M.equals(Materials.Osmiridium)
- || !M.equals(Materials.Osmiridium) || !M.equals(Materials.Osmiridium) || !M.equals(Materials.Osmiridium)
+ || !M.equals(Materials.Osmiridium) || !M.equals(Materials.Osmiridium) || !M.equals(Materials.Osmiridium)
+ || !M.equals(Materials.Osmiridium) || !M.equals(Materials.Osmiridium) || !M.equals(Materials.Osmiridium)
+ || !M.equals(Materials.Osmiridium) || !M.equals(Materials.Osmiridium) || !M.equals(Materials.Osmiridium)
){
@@ -192,6 +194,20 @@ public class RecipeGen_BlastSmelter {
}
+ int mMaterialListSize=0;
+ if (M.getComposites() != null){
+ for (gtPlusPlus.core.material.MaterialStack ternkfsdf : M.getComposites()){
+ if (ternkfsdf != null)
+ mMaterialListSize++;
+ }
+ }
+ else {
+ mMaterialListSize = 1;
+ }
+
+ Utils.LOG_WARNING("Size: "+mMaterialListSize);
+
+
//Make a simple one Material Materialstack[] and log it for validity.
circuitGT = ItemUtils.getGregtechCircuit(1);
ItemStack[] tItemStackTest = new ItemStack[]{circuitGT, tStack};
@@ -204,18 +220,26 @@ public class RecipeGen_BlastSmelter {
}
//Generate Recipes for all singular materials that can be made molten.
- if (M.requiresBlastFurnace()) {
-
- if (M.getFluid(10) == null){
- Utils.LOG_WARNING("Material Fluid was Null. Why you lie gaem.");
- }
- else {
- Utils.LOG_WARNING("Material Fluid: "+M.getFluid(10).getFluid().getName());
-
- }
-
- if (CORE.RA.addBlastSmelterRecipe(tItemStackTest, M.getFluid(fluidAmount), 100, duration, 240)){
- Utils.LOG_WARNING("Success.");
+ if (mMaterialListSize >= 1){
+ if (M.requiresBlastFurnace()) {
+ if (CORE.RA.addBlastSmelterRecipe(tItemStackTest, M.getFluid(fluidAmount), 100, duration, 240)){
+ Utils.LOG_WARNING("Success.");
+ if (GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Ingot.get(0), M.getFluid(144), M.getIngot(1), duration, 120)){
+ Utils.LOG_INFO("Success, Also added a Fluid solidifier recipe.");
+ if (GT_Values.RA.addFluidExtractionRecipe(M.getIngot(1), null, M.getFluid(144), 100, duration, 120)){
+ Utils.LOG_INFO("Success, Also added a Fluid Extractor recipe.");
+ }
+ if (GT_Values.RA.addFluidExtractionRecipe(ItemUtils.getItemStackOfAmountFromOreDictNoBroken("nugget"+M.getLocalizedName(), 1), null, M.getFluid(16), 100, duration/9, 120)){
+ Utils.LOG_INFO("Success, Also added a Fluid Extractor recipe.");
+ }
+ if (GT_Values.RA.addFluidExtractionRecipe(M.getSmallDust(1), null, M.getFluid(36), 100, duration/4, 120)){
+ Utils.LOG_INFO("Success, Also added a Fluid Extractor recipe.");
+ }
+ if (GT_Values.RA.addFluidExtractionRecipe(M.getTinyDust(1), null, M.getFluid(16), 100, duration/9, 120)){
+ Utils.LOG_INFO("Success, Also added a Fluid Extractor recipe.");
+ }
+ }
+ }
}
else {
Utils.LOG_WARNING("Failed.");
@@ -224,11 +248,29 @@ public class RecipeGen_BlastSmelter {
else {
if (CORE.RA.addBlastSmelterRecipe(tItemStackTest, M.getFluid(fluidAmount), 100, duration/2, 120)){
Utils.LOG_WARNING("Success.");
+ if (GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Ingot.get(0), M.getFluid(144), M.getIngot(1), duration/2, 60)){
+ Utils.LOG_INFO("Success, Also added a Fluid solidifier recipe.");
+ if (GT_Values.RA.addFluidExtractionRecipe(M.getIngot(1), null, M.getFluid(144), 100, duration/2, 60)){
+ Utils.LOG_INFO("Success, Also added a Fluid Extractor recipe.");
+ }
+ ItemStack tempitem = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("nugget"+M.getLocalizedName(), 1);
+ if (tempitem != null){
+ if (GT_Values.RA.addFluidExtractionRecipe(tempitem, null, M.getFluid(16), 100, duration/2/9, 60)){
+ Utils.LOG_INFO("Success, Also added a Fluid Extractor recipe.");
+ }
+ }
+ if (GT_Values.RA.addFluidExtractionRecipe(M.getSmallDust(1), null, M.getFluid(36), 100, duration/2/4, 60)){
+ Utils.LOG_INFO("Success, Also added a Fluid Extractor recipe.");
+ }
+ if (GT_Values.RA.addFluidExtractionRecipe(M.getTinyDust(1), null, M.getFluid(16), 100, duration/2/9, 60)){
+ Utils.LOG_INFO("Success, Also added a Fluid Extractor recipe.");
+ }
+ }
}
else {
Utils.LOG_WARNING("Failed.");
}
- }
+ }
if (tMaterial != null){
//Reset the Variables for compounds if last recipe was a success.
@@ -236,11 +278,7 @@ public class RecipeGen_BlastSmelter {
counter=0;
- int mMaterialListSize=0;
- for (gtPlusPlus.core.material.MaterialStack ternkfsdf:M.getComposites()){
- mMaterialListSize++;
- }
- Utils.LOG_WARNING("Size: "+mMaterialListSize);
+
//If this Material has some kind of compound list, proceed
if (mMaterialListSize > 1){
gtPlusPlus.core.material.MaterialStack[] tempStack = new gtPlusPlus.core.material.MaterialStack[mMaterialListSize];
@@ -254,12 +292,9 @@ public class RecipeGen_BlastSmelter {
if (xMaterial != null){
if (xMaterial.getStackMaterial() != null){
Utils.LOG_WARNING("FOUND: "+xMaterial.getStackMaterial().getLocalizedName());
- Utils.LOG_WARNING("ADDING: "+xMaterial.getStackMaterial().getLocalizedName());
-
- }
-
- tempStack[ooo] = xMaterial;
-
+ Utils.LOG_WARNING("ADDING: "+xMaterial.getStackMaterial().getLocalizedName());
+ }
+ tempStack[ooo] = xMaterial;
}
ooo++;
}
@@ -274,9 +309,10 @@ public class RecipeGen_BlastSmelter {
components[irc] = M.getComposites()[irc].getDustStack(r);
}
}
-
+
+
//Adds a circuit
- if (mMaterialListSize > 0 && mMaterialListSize < 9){
+ if (mMaterialListSize < 9 && mMaterialListSize != 0){
ItemStack[] components_NoCircuit = components;
//Builds me an ItemStack[] of the materials. - With a circuit
components = new ItemStack[components_NoCircuit.length+1];
@@ -288,18 +324,23 @@ public class RecipeGen_BlastSmelter {
components[fr] = components_NoCircuit[fr-1];
}
}
+ Utils.LOG_INFO("Should have added a circuit. mMaterialListSize: "+mMaterialListSize+" | circuit: "+components[0].getDisplayName());
+ }
+ else {
+ Utils.LOG_INFO("Did not add a circuit. mMaterialListSize: "+mMaterialListSize);
}
//Set Fluid output
fluidAmount = 144*inputStackCount;
-
Utils.LOG_INFO("Adding an Alloy Blast Smelter Recipe for "+M.getLocalizedName()+" using it's compound dusts. This material has "+ inputStackCount+" parts. Gives "+fluidAmount+"L of molten metal.");
Utils.LOG_INFO("tMaterial.length: "+components.length+".");
for (int das=0;das<components.length;das++){
if (components[das] != null)
Utils.LOG_INFO("tMaterial["+das+"]: "+components[das].getDisplayName()+" Meta: "+components[das].getItemDamage()+", Amount: "+components[das].stackSize);
}
+
+ //Adds Recipe
if (M.requiresBlastFurnace()) {
if (CORE.RA.addBlastSmelterRecipe(components, M.getFluid(fluidAmount), 100, duration, 500)){
Utils.LOG_WARNING("Success.");