mirror of
https://github.com/GTNewHorizons/MagicBees.git
synced 2026-11-21 20:52:24 +00:00
Collapsing TE & TF helpers into ThermalModsHelper.
Moving Thermal * item refs from Config into helper.
This commit is contained in:
1 parent
8beb50fcf8
commit
8d65e675d1
10 files changed
+180
-259
No files matched your search
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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();
|
||||
|
||||
Reference in new issue
Block a user