Update 5.08.19

3 files changed, 32 insertions, 24 deletions

diff --git a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java
index dc9c9a7615..674919761d 100644
--- a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java
+++ b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java
@@ -71,20 +71,20 @@ public abstract class GT_MetaTileEntity_LargeTurbine extends GT_MetaTileEntity_M
 	            for (byte k = 0; k < 4; k = (byte)(k + 1)) {
 	              if (((i == 0) || (j == 0)) && ((k == 1) || (k == 2)))
 	              {
-	                if (getBaseMetaTileEntity().getBlock(tX + (tSide == 5 ? k : tSide < 4 ? i : -k), tY + j, tZ + (tSide < 4 ? -k : tSide == 3 ? k : i)) == getCasingBlock())
+	                if (getBaseMetaTileEntity().getBlock(tX + (tSide == 5 ? k : tSide < 4 ? i : -k), tY + j, tZ + (tSide > 4 ? -k : tSide == 3 ? k : i)) == getCasingBlock())
 	                {
-	                  if (getBaseMetaTileEntity().getMetaID(tX + (tSide == 5 ? k : tSide < 4 ? i : -k), tY + j, tZ + (tSide < 4 ? -k : tSide == 3 ? k : i)) == getCasingMeta()) {}
+	                  if (getBaseMetaTileEntity().getMetaID(tX + (tSide == 5 ? k : tSide < 4 ? i : -k), tY + j, tZ + (tSide > 4 ? -k : tSide == 3 ? k : i)) == getCasingMeta()) {}
 	                }
-	                else if (!addToMachineList(getBaseMetaTileEntity().getIGregTechTileEntity(tX + (tSide == 5 ? k : tSide < 4 ? i : -k), tY + j, tZ + (tSide < 4 ? -k : tSide == 3 ? k : i)))) {
+	                else if (!addToMachineList(getBaseMetaTileEntity().getIGregTechTileEntity(tX + (tSide == 5 ? k : tSide < 4 ? i : -k), tY + j, tZ + (tSide > 4 ? -k : tSide == 3 ? k : i)))) {
 	                	return false;
 	                }
 	              }
-	              else if (getBaseMetaTileEntity().getBlock(tX + (tSide == 5 ? k : tSide < 4 ? i : -k), tY + j, tZ + (tSide < 4 ? -k : tSide == 3 ? k : i)) == getCasingBlock())
+	              else if (getBaseMetaTileEntity().getBlock(tX + (tSide == 5 ? k : tSide < 4 ? i : -k), tY + j, tZ + (tSide > 4 ? -k : tSide == 3 ? k : i)) == getCasingBlock())
 	              {
-	                if (getBaseMetaTileEntity().getMetaID(tX + (tSide == 5 ? k : tSide < 4 ? i : -k), tY + j, tZ + (tSide < 4 ? -k : tSide == 3 ? k : i)) == getCasingMeta()) {}
+	                if (getBaseMetaTileEntity().getMetaID(tX + (tSide == 5 ? k : tSide < 4 ? i : -k), tY + j, tZ + (tSide > 4 ? -k : tSide == 3 ? k : i)) == getCasingMeta()) {}
 	              }
 	              else {
-	                return false;
+	            	  return false;
 	              }
 	            }
 	          }
diff --git a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java
index 5ddd0e9069..0c4b88b621 100644
--- a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java
+++ b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java
@@ -49,7 +49,7 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar
 		    		counter = 0;
 		    		baseEff = (int) ((50.0F+(10.0F*((GT_MetaGenerated_Tool)aStack.getItem()).getToolCombatDamage(aStack)))*100);
 		    		optFlow = (int) Math.max(Float.MIN_NORMAL, ((GT_MetaGenerated_Tool)aStack.getItem()).getToolStats(aStack).getSpeedMultiplier() * ((GT_MetaGenerated_Tool)aStack.getItem()).getPrimaryMaterial(aStack).mToolSpeed*50);
