diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/core')
3 files changed, 0 insertions, 16 deletions
diff --git a/src/main/java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java b/src/main/java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java index f511e3e6ae..0593c833f3 100644 --- a/src/main/java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java +++ b/src/main/java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java @@ -12,7 +12,6 @@ import gtPlusPlus.xmod.gregtech.HANDLER_GT; import gtPlusPlus.xmod.ic2.HANDLER_IC2; import gtPlusPlus.xmod.ob.HANDLER_OpenBlocks; import gtPlusPlus.xmod.railcraft.HANDLER_Railcraft; -import gtPlusPlus.xmod.thaumcraft.HANDLER_Thaumcraft; import gtPlusPlus.xmod.thermalfoundation.HANDLER_TF; import gtPlusPlus.xmod.tinkers.HANDLER_Tinkers; @@ -31,7 +30,6 @@ public class COMPAT_IntermodStaging { public static void init(FMLInitializationEvent init) { HANDLER_GT.init(); HANDLER_TF.init(); - HANDLER_Thaumcraft.init(); HANDLER_OpenBlocks.init(); } diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java index b54811947f..485e508805 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java @@ -2,7 +2,6 @@ package gtPlusPlus.core.item.base; import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.enums.Mods.GregTech; -import static gregtech.api.enums.Mods.Thaumcraft; import java.awt.Color; import java.util.HashMap; @@ -78,14 +77,6 @@ public class BaseItemComponent extends Item { if (componentType == ComponentTypes.GEAR) { GT_OreDictUnificator.registerOre("gear" + material.getUnlocalizedName(), ItemUtils.getSimpleStack(this)); } - if (Thaumcraft.isModLoaded()) { - // ThaumcraftUtils.addAspectToItem(ItemUtils.getSimpleStack(this), - // TC_Aspect_Wrapper.generate(TC_Aspects.METALLUM.mAspect), 1); - if (componentMaterial.isRadioactive) { - // ThaumcraftUtils.addAspectToItem(ItemUtils.getSimpleStack(this), - // TC_Aspect_Wrapper.generate(TC_Aspects.RADIO.mAspect), componentMaterial.vRadiationLevel); - } - } registerComponent(); GT_LanguageManager.addStringLocalization("gtplusplus.item." + unlocalName + ".name", getFormattedLangName()); diff --git a/src/main/java/gtPlusPlus/core/material/Material.java b/src/main/java/gtPlusPlus/core/material/Material.java index 8068d6ab35..fe1dcd618d 100644 --- a/src/main/java/gtPlusPlus/core/material/Material.java +++ b/src/main/java/gtPlusPlus/core/material/Material.java @@ -32,7 +32,6 @@ import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.MaterialUtils; -import gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect.TC_Aspect_Wrapper; import gtPlusPlus.xmod.tinkers.material.BaseTinkersMaterial; public class Material { @@ -85,8 +84,6 @@ public class Material { public int vToolQuality; public int vHarvestLevel; - private TC_Aspect_Wrapper[] vAspects; - public BaseTinkersMaterial vTiConHandler; public short werkstoffID; @@ -531,8 +528,6 @@ public class Material { this.vNeutrons = this.calculateNeutrons(); } - this.vAspects = null; - this.vMass = this.getMass(); // Sets tool Durability |