Update buildscript & spotlessApply

This commit is contained in:
DianeXD committed 2022-07-03 12:17:51 +08:00
1 parent e4329e2b8f
commit 8683a345c3
818 files changed
+51123 -49403

No files matched your search

@@ -1,11 +1,11 @@
package binnie.botany.api;
public enum EnumAcidity {
ACID,
NEUTRAL,
ALKALINE;
ACID,
NEUTRAL,
ALKALINE;
public String getID() {
return name().toLowerCase();
}
public String getID() {
return name().toLowerCase();
}
}
@@ -10,37 +10,37 @@ import forestry.api.genetics.IChromosomeType;
import forestry.api.genetics.ISpeciesRoot;
public enum EnumFlowerChromosome implements IChromosomeType {
SPECIES(IAlleleFlowerSpecies.class),
PRIMARY(IAlleleInteger.class),
SECONDARY(IAlleleInteger.class),
FERTILITY(IAlleleInteger.class),
TERRITORY(IAlleleArea.class),
EFFECT(IAlleleFlowerEffect.class),
LIFESPAN(IAlleleInteger.class),
TEMPERATURE_TOLERANCE(IAlleleTolerance.class),
HUMIDITY_TOLERANCE(IAlleleTolerance.class),
PH_TOLERANCE(IAlleleTolerance.class),
SAPPINESS(IAlleleFloat.class),
STEM(IAlleleInteger.class);
SPECIES(IAlleleFlowerSpecies.class),
PRIMARY(IAlleleInteger.class),
SECONDARY(IAlleleInteger.class),
FERTILITY(IAlleleInteger.class),
TERRITORY(IAlleleArea.class),
EFFECT(IAlleleFlowerEffect.class),
LIFESPAN(IAlleleInteger.class),
TEMPERATURE_TOLERANCE(IAlleleTolerance.class),
HUMIDITY_TOLERANCE(IAlleleTolerance.class),
PH_TOLERANCE(IAlleleTolerance.class),
SAPPINESS(IAlleleFloat.class),
STEM(IAlleleInteger.class);
private Class<? extends IAllele> cls;
private Class<? extends IAllele> cls;
EnumFlowerChromosome(Class<? extends IAllele> cls) {
this.cls = cls;
}
EnumFlowerChromosome(Class<? extends IAllele> cls) {
this.cls = cls;
}
@Override
public Class<? extends IAllele> getAlleleClass() {
return cls;
}
@Override
public Class<? extends IAllele> getAlleleClass() {
return cls;
}
@Override
public String getName() {
return toString().toLowerCase();
}
@Override
public String getName() {
return toString().toLowerCase();
}
@Override
public ISpeciesRoot getSpeciesRoot() {
return AlleleManager.alleleRegistry.getSpeciesRoot("rootFlowers");
}
@Override
public ISpeciesRoot getSpeciesRoot() {
return AlleleManager.alleleRegistry.getSpeciesRoot("rootFlowers");
}
}
@@ -1,18 +1,18 @@
package binnie.botany.api;
public enum EnumFlowerStage {
FLOWER("Flower"),
SEED("Seed"),
POLLEN("Pollen"),
NONE("NONE");
FLOWER("Flower"),
SEED("Seed"),
POLLEN("Pollen"),
NONE("NONE");
protected String name;
protected String name;
EnumFlowerStage(String name) {
this.name = name;
}
EnumFlowerStage(String name) {
this.name = name;
}
public String getName() {
return name;
}
public String getName() {
return name;
}
}
@@ -1,11 +1,11 @@
package binnie.botany.api;
public enum EnumMoisture {
DRY,
NORMAL,
DAMP;
DRY,
NORMAL,
DAMP;
public String getID() {
return name().toLowerCase();
}
public String getID() {
return name().toLowerCase();
}
}
@@ -1,11 +1,11 @@
package binnie.botany.api;
public enum EnumSoilType {
SOIL,
LOAM,
FLOWERBED;
SOIL,
LOAM,
FLOWERBED;
public String getID() {
return name().toLowerCase();
}
public String getID() {
return name().toLowerCase();
}
}
@@ -5,5 +5,5 @@ import forestry.api.genetics.IEffectData;
import net.minecraft.world.World;
public interface IAlleleFlowerEffect extends IAlleleEffect {
IEffectData doEffect(IFlowerGenome genome, IEffectData storedData, World world, int x, int y, int z);
IEffectData doEffect(IFlowerGenome genome, IEffectData storedData, World world, int x, int y, int z);
}
@@ -3,9 +3,9 @@ package binnie.botany.api;
import forestry.api.genetics.IAlleleSpecies;
public interface IAlleleFlowerSpecies extends IAlleleSpecies {
IFlowerType getType();
IFlowerType getType();
EnumAcidity getPH();
EnumAcidity getPH();
EnumMoisture getMoisture();
EnumMoisture getMoisture();
}
@@ -2,5 +2,4 @@ package binnie.botany.api;
import forestry.api.genetics.IBreedingTracker;
public interface IBotanistTracker extends IBreedingTracker {
}
public interface IBotanistTracker extends IBreedingTracker {}
@@ -1,13 +1,13 @@
package binnie.botany.api;
public interface IColourMix {
IFlowerColor getColor1();
IFlowerColor getColor1();
IFlowerColor getColor2();
IFlowerColor getColor2();
boolean isMutation(IFlowerColor color1, IFlowerColor color2);
boolean isMutation(IFlowerColor color1, IFlowerColor color2);
int getChance();
int getChance();
IFlowerColor getResult();
IFlowerColor getResult();
}
+14 -14
View File
@@ -4,30 +4,30 @@ import forestry.api.genetics.IIndividual;
import net.minecraft.world.World;
public interface IFlower extends IIndividual {
@Override
IFlowerGenome getGenome();
@Override
IFlowerGenome getGenome();
IFlowerGenome getMate();
IFlowerGenome getMate();
void mate(IFlower other);
void mate(IFlower other);
int getAge();
int getAge();
void setAge(int age);
void setAge(int age);
void age();
void age();
IFlower getOffspring(World world);
IFlower getOffspring(World world);
int getMaxAge();
int getMaxAge();
boolean isWilted();
boolean isWilted();
void setWilted(boolean value);
void setWilted(boolean value);
boolean hasFlowered();
boolean hasFlowered();
void setFlowered(boolean value);
void setFlowered(boolean value);
void removeMate();
void removeMate();
}
@@ -3,11 +3,11 @@ package binnie.botany.api;
import forestry.api.genetics.IAlleleInteger;
public interface IFlowerColor {
int getColor(boolean dis);
int getColor(boolean dis);
IAlleleInteger getAllele();
IAlleleInteger getAllele();
int getID();
int getID();
String getName();
String getName();
}
@@ -5,37 +5,37 @@ import forestry.api.genetics.EnumTolerance;
import forestry.api.genetics.IGenome;
public interface IFlowerGenome extends IGenome {
@Override
IAlleleFlowerSpecies getPrimary();
@Override
IAlleleFlowerSpecies getPrimary();
@Override
IAlleleFlowerSpecies getSecondary();
@Override
IAlleleFlowerSpecies getSecondary();
IFlowerColor getPrimaryColor();
IFlowerColor getPrimaryColor();
IFlowerColor getSecondaryColor();
IFlowerColor getSecondaryColor();
IFlowerColor getStemColor();
IFlowerColor getStemColor();
int getFertility();
int getFertility();
int getLifespan();
int getLifespan();
IFlowerType getType();
IFlowerType getType();
EnumTolerance getToleranceTemperature();
EnumTolerance getToleranceTemperature();
EnumTolerance getToleranceMoisture();
EnumTolerance getToleranceMoisture();
EnumTolerance getTolerancePH();
EnumTolerance getTolerancePH();
float getAgeChance();
float getAgeChance();
float getSappiness();
float getSappiness();
boolean canTolerate(EnumAcidity pH);
boolean canTolerate(EnumAcidity pH);
boolean canTolerate(EnumMoisture moisture);
boolean canTolerate(EnumMoisture moisture);
boolean canTolerate(EnumTemperature temp);
boolean canTolerate(EnumTemperature temp);
}
@@ -5,5 +5,5 @@ import forestry.api.genetics.IGenome;
import forestry.api.genetics.IMutation;
public interface IFlowerMutation extends IMutation {
float getChance(IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1);
float getChance(IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1);
}
@@ -3,42 +3,41 @@ package binnie.botany.api;
import com.mojang.authlib.GameProfile;
import forestry.api.genetics.IAllele;
import forestry.api.genetics.ISpeciesRoot;
import java.util.Collection;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import java.util.Collection;
public interface IFlowerRoot extends ISpeciesRoot {
@Override
IFlower getMember(ItemStack stack);
@Override
IFlower getMember(ItemStack stack);
@Override
IFlower templateAsIndividual(IAllele[] template);
@Override
IFlower templateAsIndividual(IAllele[] template);
@Override
IFlower templateAsIndividual(IAllele[] templateActive, IAllele[] templateInactive);
@Override
IFlower templateAsIndividual(IAllele[] templateActive, IAllele[] templateInactive);
@Override
IFlowerGenome templateAsGenome(IAllele[] template);
@Override
IFlowerGenome templateAsGenome(IAllele[] template);
@Override
IFlowerGenome templateAsGenome(IAllele[] templateActive, IAllele[] templateInactive);
@Override
IFlowerGenome templateAsGenome(IAllele[] templateActive, IAllele[] templateInactive);
@Override
IBotanistTracker getBreedingTracker(World world, GameProfile player);
@Override
IBotanistTracker getBreedingTracker(World world, GameProfile player);
@Override
Collection<IFlowerMutation> getMutations(boolean shuffle);
@Override
Collection<IFlowerMutation> getMutations(boolean shuffle);
EnumFlowerStage getStageType(ItemStack stack);
EnumFlowerStage getStageType(ItemStack stack);
IFlower getFlower(World world, IFlowerGenome genome);
IFlower getFlower(World world, IFlowerGenome genome);
void addConversion(ItemStack stack, IAllele[] template);
void addConversion(ItemStack stack, IAllele[] template);
IFlower getConversion(ItemStack stack);
IFlower getConversion(ItemStack stack);
Collection<IColourMix> getColourMixes(boolean shuffle);
Collection<IColourMix> getColourMixes(boolean shuffle);
void registerColourMix(IColourMix colorMix);
void registerColourMix(IColourMix colorMix);
}
@@ -3,15 +3,15 @@ package binnie.botany.api;
import net.minecraft.util.IIcon;
public interface IFlowerType {
IIcon getStem(EnumFlowerStage stage, boolean flowered, int section);
IIcon getStem(EnumFlowerStage stage, boolean flowered, int section);
IIcon getPetalIcon(EnumFlowerStage stage, boolean flowered, int section);
IIcon getPetalIcon(EnumFlowerStage stage, boolean flowered, int section);
IIcon getVariantIcon(EnumFlowerStage stage, boolean flowered, int section);
IIcon getVariantIcon(EnumFlowerStage stage, boolean flowered, int section);
int getID();
int getID();
int getSections();
int getSections();
int ordinal();
int ordinal();
}
@@ -6,19 +6,19 @@ import binnie.botany.api.EnumSoilType;
import net.minecraft.world.World;
public interface IBlockSoil {
EnumAcidity getPH(World world, int x, int y, int z);
EnumAcidity getPH(World world, int x, int y, int z);
EnumMoisture getMoisture(World world, int x, int y, int z);
EnumMoisture getMoisture(World world, int x, int y, int z);
EnumSoilType getType(World world, int x, int y, int z);
EnumSoilType getType(World world, int x, int y, int z);
boolean fertilise(World world, int x, int y, int z, EnumSoilType maxLevel);
boolean fertilise(World world, int x, int y, int z, EnumSoilType maxLevel);
boolean degrade(World world, int x, int y, int z, EnumSoilType minLevel);
boolean degrade(World world, int x, int y, int z, EnumSoilType minLevel);
boolean setPH(World world, int x, int y, int z, EnumAcidity pH);
boolean setPH(World world, int x, int y, int z, EnumAcidity pH);
boolean setMoisture(World world, int x, int y, int z, EnumMoisture p4);
boolean setMoisture(World world, int x, int y, int z, EnumMoisture p4);
boolean resistsWeeds(World world, int x, int y, int z);
boolean resistsWeeds(World world, int x, int y, int z);
}