Add recipes for Sparging Multiblock.

Add some localization.
Migrate material recipes out of item classes.

9 files changed, 6 insertions, 106 deletions

diff --git a/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot.java b/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot.java
index 5f0254bc51..ea96e2914c 100644
--- a/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot.java
+++ b/src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot.java
@@ -1,12 +1,7 @@
 package gtPlusPlus.core.item.base.ingots;
 
-import net.minecraft.item.ItemStack;
-
-import gregtech.api.util.GT_ModHandler;
-
 import gtPlusPlus.core.item.base.BaseItemComponent;
 import gtPlusPlus.core.material.Material;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
 
 public class BaseItemIngot extends BaseItemComponent{
 
@@ -21,18 +16,6 @@ public class BaseItemIngot extends BaseItemComponent{
 		super(material, type);
 		this.materialName = material.getLocalizedName();
 		this.unlocalName = material.getUnlocalizedName();
-		if (type != ComponentTypes.HOTINGOT) {
-			this.generateCompressorRecipe();
-		}
 	}
 
-	private void generateCompressorRecipe(){
-		final ItemStack tempStack = componentMaterial.getIngot(9);
-		final ItemStack tempOutput = componentMaterial.getBlock(1);
-		if (ItemUtils.checkForInvalidItems(new ItemStack[] {tempStack, tempOutput})){
-			GT_ModHandler.addCompressionRecipe(tempStack, tempOutput);
-		}
-	}
-
-
 }
diff --git a/src/Java/gtPlusPlus/core/item/base/nugget/BaseItemNugget.java b/src/Java/gtPlusPlus/core/item/base/nugget/BaseItemNugget.java
index a6eb598622..1644856bf8 100644
--- a/src/Java/gtPlusPlus/core/item/base/nugget/BaseItemNugget.java
+++ b/src/Java/gtPlusPlus/core/item/base/nugget/BaseItemNugget.java
@@ -8,4 +8,5 @@ public class BaseItemNugget extends BaseItemComponent{
 	public BaseItemNugget(final Material material) {
 		super(material, BaseItemComponent.ComponentTypes.NUGGET);
 	}
+	
 }
diff --git a/src/Java/gtPlusPlus/core/item/base/plates/BaseItemPlate.java b/src/Java/gtPlusPlus/core/item/base/plates/BaseItemPlate.java
index 34d44cd43e..a810b22c70 100644
--- a/src/Java/gtPlusPlus/core/item/base/plates/BaseItemPlate.java
+++ b/src/Java/gtPlusPlus/core/item/base/plates/BaseItemPlate.java
@@ -15,6 +15,4 @@ public class BaseItemPlate extends BaseItemComponent{
 		this(MaterialUtils.generateQuickMaterial(materialName, state, new short[]{colour[0], colour[1], colour[2], 0}, sRadioactivity));
 	}
 
-
-
 }
diff --git a/src/Java/gtPlusPlus/core/item/base/plates/BaseItemPlateDouble.java b/src/Java/gtPlusPlus/core/item/base/plates/BaseItemPlateDouble.java
index 373f84b7c5..31f86e8ffa 100644
--- a/src/Java/gtPlusPlus/core/item/base/plates/BaseItemPlateDouble.java
+++ b/src/Java/gtPlusPlus/core/item/base/plates/BaseItemPlateDouble.java
@@ -16,4 +16,5 @@ public class BaseItemPlateDouble extends BaseItemComponent{
 	public String getItemStackDisplayName(final ItemStack p_77653_1_) {
 		return ("Double "+this.materialName+ " Plate");
 	}
+	
 }
diff --git a/src/Java/gtPlusPlus/core/item/base/rings/BaseItemRing.java b/src/Java/gtPlusPlus/core/item/base/rings/BaseItemRing.java
index 62777cc9f5..c83ae94af1 100644
--- a/src/Java/gtPlusPlus/core/item/base/rings/BaseItemRing.java
+++ b/src/Java/gtPlusPlus/core/item/base/rings/BaseItemRing.java
@@ -8,4 +8,5 @@ public class BaseItemRing extends BaseItemComponent{
 	public BaseItemRing(final Material material) {
 		super(material, BaseItemComponent.ComponentTypes.RING);
 	}
+	
 }
diff --git a/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRod.java b/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRod.java
index ef3266fe75..f77f846d34 100644
--- a/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRod.java
+++ b/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRod.java
@@ -1,49 +1,12 @@
 package gtPlusPlus.core.item.base.rods;
 
-import net.minecraft.item.ItemStack;
-
-import gregtech.api.enums.GT_Values;
-
-import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.item.base.BaseItemComponent;
 import gtPlusPlus.core.material.Material;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
 
 public class BaseItemRod extends BaseItemComponent{
 
 	public BaseItemRod(final Material material) {
 		super(material, BaseItemComponent.ComponentTypes.ROD);
-		this.addCutterRecipe(material);
-		this.addLatheRecipe(material);
-	}
-
-
-	private void addCutterRecipe(Material material){
-		Logger.WARNING("Adding cutter recipe for "+this.materialName+" Rods");
-		final ItemStack stackStick = this.componentMaterial.getRod(1);
-		final ItemStack stackBolt = this.componentMaterial.getBolt(4);
-		
-		if (ItemUtils.checkForInvalidItems(new ItemStack[] {stackStick, stackBolt}))
-			GT_Values.RA.addCutterRecipe(
-					stackStick,
-					stackBolt,
-					null,
-					(int) Math.max(this.componentMaterial.getMass() * 2L, 1L),
-					material.vVoltageMultiplier);
-	}
-
-
-	private void addLatheRecipe(Material material){
-		Logger.WARNING("Adding recipe for "+this.materialName+" Rod");
-		ItemStack boltStack = this.componentMaterial.getIngot(1);
-		if (ItemUtils.checkForInvalidItems(boltStack)){
-			GT_Values.RA.addLatheRecipe(
-					boltStack,
-					ItemUtils.getSimpleStack(this),
-					material.getSmallDust(2),
-					(int) Math.max(this.componentMaterial.getMass() / 8L, 1L),
-					material.vVoltageMultiplier);
-		}
 	}
 
 }
