From e0bf04cb11a130fea5a02582a7848409fe9efc26 Mon Sep 17 00:00:00 2001 From: DreamMasterXXL Date: Sun, 10 May 2020 16:20:41 +0200 Subject: Start to add new HEE Bees for Ender Dust, Ectoplasma and Arcane Shards --- .../gregtech/loaders/misc/GT_BeeDefinition.java | 82 ++++++++++++++++++++++ .../gregtech/loaders/misc/GT_BranchDefinition.java | 12 ++++ 2 files changed, 94 insertions(+) (limited to 'src/main/java/gregtech/loaders') diff --git a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java index 81044cc532..695d338114 100644 --- a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java +++ b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java @@ -63,6 +63,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { //AlleleHelper.instance.set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.DOWN_1); //tMutation.requireResource(GameRegistry.findBlock("minecraft", "sand"), 1); //AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, GT_Bees.superLife); + //tMutation.restrictDateRange( 1, 1, 1, 1); } @Override @@ -2012,6 +2013,87 @@ public enum GT_BeeDefinition implements IBeeDefinition { tMutation.restrictTemperature(EnumTemperature.ICY); } }, + //HEE + ENDDUST(GT_BranchDefinition.HEE, "End-Dust", true, 0xCC00FA, 0x003A7D) { + @Override + protected void setSpeciesProperties(GT_AlleleBeeSpecies beeSpecies) { + beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 4), 0.30f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ENDDUST), 0.10f); + beeSpecies.setHumidity(EnumHumidity.ARID); + beeSpecies.setTemperature(EnumTemperature.NORMAL); + beeSpecies.setHasEffect(); + } + + @Override + protected void setAlleles(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.NORMAL); + } + + @Override + protected void registerMutations() { + IBeeMutationCustom tMutation = registerMutation(getSpecies(FORRESTRY,"ENDED"), STAINLESSSTEEL.species, 8); + tMutation.restrictHumidity(EnumHumidity.ARID); + if (Loader.isModLoaded("HardcoreEnderExpansion")) + tMutation.requireResource(GameRegistry.findBlock("HardcoreEnderExpansion", "end_powder_ore"), 0); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End"));//End Dim + + + } + }, + ECTOPLASMA(GT_BranchDefinition.HEE, "Ectoplasma", true, 0xDCB0E5, 0x381C40) { + @Override + protected void setSpeciesProperties(GT_AlleleBeeSpecies beeSpecies) { + beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 4), 0.30f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ECTOPLASMA), 0.10f); + beeSpecies.setHumidity(EnumHumidity.ARID); + beeSpecies.setTemperature(EnumTemperature.NORMAL); + beeSpecies.setHasEffect(); + } + + @Override + protected void setAlleles(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT); + } + + @Override + protected void registerMutations() { + IBeeMutationCustom tMutation = registerMutation(getSpecies(FORRESTRY,"ENDED"), ENDDUST.species, 5); + tMutation.restrictHumidity(EnumHumidity.ARID); + if (Loader.isModLoaded("HardcoreEnderExpansion")) + tMutation.requireResource(GameRegistry.findBlock("HardcoreEnderExpansion", "spooky_log"), 0); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End"));//End Dim + + + } + }, + + ARCANESHARDS(GT_BranchDefinition.HEE, "ArcaneShards", true, 0x9010AD, 0x333D82) { + @Override + protected void setSpeciesProperties(GT_AlleleBeeSpecies beeSpecies) { + beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 4), 0.30f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ARCANESHARD), 0.10f); + beeSpecies.setHumidity(EnumHumidity.ARID); + beeSpecies.setTemperature(EnumTemperature.NORMAL); + beeSpecies.setHasEffect(); + } + + @Override + protected void setAlleles(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT); + } + + @Override + protected void registerMutations() { + IBeeMutationCustom tMutation = registerMutation(THAUMIUMSHARD.species, ENDDUST.species, 5); + tMutation.restrictHumidity(EnumHumidity.ARID); + if (Loader.isModLoaded("HardcoreEnderExpansion")) + tMutation.requireResource(GameRegistry.findBlock("HardcoreEnderExpansion", "laboratory_floor"), 0); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End"));//End Dim + + + } + }, + //Space Bees SPACE(GT_BranchDefinition.SPACE, "Space", true, 0x003366, 0xC0C0C0) { @Override protected void setSpeciesProperties(GT_AlleleBeeSpecies beeSpecies) { diff --git a/src/main/java/gregtech/loaders/misc/GT_BranchDefinition.java b/src/main/java/gregtech/loaders/misc/GT_BranchDefinition.java index d17340cafd..5dcdcf1e50 100644 --- a/src/main/java/gregtech/loaders/misc/GT_BranchDefinition.java +++ b/src/main/java/gregtech/loaders/misc/GT_BranchDefinition.java @@ -110,6 +110,18 @@ public enum GT_BranchDefinition { AlleleHelper.instance.set(alleles, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.FASTER); } }, + HEE("Finis Expansiones") { + @Override + protected void setBranchProperties(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_2); + AlleleHelper.instance.set(alleles, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.BOTH_2); + AlleleHelper.instance.set(alleles, EnumBeeChromosome.NOCTURNAL, true); + AlleleHelper.instance.set(alleles, EnumBeeChromosome.FLOWER_PROVIDER, getFlowers(EXTRABEES, "rock")); + AlleleHelper.instance.set(alleles, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT); + AlleleHelper.instance.set(alleles, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.SLOW); + AlleleHelper.instance.set(alleles, EnumBeeChromosome.SPEED, EnumAllele.Speed.FASTEST); + } + }, SPACE("Cosmicis") { @Override protected void setBranchProperties(IAllele[] alleles) { -- cgit From 2dda2750a91a3a94fa4d0cdf1bf096fe13946025 Mon Sep 17 00:00:00 2001 From: DreamMasterXXL Date: Sun, 10 May 2020 19:11:06 +0200 Subject: more HEE bees and some fixes --- .../gregtech/loaders/misc/GT_BeeDefinition.java | 140 +++++++++++++++++++-- src/main/java/gregtech/loaders/misc/GT_Bees.java | 2 - 2 files changed, 132 insertions(+), 10 deletions(-) (limited to 'src/main/java/gregtech/loaders') diff --git a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java index 695d338114..00b4cb25ae 100644 --- a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java +++ b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java @@ -2014,10 +2014,10 @@ public enum GT_BeeDefinition implements IBeeDefinition { } }, //HEE - ENDDUST(GT_BranchDefinition.HEE, "End-Dust", true, 0xCC00FA, 0x003A7D) { + ENDDUST(GT_BranchDefinition.HEE, "End Dust", true, 0xCC00FA, 0x003A7D) { @Override protected void setSpeciesProperties(GT_AlleleBeeSpecies beeSpecies) { - beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 4), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 8), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ENDDUST), 0.10f); beeSpecies.setHumidity(EnumHumidity.ARID); beeSpecies.setTemperature(EnumTemperature.NORMAL); @@ -2031,7 +2031,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { @Override protected void registerMutations() { - IBeeMutationCustom tMutation = registerMutation(getSpecies(FORRESTRY,"ENDED"), STAINLESSSTEEL.species, 8); + IBeeMutationCustom tMutation = registerMutation(getSpecies(FORRESTRY,"End"), STAINLESSSTEEL.species, 8); tMutation.restrictHumidity(EnumHumidity.ARID); if (Loader.isModLoaded("HardcoreEnderExpansion")) tMutation.requireResource(GameRegistry.findBlock("HardcoreEnderExpansion", "end_powder_ore"), 0); @@ -2040,10 +2040,38 @@ public enum GT_BeeDefinition implements IBeeDefinition { } }, + + STARDUST(GT_BranchDefinition.HEE, "Star Dust", true, 0xffff00, 0xDCBE13) { + @Override + protected void setSpeciesProperties(GT_AlleleBeeSpecies beeSpecies) { + beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 8), 0.30f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.STARDUST), 0.10f); + beeSpecies.setHumidity(EnumHumidity.ARID); + beeSpecies.setTemperature(EnumTemperature.NORMAL); + beeSpecies.setHasEffect(); + } + + @Override + protected void setAlleles(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, GT_Bees.speedBlinding); + AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTEST); + } + + @Override + protected void registerMutations() { + IBeeMutationCustom tMutation = registerMutation(getSpecies(FORRESTRY,"End"), ZINC.species, 8); + tMutation.restrictHumidity(EnumHumidity.ARID); + if (Loader.isModLoaded("HardcoreEnderExpansion")) + tMutation.requireResource(GameRegistry.findBlock("HardcoreEnderExpansion", "stardust_ore"), 0); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End"));//End Dim + + } + }, + ECTOPLASMA(GT_BranchDefinition.HEE, "Ectoplasma", true, 0xDCB0E5, 0x381C40) { @Override protected void setSpeciesProperties(GT_AlleleBeeSpecies beeSpecies) { - beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 4), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 8), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ECTOPLASMA), 0.10f); beeSpecies.setHumidity(EnumHumidity.ARID); beeSpecies.setTemperature(EnumTemperature.NORMAL); @@ -2053,11 +2081,13 @@ public enum GT_BeeDefinition implements IBeeDefinition { @Override protected void setAlleles(IAllele[] template) { AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT); + AlleleHelper.instance.set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_1); + AlleleHelper.instance.set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.BOTH_1); } @Override protected void registerMutations() { - IBeeMutationCustom tMutation = registerMutation(getSpecies(FORRESTRY,"ENDED"), ENDDUST.species, 5); + IBeeMutationCustom tMutation = registerMutation(getSpecies(FORRESTRY,"End"), ENDDUST.species, 5); tMutation.restrictHumidity(EnumHumidity.ARID); if (Loader.isModLoaded("HardcoreEnderExpansion")) tMutation.requireResource(GameRegistry.findBlock("HardcoreEnderExpansion", "spooky_log"), 0); @@ -2067,10 +2097,10 @@ public enum GT_BeeDefinition implements IBeeDefinition { } }, - ARCANESHARDS(GT_BranchDefinition.HEE, "ArcaneShards", true, 0x9010AD, 0x333D82) { + ARCANESHARDS(GT_BranchDefinition.HEE, "Arcane Shards", true, 0x9010AD, 0x333D82) { @Override protected void setSpeciesProperties(GT_AlleleBeeSpecies beeSpecies) { - beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 4), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 8), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ARCANESHARD), 0.10f); beeSpecies.setHumidity(EnumHumidity.ARID); beeSpecies.setTemperature(EnumTemperature.NORMAL); @@ -2079,7 +2109,10 @@ public enum GT_BeeDefinition implements IBeeDefinition { @Override protected void setAlleles(IAllele[] template) { - AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT); + AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.LONG); + AlleleHelper.instance.set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_1); + AlleleHelper.instance.set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.BOTH_1); + } @Override @@ -2091,6 +2124,97 @@ public enum GT_BeeDefinition implements IBeeDefinition { tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End"));//End Dim + } + }, + + DRAGONESSENCE(GT_BranchDefinition.HEE, "Dragonessence", true, 0xFFA12B, 0xffff00) { + @Override + protected void setSpeciesProperties(GT_AlleleBeeSpecies beeSpecies) { + beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 8), 0.30f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.DRAGONESSENCE), 0.10f); + beeSpecies.setHumidity(EnumHumidity.ARID); + beeSpecies.setTemperature(EnumTemperature.NORMAL); + beeSpecies.setHasEffect(); + } + + @Override + protected void setAlleles(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.LONGER); + AlleleHelper.instance.set(template, EnumBeeChromosome.EFFECT, AlleleEffect.effectBeatific); + AlleleHelper.instance.set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_3); + AlleleHelper.instance.set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.BOTH_3); + } + + @Override + protected void registerMutations() { + IBeeMutationCustom tMutation = registerMutation(ECTOPLASMA.species, ARCANESHARDS.species, 4); + tMutation.restrictHumidity(EnumHumidity.ARID); + if (Loader.isModLoaded("HardcoreEnderExpansion")) + tMutation.requireResource(GameRegistry.findBlock("HardcoreEnderExpansion", "essence_altar>"), 1); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End"));//End Dim + + + } + }, + + ENDERMANHEAD(GT_BranchDefinition.HEE, "Enderman", true, 0x161616, 0x6200e7) { + @Override + protected void setSpeciesProperties(GT_AlleleBeeSpecies beeSpecies) { + beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 8), 0.30f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ENDERMAN), 0.10f); + beeSpecies.setHumidity(EnumHumidity.ARID); + beeSpecies.setTemperature(EnumTemperature.NORMAL); + beeSpecies.setHasEffect(); + } + + @Override + protected void setAlleles(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.LONGER); + AlleleHelper.instance.set(template, EnumBeeChromosome.EFFECT, getEffect(EXTRABEES, "teleport")); + AlleleHelper.instance.set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.UP_1); + AlleleHelper.instance.set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.UP_1); + } + + @Override + protected void registerMutations() { + IBeeMutationCustom tMutation = registerMutation(ENDERIUM.species, STARDUST.species, 4); + tMutation.restrictHumidity(EnumHumidity.ARID); + if (Loader.isModLoaded("HardcoreEnderExpansion")) + tMutation.requireResource(GameRegistry.findBlock("HardcoreEnderExpansion", "ender_goo"), 0); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End"));//End Dim + + + } + }, + + SILVERFISH(GT_BranchDefinition.HEE, "Silverfisch", true, 0xEE053D, 0x000000) { + @Override + protected void setSpeciesProperties(GT_AlleleBeeSpecies beeSpecies) { + beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 8), 0.30f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.SILVERFISH), 0.10f); + beeSpecies.setHumidity(EnumHumidity.ARID); + beeSpecies.setTemperature(EnumTemperature.NORMAL); + beeSpecies.setHasEffect(); + } + + @Override + protected void setAlleles(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.LONGER); + AlleleHelper.instance.set(template, EnumBeeChromosome.EFFECT, getEffect(MAGICBEES, "SlowSpeed")); + AlleleHelper.instance.set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.DOWN_1); + AlleleHelper.instance.set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.DOWN_1); + + } + + @Override + protected void registerMutations() { + IBeeMutationCustom tMutation = registerMutation(ECTOPLASMA.species, STARDUST.species, 5); + tMutation.restrictHumidity(EnumHumidity.ARID); + if (Loader.isModLoaded("HardcoreEnderExpansion")) + tMutation.requireResource(GameRegistry.findBlock("HardcoreEnderExpansion", "ender_goo>"), 0); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End"));//End Dim + + } }, //Space Bees diff --git a/src/main/java/gregtech/loaders/misc/GT_Bees.java b/src/main/java/gregtech/loaders/misc/GT_Bees.java index 281eb3c675..0e08ac3de6 100644 --- a/src/main/java/gregtech/loaders/misc/GT_Bees.java +++ b/src/main/java/gregtech/loaders/misc/GT_Bees.java @@ -11,7 +11,6 @@ import gregtech.common.items.ItemComb; import gregtech.common.items.ItemDrop; import gregtech.common.items.ItemPollen; import gregtech.common.items.ItemPropolis; -import gregtech.loaders.misc.GT_BeeDefinition; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; @@ -73,7 +72,6 @@ public class GT_Bees { blinkLife = new AlleleInteger("lifeBlink", 2, false, EnumBeeChromosome.LIFESPAN); superLife = new AlleleInteger("lifeEon", 600, false, EnumBeeChromosome.LIFESPAN); - } private static class AlleleFloat extends Allele implements IAlleleFloat { -- cgit From 7cd941cdc0fcbdc55fc05b17e8d6fe957c26aeb0 Mon Sep 17 00:00:00 2001 From: DreamMasterXXL Date: Sun, 10 May 2020 21:27:24 +0200 Subject: add more hee bees --- .../gregtech/loaders/misc/GT_BeeDefinition.java | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'src/main/java/gregtech/loaders') diff --git a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java index 00b4cb25ae..4eb3781c07 100644 --- a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java +++ b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java @@ -25,6 +25,8 @@ import gregtech.api.util.GT_OreDictUnificator; import gregtech.common.bees.GT_AlleleBeeSpecies; import gregtech.common.bees.GT_Bee_Mutation; import gregtech.common.items.CombType; +import gregtech.common.items.DropType; +import gregtech.common.items.PropolisType; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -2041,6 +2043,35 @@ public enum GT_BeeDefinition implements IBeeDefinition { } }, + ENDIUM(GT_BranchDefinition.HEE, "Endium", true, 0xa0ffff, 0x2F5A6C) { + @Override + protected void setSpeciesProperties(GT_AlleleBeeSpecies beeSpecies) { + beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 8), 0.30f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ENDIUM), 0.10f); + beeSpecies.addSpecialty(GT_Bees.propolis.getStackForType(PropolisType.Endium), 0.15f); + beeSpecies.addSpecialty(GT_Bees.drop.getStackForType(DropType.ENDERGOO), 0.10f); + beeSpecies.setHumidity(EnumHumidity.ARID); + beeSpecies.setTemperature(EnumTemperature.NORMAL); + beeSpecies.setHasEffect(); + } + + @Override + protected void setAlleles(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.NORMAL); + } + + @Override + protected void registerMutations() { + IBeeMutationCustom tMutation = registerMutation(getSpecies(FORRESTRY,"End"), THAUMIUMDUST.species, 8); + tMutation.restrictHumidity(EnumHumidity.ARID); + if (Loader.isModLoaded("HardcoreEnderExpansion")) + tMutation.requireResource("blockHeeEndium"); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End"));//End Dim + + + } + }, + STARDUST(GT_BranchDefinition.HEE, "Star Dust", true, 0xffff00, 0xDCBE13) { @Override protected void setSpeciesProperties(GT_AlleleBeeSpecies beeSpecies) { @@ -2055,6 +2086,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { protected void setAlleles(IAllele[] template) { AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, GT_Bees.speedBlinding); AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTEST); + AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.SLOWER); } @Override -- cgit From 8cb5d5b06ca66b2a93041e70ba2bf8880825414c Mon Sep 17 00:00:00 2001 From: DreamMasterXXL Date: Sun, 10 May 2020 21:39:37 +0200 Subject: fix overseen --- src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/java/gregtech/loaders') diff --git a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java index 4eb3781c07..ef90c96ca7 100644 --- a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java +++ b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java @@ -2182,7 +2182,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { IBeeMutationCustom tMutation = registerMutation(ECTOPLASMA.species, ARCANESHARDS.species, 4); tMutation.restrictHumidity(EnumHumidity.ARID); if (Loader.isModLoaded("HardcoreEnderExpansion")) - tMutation.requireResource(GameRegistry.findBlock("HardcoreEnderExpansion", "essence_altar>"), 1); + tMutation.requireResource(GameRegistry.findBlock("HardcoreEnderExpansion", "essence_altar"), 1); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End"));//End Dim @@ -2243,7 +2243,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { IBeeMutationCustom tMutation = registerMutation(ECTOPLASMA.species, STARDUST.species, 5); tMutation.restrictHumidity(EnumHumidity.ARID); if (Loader.isModLoaded("HardcoreEnderExpansion")) - tMutation.requireResource(GameRegistry.findBlock("HardcoreEnderExpansion", "ender_goo>"), 0); + tMutation.requireResource(GameRegistry.findBlock("HardcoreEnderExpansion", "ender_goo"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End"));//End Dim -- cgit From d450ef213ba4bc3b98a1941d74c75d70897d0f82 Mon Sep 17 00:00:00 2001 From: DreamMasterXXL Date: Sun, 10 May 2020 22:27:30 +0200 Subject: finishing hee bees so far --- src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src/main/java/gregtech/loaders') diff --git a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java index ef90c96ca7..371798b6fa 100644 --- a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java +++ b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java @@ -2033,7 +2033,8 @@ public enum GT_BeeDefinition implements IBeeDefinition { @Override protected void registerMutations() { - IBeeMutationCustom tMutation = registerMutation(getSpecies(FORRESTRY,"End"), STAINLESSSTEEL.species, 8); + IBeeMutationCustom tMutation = registerMutation(getSpecies(FORRESTRY,"Ended"), STAINLESSSTEEL.species, 8); + tMutation.restrictHumidity(EnumHumidity.ARID); if (Loader.isModLoaded("HardcoreEnderExpansion")) tMutation.requireResource(GameRegistry.findBlock("HardcoreEnderExpansion", "end_powder_ore"), 0); @@ -2062,7 +2063,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { @Override protected void registerMutations() { - IBeeMutationCustom tMutation = registerMutation(getSpecies(FORRESTRY,"End"), THAUMIUMDUST.species, 8); + IBeeMutationCustom tMutation = registerMutation(getSpecies(FORRESTRY,"Ended"), THAUMIUMDUST.species, 8); tMutation.restrictHumidity(EnumHumidity.ARID); if (Loader.isModLoaded("HardcoreEnderExpansion")) tMutation.requireResource("blockHeeEndium"); @@ -2091,7 +2092,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { @Override protected void registerMutations() { - IBeeMutationCustom tMutation = registerMutation(getSpecies(FORRESTRY,"End"), ZINC.species, 8); + IBeeMutationCustom tMutation = registerMutation(getSpecies(FORRESTRY,"Ended"), ZINC.species, 8); tMutation.restrictHumidity(EnumHumidity.ARID); if (Loader.isModLoaded("HardcoreEnderExpansion")) tMutation.requireResource(GameRegistry.findBlock("HardcoreEnderExpansion", "stardust_ore"), 0); @@ -2119,7 +2120,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { @Override protected void registerMutations() { - IBeeMutationCustom tMutation = registerMutation(getSpecies(FORRESTRY,"End"), ENDDUST.species, 5); + IBeeMutationCustom tMutation = registerMutation(getSpecies(FORRESTRY,"Ended"), ENDDUST.species, 5); tMutation.restrictHumidity(EnumHumidity.ARID); if (Loader.isModLoaded("HardcoreEnderExpansion")) tMutation.requireResource(GameRegistry.findBlock("HardcoreEnderExpansion", "spooky_log"), 0); @@ -2159,7 +2160,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { } }, - DRAGONESSENCE(GT_BranchDefinition.HEE, "Dragonessence", true, 0xFFA12B, 0xffff00) { + DRAGONESSENCE(GT_BranchDefinition.HEE, "Dragonessence", true, 0xFFA12B, 0x911ECE) { @Override protected void setSpeciesProperties(GT_AlleleBeeSpecies beeSpecies) { beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 8), 0.30f); @@ -3330,6 +3331,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { @Override protected void setAlleles(IAllele[] template) { AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTEST); + AlleleHelper.instance.set(template, EnumBeeChromosome.EFFECT, getEffect(EXTRABEES, "blindness")); } @Override -- cgit From 4d1a048f03e55505804bbd6906240c1044b821ae Mon Sep 17 00:00:00 2001 From: DreamMasterXXL Date: Tue, 12 May 2020 23:17:34 +0200 Subject: fix a few things --- .../gregtech/loaders/misc/GT_BeeDefinition.java | 38 ++++++++++++++++++---- .../gregtech/loaders/misc/GT_BranchDefinition.java | 9 +++-- 2 files changed, 38 insertions(+), 9 deletions(-) (limited to 'src/main/java/gregtech/loaders') diff --git a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java index 371798b6fa..82f08a7cd3 100644 --- a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java +++ b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java @@ -8,6 +8,7 @@ import forestry.api.core.EnumTemperature; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleFlowers; +import forestry.api.genetics.IMutationCustom; import forestry.apiculture.genetics.Bee; import forestry.apiculture.genetics.BeeVariation; import forestry.apiculture.genetics.IBeeDefinition; @@ -531,7 +532,6 @@ public enum GT_BeeDefinition implements IBeeDefinition { AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER); AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTEST); AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.FAST); - AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTEST); } @Override @@ -1791,7 +1791,6 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.setTemperature(EnumTemperature.NORMAL); beeSpecies.setNocturnal(); beeSpecies.setHasEffect(); - beeSpecies.setIsSecret(); } @@ -1816,7 +1815,6 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.COLD); beeSpecies.setNocturnal(); - beeSpecies.setIsSecret(); } @Override @@ -1839,7 +1837,6 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.setTemperature(EnumTemperature.NORMAL); beeSpecies.setNocturnal(); beeSpecies.setHasEffect(); - beeSpecies.setIsSecret(); } @Override @@ -1862,7 +1859,6 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.setTemperature(EnumTemperature.NORMAL); beeSpecies.setNocturnal(); beeSpecies.setHasEffect(); - beeSpecies.setIsSecret(); } @Override @@ -1884,7 +1880,6 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.setHumidity(EnumHumidity.DAMP); beeSpecies.setTemperature(EnumTemperature.HELLISH); beeSpecies.setHasEffect(); - beeSpecies.setIsSecret(); } @Override @@ -2248,6 +2243,37 @@ public enum GT_BeeDefinition implements IBeeDefinition { tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End"));//End Dim + } + }, + RUNE(GT_BranchDefinition.HEE, "Rune", true, 0xE31010, 0x0104D9) { + @Override + protected void setSpeciesProperties(GT_AlleleBeeSpecies beeSpecies) { + beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 8), 0.30f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.RUNEI), 0.0025f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.RUNEII), 0.00125f); + beeSpecies.setHumidity(EnumHumidity.ARID); + beeSpecies.setTemperature(EnumTemperature.HELLISH); + beeSpecies.setHasEffect(); + } + + @Override + protected void setAlleles(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, GT_Bees.superLife); + AlleleHelper.instance.set(template, EnumBeeChromosome.EFFECT, getEffect(MAGICBEES, "SlowSpeed")); + AlleleHelper.instance.set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.NONE); + AlleleHelper.instance.set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.NONE); + + } + + @Override + protected void registerMutations() { + IMutationCustom tMutation = registerMutation(DRAGONESSENCE.species, STARDUST.species, 2).setIsSecret(); + tMutation.restrictHumidity(EnumHumidity.ARID); + if (Loader.isModLoaded("EnderStorage")) + tMutation.requireResource(GameRegistry.findBlock("EnderStorage", "enderChest"), 0); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End"));//End Dim + + } }, //Space Bees diff --git a/src/main/java/gregtech/loaders/misc/GT_BranchDefinition.java b/src/main/java/gregtech/loaders/misc/GT_BranchDefinition.java index 5dcdcf1e50..01c9982358 100644 --- a/src/main/java/gregtech/loaders/misc/GT_BranchDefinition.java +++ b/src/main/java/gregtech/loaders/misc/GT_BranchDefinition.java @@ -10,8 +10,7 @@ import forestry.core.genetics.alleles.EnumAllele; import java.util.Arrays; -import static gregtech.loaders.misc.GT_BeeDefinition.EXTRABEES; -import static gregtech.loaders.misc.GT_BeeDefinition.getFlowers; +import static gregtech.loaders.misc.GT_BeeDefinition.*; public enum GT_BranchDefinition { @@ -98,6 +97,7 @@ public enum GT_BranchDefinition { AlleleHelper.instance.set(alleles, EnumBeeChromosome.FLOWER_PROVIDER, EnumAllele.Flowers.END); AlleleHelper.instance.set(alleles, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.AVERAGE); AlleleHelper.instance.set(alleles, EnumBeeChromosome.SPEED, GT_Bees.speedBlinding); + AlleleHelper.instance.set(alleles, EnumBeeChromosome.SPEED, getEffect(EXTRABEES, "radioactive")); } }, TWILIGHT("Nemoris Obscuri") { @@ -116,10 +116,11 @@ public enum GT_BranchDefinition { AlleleHelper.instance.set(alleles, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_2); AlleleHelper.instance.set(alleles, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.BOTH_2); AlleleHelper.instance.set(alleles, EnumBeeChromosome.NOCTURNAL, true); - AlleleHelper.instance.set(alleles, EnumBeeChromosome.FLOWER_PROVIDER, getFlowers(EXTRABEES, "rock")); + AlleleHelper.instance.set(alleles, EnumBeeChromosome.FLOWER_PROVIDER, getFlowers(EXTRABEES, "book")); AlleleHelper.instance.set(alleles, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT); AlleleHelper.instance.set(alleles, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.SLOW); AlleleHelper.instance.set(alleles, EnumBeeChromosome.SPEED, EnumAllele.Speed.FASTEST); + AlleleHelper.instance.set(alleles, EnumBeeChromosome.TERRITORY, EnumAllele.Territory.LARGER); } }, SPACE("Cosmicis") { @@ -132,6 +133,7 @@ public enum GT_BranchDefinition { AlleleHelper.instance.set(alleles, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.FASTEST); AlleleHelper.instance.set(alleles, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.LONGEST); AlleleHelper.instance.set(alleles, EnumBeeChromosome.SPEED, EnumAllele.Speed.FAST); + AlleleHelper.instance.set(alleles, EnumBeeChromosome.TERRITORY, EnumAllele.Territory.LARGEST); } }, PLANET("Planetaris") { @@ -143,6 +145,7 @@ public enum GT_BranchDefinition { AlleleHelper.instance.set(alleles, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.FASTEST); AlleleHelper.instance.set(alleles, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.NORMAL); AlleleHelper.instance.set(alleles, EnumBeeChromosome.SPEED, EnumAllele.Speed.FASTEST); + AlleleHelper.instance.set(alleles, EnumBeeChromosome.TERRITORY, EnumAllele.Territory.LARGER); } }; -- cgit From 6378adcac4b7abf6c9306fdc38c3b335334cabd7 Mon Sep 17 00:00:00 2001 From: DreamMasterXXL Date: Wed, 13 May 2020 00:04:44 +0200 Subject: Add Fire Essense bee --- .../gregtech/loaders/misc/GT_BeeDefinition.java | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'src/main/java/gregtech/loaders') diff --git a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java index 82f08a7cd3..961dc44e83 100644 --- a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java +++ b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java @@ -2185,6 +2185,36 @@ public enum GT_BeeDefinition implements IBeeDefinition { } }, + FIREESSENCE(GT_BranchDefinition.HEE, "Fireessence", true, 0xD41238, 0xFFA157) { + @Override + protected void setSpeciesProperties(GT_AlleleBeeSpecies beeSpecies) { + beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 8), 0.30f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.FIREESSENSE), 0.10f); + beeSpecies.setHumidity(EnumHumidity.ARID); + beeSpecies.setTemperature(EnumTemperature.HELLISH); + beeSpecies.setHasEffect(); + } + + @Override + protected void setAlleles(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.ELONGATED); + AlleleHelper.instance.set(template, EnumBeeChromosome.EFFECT, AlleleEffect.effectIgnition); + AlleleHelper.instance.set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.UP_3); + AlleleHelper.instance.set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.DOWN_3); + } + + @Override + protected void registerMutations() { + IBeeMutationCustom tMutation = registerMutation(FIRESTONE.species, ARCANESHARDS.species, 4); + tMutation.restrictHumidity(EnumHumidity.ARID); + if (Loader.isModLoaded("HardcoreEnderExpansion")) + tMutation.requireResource(GameRegistry.findBlock("HardcoreEnderExpansion", "essence_altar"), 2); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End"));//End Dim + + + } + }, + ENDERMANHEAD(GT_BranchDefinition.HEE, "Enderman", true, 0x161616, 0x6200e7) { @Override protected void setSpeciesProperties(GT_AlleleBeeSpecies beeSpecies) { -- cgit From 8f0cb3eb75b0d212fad185fd28e6bcbba7338695 Mon Sep 17 00:00:00 2001 From: DreamMasterXXL Date: Wed, 13 May 2020 00:44:11 +0200 Subject: set hidden bees now to hidden. Before it wont work --- src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/main/java/gregtech/loaders') diff --git a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java index 961dc44e83..418f8bd46e 100644 --- a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java +++ b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java @@ -1825,7 +1825,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { @Override protected void registerMutations() { - IBeeMutationCustom tMutation = registerMutation(COAL.species, URANIUM.species, 2); + IMutationCustom tMutation = registerMutation(COAL.species, URANIUM.species, 2).setIsSecret(); tMutation.requireResource(GregTech_API.sBlockMetal7, 5); } }, @@ -1847,7 +1847,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { @Override protected void registerMutations() { - IBeeMutationCustom tMutation = registerMutation(THORIUM.species, getSpecies(EXTRABEES,"rotten"), 1); + IMutationCustom tMutation = registerMutation(THORIUM.species, getSpecies(EXTRABEES,"rotten"), 1).setIsSecret(); tMutation.requireResource(GregTech_API.sBlockMetal4, 3); } }, @@ -1869,7 +1869,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { @Override protected void registerMutations() { - IBeeMutationCustom tMutation = registerMutation(LUTETIUM.species, CHROME.species, 3, 4); + IMutationCustom tMutation = registerMutation(LUTETIUM.species, CHROME.species, 3, 4).setIsSecret(); tMutation.requireResource(GregTech_API.sBlockMetal1, 2); } }, @@ -1891,7 +1891,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { @Override protected void registerMutations() { - IBeeMutationCustom tMutation = registerMutation(NAQUADRIA.species, AMERICIUM.species, 1,2); + IMutationCustom tMutation = registerMutation(NAQUADRIA.species, AMERICIUM.species, 1,2).setIsSecret(); tMutation.requireResource(GregTech_API.sBlockMetal5, 2); } }, @@ -3392,7 +3392,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { @Override protected void registerMutations() { - IBeeMutationCustom tMutation = registerMutation(DOB.species, COSMICNEUTRONIUM.species, 3, 10); + IMutationCustom tMutation = registerMutation(DOB.species, COSMICNEUTRONIUM.species, 3, 10).setIsSecret(); if (Loader.isModLoaded("Avaritia")) tMutation.requireResource(GameRegistry.findBlock("Avaritia", "Resource_Block"), 1); } -- cgit