aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/GT_ThaumcraftCompat.java
diff options
context:
space:
mode:
authorMuramasa <haydenkilloh@gmail.com>2016-09-16 12:17:19 +0100
committerMuramasa <haydenkilloh@gmail.com>2016-09-16 12:17:19 +0100
commit312141cd1096a19d07aa0a5186cd3e7eeee51a9d (patch)
tree7a9d891f1bf1e4108be3e0c17f4a6e4e4b7e004f /src/main/java/gregtech/common/GT_ThaumcraftCompat.java
parente981c0db305ee97e9b4782a501443da868eb1c94 (diff)
parent491925bc5927975a224e904facb6f38cbdc99345 (diff)
downloadGT5-Unofficial-312141cd1096a19d07aa0a5186cd3e7eeee51a9d.tar.gz
GT5-Unofficial-312141cd1096a19d07aa0a5186cd3e7eeee51a9d.tar.bz2
GT5-Unofficial-312141cd1096a19d07aa0a5186cd3e7eeee51a9d.zip
Fix it again
Diffstat (limited to 'src/main/java/gregtech/common/GT_ThaumcraftCompat.java')
-rw-r--r--src/main/java/gregtech/common/GT_ThaumcraftCompat.java41
1 files changed, 17 insertions, 24 deletions
diff --git a/src/main/java/gregtech/common/GT_ThaumcraftCompat.java b/src/main/java/gregtech/common/GT_ThaumcraftCompat.java
index 7c2cfed0ae..aa3d120357 100644
--- a/src/main/java/gregtech/common/GT_ThaumcraftCompat.java
+++ b/src/main/java/gregtech/common/GT_ThaumcraftCompat.java
@@ -191,31 +191,24 @@ 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;
- }
- AspectList tAlreadyRegisteredAspects = ThaumcraftApiHelper.getObjectAspects(aExampleStack);
- if ((tAlreadyRegisteredAspects == null) || (tAlreadyRegisteredAspects.size() <= 0)) {
- ThaumcraftApi.registerObjectTag(aOreDict, getAspectList(aAspects));
- }
- return true;
- }
+ 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 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);