Updated recipe for compressed glowstone.

Changed recipes for Rhugnor and Hypogen.
Fixed structure check for Large Extruder.
Fixed structure check for Maceration Stack.
Fixed structure check for Large Rocket Engine.
Fix Chem Plant consuming wrong catalyst.

src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java

@@ -477,21 +477,21 @@ private static void fusionRecipes() {
 
 		//Hypogen Creation
 		GT_Values.RA.addFusionReactorRecipe(
-				Materials.Neutronium.getMolten(128),
-				ALLOY.QUANTUM.getFluidStack(256),
-				ELEMENT.STANDALONE.HYPOGEN.getFluidStack(4),
+				ELEMENT.STANDALONE.DRAGON_METAL.getFluidStack(144),
+				ELEMENT.STANDALONE.RHUGNOR.getFluidStack(288),
+				ELEMENT.STANDALONE.HYPOGEN.getFluidStack(36),
 				2048 * 4,
-				(int) MaterialUtils.getVoltageForTier(9),
+				MaterialUtils.getVoltageForTier(9),
 				600000000 * 2);
 
 		//Rhugnor
 		GT_Values.RA.addFusionReactorRecipe(
-				GenericChem.TEFLON.getFluidStack(64),
-				ALLOY.PIKYONIUM.getFluidStack(128),
-				ELEMENT.STANDALONE.RHUGNOR.getFluidStack(8),
-				2048 * 4,
-				(int) MaterialUtils.getVoltageForTier(7),
-				150000000 * 2);
+				MaterialUtils.getMaterial("Infinity", "Neutronium").getMolten(144),
+				ALLOY.QUANTUM.getFluidStack(288),
+				ELEMENT.STANDALONE.RHUGNOR.getFluidStack(144),
+				512,
+				MaterialUtils.getVoltageForTier(8),
+				2000000000);
 
 	}
 

src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java

@@ -430,7 +430,7 @@ private static boolean addCompressedObsidian(){
 
 			if (RecipeUtils.addShapedRecipe(
 					input, input, input,
-					input, aInvertedObsidian, input,
+					input, r == 2 ? aInvertedObsidian : input, input,
 					input, input, input,
 					output)){
 				Logger.INFO("Added a recipe for Compressed Glowstone ["+r+"]");

src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java

@@ -81,7 +81,7 @@ public IStructureDefinition<GregtechMetaTileEntity_IndustrialExtruder> getStruct
 			STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_IndustrialExtruder>builder()
 					.addShape(mName, transpose(new String[][]{
 							{"CCC", "CCC", "CCC", "CCC", "CCC"},
-							{"C~C", "C-C", "C-C", "C-C", "CMC"},
+							{"C~C", "C-C", "C-C", "C-C", "CCC"},
 							{"CCC", "CCC", "CCC", "CCC", "CCC"},
 					}))
 					.addElement(
@@ -98,12 +98,6 @@ public IStructureDefinition<GregtechMetaTileEntity_IndustrialExtruder> getStruct
 									)
 							)
 					)
-					.addElement(
-							'M',
-							ofHatchAdder(
-									GregtechMetaTileEntity_IndustrialExtruder::addIndustrialExtruderMufflerList, getCasingTextureIndex(), 2
-							)
-					)
 					.build();
 		}
 		return STRUCTURE_DEFINITION;
@@ -140,19 +134,6 @@ public final boolean addIndustrialExtruderList(IGregTechTileEntity aTileEntity,
 		return false;
 	}
 
-	public final boolean addIndustrialExtruderMufflerList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) {
-		if (aTileEntity == null) {
-			return false;
-		} else {
-			IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
-			if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler) {
-				((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);
-				return this.mMufflerHatches.add((GT_MetaTileEntity_Hatch_Muffler) aMetaTileEntity);
-			}
-		}
-		return false;
-	}
-
 	@Override
 	public String getSound() {
 		return GregTech_API.sSoundList.get(Integer.valueOf(203));

src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMacerator.java

@@ -145,13 +145,16 @@ public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack a
 	public final boolean addIndustrialMaceratorBottomList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) {
 		if (aTileEntity == null) {
 			return false;
-		} else {
+		}
+		else {
 			IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
-			if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus){
+			if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus) {
 				return addToMachineList(aTileEntity, aBaseCasingIndex);
-			} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance){
+			}
+			else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance) {
 				return addToMachineList(aTileEntity, aBaseCasingIndex);
-			} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy){
+			}
+			else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy) {
 				return addToMachineList(aTileEntity, aBaseCasingIndex);
 			}
 		}
