Add and fix

More Bugfixes, Soldering Iron and Magic Energy Absorber

3 files changed, 33 insertions, 21 deletions

diff --git a/main/java/gregtech/loaders/oreprocessing/ProcessingBolt.java b/main/java/gregtech/loaders/oreprocessing/ProcessingBolt.java
index 4c947704fb..f8871aad3b 100644
--- a/main/java/gregtech/loaders/oreprocessing/ProcessingBolt.java
+++ b/main/java/gregtech/loaders/oreprocessing/ProcessingBolt.java
@@ -1,11 +1,15 @@
 /*    */ package gregtech.loaders.oreprocessing;
 /*    */ 
 /*    */ 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;
+import gregtech.api.util.GT_ModHandler;
 /*    */ import gregtech.api.util.GT_OreDictUnificator;
 /*    */ import gregtech.api.util.GT_Utility;
+import gregtech.common.items.GT_MetaGenerated_Tool_01;
+import net.minecraft.block.material.Material;
 /*    */ import net.minecraft.item.ItemStack;
 /*    */ 
 /*    */ public class ProcessingBolt implements gregtech.api.interfaces.IOreRecipeRegistrator
@@ -17,8 +21,8 @@
 /*    */   
 /*    */   public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack)
 /*    */   {
-/* 20 */     if (!aMaterial.contains(SubTag.NO_WORKING)) GT_Values.RA.addLatheRecipe(GT_Utility.copyAmount(1L, new Object[] { aStack }), GT_OreDictUnificator.get(OrePrefixes.screw, aMaterial, 1L), null, (int)Math.max(aMaterial.getMass() / 8L, 1L), 4);
-/*    */   }
+/* 20 */    if (!aMaterial.contains(SubTag.NO_WORKING)) GT_Values.RA.addLatheRecipe(GT_Utility.copyAmount(1L, new Object[] { aStack }), GT_OreDictUnificator.get(OrePrefixes.screw, aMaterial, 1L), null, (int)Math.max(aMaterial.getMass() / 8L, 1L), 4);
+/*    */  	 }
 /*    */ }
 
 
diff --git a/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java b/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java
index 463ef4f871..c72a300d5f 100644
--- a/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java
+++ b/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java
@@ -36,25 +36,31 @@
 /*     */     }
 /*     */     
 /*     */     ItemStack tStack;
