mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-22 13:09:47 +00:00
Some refactoring
Partial drop Binnie ForestryAllele and similar class, replace to Forestry EnumAllele, EnumTemperature, etc
This commit is contained in:
1 parent
c9bc65bde2
commit
0d8c5b9230
15 files changed
+456
-456
No files matched your search
@@ -80,7 +80,7 @@ public class WindowGenesis extends Window {
|
||||
|
||||
@Override
|
||||
public int getOutlineColour() {
|
||||
return value.getColour();
|
||||
return value.getColor();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -20,7 +20,7 @@ class ControlBreedingProgress extends Control {
|
||||
public ControlBreedingProgress(IWidget parent, int x, int y, int width, int height, BreedingSystem system, float percentage) {
|
||||
super(parent, x, y, width, height);
|
||||
this.percentage = percentage;
|
||||
colour = system.getColour();
|
||||
colour = system.getColor();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -4,6 +4,7 @@ import binnie.Binnie;
|
||||
import binnie.core.BinnieCore;
|
||||
import binnie.core.util.I18N;
|
||||
import binnie.extrabees.ExtraBees;
|
||||
import binnie.genetics.genetics.AlleleHelper;
|
||||
import forestry.api.apiculture.EnumBeeChromosome;
|
||||
import forestry.api.apiculture.EnumBeeType;
|
||||
import forestry.api.apiculture.IAlleleBeeSpecies;
|
||||
@@ -11,11 +12,14 @@ import forestry.api.apiculture.IApiaristTracker;
|
||||
import forestry.api.apiculture.IBeeGenome;
|
||||
import forestry.api.apiculture.IBeeMutation;
|
||||
import forestry.api.apiculture.IBeeRoot;
|
||||
import forestry.api.genetics.AlleleManager;
|
||||
import forestry.api.genetics.EnumTolerance;
|
||||
import forestry.api.genetics.IAllele;
|
||||
import forestry.api.genetics.IBreedingTracker;
|
||||
import forestry.api.genetics.IChromosomeType;
|
||||
import forestry.api.genetics.IMutation;
|
||||
import forestry.api.genetics.ISpeciesRoot;
|
||||
import forestry.core.genetics.alleles.EnumAllele;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
@@ -44,7 +48,7 @@ class BeeBreedingSystem extends BreedingSystem {
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getColour() {
|
||||
public int getColor() {
|
||||
return 0xffd900;
|
||||
}
|
||||
|
||||
@@ -91,33 +95,33 @@ class BeeBreedingSystem extends BreedingSystem {
|
||||
public void addExtraAlleles(IChromosomeType chromosome, TreeSet<IAllele> alleles) {
|
||||
switch ((EnumBeeChromosome) chromosome) {
|
||||
case FERTILITY:
|
||||
for (ForestryAllele.Fertility a : ForestryAllele.Fertility.values()) {
|
||||
alleles.add(a.getAllele());
|
||||
for (EnumAllele.Fertility fertility : EnumAllele.Fertility.values()) {
|
||||
alleles.add(AlleleManager.alleleRegistry.getAllele(AlleleHelper.getUid(fertility)));
|
||||
}
|
||||
break;
|
||||
|
||||
case FLOWERING:
|
||||
for (ForestryAllele.Flowering a2 : ForestryAllele.Flowering.values()) {
|
||||
alleles.add(a2.getAllele());
|
||||
for (EnumAllele.Flowering flowering : EnumAllele.Flowering.values()) {
|
||||
alleles.add(AlleleManager.alleleRegistry.getAllele(AlleleHelper.getUid(flowering)));
|
||||
}
|
||||
break;
|
||||
|
||||
case HUMIDITY_TOLERANCE:
|
||||
case TEMPERATURE_TOLERANCE:
|
||||
for (Tolerance a3 : Tolerance.values()) {
|
||||
alleles.add(a3.getAllele());
|
||||
for (EnumTolerance tolerance : EnumTolerance.values()) {
|
||||
alleles.add(AlleleManager.alleleRegistry.getAllele(AlleleHelper.getUid(tolerance)));
|
||||
}
|
||||
break;
|
||||
|
||||
case LIFESPAN:
|
||||
for (ForestryAllele.Lifespan a4 : ForestryAllele.Lifespan.values()) {
|
||||
alleles.add(a4.getAllele());
|
||||
for (EnumAllele.Lifespan lifespan : EnumAllele.Lifespan.values()) {
|
||||
alleles.add(AlleleManager.alleleRegistry.getAllele(AlleleHelper.getUid(lifespan)));
|
||||
}
|
||||
break;
|
||||
|
||||
case SPEED:
|
||||
for (ForestryAllele.Speed a5 : ForestryAllele.Speed.values()) {
|
||||
alleles.add(a5.getAllele());
|
||||
for (EnumAllele.Speed speed : EnumAllele.Speed.values()) {
|
||||
alleles.add(AlleleManager.alleleRegistry.getAllele(AlleleHelper.getUid(speed)));
|
||||
}
|
||||
break;
|
||||
|
||||
@@ -130,8 +134,8 @@ class BeeBreedingSystem extends BreedingSystem {
|
||||
case NOCTURNAL:
|
||||
case CAVE_DWELLING:
|
||||
case TOLERANT_FLYER:
|
||||
for (ForestryAllele.Bool a7 : ForestryAllele.Bool.values()) {
|
||||
alleles.add(a7.getAllele());
|
||||
for (ForestryAllele.Bool bool : ForestryAllele.Bool.values()) {
|
||||
alleles.add(bool.getAllele());
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -417,7 +417,7 @@ public abstract class BreedingSystem implements IItemStackRepresentative {
|
||||
return null;
|
||||
}
|
||||
|
||||
public abstract int getColour();
|
||||
public abstract int getColor();
|
||||
|
||||
public String getAlleleName(IChromosomeType chromosome, IAllele allele) {
|
||||
if (allele instanceof IAlleleBoolean) {
|
||||
|
||||
@@ -10,12 +10,16 @@ import binnie.botany.genetics.EnumFlowerColor;
|
||||
import binnie.core.BinnieCore;
|
||||
import binnie.core.util.I18N;
|
||||
import binnie.extrabees.ExtraBees;
|
||||
import binnie.genetics.genetics.AlleleHelper;
|
||||
import forestry.api.genetics.AlleleManager;
|
||||
import forestry.api.genetics.EnumTolerance;
|
||||
import forestry.api.genetics.IAllele;
|
||||
import forestry.api.genetics.IBreedingTracker;
|
||||
import forestry.api.genetics.IChromosomeType;
|
||||
import forestry.api.genetics.IIndividual;
|
||||
import forestry.api.genetics.IMutation;
|
||||
import forestry.api.genetics.ISpeciesRoot;
|
||||
import forestry.core.genetics.alleles.EnumAllele;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
@@ -38,7 +42,7 @@ class FlowerBreedingSystem extends BreedingSystem {
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getColour() {
|
||||
public int getColor() {
|
||||
return 0xde3737;
|
||||
}
|
||||
|
||||
@@ -79,9 +83,9 @@ class FlowerBreedingSystem extends BreedingSystem {
|
||||
@Override
|
||||
public int[] getActiveTypes() {
|
||||
return new int[]{
|
||||
EnumFlowerStage.FLOWER.ordinal(),
|
||||
EnumFlowerStage.POLLEN.ordinal(),
|
||||
EnumFlowerStage.SEED.ordinal()
|
||||
EnumFlowerStage.FLOWER.ordinal(),
|
||||
EnumFlowerStage.POLLEN.ordinal(),
|
||||
EnumFlowerStage.SEED.ordinal()
|
||||
};
|
||||
}
|
||||
|
||||
@@ -89,22 +93,22 @@ class FlowerBreedingSystem extends BreedingSystem {
|
||||
public void addExtraAlleles(IChromosomeType chromosome, TreeSet<IAllele> alleles) {
|
||||
switch ((EnumFlowerChromosome) chromosome) {
|
||||
case FERTILITY:
|
||||
for (ForestryAllele.Fertility a : ForestryAllele.Fertility.values()) {
|
||||
alleles.add(a.getAllele());
|
||||
for (EnumAllele.Fertility fertility : EnumAllele.Fertility.values()) {
|
||||
alleles.add(AlleleManager.alleleRegistry.getAllele(AlleleHelper.getUid(fertility)));
|
||||
}
|
||||
break;
|
||||
|
||||
case LIFESPAN:
|
||||
for (ForestryAllele.Lifespan a2 : ForestryAllele.Lifespan.values()) {
|
||||
alleles.add(a2.getAllele());
|
||||
for (EnumAllele.Lifespan lifespan : EnumAllele.Lifespan.values()) {
|
||||
alleles.add(AlleleManager.alleleRegistry.getAllele(AlleleHelper.getUid(lifespan)));
|
||||
}
|
||||
break;
|
||||
|
||||
case HUMIDITY_TOLERANCE:
|
||||
case PH_TOLERANCE:
|
||||
case TEMPERATURE_TOLERANCE:
|
||||
for (Tolerance a3 : Tolerance.values()) {
|
||||
alleles.add(a3.getAllele());
|
||||
for (EnumTolerance a3 : EnumTolerance.values()) {
|
||||
alleles.add(AlleleManager.alleleRegistry.getAllele(AlleleHelper.getUid(a3)));
|
||||
}
|
||||
break;
|
||||
|
||||
@@ -117,14 +121,14 @@ class FlowerBreedingSystem extends BreedingSystem {
|
||||
break;
|
||||
|
||||
case SAPPINESS:
|
||||
for (ForestryAllele.Sappiness a5 : ForestryAllele.Sappiness.values()) {
|
||||
alleles.add(a5.getAllele());
|
||||
for (EnumAllele.Sappiness sappiness : EnumAllele.Sappiness.values()) {
|
||||
alleles.add(AlleleManager.alleleRegistry.getAllele(AlleleHelper.getUid(sappiness)));
|
||||
}
|
||||
break;
|
||||
|
||||
case TERRITORY:
|
||||
for (ForestryAllele.Territory a6 : ForestryAllele.Territory.values()) {
|
||||
alleles.add(a6.getAllele());
|
||||
for (EnumAllele.Territory territory : EnumAllele.Territory.values()) {
|
||||
alleles.add(AlleleManager.alleleRegistry.getAllele(AlleleHelper.getUid(territory)));
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -36,7 +36,7 @@ class MothBreedingSystem extends BreedingSystem {
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getColour() {
|
||||
public int getColor() {
|
||||
return 0x00f2f2;
|
||||
}
|
||||
|
||||
|
||||
@@ -7,6 +7,7 @@ import binnie.core.util.UniqueItemStackSet;
|
||||
import binnie.extratrees.ExtraTrees;
|
||||
import binnie.extratrees.FakeWorld;
|
||||
import binnie.extratrees.machines.Lumbermill;
|
||||
import binnie.genetics.genetics.AlleleHelper;
|
||||
import com.mojang.authlib.GameProfile;
|
||||
import forestry.api.arboriculture.EnumGermlingType;
|
||||
import forestry.api.arboriculture.EnumTreeChromosome;
|
||||
@@ -29,6 +30,7 @@ import forestry.api.genetics.IFruitFamily;
|
||||
import forestry.api.genetics.IIndividual;
|
||||
import forestry.api.genetics.IMutation;
|
||||
import forestry.api.genetics.ISpeciesRoot;
|
||||
import forestry.core.genetics.alleles.EnumAllele;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
@@ -71,7 +73,7 @@ public class TreeBreedingSystem extends BreedingSystem {
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getColour() {
|
||||
public int getColor() {
|
||||
return 53006;
|
||||
}
|
||||
|
||||
@@ -269,8 +271,8 @@ public class TreeBreedingSystem extends BreedingSystem {
|
||||
public void addExtraAlleles(IChromosomeType chromosome, TreeSet<IAllele> alleles) {
|
||||
switch ((EnumTreeChromosome) chromosome) {
|
||||
case FERTILITY:
|
||||
for (ForestryAllele.Saplings a : ForestryAllele.Saplings.values()) {
|
||||
alleles.add(a.getAllele());
|
||||
for (EnumAllele.Saplings saplings : EnumAllele.Saplings.values()) {
|
||||
alleles.add(AlleleManager.alleleRegistry.getAllele(AlleleHelper.getUid(saplings)));
|
||||
}
|
||||
break;
|
||||
|
||||
@@ -281,38 +283,38 @@ public class TreeBreedingSystem extends BreedingSystem {
|
||||
break;
|
||||
|
||||
case HEIGHT:
|
||||
for (ForestryAllele.TreeHeight a3 : ForestryAllele.TreeHeight.values()) {
|
||||
alleles.add(a3.getAllele());
|
||||
for (EnumAllele.Height height : EnumAllele.Height.values()) {
|
||||
alleles.add(AlleleManager.alleleRegistry.getAllele(AlleleHelper.getUid(height)));
|
||||
}
|
||||
break;
|
||||
|
||||
case MATURATION:
|
||||
for (ForestryAllele.Maturation a4 : ForestryAllele.Maturation.values()) {
|
||||
alleles.add(a4.getAllele());
|
||||
for (EnumAllele.Maturation maturation : EnumAllele.Maturation.values()) {
|
||||
alleles.add(AlleleManager.alleleRegistry.getAllele(AlleleHelper.getUid(maturation)));
|
||||
}
|
||||
break;
|
||||
|
||||
case SAPPINESS:
|
||||
for (ForestryAllele.Sappiness a5 : ForestryAllele.Sappiness.values()) {
|
||||
alleles.add(a5.getAllele());
|
||||
for (EnumAllele.Sappiness sappiness : EnumAllele.Sappiness.values()) {
|
||||
alleles.add(AlleleManager.alleleRegistry.getAllele(AlleleHelper.getUid(sappiness)));
|
||||
}
|
||||
break;
|
||||
|
||||
case TERRITORY:
|
||||
for (ForestryAllele.Territory a6 : ForestryAllele.Territory.values()) {
|
||||
alleles.add(a6.getAllele());
|
||||
for (EnumAllele.Territory territory : EnumAllele.Territory.values()) {
|
||||
alleles.add(AlleleManager.alleleRegistry.getAllele(AlleleHelper.getUid(territory)));
|
||||
}
|
||||
break;
|
||||
|
||||
case YIELD:
|
||||
for (ForestryAllele.Yield a7 : ForestryAllele.Yield.values()) {
|
||||
alleles.add(a7.getAllele());
|
||||
for (EnumAllele.Yield yield : EnumAllele.Yield.values()) {
|
||||
alleles.add(AlleleManager.alleleRegistry.getAllele(AlleleHelper.getUid(yield)));
|
||||
}
|
||||
break;
|
||||
|
||||
case FIREPROOF:
|
||||
for (ForestryAllele.Bool a8 : ForestryAllele.Bool.values()) {
|
||||
alleles.add(a8.getAllele());
|
||||
for (ForestryAllele.Bool bool : ForestryAllele.Bool.values()) {
|
||||
alleles.add(bool.getAllele());
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -4,12 +4,12 @@ import binnie.Binnie;
|
||||
import binnie.core.BinnieCore;
|
||||
import binnie.core.Mods;
|
||||
import binnie.core.genetics.ForestryAllele;
|
||||
import binnie.core.genetics.Tolerance;
|
||||
import binnie.core.item.IItemEnum;
|
||||
import binnie.extrabees.ExtraBees;
|
||||
import binnie.extrabees.genetics.effect.ExtraBeesEffect;
|
||||
import binnie.extrabees.products.EnumHoneyComb;
|
||||
import binnie.extrabees.products.ItemHoneyComb;
|
||||
import binnie.genetics.genetics.AlleleHelper;
|
||||
import com.mojang.authlib.GameProfile;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
@@ -24,12 +24,14 @@ import forestry.api.core.EnumHumidity;
|
||||
import forestry.api.core.EnumTemperature;
|
||||
import forestry.api.core.IIconProvider;
|
||||
import forestry.api.genetics.AlleleManager;
|
||||
import forestry.api.genetics.EnumTolerance;
|
||||
import forestry.api.genetics.IAllele;
|
||||
import forestry.api.genetics.IAlleleFlowers;
|
||||
import forestry.api.genetics.IAlleleSpecies;
|
||||
import forestry.api.genetics.IClassification;
|
||||
import forestry.api.genetics.IIndividual;
|
||||
import forestry.api.genetics.IMutation;
|
||||
import forestry.core.genetics.alleles.EnumAllele;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -255,11 +257,11 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies, IIconProvider {
|
||||
ExtraBeesSpecies.ARID.addProduct(EnumHoneyComb.BARREN, 0.30f);
|
||||
ExtraBeesSpecies.ARID.setHumidity(EnumHumidity.ARID);
|
||||
ExtraBeesSpecies.ARID.setFlowerProvider(ExtraBeesFlowers.DEAD.getUID());
|
||||
ExtraBeesSpecies.ARID.setTemperatureTolerance(Tolerance.Up1);
|
||||
ExtraBeesSpecies.ARID.setTemperatureTolerance(EnumTolerance.UP_1);
|
||||
ExtraBeesSpecies.ARID.setSecondaryColor(aridBody);
|
||||
|
||||
ExtraBeesSpecies.BARREN.importTemplate(ExtraBeesSpecies.ARID);
|
||||
ExtraBeesSpecies.BARREN.setFertility(ForestryAllele.Fertility.Low);
|
||||
ExtraBeesSpecies.BARREN.setFertility(EnumAllele.Fertility.LOW);
|
||||
ExtraBeesSpecies.BARREN.addProduct(EnumHoneyComb.BARREN, 0.30f);
|
||||
|
||||
ExtraBeesSpecies.DESOLATE.addProduct(EnumHoneyComb.BARREN, 0.30f);
|
||||
@@ -302,11 +304,11 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies, IIconProvider {
|
||||
ExtraBeesSpecies.ROCK.setAllDay();
|
||||
ExtraBeesSpecies.ROCK.setCaveDwelling();
|
||||
ExtraBeesSpecies.ROCK.setTolerantFlyer();
|
||||
ExtraBeesSpecies.ROCK.setTemperatureTolerance(Tolerance.Both1);
|
||||
ExtraBeesSpecies.ROCK.setHumidityTolerance(Tolerance.Both1);
|
||||
ExtraBeesSpecies.ROCK.setTemperatureTolerance(EnumTolerance.BOTH_1);
|
||||
ExtraBeesSpecies.ROCK.setHumidityTolerance(EnumTolerance.BOTH_1);
|
||||
ExtraBeesSpecies.ROCK.setFlowerProvider(ExtraBeesFlowers.ROCK.getUID());
|
||||
ExtraBeesSpecies.ROCK.setFertility(ForestryAllele.Fertility.Low);
|
||||
ExtraBeesSpecies.ROCK.setLifespan(ForestryAllele.Lifespan.Short);
|
||||
ExtraBeesSpecies.ROCK.setFertility(EnumAllele.Fertility.LOW);
|
||||
ExtraBeesSpecies.ROCK.setLifespan(EnumAllele.Lifespan.SHORT);
|
||||
ExtraBeesSpecies.ROCK.setSecondaryColor(rockBody);
|
||||
|
||||
ExtraBeesSpecies.STONE.addProduct(EnumHoneyComb.STONE, 0.30f);
|
||||
@@ -316,8 +318,8 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies, IIconProvider {
|
||||
|
||||
ExtraBeesSpecies.GRANITE.addProduct(EnumHoneyComb.STONE, 0.30f);
|
||||
ExtraBeesSpecies.GRANITE.importTemplate(ExtraBeesSpecies.STONE);
|
||||
ExtraBeesSpecies.GRANITE.setTemperatureTolerance(Tolerance.Both2);
|
||||
ExtraBeesSpecies.GRANITE.setHumidityTolerance(Tolerance.Both2);
|
||||
ExtraBeesSpecies.GRANITE.setTemperatureTolerance(EnumTolerance.BOTH_2);
|
||||
ExtraBeesSpecies.GRANITE.setHumidityTolerance(EnumTolerance.BOTH_2);
|
||||
ExtraBeesSpecies.GRANITE.setSecondaryColor(rockBody);
|
||||
|
||||
ExtraBeesSpecies.MINERAL.addProduct(EnumHoneyComb.STONE, 0.30f);
|
||||
@@ -411,8 +413,8 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies, IIconProvider {
|
||||
ExtraBeesSpecies.UNSTABLE.importTemplate(ExtraBeesSpecies.MINERAL);
|
||||
ExtraBeesSpecies.UNSTABLE.addProduct(EnumHoneyComb.BARREN, 0.20f);
|
||||
ExtraBeesSpecies.UNSTABLE.setEffect(ExtraBeesEffect.RADIOACTIVE.getUID());
|
||||
ExtraBeesSpecies.UNSTABLE.setFertility(ForestryAllele.Fertility.Low);
|
||||
ExtraBeesSpecies.UNSTABLE.setLifespan(ForestryAllele.Lifespan.Shortest);
|
||||
ExtraBeesSpecies.UNSTABLE.setFertility(EnumAllele.Fertility.LOW);
|
||||
ExtraBeesSpecies.UNSTABLE.setLifespan(EnumAllele.Lifespan.SHORTEST);
|
||||
ExtraBeesSpecies.UNSTABLE.recessive();
|
||||
|
||||
ExtraBeesSpecies.NUCLEAR.importTemplate(ExtraBeesSpecies.UNSTABLE);
|
||||
@@ -427,25 +429,25 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies, IIconProvider {
|
||||
|
||||
ExtraBeesSpecies.ANCIENT.importTemplate(ForestryAllele.BeeSpecies.Noble);
|
||||
ExtraBeesSpecies.ANCIENT.addProduct(EnumHoneyComb.OLD, 0.30f);
|
||||
ExtraBeesSpecies.ANCIENT.setLifespan(ForestryAllele.Lifespan.Elongated);
|
||||
ExtraBeesSpecies.ANCIENT.setLifespan(EnumAllele.Lifespan.ELONGATED);
|
||||
|
||||
ExtraBeesSpecies.PRIMEVAL.importTemplate(ExtraBeesSpecies.ANCIENT);
|
||||
ExtraBeesSpecies.PRIMEVAL.addProduct(EnumHoneyComb.OLD, 0.30f);
|
||||
ExtraBeesSpecies.PRIMEVAL.setLifespan(ForestryAllele.Lifespan.Long);
|
||||
ExtraBeesSpecies.PRIMEVAL.setLifespan(EnumAllele.Lifespan.LONG);
|
||||
|
||||
ExtraBeesSpecies.PREHISTORIC.importTemplate(ExtraBeesSpecies.ANCIENT);
|
||||
ExtraBeesSpecies.PREHISTORIC.addProduct(EnumHoneyComb.OLD, 0.30f);
|
||||
ExtraBeesSpecies.PREHISTORIC.setLifespan(ForestryAllele.Lifespan.Longer);
|
||||
ExtraBeesSpecies.PREHISTORIC.setFertility(ForestryAllele.Fertility.Low);
|
||||
ExtraBeesSpecies.PREHISTORIC.setLifespan(EnumAllele.Lifespan.LONGER);
|
||||
ExtraBeesSpecies.PREHISTORIC.setFertility(EnumAllele.Fertility.LOW);
|
||||
ExtraBeesSpecies.PREHISTORIC.recessive();
|
||||
|
||||
ExtraBeesSpecies.RELIC.importTemplate(ExtraBeesSpecies.ANCIENT);
|
||||
ExtraBeesSpecies.RELIC.addProduct(EnumHoneyComb.OLD, 0.30f);
|
||||
ExtraBeesSpecies.RELIC.setHasEffect(true);
|
||||
ExtraBeesSpecies.RELIC.setLifespan(ForestryAllele.Lifespan.Longest);
|
||||
ExtraBeesSpecies.RELIC.setLifespan(EnumAllele.Lifespan.LONGEST);
|
||||
|
||||
ExtraBeesSpecies.COAL.importTemplate(ExtraBeesSpecies.ANCIENT);
|
||||
ExtraBeesSpecies.COAL.setLifespan(ForestryAllele.Lifespan.Normal);
|
||||
ExtraBeesSpecies.COAL.setLifespan(EnumAllele.Lifespan.NORMAL);
|
||||
ExtraBeesSpecies.COAL.addProduct(EnumHoneyComb.OLD, 0.20f);
|
||||
ExtraBeesSpecies.COAL.addSpecialty(EnumHoneyComb.COAL, 0.08f);
|
||||
|
||||
@@ -480,9 +482,9 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies, IIconProvider {
|
||||
ExtraBeesSpecies.WATER.addProduct(EnumHoneyComb.WATER, 0.30f);
|
||||
ExtraBeesSpecies.WATER.setIsSecret(false);
|
||||
ExtraBeesSpecies.WATER.setTolerantFlyer();
|
||||
ExtraBeesSpecies.WATER.setHumidityTolerance(Tolerance.Both1);
|
||||
ExtraBeesSpecies.WATER.setHumidityTolerance(EnumTolerance.BOTH_1);
|
||||
ExtraBeesSpecies.WATER.setFlowerProvider(ExtraBeesFlowers.WATER.getUID());
|
||||
ExtraBeesSpecies.WATER.setFlowering(ForestryAllele.Flowering.Slow);
|
||||
ExtraBeesSpecies.WATER.setFlowering(EnumAllele.Flowering.SLOW);
|
||||
ExtraBeesSpecies.WATER.setEffect(ExtraBeesEffect.WATER.getUID());
|
||||
ExtraBeesSpecies.WATER.setHumidity(EnumHumidity.DAMP);
|
||||
|
||||
@@ -502,15 +504,15 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies, IIconProvider {
|
||||
|
||||
ExtraBeesSpecies.GROWING.importTemplate(ForestryAllele.BeeSpecies.Forest);
|
||||
ExtraBeesSpecies.GROWING.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.35f);
|
||||
ExtraBeesSpecies.GROWING.setFlowering(ForestryAllele.Flowering.Average);
|
||||
ExtraBeesSpecies.GROWING.setFlowering(EnumAllele.Flowering.AVERAGE);
|
||||
ExtraBeesSpecies.GROWING.setFlowerProvider(ExtraBeesFlowers.LEAVES.getUID());
|
||||
|
||||
ExtraBeesSpecies.THRIVING.importTemplate(ExtraBeesSpecies.GROWING);
|
||||
ExtraBeesSpecies.THRIVING.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.35f);
|
||||
ExtraBeesSpecies.THRIVING.setFlowering(ForestryAllele.Flowering.Fast);
|
||||
ExtraBeesSpecies.THRIVING.setFlowering(EnumAllele.Flowering.FAST);
|
||||
|
||||
ExtraBeesSpecies.BLOOMING.importTemplate(ExtraBeesSpecies.THRIVING);
|
||||
ExtraBeesSpecies.BLOOMING.setFlowering(ForestryAllele.Flowering.Fastest);
|
||||
ExtraBeesSpecies.BLOOMING.setFlowering(EnumAllele.Flowering.FASTEST);
|
||||
ExtraBeesSpecies.BLOOMING.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.35f);
|
||||
ExtraBeesSpecies.BLOOMING.setFlowerProvider(ExtraBeesFlowers.SAPLING.getUID());
|
||||
ExtraBeesSpecies.BLOOMING.setEffect(ExtraBeesEffect.BONEMEAL_SAPLING.getUID());
|
||||
@@ -599,13 +601,13 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies, IIconProvider {
|
||||
|
||||
ExtraBeesSpecies.INFECTIOUS.importTemplate(ExtraBeesSpecies.MALICIOUS);
|
||||
ExtraBeesSpecies.INFECTIOUS.addProduct(ItemHoneyComb.VanillaComb.SILKY.get(), 0.25f);
|
||||
ExtraBeesSpecies.INFECTIOUS.setFlowering(ForestryAllele.Flowering.Slow);
|
||||
ExtraBeesSpecies.INFECTIOUS.setFlowering(EnumAllele.Flowering.SLOW);
|
||||
ExtraBeesSpecies.INFECTIOUS.setSecondaryColor(0x069764);
|
||||
|
||||
ExtraBeesSpecies.VIRULENT.importTemplate(ExtraBeesSpecies.INFECTIOUS);
|
||||
ExtraBeesSpecies.VIRULENT.addProduct(ItemHoneyComb.VanillaComb.SILKY.get(), 0.25f);
|
||||
ExtraBeesSpecies.VIRULENT.addSpecialty(EnumHoneyComb.VENOMOUS, 0.12f);
|
||||
ExtraBeesSpecies.VIRULENT.setFlowering(ForestryAllele.Flowering.Average);
|
||||
ExtraBeesSpecies.VIRULENT.setFlowering(EnumAllele.Flowering.AVERAGE);
|
||||
ExtraBeesSpecies.VIRULENT.recessive();
|
||||
ExtraBeesSpecies.VIRULENT.setHasEffect(true);
|
||||
ExtraBeesSpecies.VIRULENT.setSecondaryColor(0x069764);
|
||||
@@ -615,18 +617,18 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies, IIconProvider {
|
||||
ExtraBeesSpecies.VISCOUS.addProduct(ItemHoneyComb.VanillaComb.SILKY.get(), 0.25f);
|
||||
ExtraBeesSpecies.VISCOUS.setSecondaryColor(0x069764);
|
||||
ExtraBeesSpecies.VISCOUS.setHumidity(EnumHumidity.DAMP);
|
||||
ExtraBeesSpecies.VISCOUS.setSpeed(ForestryAllele.Speed.Slow);
|
||||
ExtraBeesSpecies.VISCOUS.setSpeed(EnumAllele.Speed.SLOW);
|
||||
ExtraBeesSpecies.VISCOUS.setTemperature(EnumTemperature.WARM);
|
||||
|
||||
ExtraBeesSpecies.GLUTINOUS.importTemplate(ExtraBeesSpecies.VISCOUS);
|
||||
ExtraBeesSpecies.GLUTINOUS.addProduct(ItemHoneyComb.VanillaComb.SILKY.get(), 0.25f);
|
||||
ExtraBeesSpecies.GLUTINOUS.setSpeed(ForestryAllele.Speed.Norm);
|
||||
ExtraBeesSpecies.GLUTINOUS.setSpeed(EnumAllele.Speed.NORMAL);
|
||||
ExtraBeesSpecies.GLUTINOUS.setSecondaryColor(0x069764);
|
||||
|
||||
ExtraBeesSpecies.STICKY.importTemplate(ExtraBeesSpecies.GLUTINOUS);
|
||||
ExtraBeesSpecies.STICKY.addProduct(ItemHoneyComb.VanillaComb.SILKY.get(), 0.25f);
|
||||
ExtraBeesSpecies.STICKY.addSpecialty(EnumHoneyComb.SLIME, 0.12f);
|
||||
ExtraBeesSpecies.STICKY.setSpeed(ForestryAllele.Speed.Fast);
|
||||
ExtraBeesSpecies.STICKY.setSpeed(EnumAllele.Speed.FAST);
|
||||
ExtraBeesSpecies.STICKY.setHasEffect(true);
|
||||
ExtraBeesSpecies.STICKY.setSecondaryColor(0x069764);
|
||||
|
||||
@@ -634,7 +636,7 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies, IIconProvider {
|
||||
ExtraBeesSpecies.CORROSIVE.setHumidity(EnumHumidity.DAMP);
|
||||
ExtraBeesSpecies.CORROSIVE.setTemperature(EnumTemperature.WARM);
|
||||
ExtraBeesSpecies.CORROSIVE.setEffect(ExtraBeesEffect.ACID.getUID());
|
||||
ExtraBeesSpecies.CORROSIVE.setFlowering(ForestryAllele.Flowering.Average);
|
||||
ExtraBeesSpecies.CORROSIVE.setFlowering(EnumAllele.Flowering.AVERAGE);
|
||||
ExtraBeesSpecies.CORROSIVE.addProduct(ItemHoneyComb.VanillaComb.SILKY.get(), 20f);
|
||||
ExtraBeesSpecies.CORROSIVE.recessive();
|
||||
ExtraBeesSpecies.CORROSIVE.setSecondaryColor(0x069764);
|
||||
@@ -707,9 +709,9 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies, IIconProvider {
|
||||
ExtraBeesSpecies.HAZARDOUS.addProduct(EnumHoneyComb.SALTPETER, 0.12f);
|
||||
|
||||
ExtraBeesSpecies.JADED.importTemplate(ForestryAllele.BeeSpecies.Imperial);
|
||||
ExtraBeesSpecies.JADED.setFertility(ForestryAllele.Fertility.Maximum);
|
||||
ExtraBeesSpecies.JADED.setFlowering(ForestryAllele.Flowering.Maximum);
|
||||
ExtraBeesSpecies.JADED.setTerritory(ForestryAllele.Territory.Largest);
|
||||
ExtraBeesSpecies.JADED.setFertility(EnumAllele.Fertility.MAXIMUM);
|
||||
ExtraBeesSpecies.JADED.setFlowering(EnumAllele.Flowering.MAXIMUM);
|
||||
ExtraBeesSpecies.JADED.setTerritory(EnumAllele.Territory.LARGEST);
|
||||
ExtraBeesSpecies.JADED.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.30f);
|
||||
ExtraBeesSpecies.JADED.addSpecialty(Mods.Forestry.stack("pollen"), 0.20f);
|
||||
ExtraBeesSpecies.JADED.setHasEffect(true);
|
||||
@@ -739,8 +741,8 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies, IIconProvider {
|
||||
ExtraBeesSpecies.YELLORIUM.addProduct(EnumHoneyComb.BARREN, 0.20f);
|
||||
ExtraBeesSpecies.YELLORIUM.addSpecialty(EnumHoneyComb.YELLORIUM, 0.02f);
|
||||
ExtraBeesSpecies.YELLORIUM.setEffect(ExtraBeesEffect.RADIOACTIVE.getUID());
|
||||
ExtraBeesSpecies.YELLORIUM.setFertility(ForestryAllele.Fertility.Low);
|
||||
ExtraBeesSpecies.YELLORIUM.setLifespan(ForestryAllele.Lifespan.Shortest);
|
||||
ExtraBeesSpecies.YELLORIUM.setFertility(EnumAllele.Fertility.LOW);
|
||||
ExtraBeesSpecies.YELLORIUM.setLifespan(EnumAllele.Lifespan.SHORTEST);
|
||||
|
||||
ExtraBeesSpecies.CYANITE.importTemplate(ExtraBeesSpecies.YELLORIUM);
|
||||
ExtraBeesSpecies.CYANITE.addProduct(EnumHoneyComb.BARREN, 0.20f);
|
||||
@@ -1050,32 +1052,32 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies, IIconProvider {
|
||||
}
|
||||
}
|
||||
|
||||
private void setFertility(ForestryAllele.Fertility fertility) {
|
||||
template[EnumBeeChromosome.FERTILITY.ordinal()] = fertility.getAllele();
|
||||
private void setFertility(EnumAllele.Fertility fertility) {
|
||||
template[EnumBeeChromosome.FERTILITY.ordinal()] = AlleleManager.alleleRegistry.getAllele(AlleleHelper.getUid(fertility));
|
||||
}
|
||||
|
||||
private void setLifespan(ForestryAllele.Lifespan lifespan) {
|
||||
template[EnumBeeChromosome.LIFESPAN.ordinal()] = lifespan.getAllele();
|
||||
private void setLifespan(EnumAllele.Lifespan lifespan) {
|
||||
template[EnumBeeChromosome.LIFESPAN.ordinal()] = AlleleManager.alleleRegistry.getAllele(AlleleHelper.getUid(lifespan));
|
||||
}
|
||||
|
||||
private void setSpeed(ForestryAllele.Speed speed) {
|
||||
template[EnumBeeChromosome.SPEED.ordinal()] = speed.getAllele();
|
||||
private void setSpeed(EnumAllele.Speed speed) {
|
||||
template[EnumBeeChromosome.SPEED.ordinal()] = AlleleManager.alleleRegistry.getAllele(AlleleHelper.getUid(speed));
|
||||
}
|
||||
|
||||
private void setTerritory(ForestryAllele.Territory territory) {
|
||||
template[EnumBeeChromosome.TERRITORY.ordinal()] = territory.getAllele();
|
||||
private void setTerritory(EnumAllele.Territory territory) {
|
||||
template[EnumBeeChromosome.TERRITORY.ordinal()] = AlleleManager.alleleRegistry.getAllele(AlleleHelper.getUid(territory));
|
||||
}
|
||||
|
||||
private void setFlowering(ForestryAllele.Flowering flowering) {
|
||||
template[EnumBeeChromosome.FLOWERING.ordinal()] = flowering.getAllele();
|
||||
private void setFlowering(EnumAllele.Flowering flowering) {
|
||||
template[EnumBeeChromosome.FLOWERING.ordinal()] = AlleleManager.alleleRegistry.getAllele(AlleleHelper.getUid(flowering));
|
||||
}
|
||||
|
||||
private void setHumidityTolerance(Tolerance humidityTolerance) {
|
||||
template[EnumBeeChromosome.HUMIDITY_TOLERANCE.ordinal()] = humidityTolerance.getAllele();
|
||||
private void setHumidityTolerance(EnumTolerance humidityTolerance) {
|
||||
template[EnumBeeChromosome.HUMIDITY_TOLERANCE.ordinal()] = AlleleManager.alleleRegistry.getAllele(AlleleHelper.getUid(humidityTolerance));
|
||||
}
|
||||
|
||||
private void setTemperatureTolerance(Tolerance temperatureTolerance) {
|
||||
template[EnumBeeChromosome.TEMPERATURE_TOLERANCE.ordinal()] = temperatureTolerance.getAllele();
|
||||
private void setTemperatureTolerance(EnumTolerance temperatureTolerance) {
|
||||
template[EnumBeeChromosome.TEMPERATURE_TOLERANCE.ordinal()] = AlleleManager.alleleRegistry.getAllele(AlleleHelper.getUid(temperatureTolerance));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -28,28 +28,28 @@ import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
public enum ButterflySpecies implements IAlleleButterflySpecies {
|
||||
WhiteAdmiral("White Admiral", "Limenitis camilla", 16448250),
|
||||
PurpleEmperor("Purple Emperor", "Apatura iris", 4338374),
|
||||
RedAdmiral("Red Admiral", "Vanessa atalanta", 15101764),
|
||||
PaintedLady("Painted Lady", "Vanessa cardui", 15573064),
|
||||
SmallTortoiseshell("Small Tortoiseshell", "Aglais urticae", 15365387),
|
||||
CamberwellBeauty("Camberwell Beauty", "Aglais antiopa", 9806540),
|
||||
Peacock("Peacock", "Inachis io", 13842434),
|
||||
Wall("Wall", "Lasiommata megera", 15707678),
|
||||
CrimsonRose("Crimson Rose", "Atrophaneura hector", 16736891),
|
||||
KaiserIHind("Kaiser-i-Hind", "Teinopalpus imperialis", 7839808),
|
||||
GoldenBirdwing("Golden Birdwing", "Troides aeacus", 16374814),
|
||||
MarshFritillary("Marsh Fritillary", "Euphydryas aurinia", 16747520),
|
||||
PearlBorderedFritillary("Pearl-bordered Fritillary", "Boloria euphrosyne", 16747267),
|
||||
QueenOfSpainFritillary("Queen of Spain Fritillary", "Issoria lathonia", 16765247),
|
||||
SpeckledWood("Speckled Wood", "Pararge aegeria", 16119949),
|
||||
ScotchAngus("Scotch Angus", "Erebia aethiops", 12735523),
|
||||
Gatekeeper("Gatekeeper", "Pyronia tithonus", 16433962),
|
||||
MeadowBrown("Meadow Brown", "Maniola jurtina", 14914841),
|
||||
SmallHeath("Small Heath", "Coenonympha pamphilus", 16754226),
|
||||
Ringlet("Ringlet", "Aphantopus hyperantus", 9919799),
|
||||
Monarch("Monarch", "Danaus plexippus", 16757254),
|
||||
MarbledWhite("Marbled White", "Melanargia galathea", 15527148);
|
||||
WhiteAdmiral("White Admiral", "Limenitis camilla", 0xfafafa),
|
||||
PurpleEmperor("Purple Emperor", "Apatura iris", 0x4232c6),
|
||||
RedAdmiral("Red Admiral", "Vanessa atalanta", 0xe66f44),
|
||||
PaintedLady("Painted Lady", "Vanessa cardui", 0xeda048),
|
||||
SmallTortoiseshell("Small Tortoiseshell", "Aglais urticae", 0xea750b),
|
||||
CamberwellBeauty("Camberwell Beauty", "Aglais antiopa", 0x95a2cc),
|
||||
Peacock("Peacock", "Inachis io", 0xd33802),
|
||||
Wall("Wall", "Lasiommata megera", 0xefae1e),
|
||||
CrimsonRose("Crimson Rose", "Atrophaneura hector", 0xff627b),
|
||||
KaiserIHind("Kaiser-i-Hind", "Teinopalpus imperialis", 0x77a040),
|
||||
GoldenBirdwing("Golden Birdwing", "Troides aeacus", 0xf9dc1e),
|
||||
MarshFritillary("Marsh Fritillary", "Euphydryas aurinia", 0xff8c00),
|
||||
PearlBorderedFritillary("Pearl-bordered Fritillary", "Boloria euphrosyne", 0xff8b03),
|
||||
QueenOfSpainFritillary("Queen of Spain Fritillary", "Issoria lathonia", 0xffd13f),
|
||||
SpeckledWood("Speckled Wood", "Pararge aegeria", 0xf5f88d),
|
||||
ScotchAngus("Scotch Angus", "Erebia aethiops", 0xc25423),
|
||||
Gatekeeper("Gatekeeper", "Pyronia tithonus", 0xfac32a),
|
||||
MeadowBrown("Meadow Brown", "Maniola jurtina", 0xe39519),
|
||||
SmallHeath("Small Heath", "Coenonympha pamphilus", 0xffa632),
|
||||
Ringlet("Ringlet", "Aphantopus hyperantus", 0x975d37),
|
||||
Monarch("Monarch", "Danaus plexippus", 0xffb206),
|
||||
MarbledWhite("Marbled White", "Melanargia galathea", 0xececec);
|
||||
|
||||
public IClassification branch;
|
||||
|
||||
|
||||
File diff suppressed because it is too large.
Load diff
@@ -110,6 +110,7 @@ public class AlleleHelper {
|
||||
if (needCapitalize) {
|
||||
valueName = WordUtils.capitalize(valueName.toLowerCase(Locale.ENGLISH));
|
||||
}
|
||||
valueName = valueName.replace("_", "");
|
||||
return "forestry." + key + valueName;
|
||||
}
|
||||
|
||||
|
||||
@@ -38,7 +38,7 @@ public class GeneArrayItem implements INBTTagable, IGeneItem {
|
||||
@Override
|
||||
public int getColour(int color) {
|
||||
if (color == 2) {
|
||||
return getBreedingSystem().getColour();
|
||||
return getBreedingSystem().getColor();
|
||||
}
|
||||
return 0xffffff;
|
||||
}
|
||||
|
||||
@@ -44,7 +44,7 @@ public class GeneItem implements INBTTagable, IGeneItem {
|
||||
@Override
|
||||
public int getColour(int color) {
|
||||
if (color == 2 && getBreedingSystem() != null) {
|
||||
return getBreedingSystem().getColour();
|
||||
return getBreedingSystem().getColor();
|
||||
}
|
||||
return 0xffffff;
|
||||
}
|
||||
|
||||
@@ -32,7 +32,7 @@ public class AnalystPageDatabase extends ControlAnalystPage {
|
||||
super(parent, area);
|
||||
scroll = null;
|
||||
this.isMaster = isMaster;
|
||||
int cOfSystem = system.getColour();
|
||||
int cOfSystem = system.getColor();
|
||||
int cr = (0xFF0000 & cOfSystem) >> 16;
|
||||
int cg = (0xFF00 & cOfSystem) >> 8;
|
||||
int cb = 0xFF & cOfSystem;
|
||||
|
||||
@@ -142,11 +142,11 @@ public class WindowAnalyst extends Window {
|
||||
|
||||
@Override
|
||||
public void onRenderBackground() {
|
||||
CraftGUI.Render.colour(syst.getColour());
|
||||
CraftGUI.Render.colour(syst.getColor());
|
||||
int outset = (getSystem() == syst) ? 1 : 0;
|
||||
CraftGUI.Render.texture(CraftGUITexture.TabOutline, getArea().outset(outset));
|
||||
if (getSystem() == syst) {
|
||||
CraftGUI.Render.colour(1140850688 + syst.getColour());
|
||||
CraftGUI.Render.colour(1140850688 + syst.getColor());
|
||||
CraftGUI.Render.texture(CraftGUITexture.TabSolid, getArea().outset(outset));
|
||||
}
|
||||
CraftGUI.Render.item(new IPoint(2.0f, 2.0f), syst.getItemStackRepresentative());
|
||||
|
||||
Reference in new issue
Block a user