aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gregtech
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2017-08-12 21:56:42 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2017-08-12 21:56:42 +1000
commit2f204855239daa14c085fd74cb34a02fbbf36d73 (patch)
treeceb621923538b9c6bbf7eca87f337ab1ca1c2f8f /src/Java/gregtech
parent25c74de08a9f7510da2f9f32a0e91bc9636ac9a2 (diff)
downloadGT5-Unofficial-2f204855239daa14c085fd74cb34a02fbbf36d73.tar.gz
GT5-Unofficial-2f204855239daa14c085fd74cb34a02fbbf36d73.tar.bz2
GT5-Unofficial-2f204855239daa14c085fd74cb34a02fbbf36d73.zip
+ Added Lava Filter recipe.
+ Added Thermal Boiler manual recipe. $ Fixed OreDict ASM. % Changed recipe handling for the Thermal Boiler.
Diffstat (limited to 'src/Java/gregtech')
-rw-r--r--src/Java/gregtech/api/util/HotFuel.java11
-rw-r--r--src/Java/gregtech/api/util/Recipe_GT.java7
2 files changed, 11 insertions, 7 deletions
diff --git a/src/Java/gregtech/api/util/HotFuel.java b/src/Java/gregtech/api/util/HotFuel.java
index c07a3e89fd..55fca83ab8 100644
--- a/src/Java/gregtech/api/util/HotFuel.java
+++ b/src/Java/gregtech/api/util/HotFuel.java
@@ -1,25 +1,24 @@
package gregtech.api.util;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
+import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
public class HotFuel {
- public static void addNewHotFuel(FluidStack aInput1, FluidStack aInput2, FluidStack aOutput1, int aSpecialValue) {
+ public static void addNewHotFuel(FluidStack aInput1, FluidStack aInput2, FluidStack aOutput1, ItemStack[] outputItems, int[] chances, int aSpecialValue) {
GT_Recipe x = new GT_Recipe(
true,
null,
+ outputItems,
null,
- null,
- null,
+ chances,
new FluidStack[]{aInput1, aInput2},
new FluidStack[]{aOutput1},
1, //1 Tick
0, //No Eu produced
aSpecialValue //Magic Number
);
- GT_Recipe_Map.sHotFuels.addRecipe(x);
+ Recipe_GT.Gregtech_Recipe_Map.sThermalFuels.addRecipe(x);
}
diff --git a/src/Java/gregtech/api/util/Recipe_GT.java b/src/Java/gregtech/api/util/Recipe_GT.java
index 5fef97832a..fbd5d9eb4f 100644
--- a/src/Java/gregtech/api/util/Recipe_GT.java
+++ b/src/Java/gregtech/api/util/Recipe_GT.java
@@ -252,11 +252,16 @@ public class Recipe_GT extends GT_Recipe{
public static final GT_Recipe_Map sSimpleWasherRecipes = new GT_Recipe_Map(new HashSet<GT_Recipe>(3), "gt.recipe.simplewasher", "Simple Dust Washer", null, RES_PATH_GUI + "basicmachines/PotionBrewer", 1, 1, 0, 0, 1, E, 1, E, true, true);
- //RTG FUel Map
+ //RTG Fuel Map
public static final GT_Recipe.GT_Recipe_Map_Fuel sRTGFuels = new Recipe_GT.GT_Recipe_Map_Fuel(
new HashSet(10), "gt.recipe.RTGgenerators", "RTG", null,
"gregtech:textures/gui/basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 365, " Minecraft Days", true, true);
+ //Thermal Boiler map
+ public static final GT_Recipe.GT_Recipe_Map_Fuel sThermalFuels = new GT_Recipe_Map_Fuel(new HashSet<GT_Recipe>(10), "gt.recipe.thermalgeneratorfuel",
+ "Thermal Generator Fuel", null, "gregtech:textures/gui/basicmachines/Default", 1, 1, 0, 0, 1,
+ "Fuel Value: ", 1000, " EU", true, false);
+
/**
* HashMap of Recipes based on their Items