From 7c02ac0977ee37dda637d21d7d1092835b1d03eb Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Thu, 6 Jan 2022 11:18:05 +0000
Subject: Added Asm, Screenshots and World to .gitignore. Removed some useless
 classes. Buffed Amazon Packager. Implemented Caching for Amazon Packager.
 Fixed all GT++ multis getting stuck when input bus contains less than
 required input of an item. (It will check other inputs for another valid
 recipe now)

---
 .../base/GregtechMeta_MultiBlockBase.java               | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

(limited to 'src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations')

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
index 42fdc246b4..c8b58ff097 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
@@ -40,7 +40,6 @@ import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEn
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBattery;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_OutputBattery;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Steam_BusInput;
-import gtPlusPlus.xmod.gregtech.api.objects.MultiblockRequirements;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
@@ -94,7 +93,6 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_En
 	private static final Method findRecipe09;
 
 	public GT_Recipe mLastRecipe;
-	private MultiblockRequirements mRequirements;
 	private boolean mInternalCircuit = false;
 	protected long mTotalRunTime = 0;
 	protected boolean mVoidExcess = false;
@@ -355,17 +353,6 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_En
 	public final static String TAG_HIDE_POLLUTION = "TAG_HIDE_POLLUTION";
 	public final static String TAG_HIDE_MACHINE_TYPE = "TAG_HIDE_MACHINE_TYPE";
 
-	public synchronized final MultiblockRequirements getRequirements() {
-		return mRequirements;
-	}
-
-	//public abstract MultiblockRequirements setRequirements();
-
-	public synchronized final void setRequirementsInternal() {
-		//this.mRequirements = setRequirements();
-		this.mRequirements = null;
-	}
-
 	public int getAmountOfOutputs() {
 		return 1;
 	}
@@ -970,7 +957,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_En
 		log("Running checkRecipeGeneric(0)");
 		
 		GT_Recipe tRecipe = findRecipe(
-				getBaseMetaTileEntity(), mLastRecipe, false,
+				getBaseMetaTileEntity(), mLastRecipe, false, false,
 				gregtech.api.enums.GT_Values.V[tTier], aFluidInputs, aItemInputs);		
 		
 		log("Running checkRecipeGeneric(1)");
@@ -1323,7 +1310,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_En
 		//Bad modify, let's just use the original recipe.
 		if (!mHasBoostedCurrentRecipe || mBoostedRecipe == null) {
 			tRecipe = aRecipe != null ? aRecipe : findRecipe(
-					getBaseMetaTileEntity(), mLastRecipe, false,
+					getBaseMetaTileEntity(), mLastRecipe, false, false,
 					gregtech.api.enums.GT_Values.V[tTier], aFluidInputs, aItemInputs);
 		}		
 
-- 
cgit