-/*  39 */     if ((null != (tStack = GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mSmeltInto, 1L))) && (!aMaterial.contains(SubTag.NO_SMELTING))) {
-/*  40 */       if (aMaterial.mBlastFurnaceRequired) {
-/*  41 */         GT_ModHandler.removeFurnaceSmelting(aStack);
-/*  42 */         GT_Values.RA.addBlastRecipe(GT_Utility.copyAmount(1L, new Object[] { aStack }), null, null, null, aMaterial.mBlastFurnaceTemp > 1750 ? GT_OreDictUnificator.get(OrePrefixes.ingotHot, aMaterial.mSmeltInto, tStack, 1L) : GT_Utility.copyAmount(1L, new Object[] { tStack }), null, (int)Math.max(aMaterial.getMass() / 40L, 1L) * aMaterial.mBlastFurnaceTemp, 120, aMaterial.mBlastFurnaceTemp);
-/*  43 */         if (aMaterial.mBlastFurnaceTemp <= 1000) GT_ModHandler.addRCBlastFurnaceRecipe(GT_Utility.copyAmount(1L, new Object[] { aStack }), GT_Utility.copyAmount(1L, new Object[] { tStack }), aMaterial.mBlastFurnaceTemp);
-/*     */       } else {
-/*  45 */         GT_ModHandler.addSmeltingRecipe(aStack, tStack);
-/*     */       }
-/*     */     }
-/*  48 */     else if (!aMaterial.contains(SubTag.NO_WORKING)) {
-/*  49 */       if (OrePrefixes.block.isIgnored(aMaterial)) {
-/*  50 */         if ((null == GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L)) && (aMaterial != Materials.GraniteRed) && (aMaterial != Materials.GraniteBlack) && (aMaterial != Materials.Glass) && (aMaterial != Materials.Obsidian) && (aMaterial != Materials.Glowstone) && (aMaterial != Materials.Paper) && (aMaterial != Materials.Wood)) {
-/*  51 */           GT_ModHandler.addCompressionRecipe(GT_Utility.copyAmount(1L, new Object[] { aStack }), GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L));
-/*     */         }
-/*     */       }
-/*  54 */       else if (null == GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L)) {
-/*  55 */         GT_ModHandler.addCompressionRecipe(GT_Utility.copyAmount(9L, new Object[] { aStack }), GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L));
-/*     */       }
-/*     */     }
+if ((null != (tStack = GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mSmeltInto, 1L))) && (!aMaterial.contains(SubTag.NO_SMELTING)))
+{
+  if (aMaterial.mBlastFurnaceRequired)
+  {
+    GT_ModHandler.removeFurnaceSmelting(aStack);
+    GT_Values.RA.addBlastRecipe(GT_Utility.copyAmount(1L, new Object[] { aStack }), null, null, null, aMaterial.mBlastFurnaceTemp > 1750 ? GT_OreDictUnificator.get(OrePrefixes.ingotHot, aMaterial.mSmeltInto, tStack, 1L) : GT_Utility.copyAmount(1L, new Object[] { tStack }), null, (int)Math.max(aMaterial.getMass() / 40L, 1L) * aMaterial.mBlastFurnaceTemp, 120, aMaterial.mBlastFurnaceTemp);
+    if (aMaterial.mBlastFurnaceTemp <= 1000) {
+      GT_ModHandler.addRCBlastFurnaceRecipe(GT_Utility.copyAmount(1L, new Object[] { aStack }), GT_Utility.copyAmount(1L, new Object[] { tStack }), aMaterial.mBlastFurnaceTemp);
+    }
+  }
+  else
+  {
+    GT_ModHandler.addSmeltingRecipe(aStack, tStack);
+  }
+}
+else if (!aMaterial.contains(SubTag.NO_WORKING))
+{
+  if ((!OrePrefixes.block.isIgnored(aMaterial)) && 
+    (null == GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L))) {
+    GT_ModHandler.addCompressionRecipe(GT_Utility.copyAmount(9L, new Object[] { aStack }), GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L));
+  }
+  if (((OrePrefixes.block.isIgnored(aMaterial)) || (null == GT_OreDictUnificator.get(OrePrefixes.block, aMaterial, 1L))) && (aMaterial != Materials.GraniteRed) && (aMaterial != Materials.GraniteBlack) && (aMaterial != Materials.Glass) && (aMaterial != Materials.Obsidian) && (aMaterial != Materials.Glowstone) && (aMaterial != Materials.Paper)) {
+    GT_ModHandler.addCompressionRecipe(GT_Utility.copyAmount(1L, new Object[] { aStack }), GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L));
+  }
+}
 /*     */     
 /*     */ 
 /*     */ 
diff --git a/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadHammer.java b/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadHammer.java
index e4abfe2b07..6a101dd00d 100644
--- a/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadHammer.java
+++ b/main/java/gregtech/loaders/oreprocessing/ProcessingToolHeadHammer.java
@@ -1,6 +1,7 @@
 /*    */ package gregtech.loaders.oreprocessing;
 /*    */ 
 /*    */ import gregtech.api.enums.Dyes;
+import gregtech.api.enums.ItemList;
 /*    */ import gregtech.api.enums.Materials;
 /*    */ import gregtech.api.enums.OrePrefixes;
 /*    */ import gregtech.api.enums.SubTag;
@@ -34,6 +35,7 @@
 /* 34 */         GT_ModHandler.addCraftingRecipe(GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(30, 1, aMaterial, aMaterial, null), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "PfP", "PdP", "STS", Character.valueOf('S'), OrePrefixes.stick.get(aMaterial), Character.valueOf('P'), OrePrefixes.plate.get(aMaterial), Character.valueOf('T'), OrePrefixes.screw.get(aMaterial) });
 /* 35 */         GT_ModHandler.addCraftingRecipe(GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(34, 1, aMaterial, aMaterial, null), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "fPh", " S ", Character.valueOf('S'), OrePrefixes.stick.get(aMaterial), Character.valueOf('P'), OrePrefixes.plate.get(aMaterial) });
 /* 36 */         GT_ModHandler.addCraftingRecipe(GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(36, 1, aMaterial, aMaterial, null), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "PPf", "PP ", "Sh ", Character.valueOf('S'), OrePrefixes.stick.get(aMaterial), Character.valueOf('P'), OrePrefixes.plate.get(aMaterial) });
+/*    */         GT_ModHandler.addCraftingRecipe(GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(160, 1, aMaterial, Materials.Rubber, new long[] { 100000L, 32L, 1L, -1L }), GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "LBf", "Sd ", "P  ", 'B', OrePrefixes.bolt.get(aMaterial), 'P', OrePrefixes.plate.get(Materials.Rubber),'S',OrePrefixes.stick.get(Materials.Iron),'L',ItemList.Battery_RE_LV_Lithium.get(1L, new Object[0]) });
 /*    */       }
 /*    */     }
 /*    */   }