diff options
| author | Martin Robertz <dream-master@gmx.net> | 2021-07-15 16:52:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-15 16:52:01 +0200 |
| commit | a95b3edc584f77fdb4eb4e8ddbfc04dbc91be241 (patch) | |
| tree | 58916cb4487aef3387e7e6d86cb3ad1d3e42a6b2 /src/main/java/gregtech/common/GT_ThaumcraftCompat.java | |
| parent | b0b591089c9ae646506770e92efeee074598b49b (diff) | |
| parent | 77f22e029303ba48f9aabad32367e500bdcefee3 (diff) | |
| download | GT5-Unofficial-a95b3edc584f77fdb4eb4e8ddbfc04dbc91be241.tar.gz GT5-Unofficial-a95b3edc584f77fdb4eb4e8ddbfc04dbc91be241.tar.bz2 GT5-Unofficial-a95b3edc584f77fdb4eb4e8ddbfc04dbc91be241.zip | |
Merge pull request #597 from TimeConqueror/experimental
Improvements to Vanilla Replacement & GT_Utility#copy
Diffstat (limited to 'src/main/java/gregtech/common/GT_ThaumcraftCompat.java')
| -rw-r--r-- | src/main/java/gregtech/common/GT_ThaumcraftCompat.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/gregtech/common/GT_ThaumcraftCompat.java b/src/main/java/gregtech/common/GT_ThaumcraftCompat.java index bc6372e41c..e4472824e7 100644 --- a/src/main/java/gregtech/common/GT_ThaumcraftCompat.java +++ b/src/main/java/gregtech/common/GT_ThaumcraftCompat.java @@ -182,7 +182,7 @@ public class GT_ThaumcraftCompat implements IThaumcraftCompat { if ((GT_Utility.isStringInvalid(aResearch)) || (aInput == null) || (aOutput == null) || (aAspects == null) || (aAspects.isEmpty())) { return null; } - return ThaumcraftApi.addCrucibleRecipe(aResearch, GT_Utility.copy(new Object[]{aOutput}), ((aInput instanceof ItemStack)) || ((aInput instanceof ArrayList)) ? aInput : aInput.toString(), getAspectList(aAspects)); + return ThaumcraftApi.addCrucibleRecipe(aResearch, GT_Utility.copyOrNull(aOutput), ((aInput instanceof ItemStack)) || ((aInput instanceof ArrayList)) ? aInput : aInput.toString(), getAspectList(aAspects)); } @Override @@ -190,7 +190,7 @@ public class GT_ThaumcraftCompat implements IThaumcraftCompat { if ((GT_Utility.isStringInvalid(aResearch)) || (aMainInput == null) || (aSideInputs == null) || (aOutput == null) || (aAspects == null) || (aAspects.isEmpty())) { return null; } - return ThaumcraftApi.addInfusionCraftingRecipe(aResearch, GT_Utility.copy(new Object[]{aOutput}), aInstability, getAspectList(aAspects), aMainInput, aSideInputs); + return ThaumcraftApi.addInfusionCraftingRecipe(aResearch, GT_Utility.copyOrNull(aOutput), aInstability, getAspectList(aAspects), aMainInput, aSideInputs); } @Override |