aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2016-11-30 18:14:54 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2016-11-30 18:14:54 +1000
commit3b03ee38c1c8dbd034202d2c4bb0f2dc4fb82170 (patch)
tree646821781fa959435a08ae567b244be7398eea72 /src/Java/gtPlusPlus
parent020c182014db57fb2abfa92493524f1c26ec0dd6 (diff)
downloadGT5-Unofficial-3b03ee38c1c8dbd034202d2c4bb0f2dc4fb82170.tar.gz
GT5-Unofficial-3b03ee38c1c8dbd034202d2c4bb0f2dc4fb82170.tar.bz2
GT5-Unofficial-3b03ee38c1c8dbd034202d2c4bb0f2dc4fb82170.zip
$ Refined recipe handler for Blast Smelting, it now accepts single dust -> molten recipes. (Moved the position of the code to after the single dust recipe is generated.)
Diffstat (limited to 'src/Java/gtPlusPlus')
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT.java24
1 files changed, 10 insertions, 14 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT.java
index c66563fb36..4799e20017 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT.java
@@ -24,20 +24,7 @@ public class RecipeGen_BlastSmelterGT implements Runnable{
Materials[] GregMaterials = Materials.values();
GT: for (Materials M : GregMaterials){
-
- if (M.equals(Materials.Iridium) || M.equals(Materials.Osmium) || M.equals(Materials.Osmiridium)
- || !M.equals(Materials._NULL) || !M.equals(Materials.Knightmetal) || !M.equals(Materials.Osmiridium)
- ){
-
- for (MaterialStack xMaterial : M.mMaterialList){
- if (xMaterial.mMaterial == Materials.Magic || xMaterial.mMaterial == Materials.Metal){
- continue GT;
- }
- if (null == GT_OreDictUnificator.get(OrePrefixes.dust, xMaterial, 1L)){
- continue GT;
- }
- }
-
+ if (!M.equals(Materials._NULL)){
//Add a Blast Smelting Recipe, Let's go!
ItemStack tStack;
@@ -85,6 +72,15 @@ public class RecipeGen_BlastSmelterGT implements Runnable{
else {
doTest = CORE.RA.addBlastSmelterRecipe(tItemStackTest, M.getMolten(fluidAmount), 100, duration/2, 120);
}
+
+ for (MaterialStack xMaterial : M.mMaterialList){
+ if (xMaterial.mMaterial == Materials.Magic || xMaterial.mMaterial == Materials.Metal){
+ continue GT;
+ }
+ if (null == GT_OreDictUnificator.get(OrePrefixes.dust, xMaterial, 1L)){
+ continue GT;
+ }
+ }
if (doTest){
//Reset the Variables for compounds if last recipe was a success.