Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

Make recipe input work for split stacks

Browse source
This commit is contained in:
Logan Perkins 2016-06-12 10:41:52 -07:00 committed by GitHub
parent c596231af4
commit 54ae577be0
1 changed files with 65 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
src/main/java/gregtech/api/util/GT_Recipe.java
View file

@ -317,57 +317,102 @@ public class GT_Recipe {
public boolean isRecipeInputEqual(boolean aDecreaseStacksizeBySuccess, boolean aDontCheckStackSizes, FluidStack[] aFluidInputs, ItemStack... aInputs) { public boolean isRecipeInputEqual(boolean aDecreaseStacksizeBySuccess, boolean aDontCheckStackSizes, FluidStack[] aFluidInputs, ItemStack... aInputs) {
if (mFluidInputs.length > 0 && aFluidInputs == null) return false; if (mFluidInputs.length > 0 && aFluidInputs == null) return false;
int amt;
for (FluidStack tFluid : mFluidInputs) for (FluidStack tFluid : mFluidInputs)
if (tFluid != null) { if (tFluid != null) {
boolean temp = true; boolean temp = true;
amt = tFluid.amount;
for (FluidStack aFluid : aFluidInputs) for (FluidStack aFluid : aFluidInputs)
if (aFluid != null && aFluid.isFluidEqual(tFluid) && (aDontCheckStackSizes || aFluid.amount >= tFluid.amount)) { if (aFluid != null && aFluid.isFluidEqual(tFluid)){
temp = false; if (aDontCheckStackSizes ){
break; temp = false;
break;
}
amt -= aFluid.amount;
if (amt<1){
temp = false;
break;
}
} }
if (temp) return false; if (temp) return false;
} }
if (mInputs.length > 0 && aInputs == null) return false; if (mInputs.length > 0 && aInputs == null) return false;
for (ItemStack tStack : mInputs) for (ItemStack tStack : mInputs) {
if (tStack != null) { if (tStack != null) {
amt = tStack.stackSize;
boolean temp = true; boolean temp = true;
for (ItemStack aStack : aInputs) for (ItemStack aStack : aInputs) {
if ((GT_Utility.areUnificationsEqual(aStack, tStack, true) || GT_Utility.areUnificationsEqual(GT_OreDictUnificator.get(false, aStack), tStack, true)) && (aDontCheckStackSizes || aStack.stackSize >= tStack.stackSize)) { if ((GT_Utility.areUnificationsEqual(aStack, tStack, true) || GT_Utility.areUnificationsEqual(GT_OreDictUnificator.get(false, aStack), tStack, true))) {
temp = false; if (aDontCheckStackSizes) {
break; temp = false;
break;
}
amt -= aStack.stackSize;
if (amt < 1) {
temp = false;
break;
}
} }
}
if (temp) return false; if (temp) return false;
} }
}
if (aDecreaseStacksizeBySuccess) { if (aDecreaseStacksizeBySuccess) {
if (aFluidInputs != null) { if (aFluidInputs != null) {
for (FluidStack tFluid : mFluidInputs) for (FluidStack tFluid : mFluidInputs) {
if (tFluid != null) { if (tFluid != null) {
for (FluidStack aFluid : aFluidInputs) amt = tFluid.amount;
if (aFluid != null && aFluid.isFluidEqual(tFluid) && (aDontCheckStackSizes || aFluid.amount >= tFluid.amount)) { for (FluidStack aFluid : aFluidInputs) {
aFluid.amount -= tFluid.amount; if (aFluid != null && aFluid.isFluidEqual(tFluid)) {
break; if (aDontCheckStackSizes) {
aFluid.amount -= amt;
break;
}
if (aFluid.amount < amt) {
amt -= aFluid.amount;
aFluid.amount = 0;
} else {
aFluid.amount -= amt;
amt = 0;
break;
}
} }
}
} }
}
} }
if (aInputs != null) { if (aInputs != null) {
for (ItemStack tStack : mInputs) for (ItemStack tStack : mInputs) {
if (tStack != null) { if (tStack != null) {
for (ItemStack aStack : aInputs) amt = tStack.stackSize;
if ((GT_Utility.areUnificationsEqual(aStack, tStack, true) || GT_Utility.areUnificationsEqual(GT_OreDictUnificator.get(false, aStack), tStack, true)) && (aDontCheckStackSizes || aStack.stackSize >= tStack.stackSize)) { for (ItemStack aStack : aInputs) {
aStack.stackSize -= tStack.stackSize; if ((GT_Utility.areUnificationsEqual(aStack, tStack, true) || GT_Utility.areUnificationsEqual(GT_OreDictUnificator.get(false, aStack), tStack, true))) {
break; if (aDontCheckStackSizes){
aStack.stackSize -= amt;
break;
}
if (aStack.stackSize < amt){
amt -= aStack.stackSize;
aStack.stackSize = 0;
}else{
aStack.stackSize -= amt;
amt = 0;
break;
}
} }
}
} }
}
} }
} }
return true; return true;
} }
public static class GT_Recipe_Map { public static class GT_Recipe_Map {
/** /**
* Contains all Recipe Maps * Contains all Recipe Maps
@ -1272,4 +1317,4 @@ public class GT_Recipe {
return super.containsInput(aFluid) || Dyes.isAnyFluidDye(aFluid); return super.containsInput(aFluid) || Dyes.isAnyFluidDye(aFluid);
} }
} }
} }