aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJordan Byrne <draknyte1@hotmail.com>2018-02-08 17:41:33 +1000
committerJordan Byrne <draknyte1@hotmail.com>2018-02-08 17:41:33 +1000
commit22010e06b541a6e048448d54f28525a698f421af (patch)
tree250819ceed032b92b10bedd4eadecd75ec4303b5
parent1d1c8819f1744edcc53d3f28437a0f5011732889 (diff)
downloadGT5-Unofficial-22010e06b541a6e048448d54f28525a698f421af.tar.gz
GT5-Unofficial-22010e06b541a6e048448d54f28525a698f421af.tar.bz2
GT5-Unofficial-22010e06b541a6e048448d54f28525a698f421af.zip
% Made material recycling use the centrifuge, instead of the electrolyzer.
% Updated ABS tooltip to reflect new GUI slot.
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_AlloyBlastSmelter.java2
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java5
2 files changed, 5 insertions, 2 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_AlloyBlastSmelter.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_AlloyBlastSmelter.java
index b95548df72..c1316eb49a 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_AlloyBlastSmelter.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_AlloyBlastSmelter.java
@@ -52,7 +52,7 @@ extends GregtechMeta_MultiBlockBase {
"Controller Block for the Alloy Blast Smelter", //Outputs 144mb fluid for every inputStack.stackSize; Time to use those hot metals.
"20% Faster than the Electric Blast Furnace",
"Allows Complex GT++ alloys to be created",
- "Circuit for recipe goes in the Input Bus",
+ "Circuit for recipe goes in the Input Bus or GUI slot",
"Size: 3x3x4 (Hollow)",
"Controller (front middle at bottom)",
"16x Blast Smelter Heat Containment Coils (two middle Layers, hollow)",
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java
index 27d14cf875..32fa282b0c 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java
@@ -118,7 +118,7 @@ public class RecipeGen_MaterialProcessing implements Runnable{
}
try{
- if (addElectrolyzerRecipe(
+ if (addCentrifgeRecipe(
mainDust,
emptyCell, //input 2
null, //Input fluid 1
@@ -237,6 +237,9 @@ public class RecipeGen_MaterialProcessing implements Runnable{
}
}
+ public static boolean addCentrifgeRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, ItemStack aOutput4, ItemStack aOutput5, ItemStack aOutput6, int[] aChances, int aDuration, int aEUt) {
+ return GT_Values.RA.addCentrifugeRecipe(aInput1, aInput2, aFluidInput, aFluidOutput, aOutput1, aOutput2, aOutput3, aOutput4, aOutput5, aOutput6, aChances, aDuration, aEUt);
+ }
public static boolean addElectrolyzerRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, ItemStack aOutput4, ItemStack aOutput5, ItemStack aOutput6, int[] aChances, int aDuration, int aEUt) {
if (((aInput1 == null) && (aFluidInput == null)) || ((aOutput1 == null) && (aFluidOutput == null))) {