-		    		optFlow *=10;
+		    		optFlow *=40;
 		    }
 		    int tEU=0;
 		    for(int i=0;i<steams.size();i++){
diff --git a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java
index 8056f094d4..4726181726 100644
--- a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java
+++ b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java
@@ -60,37 +60,37 @@ public class GT_MetaTileEntity_ProcessingArray extends GT_MetaTileEntity_MultiBl
 									String tmp = mInventory[1].getUnlocalizedName().replaceAll("gt.blockmachines.basicmachine.", "");
 										if(tmp.startsWith("centrifuge")){
 											return GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes;
-										}else if(tmp.equals("electrolyzer")){
+										}else if(tmp.startsWith("electrolyzer")){
 											return GT_Recipe.GT_Recipe_Map.sElectrolyzerRecipes;
-										}else if(tmp.equals("alloysmelter")){
+										}else if(tmp.startsWith("alloysmelter")){
 											return GT_Recipe.GT_Recipe_Map.sAlloySmelterRecipes;
-										}else if(tmp.equals("assembler")){
+										}else if(tmp.startsWith("assembler")){
 											return GT_Recipe.GT_Recipe_Map.sAssemblerRecipes;
-										}else if(tmp.equals("compressor")){
+										}else if(tmp.startsWith("compressor")){
 											return GT_Recipe.GT_Recipe_Map.sCompressorRecipes;
-										}else if(tmp.equals("extractor")){
+										}else if(tmp.startsWith("extractor")){
 											return GT_Recipe.GT_Recipe_Map.sExtractorRecipes;
-										}else if(tmp.equals("macerator")){
+										}else if(tmp.startsWith("macerator")){
 											return GT_Recipe.GT_Recipe_Map.sMaceratorRecipes;
-										}else if(tmp.equals("recycler")){
+										}else if(tmp.startsWith("recycler")){
 											return GT_Recipe.GT_Recipe_Map.sRecyclerRecipes;
-										}else if(tmp.equals("thermalcentrifuge")){
+										}else if(tmp.startsWith("thermalcentrifuge")){
 											return GT_Recipe.GT_Recipe_Map.sThermalCentrifugeRecipes;
-										}else if(tmp.equals("orewasher")){
+										}else if(tmp.startsWith("orewasher")){
 											return GT_Recipe.GT_Recipe_Map.sOreWasherRecipes;
-										}else if(tmp.equals("chemicalreactor")){
+										}else if(tmp.startsWith("chemicalreactor")){
 											return GT_Recipe.GT_Recipe_Map.sChemicalRecipes;
-										}else if(tmp.equals("chemicalbath")){
+										}else if(tmp.startsWith("chemicalbath")){
 											return GT_Recipe.GT_Recipe_Map.sChemicalBathRecipes;
-										}else if(tmp.equals("electromagneticseparator")){
+										}else if(tmp.startsWith("electromagneticseparator")){
 											return GT_Recipe.GT_Recipe_Map.sElectroMagneticSeparatorRecipes;
-										}else if(tmp.equals("autoclave")){
+										}else if(tmp.startsWith("autoclave")){
 											return GT_Recipe.GT_Recipe_Map.sAutoclaveRecipes;
-										}else if(tmp.equals("mixer")){
+										}else if(tmp.startsWith("mixer")){
 											return GT_Recipe.GT_Recipe_Map.sMixerRecipes;
-										}else if(tmp.equals("hammer")){
+										}else if(tmp.startsWith("hammer")){
 											return GT_Recipe.GT_Recipe_Map.sHammerRecipes;
-										}else if(tmp.equals("sifter")){
+										}else if(tmp.startsWith("sifter")){
 											return GT_Recipe.GT_Recipe_Map.sSifterRecipes;
 										}
 				/*  57: 54 */     return null;
@@ -160,13 +160,20 @@ public class GT_MetaTileEntity_ProcessingArray extends GT_MetaTileEntity_MultiBl
 										this.mOutputItems = null;
 										this.mOutputFluids = null;
 										this.mMaxProgresstime = tRecipe.mDuration;
-										int machines = Math.max(16,mInventory[1].stackSize);
+										int machines = Math.min(16,mInventory[1].stackSize);
 										this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000);
 										this.mEfficiencyIncrease = 10000;
 										int i = 0;
 										for(;i<machines;i++){
 											if(!tRecipe.isRecipeInputEqual(true, tFluids, tInputs))break;
 										}
+//										System.out.println("recipe:"+i+" "+tRecipe.mDuration+" "+tRecipe.mEUt);
+//										if(tRecipe.mOutputs.length>0){
+//											System.out.println(tRecipe.mOutputs[0].getUnlocalizedName());
+//										}
+//										if(tRecipe.mFluidOutputs.length>0){
+//											System.out.println(tRecipe.mFluidOutputs[0].getUnlocalizedName());
+//										}
 										      if (tRecipe.mEUt <= 16)
 										       {
 										        this.mEUt = (tRecipe.mEUt * (1 << tTier - 1) * (1 << tTier - 1));
@@ -206,6 +213,7 @@ public class GT_MetaTileEntity_ProcessingArray extends GT_MetaTileEntity_MultiBl
 										this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime);
 										this.mOutputItems = tOut;
 										this.mOutputFluids = new FluidStack[]{tFOut};
+//										System.out.println("ArrayOut"+mOutputItems.length+" "+mOutputFluids.length+" "+(mOutputItems.length>0?mOutputItems[0].getUnlocalizedName():"")+" "+(mOutputFluids.length>0?mOutputFluids[0].getUnlocalizedName():" "));
 										updateSlots();
 				/* 105: 93 */           return true;
 				/* 107:    */       }