aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech
diff options
context:
space:
mode:
authorBlood-Asp <bloodasphendrik@gmail.com>2016-08-31 14:22:00 +0200
committerBlood-Asp <bloodasphendrik@gmail.com>2016-08-31 14:22:00 +0200
commitb4049e88a269b5def8d3335aec566dcfc387a26b (patch)
treeae6059f00aa6878a74a260655b50bb03a1b273cb /src/main/java/gregtech
parent8086832d88da722d5c86c668e721ee72f518b8a0 (diff)
downloadGT5-Unofficial-b4049e88a269b5def8d3335aec566dcfc387a26b.tar.gz
GT5-Unofficial-b4049e88a269b5def8d3335aec566dcfc387a26b.tar.bz2
GT5-Unofficial-b4049e88a269b5def8d3335aec566dcfc387a26b.zip
Port GT6 TC load time improvements
Diffstat (limited to 'src/main/java/gregtech')
-rw-r--r--src/main/java/gregtech/common/GT_ThaumcraftCompat.java43
1 files changed, 18 insertions, 25 deletions
diff --git a/src/main/java/gregtech/common/GT_ThaumcraftCompat.java b/src/main/java/gregtech/common/GT_ThaumcraftCompat.java
index 8e5c00c131..aa3d120357 100644
--- a/src/main/java/gregtech/common/GT_ThaumcraftCompat.java
+++ b/src/main/java/gregtech/common/GT_ThaumcraftCompat.java
@@ -190,32 +190,25 @@ public class GT_ThaumcraftCompat
}
return ThaumcraftApi.addInfusionCraftingRecipe(aResearch, GT_Utility.copy(new Object[]{aOutput}), aInstability, getAspectList(aAspects), aMainInput, aSideInputs);
}
+
+ public boolean registerThaumcraftAspectsToItem(ItemStack aExampleStack, List<TC_Aspects.TC_AspectStack> aAspects, String aOreDict) {
+ if (aAspects.isEmpty()) return false;
+ ThaumcraftApi.registerObjectTag(aOreDict, (AspectList)getAspectList(aAspects));
+ return true;
+ }
- public boolean registerThaumcraftAspectsToItem(ItemStack aExampleStack, List<TC_Aspects.TC_AspectStack> aAspects, String aOreDict) {
- if (aAspects.isEmpty()) {
- return false;
- }
- AspectList tAlreadyRegisteredAspects = ThaumcraftApiHelper.getObjectAspects(aExampleStack);
- if ((tAlreadyRegisteredAspects == null) || (tAlreadyRegisteredAspects.size() <= 0)) {
- ThaumcraftApi.registerObjectTag(aOreDict, getAspectList(aAspects));
- }
- return true;
- }
-
- public boolean registerThaumcraftAspectsToItem(ItemStack aStack, List<TC_Aspects.TC_AspectStack> aAspects, boolean aAdditive) {
- if (aAspects.isEmpty()) {
- return false;
- }
- if (aAdditive) {
- ThaumcraftApi.registerComplexObjectTag(aStack, getAspectList(aAspects));
- return true;
- }
- AspectList tAlreadyRegisteredAspects = ThaumcraftApiHelper.getObjectAspects(aStack);
- if ((tAlreadyRegisteredAspects == null) || (tAlreadyRegisteredAspects.size() <= 0)) {
- ThaumcraftApi.registerObjectTag(aStack, getAspectList(aAspects));
- }
- return true;
- }
+ public boolean registerThaumcraftAspectsToItem(ItemStack aStack, List<TC_Aspects.TC_AspectStack> aAspects, boolean aAdditive) {
+ if (aAspects.isEmpty()) return false;
+ if (aAdditive) {
+ ThaumcraftApi.registerComplexObjectTag(aStack, (AspectList)getAspectList(aAspects));
+ return true;
+ }
+ AspectList tAlreadyRegisteredAspects = ThaumcraftApiHelper.getObjectAspects(aStack);
+ if (tAlreadyRegisteredAspects == null || tAlreadyRegisteredAspects.size() <= 0) {
+ ThaumcraftApi.registerObjectTag(aStack, (AspectList)getAspectList(aAspects));
+ }
+ return true;
+ }
public boolean registerPortholeBlacklistedBlock(Block aBlock) {
ThaumcraftApi.portableHoleBlackList.add(aBlock);