diff --git a/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRodLong.java b/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRodLong.java
index 9b232f95c5..215012817d 100644
--- a/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRodLong.java
+++ b/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRodLong.java
@@ -1,19 +1,13 @@
 package gtPlusPlus.core.item.base.rods;
 
-import net.minecraft.item.ItemStack;
-
-import gregtech.api.enums.GT_Values;
-
-import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.item.base.BaseItemComponent;
 import gtPlusPlus.core.material.Material;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
+import net.minecraft.item.ItemStack;
 
 public class BaseItemRodLong extends BaseItemComponent{
 
 	public BaseItemRodLong(final Material material) {
 		super(material, BaseItemComponent.ComponentTypes.RODLONG);
-		this.addExtruderRecipe();
 	}
 
 	@Override
@@ -21,26 +15,4 @@ public class BaseItemRodLong extends BaseItemComponent{
 		return ("Long "+this.materialName+ " Rod");
 	}
 
-	private void addExtruderRecipe(){
-		Logger.WARNING("Adding recipe for Long "+this.materialName+" Rods");
-
-		final ItemStack stackStick = this.componentMaterial.getRod(2);
-		final ItemStack stackLong = this.componentMaterial.getLongRod(1);
-
-		if (ItemUtils.checkForInvalidItems(new ItemStack[] {stackStick, stackLong}))
-		GT_Values.RA.addForgeHammerRecipe(
-				stackStick,
-				stackLong,
-				(int) Math.max(this.componentMaterial.getMass(), 1L),
-				16);
-
-		if (ItemUtils.checkForInvalidItems(new ItemStack[] {stackStick, stackLong}))
-		GT_Values.RA.addCutterRecipe(
-				stackLong,
-				stackStick,
-				null,
-				(int) Math.max(this.componentMaterial.getMass(), 1L),
-				4);
-	}
-
 }
diff --git a/src/Java/gtPlusPlus/core/item/base/screws/BaseItemScrew.java b/src/Java/gtPlusPlus/core/item/base/screws/BaseItemScrew.java
index 29e525ed10..dbd817215a 100644
--- a/src/Java/gtPlusPlus/core/item/base/screws/BaseItemScrew.java
+++ b/src/Java/gtPlusPlus/core/item/base/screws/BaseItemScrew.java
@@ -1,32 +1,12 @@
 package gtPlusPlus.core.item.base.screws;
 
-import net.minecraft.item.ItemStack;
-
-import gregtech.api.enums.GT_Values;
-
-import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.item.base.BaseItemComponent;
 import gtPlusPlus.core.material.Material;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
 
 public class BaseItemScrew extends BaseItemComponent{
 
 	public BaseItemScrew(final Material material) {
 		super(material, BaseItemComponent.ComponentTypes.SCREW);
-		this.addLatheRecipe();
-	}
-
-	private void addLatheRecipe(){
-		Logger.WARNING("Adding recipe for "+this.materialName+" Screws");
-		ItemStack boltStack = this.componentMaterial.getBolt(1);
-		if (ItemUtils.checkForInvalidItems(boltStack)){
-			GT_Values.RA.addLatheRecipe(
-					boltStack,
-					ItemUtils.getSimpleStack(this),
-					null,
-					(int) Math.max(this.componentMaterial.getMass() / 8L, 1L),
-					4);
-		}
 	}
 
 }
diff --git a/src/Java/gtPlusPlus/core/item/crafting/ItemDummyResearch.java b/src/Java/gtPlusPlus/core/item/crafting/ItemDummyResearch.java
index 3f8e31d8d2..d8ddb26675 100644
--- a/src/Java/gtPlusPlus/core/item/crafting/ItemDummyResearch.java
+++ b/src/Java/gtPlusPlus/core/item/crafting/ItemDummyResearch.java
@@ -28,7 +28,8 @@ public class ItemDummyResearch extends ItemGenericToken {
 		RESEARCH_6_BASIC_METALLURGY("Basic Metallurgy", "Information about material smelting"),
 		RESEARCH_7_ADV_METALLURGY("Advanced Metallurgy", "Advanced Material Sciences!"),
 		RESEARCH_8_TURBINE_AUTOMATION("Turbine Automation", "You really don't want to share this with anyone!"), 
-		RESEARCH_9_CLOAKING("Cloaking Technologies", "Sneaking around like a mouse");	
+		RESEARCH_9_CLOAKING("Cloaking Technologies", "Sneaking around like a mouse"),
+		RESEARCH_10_SPARGING("Gas Sparging", "Blowing gas for results");