Merge branch 'master-MC1.10.2' of https://github.com/ForestryMC/Binnie into master-MC1.10.2

This commit is contained in:
Nedelosk committed 2016-10-25 18:14:30 +02:00
commit f993d0571d
40 files changed
+239 -271

No files matched your search

@@ -1,11 +1,11 @@
package binnie.botany.api;
import java.util.Locale;
import net.minecraft.util.IStringSerializable;
import net.minecraft.util.text.TextFormatting;
import net.minecraft.util.text.translation.I18n;
import java.util.Locale;
public enum EnumSoilType implements IStringSerializable {
SOIL(TextFormatting.DARK_GRAY),
LOAM(TextFormatting.GOLD),
@@ -11,6 +11,7 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public interface IAlleleFlowerSpecies extends IAlleleSpecies, IAlleleProperty<IAlleleFlowerSpecies> {
IFlowerType getType();
EnumAcidity getPH();
@@ -20,8 +21,8 @@ public interface IAlleleFlowerSpecies extends IAlleleSpecies, IAlleleProperty<IA
@SideOnly(Side.CLIENT)
int getFlowerColour(EnumFlowerStage type, int renderPass);
@SideOnly(Side.CLIENT)
@Nonnull
@SideOnly(Side.CLIENT)
ModelResourceLocation getFlowerModel(EnumFlowerStage type, boolean flowered, int section);
@SideOnly(Side.CLIENT)
@@ -1,10 +1,10 @@
package binnie.botany.api;
import javax.annotation.Nonnull;
import forestry.api.genetics.IAllele;
import forestry.api.genetics.IClassification;
import javax.annotation.Nonnull;
public interface IFlowerFactory {
@Nonnull