+ Added recipes for Semi-Fluid Generators.

$ Semi-Fluid Generator fixes.

4 files changed, 35 insertions, 5 deletions

diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index 22cd044f79..124e109f25 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -1,6 +1,7 @@
 package gtPlusPlus.core.recipe;
 
 import gregtech.api.enums.*;
+import gregtech.api.util.GT_ModHandler;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.lib.CORE;
@@ -648,6 +649,27 @@ public class RECIPES_Machines {
 						"plateDoubleGrisium", "rotorGrisium", "plateDoubleGrisium",
 						RECIPE_IndustrialMultiTankController);
 			}
+			
+			ItemStack mSemiFluidgen = ItemUtils.simpleMetaStack("IC2:blockGenerator:7", 7, 1);
+			//Semi-Fluid Generators
+			GT_ModHandler.addCraftingRecipe(GregtechItemList.Generator_SemiFluid_LV.get(1L, new Object[0]), CI.bitsd,
+					new Object[] { "PCP", "EME", "GWG", Character.valueOf('M'), ItemList.Hull_LV, Character.valueOf('P'),
+							ItemList.Electric_Piston_LV, Character.valueOf('E'), ItemList.Electric_Motor_LV,
+							Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Basic), Character.valueOf('W'),
+							mSemiFluidgen, Character.valueOf('G'),
+							OrePrefixes.gearGt.get(Materials.Steel) });
+			GT_ModHandler.addCraftingRecipe(GregtechItemList.Generator_SemiFluid_MV.get(1L, new Object[0]), CI.bitsd,
+					new Object[] { "PCP", "EME", "GWG", Character.valueOf('M'), ItemList.Hull_MV, Character.valueOf('P'),
+							ItemList.Electric_Piston_MV, Character.valueOf('E'), ItemList.Electric_Motor_MV,
+							Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Good), Character.valueOf('W'),
+							mSemiFluidgen, Character.valueOf('G'),
+							OrePrefixes.gearGt.get(Materials.Aluminium) });
+			GT_ModHandler.addCraftingRecipe(GregtechItemList.Generator_SemiFluid_HV.get(1L, new Object[0]), CI.bitsd,
+					new Object[] { "PCP", "EME", "GWG", Character.valueOf('M'), ItemList.Hull_HV, Character.valueOf('P'),
+							ItemList.Electric_Piston_HV, Character.valueOf('E'), ItemList.Electric_Motor_HV,
+							Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Advanced), Character.valueOf('W'),
+							mSemiFluidgen, Character.valueOf('G'),
+							OrePrefixes.gearGt.get(Materials.StainlessSteel) });
 
 			if (CORE.configSwitches.enableMultiblock_AlloyBlastSmelter){
 				//Industrial Blast Smelter
diff --git a/src/Java/gtPlusPlus/core/recipe/common/CI.java b/src/Java/gtPlusPlus/core/recipe/common/CI.java
index 59df867766..996682464b 100644
--- a/src/Java/gtPlusPlus/core/recipe/common/CI.java
+++ b/src/Java/gtPlusPlus/core/recipe/common/CI.java
@@ -1,6 +1,7 @@
 package gtPlusPlus.core.recipe.common;
 
 import gregtech.api.enums.*;
+import gregtech.api.util.GT_ModHandler;
 import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.material.ALLOY;
@@ -15,6 +16,12 @@ public class CI {
 
 	//null
 	public static ItemStack _NULL = ItemUtils.getSimpleStack(ModItems.AAA_Broken);
+	
+	//bits
+	public static long bits = GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE
+			| GT_ModHandler.RecipeBits.BUFFERED;
+	public static long bitsd = GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+			| GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED;
 
 	//Circuits
 	public static Object circuitPrimitive;
diff --git a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityTradeTable.java b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityTradeTable.java
index 945cb3d16f..6a40e893cb 100644
--- a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityTradeTable.java
+++ b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityTradeTable.java
@@ -113,10 +113,10 @@ public class TileEntityTradeTable extends TileEntity implements INetworkDataProv
 	@Override
 	public void updateEntity() {	
 		if (!this.worldObj.isRemote){	
-
+			ItemStack slot0;
 			try{
 
-				ItemStack slot0 = this.inventoryOutputs.getStackInSlot(0);
+				slot0 = this.inventoryOutputs.getStackInSlot(0);
 				if (slot0 != null && slot0.hasTagCompound()){
 					NBTUtils.tryIterateNBTData(slot0);
 					this.inventoryOutputs.setInventorySlotContents(0, null);
@@ -124,7 +124,8 @@ public class TileEntityTradeTable extends TileEntity implements INetworkDataProv
 
 			}
 			catch (Throwable t){
-				Utils.LOG_INFO("NBT utils not found.");
+				t.printStackTrace();
+				this.inventoryOutputs.setInventorySlotContents(0, null);
 			}
 
 		}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java
index b650d0f98b..08b35b10d7 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java
@@ -35,11 +35,11 @@ public class GT_MetaTileEntity_SemiFluidGenerator extends GT_MetaTileEntity_Dies
 
 	public void onConfigLoad() {
 		this.mEfficiency = GregTech_API.sMachineFile.get(ConfigCategories.machineconfig,
-				"SemiFluidGenerator.efficiency.tier." + this.mTier, 100 - (this.mTier * 5));
+				"SemiFluidGenerator.efficiency.tier." + this.mTier, 100 - (this.mTier * 10));
 	}
 	
 	public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-		return new GT_MetaTileEntity_DieselGenerator(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
+		return new GT_MetaTileEntity_SemiFluidGenerator(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
 	}
 
 	public GT_Recipe.GT_Recipe_Map getRecipes() {