diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/tinkers')
4 files changed, 28 insertions, 32 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/tinkers/HANDLER_Tinkers.java b/src/main/java/gtPlusPlus/xmod/tinkers/HANDLER_Tinkers.java index cd25d068bb..bddde1de38 100644 --- a/src/main/java/gtPlusPlus/xmod/tinkers/HANDLER_Tinkers.java +++ b/src/main/java/gtPlusPlus/xmod/tinkers/HANDLER_Tinkers.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.tinkers; +import static gregtech.api.enums.Mods.TinkerConstruct; + import java.lang.reflect.Field; import net.minecraft.block.Block; @@ -8,7 +10,6 @@ import net.minecraftforge.fluids.FluidRegistry; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.xmod.tinkers.material.BaseTinkersMaterial; import gtPlusPlus.xmod.tinkers.util.TinkersDryingRecipe; @@ -18,16 +19,8 @@ public class HANDLER_Tinkers { public static AutoMap<BaseTinkersMaterial> mTinkerMaterials = new AutoMap<BaseTinkersMaterial>(); - public static final void preInit() { - if (LoadedMods.TiCon) {} - } - - public static final void init() { - if (LoadedMods.TiCon) {} - } - public static final void postInit() { - if (LoadedMods.TiCon) { + if (TinkerConstruct.isModLoaded()) { Fluid pyrotheumFluid = FluidRegistry.getFluid("pyrotheum"); if (pyrotheumFluid != null) { diff --git a/src/main/java/gtPlusPlus/xmod/tinkers/material/BaseTinkersMaterial.java b/src/main/java/gtPlusPlus/xmod/tinkers/material/BaseTinkersMaterial.java index 922b330443..06f7ad47f5 100644 --- a/src/main/java/gtPlusPlus/xmod/tinkers/material/BaseTinkersMaterial.java +++ b/src/main/java/gtPlusPlus/xmod/tinkers/material/BaseTinkersMaterial.java @@ -1,5 +1,6 @@ package gtPlusPlus.xmod.tinkers.material; +import static gregtech.api.enums.Mods.TinkerConstruct; import static gtPlusPlus.core.util.math.MathUtils.safeCast_LongToInt; import java.util.HashMap; @@ -170,7 +171,7 @@ public class BaseTinkersMaterial { if (generate) { Logger.INFO("[TiCon] Sending IMC: addMaterial - " + mLocalName + "."); - FMLInterModComms.sendMessage("TConstruct", "addMaterial", tag); + FMLInterModComms.sendMessage(TinkerConstruct.ID, "addMaterial", tag); ItemStack itemstack = mMaterial.getIngot(1); tag = new NBTTagCompound(); @@ -181,7 +182,7 @@ public class BaseTinkersMaterial { tag.setInteger("Value", 2); // What is value for? Logger.INFO("[TiCon] Sending IMC: addPartBuilderMaterial - " + mLocalName + "."); - FMLInterModComms.sendMessage("TConstruct", "addPartBuilderMaterial", tag); + FMLInterModComms.sendMessage(TinkerConstruct.ID, "addPartBuilderMaterial", tag); tag = new NBTTagCompound(); tag.setInteger("MaterialId", id); @@ -191,7 +192,7 @@ public class BaseTinkersMaterial { tag.setTag("Item", item); Logger.INFO("[TiCon] Sending IMC: addMaterialItem - " + mLocalName + "."); - FMLInterModComms.sendMessage("TConstruct", "addMaterialItem", tag); + FMLInterModComms.sendMessage(TinkerConstruct.ID, "addMaterialItem", tag); } } } diff --git a/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersDryingRecipe.java b/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersDryingRecipe.java index 020fee505d..ef3a0f9cd0 100644 --- a/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersDryingRecipe.java +++ b/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersDryingRecipe.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.tinkers.util; +import static gregtech.api.enums.Mods.TinkerConstruct; + import java.lang.reflect.Field; import java.util.List; @@ -10,7 +12,6 @@ import gregtech.api.enums.GT_Values; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.reflect.ReflectionUtils; @@ -55,7 +56,7 @@ public class TinkersDryingRecipe { Field aInput; Field aOutput; Class aTinkerClass = ReflectionUtils.getClass("tconstruct.library.crafting.DryingRackRecipes.DryingRecipe"); // o.getClass(); - if (aTinkerClass == null || !LoadedMods.TiCon) { + if (aTinkerClass == null || TinkerConstruct.isModLoaded()) { Logger.INFO( "Error generating Drying Recipe, could not find class. Exists? " + ReflectionUtils .doesClassExist("tconstruct.library.crafting.DryingRackRecipes.DryingRecipe")); diff --git a/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersUtils.java b/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersUtils.java index b37aad3aaf..6024e5192d 100644 --- a/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersUtils.java +++ b/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersUtils.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.tinkers.util; +import static gregtech.api.enums.Mods.TinkerConstruct; + import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; @@ -20,7 +22,6 @@ import net.minecraftforge.fluids.FluidStack; import gregtech.api.enums.Materials; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; @@ -69,29 +70,29 @@ public class TinkersUtils { * @param aSwitch - The Registry to return */ private static void setTiConDataInstance() { - if (!LoadedMods.TiCon) { + if (!TinkerConstruct.isModLoaded()) { return; - } else { - if (mSmelteryInstance == null) { - if (mClass_Smeltery != null) { - try { - mSmelteryInstance = ReflectionUtils.getField(mClass_Smeltery, "instance").get(null); - } catch (IllegalArgumentException | IllegalAccessException e) {} - } + } + + if (mSmelteryInstance == null) { + if (mClass_Smeltery != null) { + try { + mSmelteryInstance = ReflectionUtils.getField(mClass_Smeltery, "instance").get(null); + } catch (IllegalArgumentException | IllegalAccessException e) {} } - if (mTinkersRegistryInstance == null) { - if (mClass_TConstructRegistry != null) { - try { - mTinkersRegistryInstance = ReflectionUtils.getField(mClass_TConstructRegistry, "instance") - .get(null); - } catch (IllegalArgumentException | IllegalAccessException e) {} - } + } + if (mTinkersRegistryInstance == null) { + if (mClass_TConstructRegistry != null) { + try { + mTinkersRegistryInstance = ReflectionUtils.getField(mClass_TConstructRegistry, "instance") + .get(null); + } catch (IllegalArgumentException | IllegalAccessException e) {} } } } public static final boolean isTiConFirstInOD() { - if (LoadedMods.TiCon) { + if (TinkerConstruct.isModLoaded()) { try { return (boolean) ReflectionUtils.getField(ReflectionUtils.getClass("PHConstruct"), "tconComesFirst") .get(null); |