@@ -161,11 +164,19 @@ public final boolean addIndustrialMaceratorBottomList(IGregTechTileEntity aTileE
 	public final boolean addIndustrialMaceratorMidList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) {
 		if (aTileEntity == null) {
 			return false;
-		} else {
+		}
+		else {
 			IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
 			if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus) {
 				return addToMachineList(aTileEntity, aBaseCasingIndex);
-			} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler) {
+			}
+			else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler) {
+				return addToMachineList(aTileEntity, aBaseCasingIndex);
+			}
+			else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance) {
+				return addToMachineList(aTileEntity, aBaseCasingIndex);
+			}
+			else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy) {
 				return addToMachineList(aTileEntity, aBaseCasingIndex);
 			}
 		}

src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeRocketEngine.java

@@ -1,28 +1,28 @@
 package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production;
 
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.*;
+import static gregtech.api.util.GT_StructureUtility.ofHatchAdder;
+
 import java.util.ArrayList;
 import java.util.Collection;
 
 import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
-import gregtech.api.enums.GT_Values;
-import gregtech.api.enums.TAE;
-import gregtech.api.enums.Textures;
+
+import gregtech.api.enums.*;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.implementations.*;
 import gregtech.api.objects.GT_RenderedTexture;
-import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GTPP_Recipe;
+import gregtech.api.util.*;
+import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.item.chemistry.RocketFuels;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.material.MISC_MATERIALS;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_AirIntake;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler_Adv;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
@@ -31,12 +31,9 @@
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 
-import static com.gtnewhorizon.structurelib.structure.StructureUtility.*;
-import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
-import static gregtech.api.util.GT_StructureUtility.ofHatchAdder;
-
 public class GregtechMetaTileEntity_LargeRocketEngine extends GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_LargeRocketEngine>
 {
 	protected int fuelConsumption;
@@ -52,6 +49,9 @@ public class GregtechMetaTileEntity_LargeRocketEngine extends GregtechMeta_Multi
 	public static String mCasingName = "Turbodyne Casing";
 	public static String mIntakeHatchName = "Tungstensteel Turbine Casing";
 	public static String mGearboxName = "Inconel Reinforced Casing";
+
+	private static Fluid sAirFluid = null;
+	private static FluidStack sAirFluidStack = null;
 
 	private int mCasing;
 	private IStructureDefinition<GregtechMetaTileEntity_LargeRocketEngine> STRUCTURE_DEFINITION = null;
@@ -64,6 +64,7 @@ public GregtechMetaTileEntity_LargeRocketEngine(final int aID, final String aNam
 		this.fuelValue = 0;
 		this.fuelRemaining = 0;
 		this.boostEu = false;
+		setAir();
 	}
 
 	public GregtechMetaTileEntity_LargeRocketEngine(final String aName) {
@@ -72,6 +73,7 @@ public GregtechMetaTileEntity_LargeRocketEngine(final String aName) {
 		this.fuelValue = 0;
 		this.fuelRemaining = 0;
 		this.boostEu = false;
+		setAir();
 	}
 
 	@Override
@@ -95,7 +97,7 @@ protected GT_Multiblock_Tooltip_Builder createTooltip() {
 				.addStructureHint("Air Intake Hatch", 1)
 				.addInputBus("Side center line", 1)
 				.addInputHatch("Side center line", 1)
-				.addMaintenanceHatch("Side center line", 1)
+				.addMaintenanceHatch("Any Block Touching Inconel Reinforced Casing", 1)
 				.addDynamoHatch("Top center line", 2)
 				.addMufflerHatch("Back Center", 3)
 				.toolTipFinisher(CORE.GT_Tooltip_Builder);
@@ -107,7 +109,7 @@ public IStructureDefinition<GregtechMetaTileEntity_LargeRocketEngine> getStructu
 		if (STRUCTURE_DEFINITION == null) {
 			STRUCTURE_DEFINITION = StructureDefinition.<GregtechMetaTileEntity_LargeRocketEngine>builder()
 					.addShape(mName, transpose(new String[][]{
-							{"CCC", "CTC", "CTC", "CTC", "CTC", "CTC", "CTC", "CTC", "CTC", "CCC"},
+							{"CTC", "CTC", "CTC", "CTC", "CTC", "CTC", "CTC", "CTC", "CTC", "CTC"},
 							{"C~C", "SIS", "SIS", "SIS", "SIS", "SIS", "SIS", "SIS", "SIS", "CMC"},
 							{"CCC", "CSC", "CSC", "CSC", "CSC", "CSC", "CSC", "CSC", "CSC", "CCC"},
 					}))
@@ -179,13 +181,19 @@ public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack a
 	public final boolean addLargeRocketEngineTopList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) {
 		if (aTileEntity == null) {
 			return false;
-		} else {
+		}
+		else {
 			IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
-			if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance){
+			if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance) {
 				return addToMachineList(aTileEntity, aBaseCasingIndex);
-			} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Dynamo) {
+			}
+			else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_AirIntake) {
+				return addToMachineList(aTileEntity, aBaseCasingIndex);
+			}
+			else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Dynamo) {
 				return addToMachineList(aTileEntity, aBaseCasingIndex);
-			} if (LoadedMods.TecTech) {
+			}
+			if (LoadedMods.TecTech) {
 				if (isThisHatchMultiDynamo(aMetaTileEntity)) {
 					return addToMachineList(aTileEntity, aBaseCasingIndex);
 				}
@@ -197,15 +205,19 @@ public final boolean addLargeRocketEngineTopList(IGregTechTileEntity aTileEntity
 	public final boolean addLargeRocketEngineSideList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) {
 		if (aTileEntity == null) {
 			return false;
-		} else {
+		}
+		else {
 			IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
-			if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance){
+			if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance) {
 				return addToMachineList(aTileEntity, aBaseCasingIndex);
-			} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_AirIntake) {
+			}
+			else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_AirIntake) {
 				return addToMachineList(aTileEntity, aBaseCasingIndex);
-			} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) {
+			}
+			else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) {
 				return addToMachineList(aTileEntity, aBaseCasingIndex);
-			} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus) {
+			}
+			else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus) {
 				return addToMachineList(aTileEntity, aBaseCasingIndex);
 			}
 		}
