aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders/misc
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/gregtech/loaders/misc')
-rw-r--r--src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java279
-rw-r--r--src/main/java/gregtech/loaders/misc/GT_BranchDefinition.java9
2 files changed, 266 insertions, 22 deletions
diff --git a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java
index 0ec878fd29..21adb29fa4 100644
--- a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java
+++ b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java
@@ -24,6 +24,7 @@ import gregtech.common.items.CombType;
import net.minecraft.block.Block;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
+import net.minecraftforge.common.BiomeDictionary;
import org.apache.commons.lang3.text.WordUtils;
import java.util.Arrays;
@@ -842,7 +843,7 @@ public enum GT_BeeDefinition implements IBeeDefinition {
protected void registerMutations() {
IBeeMutationCustom tMutation = registerMutation(getSpecies(MAGICBEES,"Withering"), getSpecies(MAGICBEES, "Draconic"), 1);
tMutation.requireResource(GregTech_API.sBlockGem3, 3);
- tMutation.addMutationCondition(new GT_Bees.BiomeIDMutationCondition(9, "END Dimension"));//sky end biome
+ tMutation.addMutationCondition(new GT_Bees.BiomeIDMutationCondition(9, "END Biome"));//sky end biome
}
},
//gems
@@ -975,7 +976,7 @@ public enum GT_BeeDefinition implements IBeeDefinition {
beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.DIAMOND), 0.15f);
beeSpecies.setHumidity(EnumHumidity.NORMAL);
beeSpecies.setTemperature(EnumTemperature.HOT);
- beeSpecies.hasEffect();
+ beeSpecies.setHasEffect();
}
@Override
@@ -1017,7 +1018,7 @@ public enum GT_BeeDefinition implements IBeeDefinition {
beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ALUMINIUM), 0.05f);
beeSpecies.setHumidity(EnumHumidity.NORMAL);
beeSpecies.setTemperature(EnumTemperature.COLD);
- beeSpecies.hasEffect();
+ beeSpecies.setHasEffect();
}
@Override
@@ -1039,7 +1040,7 @@ public enum GT_BeeDefinition implements IBeeDefinition {
beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.PYROPE), 0.05f);
beeSpecies.setHumidity(EnumHumidity.DAMP);
beeSpecies.setTemperature(EnumTemperature.WARM);
- beeSpecies.hasEffect();
+ beeSpecies.setHasEffect();
}
@Override
@@ -1062,7 +1063,7 @@ public enum GT_BeeDefinition implements IBeeDefinition {
beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.GROSSULAR), 0.05f);
beeSpecies.setHumidity(EnumHumidity.DAMP);
beeSpecies.setTemperature(EnumTemperature.WARM);
- beeSpecies.hasEffect();
+ beeSpecies.setHasEffect();
}
@Override
@@ -1077,14 +1078,14 @@ public enum GT_BeeDefinition implements IBeeDefinition {
tMutation.requireResource("blockGarnetYellow");
}
},
- FIRESTONR(GT_BranchDefinition.GEM, "Firestone", false, 0xC00000, 0xFF0000) {
+ FIRESTONE(GT_BranchDefinition.GEM, "Firestone", false, 0xC00000, 0xFF0000) {
@Override
protected void setSpeciesProperties(GT_AlleleBeeSpecies beeSpecies) {
beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.STONE), 0.30f);
beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.FIRESTONE), 0.15f);
beeSpecies.setHumidity(EnumHumidity.DAMP);
beeSpecies.setTemperature(EnumTemperature.WARM);
- beeSpecies.hasEffect();
+ beeSpecies.setHasEffect();
}
@Override
@@ -1203,8 +1204,9 @@ public enum GT_BeeDefinition implements IBeeDefinition {
@Override
protected void registerMutations() {
IBeeMutationCustom tMutation = registerMutation(IRON.species, COAL.species, 10);
- tMutation.restrictTemperature(EnumTemperature.HOT);
tMutation.requireResource("blockSteel");
+ tMutation.restrictTemperature(EnumTemperature.HOT);
+
}
},
NICKEL(GT_BranchDefinition.METAL, "Nickel", true, 0x8585AD, 0x8585AD) {
@@ -1446,7 +1448,7 @@ public enum GT_BeeDefinition implements IBeeDefinition {
beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.OSMIUM), 0.05f);
beeSpecies.setHumidity(EnumHumidity.ARID);
beeSpecies.setTemperature(EnumTemperature.HELLISH);
- beeSpecies.hasEffect();
+ beeSpecies.setHasEffect();
}
@Override
@@ -1468,7 +1470,7 @@ public enum GT_BeeDefinition implements IBeeDefinition {
beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.IRIDIUM), 0.05f);
beeSpecies.setHumidity(EnumHumidity.ARID);
beeSpecies.setTemperature(EnumTemperature.COLD);
- beeSpecies.hasEffect();
+ beeSpecies.setHasEffect();
}
@Override
@@ -1542,7 +1544,7 @@ public enum GT_BeeDefinition implements IBeeDefinition {
@Override
protected void registerMutations() {
IBeeMutationCustom tMutation = registerMutation(REDSTONE.species, GOLD.species, 5);
- tMutation.requireResource("blockSalt");
+ tMutation.requireResource("blockElectrotine");
}
},
//radiactive
@@ -1553,6 +1555,7 @@ public enum GT_BeeDefinition implements IBeeDefinition {
beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.URANIUM), 0.15f);
beeSpecies.setHumidity(EnumHumidity.NORMAL);
beeSpecies.setTemperature(EnumTemperature.COLD);
+ beeSpecies.setNocturnal();
}
@Override
@@ -1563,11 +1566,11 @@ public enum GT_BeeDefinition implements IBeeDefinition {
@Override
protected void registerMutations() {
- IBeeMutationCustom tMutation = registerMutation(getSpecies(FORRESTRY,"Avenging"), PLATINUM.species, 5);
+ IBeeMutationCustom tMutation = registerMutation(getSpecies(FORRESTRY,"Avenging"), PLATINUM.species, 2);
tMutation.requireResource(GregTech_API.sBlockMetal7, 14);
}
},
- PLUTONIUM(GT_BranchDefinition.RADIOACTIVE, "Plutonium", true, 0x335C33, 0x6B8F00) {
+ PLUTONIUM(GT_BranchDefinition.RADIOACTIVE, "Plutonium", true, 0x570000, 0x240000) {
@Override
protected void setSpeciesProperties(GT_AlleleBeeSpecies beeSpecies) {
beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f);
@@ -1575,18 +1578,18 @@ public enum GT_BeeDefinition implements IBeeDefinition {
beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.PLUTONIUM), 0.15f);
beeSpecies.setHumidity(EnumHumidity.NORMAL);
beeSpecies.setTemperature(EnumTemperature.ICY);
+ beeSpecies.setNocturnal();
}
@Override
protected void setAlleles(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWEST);
AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.LONGEST);
- AlleleHelper.instance.set(template, EnumBeeChromosome.NOCTURNAL, true);
}
@Override
protected void registerMutations() {
- IBeeMutationCustom tMutation = registerMutation(URANIUM.species, EMERALD.species, 5);
+ IBeeMutationCustom tMutation = registerMutation(URANIUM.species, EMERALD.species, 2);
tMutation.requireResource(GregTech_API.sBlockMetal5, 13);
}
},
@@ -1598,19 +1601,19 @@ public enum GT_BeeDefinition implements IBeeDefinition {
beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.NAQUADAH), 0.15f);
beeSpecies.setHumidity(EnumHumidity.ARID);
beeSpecies.setTemperature(EnumTemperature.ICY);
- beeSpecies.hasEffect();
+ beeSpecies.setNocturnal();
+ beeSpecies.setHasEffect();
}
@Override
protected void setAlleles(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWEST);
AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.LONGEST);
- AlleleHelper.instance.set(template, EnumBeeChromosome.NOCTURNAL, true);
}
@Override
protected void registerMutations() {
- IBeeMutationCustom tMutation = registerMutation(PLUTONIUM.species, IRIDIUM.species, 3);
+ IBeeMutationCustom tMutation = registerMutation(PLUTONIUM.species, IRIDIUM.species, 1);
tMutation.requireResource(GregTech_API.sBlockMetal4, 12);
}
},
@@ -1623,14 +1626,14 @@ public enum GT_BeeDefinition implements IBeeDefinition {
beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.NAQUADRIA), 0.15f);
beeSpecies.setHumidity(EnumHumidity.ARID);
beeSpecies.setTemperature(EnumTemperature.ICY);
- beeSpecies.hasEffect();
+ beeSpecies.setNocturnal();
+ beeSpecies.setHasEffect();
}
@Override
protected void setAlleles(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWEST);
AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.LONGEST);
- AlleleHelper.instance.set(template, EnumBeeChromosome.NOCTURNAL, true);
}
@Override
@@ -1638,6 +1641,237 @@ public enum GT_BeeDefinition implements IBeeDefinition {
IBeeMutationCustom tMutation = registerMutation(PLUTONIUM.species, IRIDIUM.species, 1,10);
tMutation.requireResource(GregTech_API.sBlockMetal4, 15);
}
+ },
+ DOB(GT_BranchDefinition.RADIOACTIVE, "DOB", false, 0x003300, 0x002400) {
+ @Override
+ protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+ beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.DOB), 0.75f);
+ beeSpecies.setHumidity(EnumHumidity.NORMAL);
+ beeSpecies.setTemperature(EnumTemperature.NORMAL);
+ beeSpecies.setNocturnal();
+ beeSpecies.setHasEffect();
+ beeSpecies.setIsSecret();
+
+ }
+
+ @Override
+ protected void setAlleles(IAllele[] template) {
+ AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.FAST);
+ AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTEST);
+ }
+
+ @Override
+ protected void registerMutations() {
+ IBeeMutationCustom tMutation = registerMutation(NAQUADAH.species, THAUMIMSHARD.species, 1);
+ tMutation.requireResource(GameRegistry.findBlock("AdvancedSolarPanel", "BlockAdvSolarPanel"), 2);
+ tMutation.addMutationCondition(new GT_Bees.BiomeIDMutationCondition(9, "END Biome"));//sky end biome
+ }
+ },
+ THORIUM(GT_BranchDefinition.RADIOACTIVE, "Thorium", false, 0x005000, 0x001E00) {
+ @Override
+ protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+ beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.THORIUM), 0.75f);
+ beeSpecies.setHumidity(EnumHumidity.NORMAL);
+ beeSpecies.setTemperature(EnumTemperature.COLD);
+ beeSpecies.setNocturnal();
+ beeSpecies.setIsSecret();
+ }
+
+ @Override
+ protected void setAlleles(IAllele[] template) {
+ AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWEST);
+ AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.LONGEST);
+ }
+
+ @Override
+ protected void registerMutations() {
+ IBeeMutationCustom tMutation = registerMutation(COAL.species, URANIUM.species, 2);
+ tMutation.requireResource(GregTech_API.sBlockMetal7, 5);
+ }
+ },
+ LUTETIUM(GT_BranchDefinition.RADIOACTIVE, "Lutetium", false, 0xE6FFE6, 0xFFFFFF) {
+ @Override
+ protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+ beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.LUTETIUM), 0.15f);
+ beeSpecies.setHumidity(EnumHumidity.NORMAL);
+ beeSpecies.setTemperature(EnumTemperature.NORMAL);
+ beeSpecies.setNocturnal();
+ beeSpecies.setHasEffect();
+ beeSpecies.setIsSecret();
+ }
+
+ @Override
+ protected void setAlleles(IAllele[] template) {
+ AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWEST);
+ AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.LONGEST);
+ }
+
+ @Override
+ protected void registerMutations() {
+ IBeeMutationCustom tMutation = registerMutation(THORIUM.species, getSpecies(EXTRABEES,"rotten"), 1);
+ tMutation.requireResource(GregTech_API.sBlockMetal4, 3);
+ }
+ },
+ AMERICUM(GT_BranchDefinition.RADIOACTIVE, "Americum", false, 0xE6E6FF, 0xC8C8C8) {
+ @Override
+ protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+ beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.AMERICUM), 0.05f);
+ beeSpecies.setHumidity(EnumHumidity.NORMAL);
+ beeSpecies.setTemperature(EnumTemperature.NORMAL);
+ beeSpecies.setNocturnal();
+ beeSpecies.setHasEffect();
+ beeSpecies.setIsSecret();
+ }
+
+ @Override
+ protected void setAlleles(IAllele[] template) {
+ AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWEST);
+ AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.LONGEST);
+ }
+
+ @Override
+ protected void registerMutations() {
+ IBeeMutationCustom tMutation = registerMutation(LUTETIUM.species, CHROME.species, 1);//TODO 0,75%
+ tMutation.requireResource(GregTech_API.sBlockMetal1, 2);
+ }
+ },
+ NEUTRONIUM(GT_BranchDefinition.RADIOACTIVE, "Neutronium", false, 0xFFF0F0, 0xFAFAFA) {
+ @Override
+ protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+ beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.NEUTRONIUM), 0.0001f);
+ beeSpecies.setHumidity(EnumHumidity.DAMP);
+ beeSpecies.setTemperature(EnumTemperature.HELLISH);
+ beeSpecies.setHasEffect();
+ beeSpecies.setIsSecret();
+ }
+
+ @Override
+ protected void setAlleles(IAllele[] template) {
+ AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWEST);
+ AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.LONGEST);
+ AlleleHelper.instance.set(template, EnumBeeChromosome.NOCTURNAL, true);
+ }
+
+ @Override
+ protected void registerMutations() {
+ IBeeMutationCustom tMutation = registerMutation(NAQUADRIA.species, AMERICUM.species, 1);//TODO 0,5%
+ tMutation.requireResource(GregTech_API.sBlockMetal5, 2);
+ }
+ },
+ //Twilight
+ NAGA(GT_BranchDefinition.TWILIGHT, "Naga", true, 0x0D5A0D, 0x28874B) {
+ @Override
+ protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+ beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SALISMUNDUS), 0.02f);
+ beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.NAGA), 0.10f);
+ beeSpecies.setHumidity(EnumHumidity.DAMP);
+ beeSpecies.setTemperature(EnumTemperature.NORMAL);
+ beeSpecies.setHasEffect();
+ }
+
+ @Override
+ protected void setAlleles(IAllele[] template) {
+ AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.FAST);
+ AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTEST);
+ }
+
+ @Override
+ protected void registerMutations() {
+ IBeeMutationCustom tMutation = registerMutation(getSpecies(MAGICBEES,"Eldritch"), getSpecies(FORRESTRY,"Imperial"), 8);
+ tMutation.restrictHumidity(EnumHumidity.DAMP);
+ }
+ },
+ LICH(GT_BranchDefinition.TWILIGHT, "Lich", true, 0xC5C5C5, 0x5C605E) {
+ @Override
+ protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+ beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SALISMUNDUS), 0.04f);
+ beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.LICH), 0.10f);
+ beeSpecies.setHumidity(EnumHumidity.ARID);
+ beeSpecies.setTemperature(EnumTemperature.NORMAL);
+ beeSpecies.setHasEffect();
+ }
+
+ @Override
+ protected void setAlleles(IAllele[] template) {
+ AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.FAST);
+ AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTEST);
+ }
+
+ @Override
+ protected void registerMutations() {
+ IBeeMutationCustom tMutation = registerMutation(getSpecies(MAGICBEES,"Supernatural"), NAGA.species, 7);
+ tMutation.restrictHumidity(EnumHumidity.ARID);
+ }
+ },
+ HYDRA(GT_BranchDefinition.TWILIGHT, "Hydra", true, 0x872836, 0xB8132C) {
+ @Override
+ protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+ beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SALISMUNDUS), 0.06f);
+ beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.HYDRA), 0.10f);
+ beeSpecies.setHumidity(EnumHumidity.ARID);
+ beeSpecies.setTemperature(EnumTemperature.HELLISH);
+ beeSpecies.setHasEffect();
+ }
+
+ @Override
+ protected void setAlleles(IAllele[] template) {
+ AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.FAST);
+ AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTEST);
+ }
+
+ @Override
+ protected void registerMutations() {
+ IBeeMutationCustom tMutation = registerMutation(LICH.species, getSpecies(MAGICBEES,"TCFire"), 6);
+ tMutation.addMutationCondition(new GT_Bees.BiomeIDMutationCondition(138, "Undergarden"));//undergarden biome
+ }
+ },
+ URGHAST(GT_BranchDefinition.TWILIGHT, "UrGhast", true, 0xA7041C, 0x7C0618) {
+ @Override
+ protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+ beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SALISMUNDUS), 0.08f);
+ beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.URGHAST), 0.10f);
+ beeSpecies.setHumidity(EnumHumidity.ARID);
+ beeSpecies.setTemperature(EnumTemperature.HELLISH);
+ beeSpecies.setHasEffect();
+ beeSpecies.setNocturnal();
+ }
+
+ @Override
+ protected void setAlleles(IAllele[] template) {
+ AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.FAST);
+ AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTEST);
+ }
+
+ @Override
+ protected void registerMutations() {
+ IBeeMutationCustom tMutation = registerMutation(HYDRA.species, THAUMIUMDUST.species, 5);
+ tMutation.requireResource(GameRegistry.findBlock("Thaumcraft", "blockCosmeticSolid"), 4);
+ tMutation.restrictTemperature(EnumTemperature.HELLISH);
+ }
+ },
+ SNOWQUEEN(GT_BranchDefinition.TWILIGHT, "SnowQueen", true, 0xD02001, 0x9C0018) {
+ @Override
+ protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
+ beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SALISMUNDUS), 0.15f);
+ beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.SNOWQUEEN), 0.10f);
+ beeSpecies.setHumidity(EnumHumidity.ARID);
+ beeSpecies.setTemperature(EnumTemperature.ICY);
+ beeSpecies.setHasEffect();
+ beeSpecies.setNocturnal();
+ }
+
+ @Override
+ protected void setAlleles(IAllele[] template) {
+ AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.FAST);
+ AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTEST);
+ }
+
+ @Override
+ protected void registerMutations() {
+ IBeeMutationCustom tMutation = registerMutation(getSpecies(MAGICBEES,"Supernatural"), NAGA.species, 4);
+ tMutation.requireResource(GameRegistry.findBlock("thaumicbases", "blockSalisMundus"), 0);
+ tMutation.restrictTemperature(EnumTemperature.ICY);
+ }
};
private final GT_BranchDefinition branch;
private final GT_AlleleBeeSpecies species;
@@ -1655,10 +1889,11 @@ public enum GT_BeeDefinition implements IBeeDefinition {
String lowercaseName = this.toString().toLowerCase(Locale.ENGLISH);
String species = "species" + WordUtils.capitalize(lowercaseName);
- String uid = "gregtech." + species;
+ String uid = "gregtech." + species;//TODO String uid = "gendustry.bee." + species;
String description = "for.description." + species;
String name = "for.bees.species." + lowercaseName;
+
this.branch = branch;
this.species = new GT_AlleleBeeSpecies(uid, dominant, name, "GTNH", description, branch.getBranch(), binomial, primary, secondary);
}
@@ -1777,4 +2012,4 @@ public enum GT_BeeDefinition implements IBeeDefinition {
return new BeeVariation.RainResist(this);
}
-} \ No newline at end of file
+}
diff --git a/src/main/java/gregtech/loaders/misc/GT_BranchDefinition.java b/src/main/java/gregtech/loaders/misc/GT_BranchDefinition.java
index 4066e7f80b..4747801e2d 100644
--- a/src/main/java/gregtech/loaders/misc/GT_BranchDefinition.java
+++ b/src/main/java/gregtech/loaders/misc/GT_BranchDefinition.java
@@ -94,6 +94,15 @@ public enum GT_BranchDefinition {
AlleleHelper.instance.set(alleles, EnumBeeChromosome.FLOWER_PROVIDER, EnumAllele.Flowers.END);
AlleleHelper.instance.set(alleles, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.AVERAGE);
}
+ },
+ TWILIGHT("NemorisObscuri") {
+ @Override
+ protected void setBranchProperties(IAllele[] alleles) {
+ AlleleHelper.instance.set(alleles, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_1);
+ AlleleHelper.instance.set(alleles, EnumBeeChromosome.NOCTURNAL, false);
+ AlleleHelper.instance.set(alleles, EnumBeeChromosome.FLOWER_PROVIDER, EnumAllele.Flowers.VANILLA);
+ AlleleHelper.instance.set(alleles, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.FASTER);
+ }
};
private static IAllele[] defaultTemplate;