diff options
author | Draknyte1 <Draknyte1@hotmail.com> | 2016-07-03 17:59:20 +1000 |
---|---|---|
committer | Draknyte1 <Draknyte1@hotmail.com> | 2016-07-03 17:59:20 +1000 |
commit | 1d29368b3f291b6c079c19f329cbff7554aa0108 (patch) | |
tree | 29edb99e43934f236866fcedb30e46639abebc86 /src/Java/miscutil | |
parent | 6de8c90660c282bd28619c728816dc7ff59d79cf (diff) | |
download | GT5-Unofficial-1d29368b3f291b6c079c19f329cbff7554aa0108.tar.gz GT5-Unofficial-1d29368b3f291b6c079c19f329cbff7554aa0108.tar.bz2 GT5-Unofficial-1d29368b3f291b6c079c19f329cbff7554aa0108.zip |
+ Added some logging to the xmod Fluid handlers.
+ Bumped Build version.
Diffstat (limited to 'src/Java/miscutil')
4 files changed, 19 insertions, 8 deletions
diff --git a/src/Java/miscutil/core/lib/CORE.java b/src/Java/miscutil/core/lib/CORE.java index 9a97918b1a..0f9e277ddd 100644 --- a/src/Java/miscutil/core/lib/CORE.java +++ b/src/Java/miscutil/core/lib/CORE.java @@ -15,7 +15,7 @@ public class CORE { public static final String name = "Misc. Utils"; public static final String MODID = "miscutils"; - public static final String VERSION = "1.3.1"; + public static final String VERSION = "1.3.2"; public static final boolean DEBUG = false; public static final boolean LOAD_ALL_CONTENT = false; public static final int GREG_FIRST_ID = 760; diff --git a/src/Java/miscutil/core/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java b/src/Java/miscutil/core/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java index 8d7ea692f8..bd00b3b249 100644 --- a/src/Java/miscutil/core/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java +++ b/src/Java/miscutil/core/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java @@ -3,6 +3,7 @@ package miscutil.core.xmod.gregtech.common.blocks.fluid; import gregtech.api.enums.ItemList; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_OreDictUnificator; +import miscutil.core.util.Utils; import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; import miscutil.core.xmod.gregtech.common.Meta_GT_Proxy; @@ -28,8 +29,10 @@ 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); */ + 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, 1200, GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.Pyrotheum, 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/core/xmod/thermalfoundation/fluid/TF_Fluids.java b/src/Java/miscutil/core/xmod/thermalfoundation/fluid/TF_Fluids.java index db73b110c8..39e05dc8f8 100644 --- a/src/Java/miscutil/core/xmod/thermalfoundation/fluid/TF_Fluids.java +++ b/src/Java/miscutil/core/xmod/thermalfoundation/fluid/TF_Fluids.java @@ -1,5 +1,6 @@ package miscutil.core.xmod.thermalfoundation.fluid; +import miscutil.core.util.Utils; import miscutil.core.xmod.thermalfoundation.item.TF_Items; import net.minecraft.block.BlockDispenser; import net.minecraft.init.Items; @@ -16,20 +17,27 @@ public class TF_Fluids public static void preInit() { + Utils.LOG_INFO("Loading TF Fluids"); + Fluid pyrotheum = FluidRegistry.getFluid("pyrotheum"); + Fluid cryotheum = FluidRegistry.getFluid("cryotheum"); - if (FluidRegistry.getFluid("pyrotheum") == null){ + if (pyrotheum == null){ + Utils.LOG_INFO("Registering Blazing Pyrotheum as it does not exist."); fluidPyrotheum = new Fluid("pyrotheum").setLuminosity(15).setDensity(2000).setViscosity(1200).setTemperature(4000).setRarity(EnumRarity.rare); registerFluid(fluidPyrotheum, "pyrotheum"); } else { - fluidPyrotheum = FluidRegistry.getFluid("pyrotheum"); + Utils.LOG_INFO("Registering Blazing Pyrotheum as it an already existing Fluid."); + fluidPyrotheum = pyrotheum; } - if (FluidRegistry.getFluid("cryotheum") == null){ + if (cryotheum == null){ + Utils.LOG_INFO("Registering Gelid Cryotheum as it does not exist."); fluidCryotheum = new Fluid("cryotheum").setLuminosity(0).setDensity(4000).setViscosity(3000).setTemperature(50).setRarity(EnumRarity.rare); registerFluid(fluidCryotheum, "cryotheum"); } else { - fluidCryotheum = FluidRegistry.getFluid("cryotheum"); + Utils.LOG_INFO("Registering Gelid Cryotheum as it an already existing Fluid."); + fluidCryotheum = cryotheum; } } diff --git a/src/Java/miscutil/mcmod.info b/src/Java/miscutil/mcmod.info index 1887008ebc..a26ba593e4 100644 --- a/src/Java/miscutil/mcmod.info +++ b/src/Java/miscutil/mcmod.info @@ -1,12 +1,12 @@ /** - * @version 1.3.1 + * @version 1.3.2 * @author Alkalus * In-game info for project: MiscUtils. */ [ { "modid" : "miscutil" , "name" : "miscutils" , "description" : "Adds a few various things. Supported mods include GregTech, EnderIO, Big Reactors, Thaumcraft, ExtraUtils, Pnuematicraft & Simply Jetpacks." - , "version" : "1.3.1" + , "version" : "1.3.2" , "mcversion" : "1.7.10" , "url" : "" , "updateUrl" : "" |