From 66bb31bfa8faf432f168786f043e9cf2013b0b58 Mon Sep 17 00:00:00 2001 From: Runakai1 Date: Fri, 29 Jul 2022 17:42:00 +0200 Subject: [PATCH] Added one Bee Added the Chad bee Added RestrictedByGroup breeding requirement --- .../genetics/ExtraBeeBranchDefinition.java | 2 +- .../genetics/ExtraBeeDefinition.java | 27 +++++++++++++++ .../extrabees/genetics/ExtraBeeMutation.java | 10 ++++-- .../DummyMutationConditionGroupPersons.java | 34 +++++++++++++++++++ .../RequirementGroupOfPersons.java | 27 +++++++++++++++ .../assets/extrabees/lang/en_US.lang | 2 ++ .../assets/extrabees/lang/ru_RU.lang | 2 ++ .../assets/extrabees/lang/zh_CN.lang | 2 ++ 8 files changed, 102 insertions(+), 4 deletions(-) create mode 100644 src/main/java/binnie/extrabees/genetics/requirements/DummyMutationConditionGroupPersons.java create mode 100644 src/main/java/binnie/extrabees/genetics/requirements/RequirementGroupOfPersons.java diff --git a/src/main/java/binnie/extrabees/genetics/ExtraBeeBranchDefinition.java b/src/main/java/binnie/extrabees/genetics/ExtraBeeBranchDefinition.java index 00e93a6f..a3931f6f 100644 --- a/src/main/java/binnie/extrabees/genetics/ExtraBeeBranchDefinition.java +++ b/src/main/java/binnie/extrabees/genetics/ExtraBeeBranchDefinition.java @@ -283,7 +283,7 @@ public enum ExtraBeeBranchDefinition implements IBranchDefinition { FTB("Eftebeapis") { @Override protected void setBranchProperties(IAllele[] template) { - AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER); + AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.FASTEST); AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.NORMAL); AlleleHelper.instance.set(template, EnumBeeChromosome.EFFECT, AlleleEffect.effectBeatific); AlleleHelper.instance.set(template, EnumBeeChromosome.FERTILITY, EnumAllele.Fertility.MAXIMUM); diff --git a/src/main/java/binnie/extrabees/genetics/ExtraBeeDefinition.java b/src/main/java/binnie/extrabees/genetics/ExtraBeeDefinition.java index 92b4588d..87d62052 100644 --- a/src/main/java/binnie/extrabees/genetics/ExtraBeeDefinition.java +++ b/src/main/java/binnie/extrabees/genetics/ExtraBeeDefinition.java @@ -1638,6 +1638,33 @@ public enum ExtraBeeDefinition implements IBeeDefinition { registerMutation(BeeDefinition.ENDED, RELIC, 2).restrictPerson("jadedcat"); } }, + CHAD(ExtraBeeBranchDefinition.FTB, "merciboocoup", true, new Color(0x2157DB), new Color(0xD2ABD1)) { + ItemStack product = new ItemStack(Items.cake, 1); + + @Override + protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { + beeSpecies + .addProduct(product, 1f) + .addSpecialty(Mods.forestry.stack("pollenFertile"), 0.50f) + .addSpecialty(EnumHoneyComb.MILK.get(1), 0.55f) + .setIsNotCounted() + .setHasEffect(); + } + + protected void setAlleles(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.NOCTURNAL, true); + AlleleHelper.instance.set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_5); + AlleleHelper.instance.set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.BOTH_5); + AlleleHelper.instance.set( + template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele(ExtraBeesEffect.BIRTHDAY.getUID())); + } + + @Override + protected void registerMutations() { + String[] names = {"Runakai", "boubou_19", "Alastors_Game", "BlueWeabo", "Lewis_Saber", "True_Aurastorm,", "minecraft7771"}; + registerMutation(BeeDefinition.CULTIVATED, CELEBRATORY, 5).restrictedByGroupOfPersons(names); + } + }, /* AUSTERE BRANCH */ HAZARDOUS(BeeBranchDefinition.AUSTERE, "infensus", true, new Color(0xb06c28), new Color(0xffdc16)) { diff --git a/src/main/java/binnie/extrabees/genetics/ExtraBeeMutation.java b/src/main/java/binnie/extrabees/genetics/ExtraBeeMutation.java index a51ca792..8f889de7 100644 --- a/src/main/java/binnie/extrabees/genetics/ExtraBeeMutation.java +++ b/src/main/java/binnie/extrabees/genetics/ExtraBeeMutation.java @@ -1,8 +1,6 @@ package binnie.extrabees.genetics; -import binnie.extrabees.genetics.requirements.DummyMutationCondition; -import binnie.extrabees.genetics.requirements.IMutationRequirement; -import binnie.extrabees.genetics.requirements.RequirementPerson; +import binnie.extrabees.genetics.requirements.*; import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.apiculture.IBeeGenome; @@ -51,4 +49,10 @@ public class ExtraBeeMutation extends BeeMutation implements IBeeMutationCustom requirements.add(requirement); addMutationCondition(new DummyMutationCondition(requirement)); } + + public void restrictedByGroupOfPersons(String[] nicknames) { + RequirementGroupOfPersons requirement = new RequirementGroupOfPersons(nicknames); + requirements.add(requirement); + addMutationCondition(new DummyMutationConditionGroupPersons(requirement)); + } } diff --git a/src/main/java/binnie/extrabees/genetics/requirements/DummyMutationConditionGroupPersons.java b/src/main/java/binnie/extrabees/genetics/requirements/DummyMutationConditionGroupPersons.java new file mode 100644 index 00000000..3998bfd3 --- /dev/null +++ b/src/main/java/binnie/extrabees/genetics/requirements/DummyMutationConditionGroupPersons.java @@ -0,0 +1,34 @@ +package binnie.extrabees.genetics.requirements; + +import forestry.api.core.IClimateProvider; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IGenome; +import forestry.api.genetics.IMutationCondition; +import net.minecraft.world.World; + +public class DummyMutationConditionGroupPersons implements IMutationCondition { + private final RequirementGroupOfPersons requirement; + + public DummyMutationConditionGroupPersons(RequirementGroupOfPersons requirement) { + this.requirement = requirement; + } + + @Override + public float getChance( + World world, + int x, + int y, + int z, + IAllele allele0, + IAllele allele1, + IGenome genome0, + IGenome genome1, + IClimateProvider climate) { + return 1.0F; + } + + @Override + public String getDescription() { + return requirement.getDescription(); + } +} diff --git a/src/main/java/binnie/extrabees/genetics/requirements/RequirementGroupOfPersons.java b/src/main/java/binnie/extrabees/genetics/requirements/RequirementGroupOfPersons.java new file mode 100644 index 00000000..612e32a3 --- /dev/null +++ b/src/main/java/binnie/extrabees/genetics/requirements/RequirementGroupOfPersons.java @@ -0,0 +1,27 @@ +package binnie.extrabees.genetics.requirements; + +import binnie.core.util.I18N; +import forestry.api.apiculture.IBeeHousing; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IGenome; +import java.util.Arrays; +import java.util.List; + +public class RequirementGroupOfPersons implements IMutationRequirement { + protected List names; + + public RequirementGroupOfPersons(String[] name) { + this.names = Arrays.asList(name); + } + + @Override + public String getDescription() { + return I18N.localise("extrabees.genetics.requirements.user", names); + } + + @Override + public boolean fufilled(IBeeHousing housing, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) { + String ownerName = housing.getOwner().getName(); + return ownerName != null && names.contains(ownerName); // ownerName.contains(name); + } +} diff --git a/src/main/resources/assets/extrabees/lang/en_US.lang b/src/main/resources/assets/extrabees/lang/en_US.lang index 2c00e28a..3e4e5f86 100644 --- a/src/main/resources/assets/extrabees/lang/en_US.lang +++ b/src/main/resources/assets/extrabees/lang/en_US.lang @@ -439,6 +439,8 @@ extrabees.species.lightgray.name=Ashen extrabees.species.celebratory.name=Celebratory extrabees.species.jaded.name=Jaded extrabees.species.jaded.desc=I bred all the bees and all I got is some bloody purple dye!|Jaded, Sengir's Chosen +extrabees.species.chads.name=Chad +extrabees.species.chads.desc=GTNH Bienen: Das Beste Was Es Gibt. extrabees.species.glowstone.name=Glowering extrabees.species.hazardous.name=Hazardous extrabees.species.nickel.name=Lustered diff --git a/src/main/resources/assets/extrabees/lang/ru_RU.lang b/src/main/resources/assets/extrabees/lang/ru_RU.lang index 101f2126..1b99b674 100644 --- a/src/main/resources/assets/extrabees/lang/ru_RU.lang +++ b/src/main/resources/assets/extrabees/lang/ru_RU.lang @@ -580,6 +580,8 @@ extrabees.species.celebratory.name=Праздничная # Мерзкая ветвь extrabees.species.jaded.name=Изнурённая extrabees.species.jaded.desc=Я разводил этих пчёл и всё, что я получил - это кроваво-фиолетовый краситель!|Jaded, Sengir's Chosen +extrabees.species.chads.name=конфетти +extrabees.species.chads.desc=GTNH Bienen: Das Beste Was Es Gibt. # Суровая ветвь extrabees.species.hazardous.name=Опасная diff --git a/src/main/resources/assets/extrabees/lang/zh_CN.lang b/src/main/resources/assets/extrabees/lang/zh_CN.lang index ccc08318..83803ad5 100644 --- a/src/main/resources/assets/extrabees/lang/zh_CN.lang +++ b/src/main/resources/assets/extrabees/lang/zh_CN.lang @@ -439,6 +439,8 @@ extrabees.species.lightgray.name=淡灰 extrabees.species.celebratory.name=普天同庆 extrabees.species.jaded.name=翡翠 extrabees.species.jaded.desc=我培养出了所有蜜蜂,最后却只得到了点带血色的紫色染料!|Jaded,被 Sengir 选中之人 +extrabees.species.chads.name=乍得 +extrabees.species.chads.desc=GTNH Bienen: Das Beste Was Es Gibt. extrabees.species.glowstone.name=怒视 extrabees.species.hazardous.name=冒险 extrabees.species.nickel.name=含镍