Some reformat code for 1.11.2 source (#84)

* Optimized imports

* Some code reformat

* Some refactoring and code reformat

* Some code reformat
This commit is contained in:
Alexander Kornilov authored and mezz committed 2017-06-01 00:48:08 -07:00
1 parent 886c36a308
commit c3809fbc27
508 files changed
+6677 -6238

No files matched your search

@@ -7,9 +7,9 @@ import net.minecraft.util.text.translation.I18n;
import javax.annotation.Nullable;
public enum EnumAcidity implements IStringSerializable {
Acid(TextFormatting.RED),
Neutral(null),
Alkaline(TextFormatting.AQUA);
ACID(TextFormatting.RED),
NEUTRAL(null),
ALKALINE(TextFormatting.AQUA);
@Nullable
final TextFormatting color;
@@ -1,6 +1,13 @@
package binnie.botany.api;
import forestry.api.genetics.*;
import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.IAllele;
import forestry.api.genetics.IAlleleArea;
import forestry.api.genetics.IAlleleFloat;
import forestry.api.genetics.IAlleleInteger;
import forestry.api.genetics.IAlleleTolerance;
import forestry.api.genetics.IChromosomeType;
import forestry.api.genetics.ISpeciesRoot;
import java.util.Locale;
@@ -19,7 +19,9 @@ public enum EnumFlowerStage implements ISpeciesType {
}
public static EnumFlowerStage getStage(int age) {
return age == 0 ? EnumFlowerStage.SEED : EnumFlowerStage.FLOWER;
return age == 0
? EnumFlowerStage.SEED
: EnumFlowerStage.FLOWER;
}
public String getName() {
@@ -7,9 +7,9 @@ import net.minecraft.util.text.translation.I18n;
import javax.annotation.Nullable;
public enum EnumMoisture implements IStringSerializable {
Dry(TextFormatting.YELLOW),
Normal(null),
Damp(TextFormatting.DARK_BLUE);
DRY(TextFormatting.YELLOW),
NORMAL(null),
DAMP(TextFormatting.DARK_BLUE);
@Nullable
final TextFormatting color;
@@ -1,7 +1,6 @@
package binnie.botany.api;
public class FlowerManager {
/**
* Convenient access to AlleleManager.alleleRegistry.getSpeciesRoot("rootFlowers")
*/
@@ -11,5 +10,4 @@ public class FlowerManager {
* Used to create new flowers.
*/
public static IFlowerFactory flowerFactory;
}
@@ -9,7 +9,6 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public interface IAlleleFlowerSpecies extends IAlleleSpecies, IAlleleProperty<IAlleleFlowerSpecies> {
IFlowerType getType();
EnumAcidity getPH();
@@ -3,12 +3,10 @@ package binnie.botany.api;
import forestry.api.genetics.IAlleleSpeciesBuilder;
public interface IAlleleFlowerSpeciesBuilder extends IAlleleSpeciesBuilder {
@Override
IAlleleFlowerSpecies build();
IAlleleFlowerSpeciesBuilder setPH(EnumAcidity acidity);
IAlleleFlowerSpeciesBuilder setMoisture(EnumMoisture moisture);
}
+2 -2
View File
@@ -17,10 +17,10 @@ public interface IFlower extends IIndividual {
int getAge();
void age();
void setAge(final int age);
void age();
IFlower getOffspring(final World world, final BlockPos pos);
int getMaxAge();
@@ -4,7 +4,6 @@ import forestry.core.genetics.IGeneticDefinition;
import net.minecraft.item.ItemStack;
public interface IFlowerDefinition extends IGeneticDefinition {
@Override
IFlowerGenome getGenome();
@@ -12,5 +11,4 @@ public interface IFlowerDefinition extends IGeneticDefinition {
IFlower getIndividual();
ItemStack getMemberStack(EnumFlowerStage flowerStage);
}
@@ -4,9 +4,7 @@ import forestry.api.genetics.IAllele;
import forestry.api.genetics.IClassification;
public interface IFlowerFactory {
IAlleleFlowerSpeciesBuilder createSpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, boolean isDominant, IClassification branch, String binomial, IFlowerType flowerType);
IFlowerMutationBuilder createMutation(IAlleleFlowerSpecies parentFlower0, IAlleleFlowerSpecies parentFlower1, IAllele[] result, int chance);
}
@@ -3,5 +3,4 @@ package binnie.botany.api;
import forestry.api.genetics.IMutationBuilder;
public interface IFlowerMutationBuilder extends IMutationBuilder {
}
@@ -7,7 +7,6 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public interface IFlowerType<I extends IFlowerType<I>> extends Comparable<I> {
@SideOnly(Side.CLIENT)
void registerModels(Item item, IModelManager manager, EnumFlowerStage type);