diff options
Diffstat (limited to 'src/Java/miscutil/xmod')
| -rw-r--r-- | src/Java/miscutil/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java | 5 | ||||
| -rw-r--r-- | src/Java/miscutil/xmod/thermalfoundation/fluid/TF_Fluids.java | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/Java/miscutil/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java b/src/Java/miscutil/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java index ff6f3ae01a..6c3cdcad87 100644 --- a/src/Java/miscutil/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java +++ b/src/Java/miscutil/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java @@ -3,6 +3,7 @@ package miscutil.xmod.gregtech.common.blocks.fluid; import gregtech.api.enums.ItemList; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_OreDictUnificator; +import miscutil.core.lib.LoadedMods; import miscutil.core.util.Utils; import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; import miscutil.xmod.gregtech.common.Meta_GT_Proxy; @@ -29,11 +30,13 @@ public class GregtechFluidHandler { Meta_GT_Proxy.addFluid("mcguffium", "Mc Guffium 239", Materials.McGuffium239, 1, 295, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.McGuffium239, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000); Meta_GT_Proxy.addFluid("glue", "Glue", Materials.Glue, 1, 295, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Glue, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000); */ + + if (!LoadedMods.ThermalFoundation){ Utils.LOG_INFO("Adding Gregtech versions of Gelic Cryotheum and Blazing Pyrotheum."); Meta_GT_Proxy.addFluid("cryotheum", "Gelid Cryotheum", GT_Materials.Cryotheum, 4, -1200, GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.Cryotheum, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000); Meta_GT_Proxy.addFluid("pyrotheum", "Blazing Pyrotheum", GT_Materials.Pyrotheum, 4, 4000, GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.Pyrotheum, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000); - + } } } diff --git a/src/Java/miscutil/xmod/thermalfoundation/fluid/TF_Fluids.java b/src/Java/miscutil/xmod/thermalfoundation/fluid/TF_Fluids.java index f0b3cff7aa..92396f558b 100644 --- a/src/Java/miscutil/xmod/thermalfoundation/fluid/TF_Fluids.java +++ b/src/Java/miscutil/xmod/thermalfoundation/fluid/TF_Fluids.java @@ -1,5 +1,6 @@ package miscutil.xmod.thermalfoundation.fluid; +import miscutil.core.lib.LoadedMods; import miscutil.core.util.Utils; import miscutil.xmod.thermalfoundation.item.TF_Items; import net.minecraft.block.BlockDispenser; @@ -17,7 +18,8 @@ public class TF_Fluids public static void preInit() { - Utils.LOG_INFO("Loading TF Fluids"); + if (!LoadedMods.ThermalFoundation){ + Utils.LOG_INFO("Adding in our own versions of Thermal Foundation Fluids"); Fluid pyrotheum = FluidRegistry.getFluid("pyrotheum"); Fluid cryotheum = FluidRegistry.getFluid("cryotheum"); @@ -39,6 +41,10 @@ public class TF_Fluids Utils.LOG_INFO("Registering Gelid Cryotheum as it an already existing Fluid."); fluidCryotheum = cryotheum; } + } + else { + Utils.LOG_INFO("Thermal Foundation is already loaded, no need to add our own Cryotheum/Pyrotheum."); + } } public static void init() {} |