Collapsing TE & TF helpers into ThermalModsHelper.

Moving Thermal * item refs from Config into helper.
This commit is contained in:
MysteriousAges committed 2015-09-26 00:48:19 -07:00
1 parent 8beb50fcf8
commit 8d65e675d1
10 files changed
+180 -259

No files matched your search

+3 -3
View File
@@ -26,7 +26,7 @@ import magicbees.main.utils.LocalizationManager;
import magicbees.main.utils.compat.ArsMagicaHelper;
import magicbees.main.utils.compat.BotaniaHelper;
import magicbees.main.utils.compat.ThaumcraftHelper;
import magicbees.main.utils.compat.ThermalExpansionHelper;
import magicbees.main.utils.compat.ThermalModsHelper;
import net.minecraft.potion.Potion;
import forestry.api.apiculture.IAlleleBeeEffect;
import forestry.api.apiculture.IAlleleBeeSpecies;
@@ -133,8 +133,8 @@ public class Allele implements IAllele {
Allele.spawnManaDrainer = Allele.spawnWispOrHecate = (IAlleleEffect) Allele.getBaseAllele("effectNone");
}
if (ThermalExpansionHelper.isActive()) {
Allele.spawnBlizz = new AlleleEffectSpawnMob("TEBlizzy", true, ThermalExpansionHelper.Entity.BLIZZ.entityID)
if (ThermalModsHelper.isActive()) {
Allele.spawnBlizz = new AlleleEffectSpawnMob("TEBlizzy", true, ThermalModsHelper.Entity.BLIZZ.entityID)
.setThrottle(100)
.setChanceToSpawn(80);
} else {
@@ -15,7 +15,7 @@ import magicbees.main.utils.compat.ExtraBeesHelper;
import magicbees.main.utils.compat.ForestryHelper;
import magicbees.main.utils.compat.RedstoneArsenalHelper;
import magicbees.main.utils.compat.ThaumcraftHelper;
import magicbees.main.utils.compat.ThermalExpansionHelper;
import magicbees.main.utils.compat.ThermalModsHelper;
import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
@@ -309,7 +309,7 @@ public class BeeMutation implements IBeeMutation {
.setBlockRequired("blockElectrumFlux");
}
if (ThermalExpansionHelper.isActive()) {
if (ThermalModsHelper.isActive()) {
new BeeMutation(BeeSpecies.TIN, BeeSpecies.COPPER, BeeSpecies.TE_BRONZE, 12)
.setBlockRequired("blockBronze");
@@ -15,7 +15,7 @@ import magicbees.main.utils.compat.EquivalentExchangeHelper;
import magicbees.main.utils.compat.ForestryHelper;
import magicbees.main.utils.compat.RedstoneArsenalHelper;
import magicbees.main.utils.compat.ThaumcraftHelper;
import magicbees.main.utils.compat.ThermalExpansionHelper;
import magicbees.main.utils.compat.ThermalModsHelper;
import magicbees.main.utils.compat.BotaniaHelper.PastureSeed;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
@@ -352,14 +352,14 @@ public class BeeProductHelper {
TE_BLIZZY.addProduct(new ItemStack(ForestryHelper.beeComb, 1, ForestryHelper.Comb.FROZEN.ordinal()), 0.10f);
TE_GELID.addProduct(new ItemStack(ForestryHelper.beeComb, 1, ForestryHelper.Comb.FROZEN.ordinal()), 0.10f);
if (ThermalExpansionHelper.isActive()) {
if (ThermalModsHelper.isActive()) {
LogHelper.info("Thermal Expansion bees active");
TE_BLIZZY.addSpecialty(Config.teDustBlizz, 0.9f);
TE_GELID.addSpecialty(Config.teDustCryotheum, 0.9f);
TE_DANTE.addSpecialty(Config.teDustSulfur, 0.9f);
TE_PYRO.addSpecialty(Config.teDustPyrotheum, 0.9f);
TE_WINSOME.addSpecialty(Config.teDustPlatinum, 0.9f);
TE_ENDEARING.addSpecialty(Config.teEnderiumNugget, 0.9f);
TE_BLIZZY.addSpecialty(ThermalModsHelper.teDustBlizz, 0.9f);
TE_GELID.addSpecialty(ThermalModsHelper.teDustCryotheum, 0.9f);
TE_DANTE.addSpecialty(ThermalModsHelper.teDustSulfur, 0.9f);
TE_PYRO.addSpecialty(ThermalModsHelper.teDustPyrotheum, 0.9f);
TE_WINSOME.addSpecialty(ThermalModsHelper.teDustPlatinum, 0.9f);
TE_ENDEARING.addSpecialty(ThermalModsHelper.teEnderiumNugget, 0.9f);
}
}
+2 -2
View File
@@ -18,7 +18,7 @@ import magicbees.main.utils.compat.EquivalentExchangeHelper;
import magicbees.main.utils.compat.ForestryHelper;
import magicbees.main.utils.compat.RedstoneArsenalHelper;
import magicbees.main.utils.compat.ThaumcraftHelper;
import magicbees.main.utils.compat.ThermalExpansionHelper;
import magicbees.main.utils.compat.ThermalModsHelper;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
@@ -514,7 +514,7 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
}
BeeProductHelper.initThermalExpansionProducts();
if (!ThermalExpansionHelper.isActive()) {
if (!ThermalModsHelper.isActive()) {
TE_BLIZZY.setInactive();
TE_GELID.setInactive();
TE_DANTE.setInactive();
-22
View File
@@ -52,7 +52,6 @@ import net.minecraft.util.WeightedRandomChestContent;
import net.minecraftforge.common.ChestGenHooks;
import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.common.config.Property;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.oredict.OreDictionary;
import cpw.mods.fml.client.event.ConfigChangedEvent;
import cpw.mods.fml.common.event.FMLInterModComms;
@@ -161,27 +160,6 @@ public class Config
//----- Ars Magica Items -----------------------------------
public static Item amItemResource;
public static Item amEssence;
//---ThermalExpansion Items ---
public static ItemStack teEnderiumBlock;
public static ItemStack teElectrumBlock;
public static ItemStack teInvarBlock;
public static ItemStack teNickelBlock;
public static ItemStack tePlatinumBlock;
public static ItemStack teBronzeBlock;
public static ItemStack teEnderiumNugget;
public static ItemStack teInvarNugget;
public static ItemStack teElectrumNugget;
public static ItemStack teNickelNugget;
public static ItemStack tePlatinumNugget;
public static ItemStack teDustCryotheum;
public static ItemStack teDustBlizz;
public static ItemStack teDustPyrotheum;
public static ItemStack teDustSulfur;
public static ItemStack teDustPlatinum;
public static FluidStack teFluidGlowstone;
public static FluidStack teFluidCoal;
public static FluidStack teFluidRedstone;
public static FluidStack teFluidEnder;
//----- Config State info ----------------------------------
public static Configuration configuration;
@@ -17,7 +17,7 @@ import magicbees.main.utils.compat.ArsMagicaHelper;
import magicbees.main.utils.compat.BloodMagicHelper;
import magicbees.main.utils.compat.ForestryHelper;
import magicbees.main.utils.compat.ThaumcraftHelper;
import magicbees.main.utils.compat.ThermalExpansionHelper;
import magicbees.main.utils.compat.ThermalModsHelper;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
@@ -581,7 +581,7 @@ public class CraftingManager {
RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.BM_SANGUINE), output);
}
if (ThermalExpansionHelper.isActive()) {
if (ThermalModsHelper.isActive()) {
output = newMap();
output.put(Config.wax.getStackForType(WaxType.MAGIC), 0.55f);
output.put(Config.drops.getStackForType(DropType.DESTABILIZED), 0.22f);
@@ -9,8 +9,7 @@ public class ModHelper
ThaumcraftHelper.preInit();
EquivalentExchangeHelper.preInit();
ArsMagicaHelper.preInit();
ThermalFoundationHelper.preInit();
ThermalExpansionHelper.preInit();
ThermalModsHelper.preInit();
RedstoneArsenalHelper.preInit();
BloodMagicHelper.preInit();
BotaniaHelper.preInit();
@@ -24,8 +23,7 @@ public class ModHelper
ThaumcraftHelper.init();
EquivalentExchangeHelper.init();
ArsMagicaHelper.init();
ThermalFoundationHelper.init();
ThermalExpansionHelper.init();
ThermalModsHelper.init();
RedstoneArsenalHelper.init();
BloodMagicHelper.init();
BotaniaHelper.init();
@@ -39,8 +37,7 @@ public class ModHelper
ThaumcraftHelper.postInit();
EquivalentExchangeHelper.postInit();
ArsMagicaHelper.postInit();
ThermalFoundationHelper.postInit();
ThermalExpansionHelper.postInit();
ThermalModsHelper.postInit();
RedstoneArsenalHelper.postInit();
BloodMagicHelper.postInit();
BotaniaHelper.postInit();
@@ -1,151 +0,0 @@
package magicbees.main.utils.compat;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.event.FMLInterModComms;
import magicbees.item.types.DropType;
import magicbees.main.Config;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.fluids.FluidRegistry;
public class ThermalExpansionHelper
{
public enum MiscResource
{
EnderiumBlock,
ElectrumBlock,
BronzeBlock,
FluidCoal,
FluidRedstone,
FluidGlowstone,
FluidEnder,;
}
public enum NuggetType
{
ENDERIUM,
ELECTRUM,
BRONZE,
INVAR,
NICKEL,
PLATINUM,;
}
public enum Entity
{
BLIZZ("Blizz"),;
public final String entityID;
private Entity(String s)
{
this.entityID = s;
}
}
public static final String Name = "ThermalExpansion";
private static boolean isThermalExpansionPresent = false;
public static boolean isActive()
{
return isThermalExpansionPresent;
}
public static void preInit()
{
if (Loader.isModLoaded(Name) && Config.thermalExpansionActive)
{
isThermalExpansionPresent = true;
}
}
public static void init()
{
if (isActive())
{
getBlocks();
getItems();
getFluids();
setupCrafting();
}
}
private static void getFluids()
{
Config.teFluidGlowstone = FluidRegistry.getFluidStack("glowstone", 50);
Config.teFluidCoal = FluidRegistry.getFluidStack("coal", 50);
Config.teFluidRedstone = FluidRegistry.getFluidStack("redstone", 50);
Config.teFluidEnder = FluidRegistry.getFluidStack("ender", 50);
}
private static void setupCrafting()
{
//crucible recipes
// carbon to liquid coal
ItemStack carbonDrop = Config.drops.getStackForType(DropType.CARBON);
NBTTagCompound toSend = new NBTTagCompound();
toSend.setInteger("energy", 4000);
toSend.setTag("input", new NBTTagCompound());
toSend.setTag("output", new NBTTagCompound());
carbonDrop.writeToNBT(toSend.getCompoundTag("input"));
Config.teFluidCoal.writeToNBT(toSend.getCompoundTag("output"));
FMLInterModComms.sendMessage("ThermalExpansion", "CrucibleRecipe", toSend);
//redstone drop to molten redstone
ItemStack destabilizedDrop = Config.drops.getStackForType(DropType.DESTABILIZED);
toSend = new NBTTagCompound();
toSend.setInteger("energy", 4000);
toSend.setTag("input", new NBTTagCompound());
toSend.setTag("output", new NBTTagCompound());
destabilizedDrop.writeToNBT(toSend.getCompoundTag("input"));
Config.teFluidRedstone.writeToNBT(toSend.getCompoundTag("output"));
FMLInterModComms.sendMessage("ThermalExpansion", "CrucibleRecipe", toSend);
//endearing drop to molten ender
ItemStack endearingDrop = Config.drops.getStackForType(DropType.ENDEARING);
toSend = new NBTTagCompound();
toSend.setInteger("energy", 4000);
toSend.setTag("input", new NBTTagCompound());
toSend.setTag("output", new NBTTagCompound());
endearingDrop.writeToNBT(toSend.getCompoundTag("input"));
Config.teFluidEnder.writeToNBT(toSend.getCompoundTag("output"));
FMLInterModComms.sendMessage("ThermalExpansion", "CrucibleRecipe", toSend);
//lux drop to molten glowstone
ItemStack luxDrop = Config.drops.getStackForType(DropType.LUX);
toSend = new NBTTagCompound();
toSend.setInteger("energy", 4000);
toSend.setTag("input", new NBTTagCompound());
toSend.setTag("output", new NBTTagCompound());
luxDrop.writeToNBT(toSend.getCompoundTag("input"));
Config.teFluidGlowstone.writeToNBT(toSend.getCompoundTag("output"));
FMLInterModComms.sendMessage("ThermalExpansion", "CrucibleRecipe", toSend);
}
public static void postInit()
{
// if (isActive()) { }
}
private static void getBlocks()
{
}
private static void getItems()
{
}
}
@@ -1,63 +0,0 @@
package magicbees.main.utils.compat;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.registry.GameRegistry;
import magicbees.main.Config;
public class ThermalFoundationHelper
{
public static final String Name = "ThermalFoundation";
private static boolean isThermalFoundationPresent = false;
public static boolean isActive()
{
return isThermalFoundationPresent;
}
public static void preInit()
{
if (Loader.isModLoaded(Name) && Config.thermalExpansionActive)
{
isThermalFoundationPresent = true;
}
}
public static void init()
{
if (isActive())
{
getBlocks();
getItems();
}
}
public static void postInit()
{
//if (isActive()) { }
}
public static void getBlocks()
{
Config.teEnderiumBlock = GameRegistry.findItemStack(Name, "blockEnderium", 1);
Config.teElectrumBlock = GameRegistry.findItemStack(Name, "blockElectrum", 1);
Config.teInvarBlock = GameRegistry.findItemStack(Name, "blockInvar", 1);
Config.teNickelBlock = GameRegistry.findItemStack(Name, "blockNickel", 1);
Config.tePlatinumBlock = GameRegistry.findItemStack(Name, "blockPlatinum", 1);
Config.teBronzeBlock = GameRegistry.findItemStack(Name, "blockBronze", 1);
}
public static void getItems()
{
Config.teEnderiumNugget = GameRegistry.findItemStack(Name, "nuggetEnderium", 1);
Config.teInvarNugget = GameRegistry.findItemStack(Name, "nuggetInvar", 1);
Config.teElectrumNugget = GameRegistry.findItemStack(Name, "nuggetElectrum", 1);
Config.teNickelNugget = GameRegistry.findItemStack(Name, "nuggetNickel", 1);
Config.tePlatinumNugget = GameRegistry.findItemStack(Name, "nuggetPlatinum", 1);
Config.teDustCryotheum = GameRegistry.findItemStack(Name, "dustCryotheum", 1);
Config.teDustBlizz = GameRegistry.findItemStack(Name, "dustBlizz", 1);
Config.teDustPyrotheum = GameRegistry.findItemStack(Name, "dustPyrotheum", 1);
Config.teDustSulfur = GameRegistry.findItemStack(Name, "dustSulfur", 1);
Config.teDustPlatinum = GameRegistry.findItemStack(Name, "dustPlatinum", 1);
}
}
@@ -0,0 +1,160 @@
package magicbees.main.utils.compat;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.event.FMLInterModComms;
import cpw.mods.fml.common.registry.GameRegistry;
import magicbees.item.types.DropType;
import magicbees.main.Config;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
public class ThermalModsHelper {
public enum MiscResource {
EnderiumBlock,
ElectrumBlock,
BronzeBlock,
FluidCoal,
FluidRedstone,
FluidGlowstone,
FluidEnder,;
}
public enum NuggetType {
ENDERIUM,
ELECTRUM,
BRONZE,
INVAR,
NICKEL,
PLATINUM,;
}
public enum Entity {
BLIZZ("Blizz"),;
public final String entityID;
private Entity(String s)
{
this.entityID = s;
}
}
//---ThermalExpansion Items ---
public static ItemStack teEnderiumBlock;
public static ItemStack teElectrumBlock;
public static ItemStack teInvarBlock;
public static ItemStack teNickelBlock;
public static ItemStack tePlatinumBlock;
public static ItemStack teBronzeBlock;
public static ItemStack teEnderiumNugget;
public static ItemStack teInvarNugget;
public static ItemStack teElectrumNugget;
public static ItemStack teNickelNugget;
public static ItemStack tePlatinumNugget;
public static ItemStack teDustCryotheum;
public static ItemStack teDustBlizz;
public static ItemStack teDustPyrotheum;
public static ItemStack teDustSulfur;
public static ItemStack teDustPlatinum;
public static FluidStack teFluidGlowstone;
public static FluidStack teFluidCoal;
public static FluidStack teFluidRedstone;
public static FluidStack teFluidEnder;
public static final String Name = "ThermalExpansion";
private static boolean isThermalExpansionPresent = false;
public static boolean isActive() {
return isThermalExpansionPresent;
}
public static void preInit() {
if (Loader.isModLoaded(Name) && Config.thermalExpansionActive) {
isThermalExpansionPresent = true;
}
}
public static void init() {
if (isActive()) {
getBlocks();
getItems();
getFluids();
setupCrafting();
}
}
public static void postInit() {
// if (isActive()) { }
}
private static void getFluids() {
teFluidGlowstone = FluidRegistry.getFluidStack("glowstone", 50);
teFluidCoal = FluidRegistry.getFluidStack("coal", 50);
teFluidRedstone = FluidRegistry.getFluidStack("redstone", 50);
teFluidEnder = FluidRegistry.getFluidStack("ender", 50);
}
private static void getBlocks() {
teEnderiumBlock = GameRegistry.findItemStack(Name, "blockEnderium", 1);
teElectrumBlock = GameRegistry.findItemStack(Name, "blockElectrum", 1);
teInvarBlock = GameRegistry.findItemStack(Name, "blockInvar", 1);
teNickelBlock = GameRegistry.findItemStack(Name, "blockNickel", 1);
tePlatinumBlock = GameRegistry.findItemStack(Name, "blockPlatinum", 1);
teBronzeBlock = GameRegistry.findItemStack(Name, "blockBronze", 1);
}
private static void getItems() {
teEnderiumNugget = GameRegistry.findItemStack(Name, "nuggetEnderium", 1);
teInvarNugget = GameRegistry.findItemStack(Name, "nuggetInvar", 1);
teElectrumNugget = GameRegistry.findItemStack(Name, "nuggetElectrum", 1);
teNickelNugget = GameRegistry.findItemStack(Name, "nuggetNickel", 1);
tePlatinumNugget = GameRegistry.findItemStack(Name, "nuggetPlatinum", 1);
teDustCryotheum = GameRegistry.findItemStack(Name, "dustCryotheum", 1);
teDustBlizz = GameRegistry.findItemStack(Name, "dustBlizz", 1);
teDustPyrotheum = GameRegistry.findItemStack(Name, "dustPyrotheum", 1);
teDustSulfur = GameRegistry.findItemStack(Name, "dustSulfur", 1);
teDustPlatinum = GameRegistry.findItemStack(Name, "dustPlatinum", 1);
}
private static void setupCrafting() {
NBTTagCompound toSend = new NBTTagCompound();
toSend.setInteger("energy", 4000);
toSend.setTag("input", new NBTTagCompound());
toSend.setTag("output", new NBTTagCompound());
ItemStack carbonDrop = Config.drops.getStackForType(DropType.CARBON);
carbonDrop.writeToNBT(toSend.getCompoundTag("input"));
teFluidCoal.writeToNBT(toSend.getCompoundTag("output"));
FMLInterModComms.sendMessage("ThermalExpansion", "CrucibleRecipe", toSend);
toSend = new NBTTagCompound();
toSend.setInteger("energy", 4000);
toSend.setTag("input", new NBTTagCompound());
toSend.setTag("output", new NBTTagCompound());
ItemStack destabilizedDrop = Config.drops.getStackForType(DropType.DESTABILIZED);
destabilizedDrop.writeToNBT(toSend.getCompoundTag("input"));
teFluidRedstone.writeToNBT(toSend.getCompoundTag("output"));
FMLInterModComms.sendMessage("ThermalExpansion", "CrucibleRecipe", toSend);
toSend = new NBTTagCompound();
toSend.setInteger("energy", 4000);
toSend.setTag("input", new NBTTagCompound());
toSend.setTag("output", new NBTTagCompound());
ItemStack endearingDrop = Config.drops.getStackForType(DropType.ENDEARING);
endearingDrop.writeToNBT(toSend.getCompoundTag("input"));
teFluidEnder.writeToNBT(toSend.getCompoundTag("output"));
FMLInterModComms.sendMessage("ThermalExpansion", "CrucibleRecipe", toSend);
toSend = new NBTTagCompound();
toSend.setInteger("energy", 4000);
toSend.setTag("input", new NBTTagCompound());
toSend.setTag("output", new NBTTagCompound());
ItemStack luxDrop = Config.drops.getStackForType(DropType.LUX);
luxDrop.writeToNBT(toSend.getCompoundTag("input"));
teFluidGlowstone.writeToNBT(toSend.getCompoundTag("output"));
FMLInterModComms.sendMessage("ThermalExpansion", "CrucibleRecipe", toSend);
}
}