diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/thermalfoundation')
5 files changed, 48 insertions, 56 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/thermalfoundation/HANDLER_TF.java b/src/main/java/gtPlusPlus/xmod/thermalfoundation/HANDLER_TF.java index 624445a827..460a5e9fbe 100644 --- a/src/main/java/gtPlusPlus/xmod/thermalfoundation/HANDLER_TF.java +++ b/src/main/java/gtPlusPlus/xmod/thermalfoundation/HANDLER_TF.java @@ -1,6 +1,7 @@ package gtPlusPlus.xmod.thermalfoundation; -import gtPlusPlus.core.lib.LoadedMods; +import static gregtech.api.enums.Mods.COFHCore; + import gtPlusPlus.xmod.thermalfoundation.block.TF_Blocks; import gtPlusPlus.xmod.thermalfoundation.fluid.TF_Fluids; import gtPlusPlus.xmod.thermalfoundation.item.TF_Items; @@ -9,7 +10,7 @@ import gtPlusPlus.xmod.thermalfoundation.recipe.TF_Gregtech_Recipes; public class HANDLER_TF { public static void preInit() { - if (LoadedMods.CoFHCore && !LoadedMods.ThermalFoundation) { + if (COFHCore.isModLoaded()) { TF_Fluids.preInit(); TF_Items.preInit(); TF_Blocks.preInit(); @@ -17,7 +18,7 @@ public class HANDLER_TF { } public static void init() { - if (LoadedMods.CoFHCore && !LoadedMods.ThermalFoundation) { + if (COFHCore.isModLoaded()) { TF_Fluids.init(); TF_Blocks.init(); TF_Items.init(); @@ -25,7 +26,7 @@ public class HANDLER_TF { } public static void postInit() { - if (LoadedMods.CoFHCore && !LoadedMods.ThermalFoundation) { + if (COFHCore.isModLoaded()) { TF_Fluids.postInit(); TF_Items.postInit(); TF_Blocks.postInit(); diff --git a/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Cryotheum.java b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Cryotheum.java index bede18377f..d567d7bbc2 100644 --- a/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Cryotheum.java +++ b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Cryotheum.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.thermalfoundation.block; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.Random; import net.minecraft.block.Block; @@ -8,7 +10,10 @@ import net.minecraft.block.material.Material; import net.minecraft.block.material.MaterialLiquid; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.monster.*; +import net.minecraft.entity.monster.EntityBlaze; +import net.minecraft.entity.monster.EntityCreeper; +import net.minecraft.entity.monster.EntitySnowman; +import net.minecraft.entity.monster.EntityZombie; import net.minecraft.init.Blocks; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; @@ -21,7 +26,6 @@ import cofh.lib.util.BlockWrapper; import cofh.lib.util.helpers.DamageHelper; import cofh.lib.util.helpers.ServerHelper; import cpw.mods.fml.common.registry.GameRegistry; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.thermalfoundation.fluid.TF_Fluids; public class TF_Block_Fluid_Cryotheum extends BlockFluidInteractive { @@ -33,7 +37,7 @@ public class TF_Block_Fluid_Cryotheum extends BlockFluidInteractive { private static boolean effect = true; public TF_Block_Fluid_Cryotheum() { - super(CORE.MODID, TF_Fluids.fluidCryotheum, materialFluidCryotheum, "cryotheum"); + super(GTPlusPlus.ID, TF_Fluids.fluidCryotheum, materialFluidCryotheum, "cryotheum"); this.setQuantaPerBlock(5); this.setTickRate(15); diff --git a/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Ender.java b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Ender.java index 7800892f72..5bbf0ea3ab 100644 --- a/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Ender.java +++ b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Ender.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.thermalfoundation.block; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; import net.minecraft.block.material.MaterialLiquid; @@ -10,7 +12,6 @@ import net.minecraft.world.World; import cofh.core.fluid.BlockFluidCoFHBase; import cofh.core.util.CoreUtils; import cpw.mods.fml.common.registry.GameRegistry; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.thermalfoundation.fluid.TF_Fluids; public class TF_Block_Fluid_Ender extends BlockFluidCoFHBase { @@ -20,7 +21,7 @@ public class TF_Block_Fluid_Ender extends BlockFluidCoFHBase { private static boolean effect = true; public TF_Block_Fluid_Ender() { - super(CORE.MODID, TF_Fluids.fluidEnder, materialFluidEnder, "ender"); + super(GTPlusPlus.ID, TF_Fluids.fluidEnder, materialFluidEnder, "ender"); setQuantaPerBlock(4); setTickRate(20); diff --git a/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java index 649149e186..af6b74c216 100644 --- a/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java +++ b/src/main/java/gtPlusPlus/xmod/thermalfoundation/block/TF_Block_Fluid_Pyrotheum.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.thermalfoundation.block; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.Random; import net.minecraft.block.Block; @@ -18,7 +20,6 @@ import cofh.core.fluid.BlockFluidInteractive; import cofh.lib.util.BlockWrapper; import cofh.lib.util.helpers.ServerHelper; import cpw.mods.fml.common.registry.GameRegistry; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.thermalfoundation.fluid.TF_Fluids; public class TF_Block_Fluid_Pyrotheum extends BlockFluidInteractive { @@ -30,7 +31,7 @@ public class TF_Block_Fluid_Pyrotheum extends BlockFluidInteractive { private static boolean enableSourceFall = true; public TF_Block_Fluid_Pyrotheum() { - super(CORE.MODID, TF_Fluids.fluidPyrotheum, Material.lava, "pyrotheum"); + super(GTPlusPlus.ID, TF_Fluids.fluidPyrotheum, Material.lava, "pyrotheum"); this.setQuantaPerBlock(5); this.setTickRate(10); diff --git a/src/main/java/gtPlusPlus/xmod/thermalfoundation/fluid/TF_Fluids.java b/src/main/java/gtPlusPlus/xmod/thermalfoundation/fluid/TF_Fluids.java index f554c82619..35819c1f1b 100644 --- a/src/main/java/gtPlusPlus/xmod/thermalfoundation/fluid/TF_Fluids.java +++ b/src/main/java/gtPlusPlus/xmod/thermalfoundation/fluid/TF_Fluids.java @@ -1,16 +1,10 @@ package gtPlusPlus.xmod.thermalfoundation.fluid; -import net.minecraft.block.BlockDispenser; -import net.minecraft.init.Items; import net.minecraft.item.EnumRarity; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; -import cofh.core.util.fluid.DispenserEmptyBucketHandler; -import cofh.core.util.fluid.DispenserFilledBucketHandler; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.LoadedMods; -import gtPlusPlus.xmod.thermalfoundation.item.TF_Items; public class TF_Fluids { @@ -19,42 +13,38 @@ public class TF_Fluids { public static Fluid fluidEnder; public static void preInit() { - if (!LoadedMods.ThermalFoundation) { - Logger.INFO("Adding in our own versions of Thermal Foundation Fluids - Non-GT"); - final Fluid pyrotheum = FluidRegistry.getFluid("pyrotheum"); - final Fluid cryotheum = FluidRegistry.getFluid("cryotheum"); - final Fluid ender = FluidRegistry.getFluid("ender"); - - if (pyrotheum == null) { - Logger.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 { - Logger.INFO("Registering Blazing Pyrotheum as it is an already existing Fluid."); - fluidPyrotheum = pyrotheum; - } - if (cryotheum == null) { - Logger.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 { - Logger.INFO("Registering Gelid Cryotheum as it is an already existing Fluid."); - fluidCryotheum = cryotheum; - } + Logger.INFO("Adding in our own versions of Thermal Foundation Fluids - Non-GT"); + final Fluid pyrotheum = FluidRegistry.getFluid("pyrotheum"); + final Fluid cryotheum = FluidRegistry.getFluid("cryotheum"); + final Fluid ender = FluidRegistry.getFluid("ender"); + + if (pyrotheum == null) { + Logger.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 { + Logger.INFO("Registering Blazing Pyrotheum as it is an already existing Fluid."); + fluidPyrotheum = pyrotheum; + } + if (cryotheum == null) { + Logger.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 { + Logger.INFO("Registering Gelid Cryotheum as it is an already existing Fluid."); + fluidCryotheum = cryotheum; + } - if (ender == null) { - Logger.INFO("Registering Resonant Ender as it does not exist."); - fluidEnder = new Fluid("ender").setLuminosity(3).setDensity(4000).setViscosity(3000).setTemperature(300) - .setRarity(EnumRarity.uncommon); - registerFluid(fluidEnder, "ender"); - } else { - Logger.INFO("Registering Resonant Ender as it is an already existing Fluid."); - fluidEnder = ender; - } + if (ender == null) { + Logger.INFO("Registering Resonant Ender as it does not exist."); + fluidEnder = new Fluid("ender").setLuminosity(3).setDensity(4000).setViscosity(3000).setTemperature(300) + .setRarity(EnumRarity.uncommon); + registerFluid(fluidEnder, "ender"); } else { - Logger.INFO("Thermal Foundation is already loaded, no need to add our own Cryotheum/Pyrotheum."); + Logger.INFO("Registering Resonant Ender as it is an already existing Fluid."); + fluidEnder = ender; } } @@ -67,9 +57,4 @@ public class TF_Fluids { FluidRegistry.registerFluid(paramFluid); } } - - public static void registerDispenserHandlers() { - BlockDispenser.dispenseBehaviorRegistry.putObject(TF_Items.itemBucket, new DispenserFilledBucketHandler()); - BlockDispenser.dispenseBehaviorRegistry.putObject(Items.bucket, new DispenserEmptyBucketHandler()); - } } |