aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/gregtech')
-rw-r--r--src/main/java/gregtech/common/items/CombType.java2
-rw-r--r--src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java38
2 files changed, 28 insertions, 12 deletions
diff --git a/src/main/java/gregtech/common/items/CombType.java b/src/main/java/gregtech/common/items/CombType.java
index 21b2b55e8e..dfab8eb627 100644
--- a/src/main/java/gregtech/common/items/CombType.java
+++ b/src/main/java/gregtech/common/items/CombType.java
@@ -29,7 +29,7 @@ public enum CombType {
//Thaumcraft Line
THAUMIUMDUST("thaumiumdust", true, Materials.Thaumium, 100),
- THAUMIUMSHARD("tahumiumshard", true, Materials._NULL, 85),
+ THAUMIUMSHARD("thaumiumshard", true, Materials._NULL, 85),
AMBER("amber", true, Materials.Amber, 90),
QUICKSILVER("quicksilver", true, Materials.Mercury, 90),
SALISMUNDUS("salismundus", true, Materials._NULL, 75),
diff --git a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java
index a0ea362807..3c1dee8c61 100644
--- a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java
+++ b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java
@@ -45,6 +45,8 @@ public enum GT_BeeDefinition implements IBeeDefinition {
@Override
protected void setAlleles(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.SLOWER);
+ AlleleHelper.instance.set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.NONE);
+ AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWER_PROVIDER, EnumAllele.Flowers.VANILLA);
//Exaples
//template = BeeDefinition.CULTIVATED.getTemplate();
//AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.FASTEST);
@@ -78,6 +80,7 @@ public enum GT_BeeDefinition implements IBeeDefinition {
AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWER_PROVIDER, EnumAllele.Flowers.MUSHROOMS);
AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.SLOWER);
AlleleHelper.instance.set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_1);
+ AlleleHelper.instance.set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.BOTH_1);
}
@Override
@@ -103,6 +106,7 @@ public enum GT_BeeDefinition implements IBeeDefinition {
AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTER);
AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWER_PROVIDER, EnumAllele.Flowers.WHEAT);
AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.FASTER);
+ AlleleHelper.instance.set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.NONE);
}
@Override
@@ -123,6 +127,7 @@ public enum GT_BeeDefinition implements IBeeDefinition {
@Override
protected void setAlleles(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.SLOWER);
+ AlleleHelper.instance.set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.NONE);
}
@Override
@@ -138,8 +143,6 @@ public enum GT_BeeDefinition implements IBeeDefinition {
beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.COAL), 0.15f);
beeSpecies.setHumidity(EnumHumidity.NORMAL);
beeSpecies.setTemperature(EnumTemperature.NORMAL);
- beeSpecies.setNocturnal();
-
}
@Override
@@ -148,6 +151,8 @@ public enum GT_BeeDefinition implements IBeeDefinition {
AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWEST);
AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.LONGER);
AlleleHelper.instance.set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.DOWN_2);
+ AlleleHelper.instance.set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.DOWN_1);
+ AlleleHelper.instance.set(template, EnumBeeChromosome.NOCTURNAL, true);
AlleleHelper.instance.set(template, EnumBeeChromosome.EFFECT, AlleleEffect.effectCreeper);
}
@@ -164,13 +169,19 @@ public enum GT_BeeDefinition implements IBeeDefinition {
beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.OIL), 0.15f);
beeSpecies.setHumidity(EnumHumidity.DAMP);
beeSpecies.setTemperature(EnumTemperature.NORMAL);
- beeSpecies.setNocturnal();
beeSpecies.setHasEffect();
}
@Override
protected void setAlleles(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.SLOWER);
+ AlleleHelper.instance.set(template, EnumBeeChromosome.NOCTURNAL, true);
+ AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.NORMAL);
+ AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER);
+ AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWER_PROVIDER, EnumAllele.Flowers.VANILLA);
+ AlleleHelper.instance.set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.NONE);
+ AlleleHelper.instance.set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.NONE);
+
}
@Override
@@ -282,9 +293,9 @@ public enum GT_BeeDefinition implements IBeeDefinition {
AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER);
AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.LONGER);
AlleleHelper.instance.set(template, EnumBeeChromosome.EFFECT, AlleleEffect.effectIgnition);
- AlleleHelper.instance.set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.DOWN_2);
+ AlleleHelper.instance.set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.UP_1);
AlleleHelper.instance.set(template, EnumBeeChromosome.NOCTURNAL, true);
- AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWER_PROVIDER, EnumAllele.Flowers.NETHER);
+ AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWER_PROVIDER, EnumAllele.Flowers.SNOW);
AlleleHelper.instance.set(template, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.AVERAGE);
}
@@ -293,7 +304,7 @@ public enum GT_BeeDefinition implements IBeeDefinition {
IBeeMutationCustom tMutation = registerMutation(LAPIS.species, ENERGY.species, 6);
tMutation.requireResource("blockLapis");
tMutation.restrictTemperature(EnumTemperature.ICY);
- tMutation.addMutationCondition(new GT_Bees.BiomeIDMutationCondition(141));//moon dim
+ tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(28));//moon dim
}
},
//Alloy
@@ -309,6 +320,7 @@ public enum GT_BeeDefinition implements IBeeDefinition {
@Override
protected void setAlleles(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER);
+ AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTER);
}
@Override
@@ -329,6 +341,7 @@ public enum GT_BeeDefinition implements IBeeDefinition {
@Override
protected void setAlleles(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER);
+ AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTER);
}
@Override
@@ -372,8 +385,9 @@ public enum GT_BeeDefinition implements IBeeDefinition {
@Override
protected void setAlleles(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER);
- AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.NORMAL);
+ 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
@@ -416,6 +430,7 @@ public enum GT_BeeDefinition implements IBeeDefinition {
@Override
protected void setAlleles(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER);
+ AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTER);
}
@Override
@@ -505,7 +520,6 @@ 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.EFFECT, getEffect(EXTRABEES, "teleport"));
- AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.FAST);
AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTEST);
}
@@ -539,7 +553,7 @@ public enum GT_BeeDefinition implements IBeeDefinition {
protected void registerMutations() {
IBeeMutationCustom tMutation = registerMutation(getSpecies(MAGICBEES,"TCFire"), getSpecies(FORRESTRY,"Edenic"), 10);
tMutation.requireResource("blockThaumium");
- tMutation.restrictBiomeType(BiomeDictionary.Type.MAGICAL, BiomeDictionary.Type.FOREST);
+ tMutation.addMutationCondition(new GT_Bees.BiomeIDMutationCondition(192));//magical forest
}
},
THAUMIMSHARD(GT_BranchDefinition.THAUMIC, "ThaumiumShard", true, 0x9966FF, 0xAD85FF) {
@@ -581,6 +595,8 @@ public enum GT_BeeDefinition implements IBeeDefinition {
@Override
protected void setAlleles(IAllele[] template) {
AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER);
+ AlleleHelper.instance.set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.NONE);
+ AlleleHelper.instance.set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.NONE);
}
@Override
@@ -1079,12 +1095,12 @@ public enum GT_BeeDefinition implements IBeeDefinition {
beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.PLUTONIUM), 0.15f);
beeSpecies.setHumidity(EnumHumidity.NORMAL);
beeSpecies.setTemperature(EnumTemperature.ICY);
- beeSpecies.setNocturnal();
}
@Override
protected void setAlleles(IAllele[] template) {
template = BeeDefinition.AVENGING.getTemplate();
+ AlleleHelper.instance.set(template, EnumBeeChromosome.NOCTURNAL, true);
}
@Override
@@ -1100,12 +1116,12 @@ public enum GT_BeeDefinition implements IBeeDefinition {
beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.NAQUADAH), 0.15f);
beeSpecies.setHumidity(EnumHumidity.ARID);
beeSpecies.setTemperature(EnumTemperature.ICY);
- beeSpecies.setNocturnal();
}
@Override
protected void setAlleles(IAllele[] template) {
template = BeeDefinition.AVENGING.getTemplate();
+ AlleleHelper.instance.set(template, EnumBeeChromosome.NOCTURNAL, true);
}
@Override
generated by cgit (git 2.46.0) at 2025-03-06 20:41:14 +0000