@@ -241,19 +253,28 @@ public boolean isCorrectMachinePart(final ItemStack aStack) {
 	public Object getClientGUI(final int aID, final InventoryPlayer aPlayerInventory, final IGregTechTileEntity aBaseMetaTileEntity) {
 		return super.getClientGUI(aID, aPlayerInventory, aBaseMetaTileEntity);
 	}
+
+	public static void setAir() {
+		if (sAirFluidStack == null) {
+			sAirFluidStack = FluidUtils.getFluidStack("air", 1);
+		}
+		if (sAirFluid == null && sAirFluidStack != null) {
+			sAirFluid = sAirFluidStack.getFluid();
+		}
+	}
 
 	public int getAir() {
+		setAir();
 		if (this.mAirIntakes.isEmpty() || this.mAirIntakes.size() <= 0) {
 			return 0;
 		}
 		else {
 			int totalAir = 0;
-			FluidStack airstack = FluidUtils.getFluidStack("air", 1);
 			for (GT_MetaTileEntity_Hatch_AirIntake u : this.mAirIntakes) {
 				if (u != null && u.mFluid != null) {
 					// had this trow errors cousing the machine to stop probebly fixed
 					FluidStack f = u.mFluid;
-					if (f.isFluidEqual(airstack)) {
+					if (f.isFluidEqual(sAirFluidStack)) {
 						totalAir += f.amount;
 					}
 				}
@@ -262,18 +283,22 @@ public int getAir() {
 		}		
 	}
 
+	@Override
+	public GT_Recipe_Map getRecipeMap() {
+		return GTPP_Recipe.GTPP_Recipe_Map.sRocketFuels;
+	}
+
 	@Override
 	public boolean checkRecipe(final ItemStack aStack) {
 		final ArrayList<FluidStack> tFluids = this.getStoredFluids();
-		FluidStack air = FluidUtils.getFluidStack("air", 1);
 
 		int aircount = getAir() ;
 		if (aircount <  euProduction/100) {
 			//log("Not Enough Air to Run "+aircount);
 			return false;
 		}
 		else {		
-			boolean hasIntakeAir = this.depleteInput(FluidUtils.getFluidStack(air, euProduction/100));
+			boolean hasIntakeAir = this.depleteInput(FluidUtils.getFluidStack(sAirFluid, euProduction/100));
 			if (!hasIntakeAir) {
 				//log("Could not consume Air to run "+aircount);
 				freeFuelTicks = 0;
@@ -286,10 +311,9 @@ public boolean checkRecipe(final ItemStack aStack) {
 
 		//log("Running "+aircount);
 		log("looking at hatch");
-		final Collection<GT_Recipe> tRecipeList = GTPP_Recipe.GTPP_Recipe_Map.sRocketFuels.mRecipeList;
 
 
-		if (tFluids.size() > 0 && tRecipeList != null) {
+		if (tFluids.size() > 0 && getRecipeMap() != null) {
 
 			if (tFluids.contains(MISC_MATERIALS.CARBON_DIOXIDE.getFluidStack(this.boostEu ? 3 : 1)) || tFluids.contains(FluidUtils.getFluidStack("carbondioxide", (this.boostEu ? 3 : 1)))) {
 				if (this.mRuntime % 72 == 0 || this.mRuntime == 0) {
@@ -308,12 +332,12 @@ public boolean checkRecipe(final ItemStack aStack) {
 				this.boostEu = consumeLOH();
 
 			for (final FluidStack hatchFluid1 : tFluids) {
-				if (hatchFluid1.isFluidEqual(air)) {
+				if (hatchFluid1.isFluidEqual(sAirFluidStack)) {
 					continue;
 				}
 
 				if (freeFuelTicks == 0) {
-					for (final GT_Recipe aFuel : tRecipeList) {
+					for (final GT_Recipe aFuel : getRecipeMap().mRecipeList) {
 						final FluidStack tLiquid;
 						tLiquid = aFuel.mFluidInputs[0];
 						if (hatchFluid1.isFluidEqual(tLiquid)) {

src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java

@@ -601,7 +601,7 @@ public boolean checkRecipeGeneric(
 		}		
 
 		// checks if it has a catalyst
-		ItemStack tCatalystRecipe = findCatalyst(aItemInputs);
+		ItemStack tCatalystRecipe = null;
 		boolean aDoesRecipeNeedCatalyst = false;
 		for (ItemStack aInputItem : tRecipe.mInputs) {
 			if (ItemUtils.isCatalyst(aInputItem)) {
@@ -610,6 +610,7 @@ public boolean checkRecipeGeneric(
 			}
 		}
 		if (aDoesRecipeNeedCatalyst) {
+			tCatalystRecipe = findCatalyst(aItemInputs, tRecipe.mInputs);
 			if (tCatalystRecipe == null) {
 				log("does not have catalyst");
 				return false;
@@ -951,12 +952,16 @@ private int getCatalysts(ItemStack[] aItemInputs, ItemStack aRecipeCatalyst, int
 		return allowedParallel;
 	}
 
-	private ItemStack findCatalyst(ItemStack[] aItemInputs) {
+	private ItemStack findCatalyst(ItemStack[] aItemInputs, ItemStack[] aRecipeInputs) {
 		if (aItemInputs != null) {
 			for (final ItemStack aInput : aItemInputs) {
 				if (aInput != null) {
 					if (ItemUtils.isCatalyst(aInput)) {
-						return aInput;
+						for (ItemStack aRecipeInput : aRecipeInputs) {
+							if (GT_Utility.areStacksEqual(aRecipeInput, aInput, true)) {
+								return aInput;
+							}
+						}
 					}
 				}
 			}