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

Fix Steam macerator not accepting some items per automation

Browse source
This commit is contained in:
Blood-Asp 2017-03-02 18:37:59 +01:00
parent 4280e3dbd3
commit 8e945a8b88
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/gregtech/api/util/GT_ModHandler.java
View file

@ -1490,6 +1490,7 @@ public class GT_ModHandler {
/**
* Used in my own Macerator. Decreases StackSize of the Input if wanted.
*/
@Deprecated
public static ItemStack getMaceratorOutput(ItemStack aInput, boolean aRemoveInput, ItemStack aOutputSlot) {
return GT_Utility.copy(getMachineOutput(aInput, getMaceratorRecipeList(), aRemoveInput, new NBTTagCompound(), aOutputSlot)[0]);
}
@ -1497,6 +1498,7 @@ public class GT_ModHandler {
/**
* Used in my own Extractor. Decreases StackSize of the Input if wanted.
*/
@Deprecated
public static ItemStack getExtractorOutput(ItemStack aInput, boolean aRemoveInput, ItemStack aOutputSlot) {
return GT_Utility.copy(getMachineOutput(aInput, getExtractorRecipeList(), aRemoveInput, new NBTTagCompound(), aOutputSlot)[0]);
}
@ -1504,6 +1506,7 @@ public class GT_ModHandler {
/**
* Used in my own Compressor. Decreases StackSize of the Input if wanted.
*/
@Deprecated
public static ItemStack getCompressorOutput(ItemStack aInput, boolean aRemoveInput, ItemStack aOutputSlot) {
return GT_Utility.copy(getMachineOutput(aInput, getCompressorRecipeList(), aRemoveInput, new NBTTagCompound(), aOutputSlot)[0]);
}

2
src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Bronze.java
View file

@ -66,7 +66,7 @@ public class GT_MetaTileEntity_Macerator_Bronze
if (!super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) {
return false;
}
return GT_ModHandler.getMaceratorOutput(GT_Utility.copyAmount(64L, new Object[]{aStack}), false, null) != null;
return GT_Recipe.GT_Recipe_Map.sMaceratorRecipes.containsInput(GT_Utility.copyAmount(64L, new Object[]{aStack}));
}
public void startSoundLoop(byte aIndex, double aX, double aY, double aZ) {

2
src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Steel.java
View file

@ -66,7 +66,7 @@ public class GT_MetaTileEntity_Macerator_Steel
if (!super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) {
return false;
}
return GT_ModHandler.getMaceratorOutput(GT_Utility.copyAmount(64L, new Object[]{aStack}), false, null) != null;
return GT_Recipe.GT_Recipe_Map.sMaceratorRecipes.containsInput(GT_Utility.copyAmount(64L, new Object[]{aStack}));
}
public void startSoundLoop(byte aIndex, double aX, double aY, double aZ) {