From afee91a925a59aad0063027590765537f888edf2 Mon Sep 17 00:00:00 2001 From: KryptonCaptain Date: Fri, 15 Sep 2017 23:04:43 +1000 Subject: [PATCH] quick fixes 2 Added TE signalum and lumium bees Investigating why Amped/Rocking spawn Blizz instead of respective TE mobs --- src/main/java/magicbees/bees/Allele.java | 5 +++-- .../java/magicbees/bees/BeeGenomeManager.java | 16 ++++++++++++++++ src/main/java/magicbees/bees/BeeMutation.java | 6 ++++++ .../java/magicbees/bees/BeeProductHelper.java | 7 +++++++ src/main/java/magicbees/bees/BeeSpecies.java | 8 ++++++++ .../main/utils/compat/ThermalModsHelper.java | 12 ++++++++++++ .../resources/assets/magicbees/lang/en_US.lang | 4 ++++ 7 files changed, 56 insertions(+), 2 deletions(-) diff --git a/src/main/java/magicbees/bees/Allele.java b/src/main/java/magicbees/bees/Allele.java index 576025c..0df9afa 100644 --- a/src/main/java/magicbees/bees/Allele.java +++ b/src/main/java/magicbees/bees/Allele.java @@ -236,14 +236,15 @@ public class Allele implements IAllele { spawnWispOrHecate = new AlleleEffectPlaceholder(EFFECT_AM_WISP, true); } + //TODO TE spawning if (ThermalModsHelper.isActive()) { spawnBlizz = new AlleleEffectSpawnMob(EFFECT_TE_BLIZZY, true, ThermalModsHelper.Entity.BLIZZ.entityID, ThermalModsHelper.Entity.BLIZZ.soundName) .setThrottle(100) .setChanceToSpawn(80); - spawnBlitz = new AlleleEffectSpawnMob(EFFECT_TE_BLITZ, true, ThermalModsHelper.Entity.BLIZZ.entityID, ThermalModsHelper.Entity.BLIZZ.soundName) + spawnBlitz = new AlleleEffectSpawnMob(EFFECT_TE_BLITZ, true, ThermalModsHelper.Entity.BLITZ.entityID, ThermalModsHelper.Entity.BLITZ.soundName) .setThrottle(100) .setChanceToSpawn(80); - spawnBasalz = new AlleleEffectSpawnMob(EFFECT_TE_BASALZ, true, ThermalModsHelper.Entity.BLIZZ.entityID, ThermalModsHelper.Entity.BLIZZ.soundName) + spawnBasalz = new AlleleEffectSpawnMob(EFFECT_TE_BASALZ, true, ThermalModsHelper.Entity.BASALZ.entityID, ThermalModsHelper.Entity.BASALZ.soundName) .setThrottle(100) .setChanceToSpawn(80); } diff --git a/src/main/java/magicbees/bees/BeeGenomeManager.java b/src/main/java/magicbees/bees/BeeGenomeManager.java index a6c8181..7da483e 100644 --- a/src/main/java/magicbees/bees/BeeGenomeManager.java +++ b/src/main/java/magicbees/bees/BeeGenomeManager.java @@ -1320,6 +1320,22 @@ public class BeeGenomeManager { return genome; } + + public static IAllele[] getTemplateTESignalus() { + IAllele[] genome = getTemplateTEBase(); + + genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TE_SIGNALUS.getSpecies(); + + return genome; + } + + public static IAllele[] getTemplateTELumius() { + IAllele[] genome = getTemplateTEBaseNether(); + + genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TE_LUMIUS.getSpecies(); + + return genome; + } public static IAllele[] getTemplateTEDante() { IAllele[] genome = getTemplateTEBaseNether(); diff --git a/src/main/java/magicbees/bees/BeeMutation.java b/src/main/java/magicbees/bees/BeeMutation.java index 1836719..066cedb 100644 --- a/src/main/java/magicbees/bees/BeeMutation.java +++ b/src/main/java/magicbees/bees/BeeMutation.java @@ -349,6 +349,12 @@ public class BeeMutation { beeMutationFactory.createMutation(BeeSpecies.TE_WINSOME.getSpecies(), BeeSpecies.TE_COAL.getSpecies(), BeeSpecies.TE_ENDEARING.getGenome(), 8) .requireResource("blockEnderium"); + + beeMutationFactory.createMutation(BeeSpecies.COPPER.getSpecies(), BeeSpecies.TE_DESTABILIZED.getSpecies(), BeeSpecies.TE_SIGNALUS.getGenome(), 8) + .requireResource("blockSignalum"); + + beeMutationFactory.createMutation(BeeSpecies.TIN.getSpecies(), BeeSpecies.TE_LUX.getSpecies(), BeeSpecies.TE_LUMIUS.getGenome(), 8) + .requireResource("blockLumium"); } if (BotaniaHelper.isActive()) { diff --git a/src/main/java/magicbees/bees/BeeProductHelper.java b/src/main/java/magicbees/bees/BeeProductHelper.java index 52a2d66..3235d21 100644 --- a/src/main/java/magicbees/bees/BeeProductHelper.java +++ b/src/main/java/magicbees/bees/BeeProductHelper.java @@ -368,6 +368,11 @@ public class BeeProductHelper { TE_GROUNDED.addProduct(Config.combs.getStackForType(CombType.EARTHY), 0.16f); TE_ROCKING.addProduct(Config.combs.getStackForType(CombType.EARTHY), 0.29f); + TE_SIGNALUS.addProduct(Config.combs.getStackForType(CombType.TE_DESTABILIZED), 0.10f) + .addProduct(Config.combs.getStackForType(CombType.OCCULT), 0.10f); + TE_LUMIUS.addProduct(Config.combs.getStackForType(CombType.TE_LUX), 0.10f) + .addProduct(Config.combs.getStackForType(CombType.OCCULT), 0.10f); + if (ThermalModsHelper.isActive()) { LogHelper.info("Thermal Expansion bees active"); TE_BLIZZY.addSpecialty(ThermalModsHelper.dustBlizz, 0.09f); @@ -380,6 +385,8 @@ public class BeeProductHelper { TE_ROCKING.addSpecialty(ThermalModsHelper.dustPetrotheum, 0.09f); TE_WINSOME.addSpecialty(ThermalModsHelper.dustPlatinum, 0.09f); TE_ENDEARING.addSpecialty(ThermalModsHelper.enderiumNugget, 0.09f); + TE_SIGNALUS.addSpecialty(ThermalModsHelper.signalumNugget, 0.09f); + TE_LUMIUS.addSpecialty(ThermalModsHelper.lumiumNugget, 0.09f); } } diff --git a/src/main/java/magicbees/bees/BeeSpecies.java b/src/main/java/magicbees/bees/BeeSpecies.java index 9c45900..7c963da 100644 --- a/src/main/java/magicbees/bees/BeeSpecies.java +++ b/src/main/java/magicbees/bees/BeeSpecies.java @@ -281,6 +281,10 @@ public enum BeeSpecies 0x096B67, EnumTemperature.COLD, EnumHumidity.NORMAL, false, false), TE_ENDEARING("TEEndearing", "cognito", BeeClassification.ADORABLE, 0x069E97, EnumTemperature.COLD, EnumHumidity.NORMAL, true, true), + TE_SIGNALUS("TESignalus", "scelerisque", BeeClassification.THERMAL, + 0x5E0203, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, true), + TE_LUMIUS("TELumius", "lucidum", BeeClassification.THERMAL, + 0xF1FA89, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, true), // --------------------Redstone Arsenal Bees----------------------------- RSA_FLUXED("RSAFluxed", "Thermametallic electroflux", BeeClassification.THERMAL, @@ -442,6 +446,8 @@ public enum BeeSpecies TE_LUX.registerGenomeTemplate(BeeGenomeManager.getTemplateTELux()); TE_WINSOME.registerGenomeTemplate(BeeGenomeManager.getTemplateTEWinsome()); TE_ENDEARING.registerGenomeTemplate(BeeGenomeManager.getTemplateTEEndearing()); + TE_SIGNALUS.registerGenomeTemplate(BeeGenomeManager.getTemplateTESignalus()); + TE_LUMIUS.registerGenomeTemplate(BeeGenomeManager.getTemplateTELumius()); RSA_FLUXED.registerGenomeTemplate(BeeGenomeManager.getTemplateRSAFluxed()); BOT_ROOTED.registerGenomeTemplate(BeeGenomeManager.getTemplateBotRooted()); BOT_BOTANIC.registerGenomeTemplate(BeeGenomeManager.getTemplateBotBotanic()); @@ -512,6 +518,8 @@ public enum BeeSpecies TE_LUX.setInactive(); TE_WINSOME.setInactive(); TE_ENDEARING.setInactive(); + TE_SIGNALUS.setInactive(); + TE_LUMIUS.setInactive(); } BeeProductHelper.initRedstoneArsenelProducts(); diff --git a/src/main/java/magicbees/main/utils/compat/ThermalModsHelper.java b/src/main/java/magicbees/main/utils/compat/ThermalModsHelper.java index e131114..b2af474 100644 --- a/src/main/java/magicbees/main/utils/compat/ThermalModsHelper.java +++ b/src/main/java/magicbees/main/utils/compat/ThermalModsHelper.java @@ -54,11 +54,17 @@ public class ThermalModsHelper implements IModHelper { public static ItemStack nickelBlock; public static ItemStack platinumBlock; public static ItemStack bronzeBlock; + public static ItemStack signalumBlock; + public static ItemStack lumiumBlock; + public static ItemStack enderiumNugget; public static ItemStack invarNugget; public static ItemStack electrumNugget; public static ItemStack nickelNugget; public static ItemStack platinumNugget; + public static ItemStack signalumNugget; + public static ItemStack lumiumNugget; + public static ItemStack dustCryotheum; public static ItemStack dustBlizz; public static ItemStack dustPyrotheum; @@ -68,6 +74,7 @@ public class ThermalModsHelper implements IModHelper { public static ItemStack dustPetrotheum; public static ItemStack dustSulfur; public static ItemStack dustPlatinum; + public static FluidStack fluidGlowstone; public static FluidStack fluidCoal; public static FluidStack fluidRedstone; @@ -113,6 +120,8 @@ public class ThermalModsHelper implements IModHelper { nickelBlock = GameRegistry.findItemStack(Name, "blockNickel", 1); platinumBlock = GameRegistry.findItemStack(Name, "blockPlatinum", 1); bronzeBlock = GameRegistry.findItemStack(Name, "blockBronze", 1); + signalumBlock = GameRegistry.findItemStack(Name, "blockSignalum", 1); + lumiumBlock = GameRegistry.findItemStack(Name, "blockLumium", 1); } private static void getItems() { @@ -121,6 +130,9 @@ public class ThermalModsHelper implements IModHelper { electrumNugget = GameRegistry.findItemStack(Name, "nuggetElectrum", 1); nickelNugget = GameRegistry.findItemStack(Name, "nuggetNickel", 1); platinumNugget = GameRegistry.findItemStack(Name, "nuggetPlatinum", 1); + signalumNugget = GameRegistry.findItemStack(Name, "nuggetSignalum", 1); + lumiumNugget = GameRegistry.findItemStack(Name, "nuggetLumium", 1); + dustCryotheum = GameRegistry.findItemStack(Name, "dustCryotheum", 1); dustBlizz = GameRegistry.findItemStack(Name, "dustBlizz", 1); dustPyrotheum = GameRegistry.findItemStack(Name, "dustPyrotheum", 1); diff --git a/src/main/resources/assets/magicbees/lang/en_US.lang b/src/main/resources/assets/magicbees/lang/en_US.lang index 6c28419..850ee7e 100644 --- a/src/main/resources/assets/magicbees/lang/en_US.lang +++ b/src/main/resources/assets/magicbees/lang/en_US.lang @@ -471,6 +471,10 @@ magicbees.speciesTEWinsome=Winsome magicbees.speciesTEWinsome.description="I like these ones, they're so adorable!"|Jadedcat, maker of packs magicbees.speciesTEEndearing=Endearing magicbees.speciesTEEndearing.description="Hypnotic powers and vicious temperment aside, these bees are the cutest!"|Jadedcat, maker of packs +magicbees.speciesTESignalus=Signalus +magicbees.speciesTESignalus.description=These bees are their own security measures.|Apinomicon +magicbees.speciesTELumius=Lumius +magicbees.speciesTELumius.description=Bearing more resemblance to fireflies than bees, this species literally glows.|Apinomicon magicbees.speciesRSAFluxed=Fluxed magicbees.speciesRSAFluxed.description="What? Bees are OP."|Marquis Muskrat magicbees.speciesBotRooted=Rooted