diff --git a/src/main/java/binnie/botany/api/EnumAcidity.java b/src/main/java/binnie/botany/api/EnumAcidity.java index 80147bbb..c8bf2e10 100644 --- a/src/main/java/binnie/botany/api/EnumAcidity.java +++ b/src/main/java/binnie/botany/api/EnumAcidity.java @@ -1,10 +1,10 @@ package binnie.botany.api; -import javax.annotation.Nullable; - +import binnie.core.util.I18N; import net.minecraft.util.IStringSerializable; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; + +import javax.annotation.Nullable; public enum EnumAcidity implements IStringSerializable { ACID(TextFormatting.RED), @@ -24,9 +24,9 @@ public enum EnumAcidity implements IStringSerializable { } public String getLocalisedName(boolean withColor) { - String localisedName = I18n.translateToLocal("botany.ph." + getName()); - if(withColor && color != null){ - localisedName +=color; + String localisedName = I18N.localise("botany.ph." + getName()); + if (withColor && color != null) { + localisedName += color; } return localisedName; } diff --git a/src/main/java/binnie/botany/api/EnumFlowerChromosome.java b/src/main/java/binnie/botany/api/EnumFlowerChromosome.java index c90de665..052bf478 100644 --- a/src/main/java/binnie/botany/api/EnumFlowerChromosome.java +++ b/src/main/java/binnie/botany/api/EnumFlowerChromosome.java @@ -1,7 +1,5 @@ package binnie.botany.api; -import java.util.Locale; - import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleArea; @@ -11,6 +9,8 @@ import forestry.api.genetics.IAlleleTolerance; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.ISpeciesRoot; +import java.util.Locale; + public enum EnumFlowerChromosome implements IChromosomeType { SPECIES(IAlleleFlowerSpecies.class), PRIMARY(IAlleleInteger.class), @@ -27,7 +27,7 @@ public enum EnumFlowerChromosome implements IChromosomeType { private Class cls; - EnumFlowerChromosome(final Class cls) { + EnumFlowerChromosome(Class cls) { this.cls = cls; } diff --git a/src/main/java/binnie/botany/api/EnumFlowerStage.java b/src/main/java/binnie/botany/api/EnumFlowerStage.java index be7a2c4a..15be3988 100644 --- a/src/main/java/binnie/botany/api/EnumFlowerStage.java +++ b/src/main/java/binnie/botany/api/EnumFlowerStage.java @@ -10,7 +10,7 @@ public enum EnumFlowerStage implements ISpeciesType { public static final EnumFlowerStage[] VALUES = values(); String name; - EnumFlowerStage(final String name) { + EnumFlowerStage(String name) { this.name = name; } diff --git a/src/main/java/binnie/botany/api/EnumMoisture.java b/src/main/java/binnie/botany/api/EnumMoisture.java index 1b52c576..b5cb471b 100644 --- a/src/main/java/binnie/botany/api/EnumMoisture.java +++ b/src/main/java/binnie/botany/api/EnumMoisture.java @@ -1,10 +1,10 @@ package binnie.botany.api; -import javax.annotation.Nullable; - +import binnie.core.util.I18N; import net.minecraft.util.IStringSerializable; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; + +import javax.annotation.Nullable; public enum EnumMoisture implements IStringSerializable { DRY(TextFormatting.YELLOW), @@ -24,9 +24,9 @@ public enum EnumMoisture implements IStringSerializable { } public String getLocalisedName(boolean withColor) { - String localisedName = I18n.translateToLocal("botany.moisture." + getName()); - if(withColor && color != null){ - localisedName +=color; + String localisedName = I18N.localise("botany.moisture." + getName()); + if (withColor && color != null) { + localisedName += color; } return localisedName; } diff --git a/src/main/java/binnie/botany/api/EnumSoilType.java b/src/main/java/binnie/botany/api/EnumSoilType.java index 6153fa3d..4077da7e 100644 --- a/src/main/java/binnie/botany/api/EnumSoilType.java +++ b/src/main/java/binnie/botany/api/EnumSoilType.java @@ -1,21 +1,19 @@ package binnie.botany.api; -import javax.annotation.Nullable; -import java.util.Locale; - +import binnie.core.util.I18N; 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), FLOWERBED(TextFormatting.LIGHT_PURPLE); - @Nullable - final TextFormatting color; + private final TextFormatting color; - EnumSoilType(@Nullable TextFormatting color) { + EnumSoilType(TextFormatting color) { this.color = color; } @@ -24,7 +22,7 @@ public enum EnumSoilType implements IStringSerializable { return this.name().toLowerCase(Locale.ENGLISH); } - public String getTranslated(boolean withColor) { - return (withColor && color != null ? color : "") + I18n.translateToLocal("botany.soil." + getName()); + public String getTranslated() { + return color + I18N.localise("botany.soil." + getName()); } } diff --git a/src/main/java/binnie/botany/api/FlowerManager.java b/src/main/java/binnie/botany/api/FlowerManager.java index 5a1c8ecc..c2844bee 100644 --- a/src/main/java/binnie/botany/api/FlowerManager.java +++ b/src/main/java/binnie/botany/api/FlowerManager.java @@ -10,7 +10,7 @@ public class FlowerManager { * Used to create new flowers. */ public static IFlowerFactory flowerFactory; - + /** * Used to manager soil. */ diff --git a/src/main/java/binnie/botany/api/IAlleleFlowerEffect.java b/src/main/java/binnie/botany/api/IAlleleFlowerEffect.java index 5b83c151..ac6cd8c5 100644 --- a/src/main/java/binnie/botany/api/IAlleleFlowerEffect.java +++ b/src/main/java/binnie/botany/api/IAlleleFlowerEffect.java @@ -1,10 +1,9 @@ package binnie.botany.api; -import net.minecraft.world.World; - import forestry.api.genetics.IAlleleEffect; import forestry.api.genetics.IEffectData; +import net.minecraft.world.World; public interface IAlleleFlowerEffect extends IAlleleEffect { - IEffectData doEffect(final IFlowerGenome p0, final IEffectData p1, final World p2, final int p3, final int p4, final int p5); + IEffectData doEffect(IFlowerGenome genome, IEffectData effect, World world, int x, int y, int z); } diff --git a/src/main/java/binnie/botany/api/IAlleleFlowerSpecies.java b/src/main/java/binnie/botany/api/IAlleleFlowerSpecies.java index 47e9c65e..5cc30f58 100644 --- a/src/main/java/binnie/botany/api/IAlleleFlowerSpecies.java +++ b/src/main/java/binnie/botany/api/IAlleleFlowerSpecies.java @@ -1,14 +1,12 @@ package binnie.botany.api; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.item.Item; - -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - import forestry.api.core.IModelManager; import forestry.api.genetics.IAlleleProperty; import forestry.api.genetics.IAlleleSpecies; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.item.Item; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public interface IAlleleFlowerSpecies extends IAlleleSpecies, IAlleleProperty { IFlowerType getType(); @@ -18,7 +16,7 @@ public interface IAlleleFlowerSpecies extends IAlleleSpecies, IAlleleProperty getColourMixes(boolean p0); + Collection getColorMixes(boolean shuffle); + + void registerColourMix(IColorMix colorMix); - void registerColourMix(IColourMix colourMix); - boolean plant(World world, BlockPos pos, IFlower flower, GameProfile owner); - + void tryGrowSection(World world, BlockPos pos); - + void onGrowFromSeed(World world, BlockPos pos); } diff --git a/src/main/java/binnie/botany/api/IFlowerType.java b/src/main/java/binnie/botany/api/IFlowerType.java index fb53071b..644bc31b 100644 --- a/src/main/java/binnie/botany/api/IFlowerType.java +++ b/src/main/java/binnie/botany/api/IFlowerType.java @@ -1,13 +1,11 @@ package binnie.botany.api; +import forestry.api.core.IModelManager; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.Item; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import forestry.api.core.IModelManager; - public interface IFlowerType> extends Comparable { @SideOnly(Side.CLIENT) void registerModels(Item item, IModelManager manager, EnumFlowerStage type); diff --git a/src/main/java/binnie/botany/api/IGardeningManager.java b/src/main/java/binnie/botany/api/IGardeningManager.java index e40dd437..44f3e5da 100644 --- a/src/main/java/binnie/botany/api/IGardeningManager.java +++ b/src/main/java/binnie/botany/api/IGardeningManager.java @@ -1,68 +1,67 @@ package binnie.botany.api; -import javax.annotation.Nullable; -import java.util.Collection; - +import forestry.api.core.EnumTemperature; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import forestry.api.core.EnumTemperature; +import javax.annotation.Nullable; +import java.util.Collection; public interface IGardeningManager { - default boolean isSoil(final Block block) { + default boolean isSoil(Block block) { return block instanceof IBlockSoil; } - + boolean isSoil(Item item); - + boolean isSoil(ItemStack item); - + EnumMoisture getNaturalMoisture(World world, BlockPos pos); - + EnumAcidity getNaturalPH(World world, BlockPos pos); - + float getBiomeMoisture(World world, BlockPos pos); - + float getBiomePH(World world, BlockPos pos); - + void plantSoil(World world, BlockPos pos, EnumSoilType soil, EnumMoisture moisture, EnumAcidity acidity); - + Collection getAcidFertilisers(); - + Collection getAlkalineFertilisers(); - + Collection getNutrientFertilisers(); - + void registerAcidFertiliser(ItemStack stack, int strength); - + void registerAlkalineFertiliser(ItemStack stack, int strength); - + void registerNutrientFertiliser(ItemStack stack, int strength); - + boolean isAcidFertiliser(ItemStack stack); - + boolean isAlkalineFertiliser(ItemStack stack); - + boolean isNutrientFertiliser(ItemStack stack); - + int getFertiliserStrength(ItemStack stack); - + boolean canTolerate(@Nullable IFlower flower, World world, BlockPos pos); - + EnumSoilType getSoilType(World world, BlockPos pos); - + default Block getSoilBlock(EnumSoilType type) { return getSoilBlock(type, false); } - - Block getSoilBlock(EnumSoilType type, boolean weedkill); - - boolean canTolerate(IFlower flower, EnumAcidity ePH, EnumMoisture eMoisture, EnumTemperature eTemp); - + + Block getSoilBlock(EnumSoilType type, boolean weedKill); + + boolean canTolerate(IFlower flower, EnumAcidity acidity, EnumMoisture moisture, EnumTemperature temperature); + boolean isWeedkiller(ItemStack heldItem); - + boolean addWeedKiller(World world, BlockPos pos); } diff --git a/src/main/java/binnie/botany/api/package-info.java b/src/main/java/binnie/botany/api/package-info.java index 25288c28..d93958b7 100644 --- a/src/main/java/binnie/botany/api/package-info.java +++ b/src/main/java/binnie/botany/api/package-info.java @@ -2,6 +2,6 @@ @MethodsReturnNonnullByDefault package binnie.botany.api; -import javax.annotation.ParametersAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file +import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java b/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java index 6fa78539..de22b64c 100644 --- a/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java +++ b/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java @@ -88,7 +88,7 @@ public class BlockStainedGlass extends Block implements IBlockMetadata, IColored player.addExhaustion(0.005F); if (EnchantmentHelper.getEnchantmentLevel(Enchantments.SILK_TOUCH, stack) > 0 && te instanceof TileEntityMetadata) { - java.util.List items = new java.util.ArrayList(); + java.util.List items = new java.util.ArrayList<>(); TileEntityMetadata tile = (TileEntityMetadata) te; int damage = getDroppedMeta(state, tile.getTileMetadata()); ItemStack itemstack = TileEntityMetadata.getItemStack(this, damage); diff --git a/src/main/java/binnie/botany/craftgui/ControlColorMixBox.java b/src/main/java/binnie/botany/craftgui/ControlColorMixBox.java index 4da7bd92..d1965f62 100644 --- a/src/main/java/binnie/botany/craftgui/ControlColorMixBox.java +++ b/src/main/java/binnie/botany/craftgui/ControlColorMixBox.java @@ -1,10 +1,10 @@ package binnie.botany.craftgui; -import binnie.botany.api.IColourMix; +import binnie.botany.api.IColorMix; import binnie.core.craftgui.IWidget; import binnie.core.craftgui.controls.listbox.ControlListBox; -public class ControlColorMixBox extends ControlListBox { +public class ControlColorMixBox extends ControlListBox { private int index; private Type type; @@ -14,7 +14,7 @@ public class ControlColorMixBox extends ControlListBox { } @Override - public IWidget createOption(final IColourMix value, final int y) { + public IWidget createOption(final IColorMix value, final int y) { return new ControlColorMixItem(this.getContent(), value, y); } diff --git a/src/main/java/binnie/botany/craftgui/ControlColorMixItem.java b/src/main/java/binnie/botany/craftgui/ControlColorMixItem.java index 3719f002..272fd22c 100644 --- a/src/main/java/binnie/botany/craftgui/ControlColorMixItem.java +++ b/src/main/java/binnie/botany/craftgui/ControlColorMixItem.java @@ -1,21 +1,21 @@ package binnie.botany.craftgui; -import binnie.botany.api.IColourMix; +import binnie.botany.api.IColorMix; import binnie.core.craftgui.controls.listbox.ControlList; import binnie.core.craftgui.controls.listbox.ControlOption; -public class ControlColorMixItem extends ControlOption { +public class ControlColorMixItem extends ControlOption { private final ControlColorDisplay itemWidget1; private final ControlColorDisplay itemWidget2; private final ControlColorDisplay itemWidget3; private final ControlColorMixSymbol addSymbol; private final ControlColorMixSymbol arrowSymbol; - public ControlColorMixItem(final ControlList controlList, final IColourMix option, final int y) { + public ControlColorMixItem(final ControlList controlList, final IColorMix option, final int y) { super(controlList, option, y); - IColourMix value = this.getValue(); - this.itemWidget1 = new ControlColorDisplay(this, 4, 4, value.getColourFirst()); - this.itemWidget2 = new ControlColorDisplay(this, 44, 4, value.getColourSecond()); + IColorMix value = this.getValue(); + this.itemWidget1 = new ControlColorDisplay(this, 4, 4, value.getColorFirst()); + this.itemWidget2 = new ControlColorDisplay(this, 44, 4, value.getColorSecond()); this.itemWidget3 = new ControlColorDisplay(this, 104, 4, value.getResult()); this.addSymbol = new ControlColorMixSymbol(this, 24, 4, 0, value); this.arrowSymbol = new ControlColorMixSymbol(this, 64, 4, 1, value); diff --git a/src/main/java/binnie/botany/craftgui/ControlColorMixSymbol.java b/src/main/java/binnie/botany/craftgui/ControlColorMixSymbol.java index 0e9adb7e..edcf688c 100644 --- a/src/main/java/binnie/botany/craftgui/ControlColorMixSymbol.java +++ b/src/main/java/binnie/botany/craftgui/ControlColorMixSymbol.java @@ -3,7 +3,7 @@ package binnie.botany.craftgui; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.botany.api.IColourMix; +import binnie.botany.api.IColorMix; import binnie.core.craftgui.Attribute; import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.ITooltip; @@ -19,10 +19,10 @@ import binnie.core.util.I18N; public class ControlColorMixSymbol extends Control implements ITooltip { static Texture MutationPlus = new StandardTexture(2, 94, 16, 16, CraftGUITextureSheet.Controls2); static Texture MutationArrow = new StandardTexture(20, 94, 32, 16, CraftGUITextureSheet.Controls2); - IColourMix value; + IColorMix value; int type; - protected ControlColorMixSymbol(final IWidget parent, final int x, final int y, final int type, final IColourMix value) { + protected ControlColorMixSymbol(final IWidget parent, final int x, final int y, final int type, final IColorMix value) { super(parent, x, y, 16 + type * 16, 16); this.value = value; this.type = type; @@ -40,7 +40,7 @@ public class ControlColorMixSymbol extends Control implements ITooltip { } } - public void setValue(final IColourMix value) { + public void setValue(final IColorMix value) { this.value = value; this.setColour(0xffffff); } diff --git a/src/main/java/binnie/botany/craftgui/PageColorMix.java b/src/main/java/binnie/botany/craftgui/PageColorMix.java index 671d1386..92bc8b31 100644 --- a/src/main/java/binnie/botany/craftgui/PageColorMix.java +++ b/src/main/java/binnie/botany/craftgui/PageColorMix.java @@ -3,7 +3,7 @@ package binnie.botany.craftgui; import java.util.ArrayList; import java.util.List; -import binnie.botany.api.IColourMix; +import binnie.botany.api.IColorMix; import binnie.botany.api.IFlowerColour; import binnie.botany.core.BotanyCore; import binnie.core.craftgui.IWidget; @@ -25,9 +25,9 @@ public class PageColorMix extends PageAbstract { @Override public void onValueChanged(final IFlowerColour colour) { - final List mixes = new ArrayList<>(); - for (final IColourMix mix : BotanyCore.getFlowerRoot().getColourMixes(false)) { - if (mix.getColourFirst() == colour || mix.getColourSecond() == colour) { + final List mixes = new ArrayList<>(); + for (final IColorMix mix : BotanyCore.getFlowerRoot().getColorMixes(false)) { + if (mix.getColorFirst() == colour || mix.getColorSecond() == colour) { mixes.add(mix); } } diff --git a/src/main/java/binnie/botany/craftgui/PageColorMixResultant.java b/src/main/java/binnie/botany/craftgui/PageColorMixResultant.java index 95363098..c2f03342 100644 --- a/src/main/java/binnie/botany/craftgui/PageColorMixResultant.java +++ b/src/main/java/binnie/botany/craftgui/PageColorMixResultant.java @@ -3,7 +3,7 @@ package binnie.botany.craftgui; import java.util.ArrayList; import java.util.List; -import binnie.botany.api.IColourMix; +import binnie.botany.api.IColorMix; import binnie.botany.api.IFlowerColour; import binnie.botany.core.BotanyCore; import binnie.core.craftgui.IWidget; @@ -25,8 +25,8 @@ public class PageColorMixResultant extends PageAbstract { @Override public void onValueChanged(final IFlowerColour colour) { - final List mixes = new ArrayList<>(); - for (final IColourMix mix : BotanyCore.getFlowerRoot().getColourMixes(false)) { + final List mixes = new ArrayList<>(); + for (final IColorMix mix : BotanyCore.getFlowerRoot().getColorMixes(false)) { if (mix.getResult() == colour) { mixes.add(mix); } diff --git a/src/main/java/binnie/botany/gardening/Gardening.java b/src/main/java/binnie/botany/gardening/Gardening.java index 1f387932..18b9b7c5 100644 --- a/src/main/java/binnie/botany/gardening/Gardening.java +++ b/src/main/java/binnie/botany/gardening/Gardening.java @@ -1,11 +1,16 @@ package binnie.botany.gardening; -import javax.annotation.Nullable; -import java.util.Collection; -import java.util.Collections; -import java.util.LinkedHashMap; -import java.util.Map; - +import binnie.botany.Botany; +import binnie.botany.api.EnumAcidity; +import binnie.botany.api.EnumMoisture; +import binnie.botany.api.EnumSoilType; +import binnie.botany.api.IBlockSoil; +import binnie.botany.api.IFlower; +import binnie.botany.api.IGardeningManager; +import binnie.botany.items.BotanyItems; +import forestry.api.climate.IClimateInfo; +import forestry.api.core.EnumTemperature; +import forestry.api.core.ForestryAPI; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; @@ -16,18 +21,11 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.biome.Biome; -import forestry.api.climate.IClimateInfo; -import forestry.api.core.EnumTemperature; -import forestry.api.core.ForestryAPI; - -import binnie.botany.Botany; -import binnie.botany.api.EnumAcidity; -import binnie.botany.api.EnumMoisture; -import binnie.botany.api.EnumSoilType; -import binnie.botany.api.IBlockSoil; -import binnie.botany.api.IFlower; -import binnie.botany.api.IGardeningManager; -import binnie.botany.items.BotanyItems; +import javax.annotation.Nullable; +import java.util.Collection; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.Map; public class Gardening implements IGardeningManager { private final Map fertiliserAcid = new LinkedHashMap<>(); @@ -219,23 +217,25 @@ public class Gardening implements IGardeningManager { } @Override - public Block getSoilBlock(final EnumSoilType type, final boolean weedkill) { + public Block getSoilBlock(final EnumSoilType type, final boolean weedKill) { switch (type) { case FLOWERBED: { - return weedkill ? Botany.flowerbedNoWeed : Botany.flowerbed; + return weedKill ? Botany.flowerbedNoWeed : Botany.flowerbed; } case LOAM: { - return weedkill ? Botany.loamNoWeed : Botany.loam; + return weedKill ? Botany.loamNoWeed : Botany.loam; } default: { - return weedkill ? Botany.soilNoWeed : Botany.soil; + return weedKill ? Botany.soilNoWeed : Botany.soil; } } } @Override - public boolean canTolerate(IFlower flower, EnumAcidity ePH, EnumMoisture eMoisture, EnumTemperature eTemp) { - return flower.getGenome().canTolerate(ePH) && flower.getGenome().canTolerate(eMoisture) && flower.getGenome().canTolerate(eTemp); + public boolean canTolerate(IFlower flower, EnumAcidity acidity, EnumMoisture moisture, EnumTemperature temperature) { + return flower.getGenome().canTolerate(acidity) + && flower.getGenome().canTolerate(moisture) + && flower.getGenome().canTolerate(temperature); } @Override diff --git a/src/main/java/binnie/botany/gardening/ItemSoilMeter.java b/src/main/java/binnie/botany/gardening/ItemSoilMeter.java index c6224226..eb17f6ec 100644 --- a/src/main/java/binnie/botany/gardening/ItemSoilMeter.java +++ b/src/main/java/binnie/botany/gardening/ItemSoilMeter.java @@ -77,7 +77,7 @@ public class ItemSoilMeter extends Item implements IItemModelRegister { if (gardening.isSoil(block) && !BinnieCore.getBinnieProxy().isSimulating(worldIn)) { IBlockSoil soil = (IBlockSoil) block; String info = I18N.localise("botany.soil.type") + ": "; - info = info + soil.getType(worldIn, pos).getTranslated(true); + info = info + soil.getType(worldIn, pos).getTranslated(); info += ", " + TextFormatting.WHITE + I18N.localise("botany.moisture") + ": "; info = info + soil.getMoisture(worldIn, pos).getLocalisedName(true); info += ", " + TextFormatting.WHITE + I18N.localise("botany.ph") + ": "; diff --git a/src/main/java/binnie/botany/genetics/AlleleEffectNone.java b/src/main/java/binnie/botany/genetics/AlleleEffectNone.java index d44016e3..0ded7726 100644 --- a/src/main/java/binnie/botany/genetics/AlleleEffectNone.java +++ b/src/main/java/binnie/botany/genetics/AlleleEffectNone.java @@ -34,8 +34,8 @@ public class AlleleEffectNone implements IAlleleFlowerEffect { } @Override - public IEffectData doEffect(final IFlowerGenome genome, final IEffectData storedData, final World world, final int x, final int y, final int z) { - return storedData; + public IEffectData doEffect(final IFlowerGenome genome, final IEffectData effect, final World world, final int x, final int y, final int z) { + return effect; } @Override diff --git a/src/main/java/binnie/botany/genetics/AlleleFlowerSpecies.java b/src/main/java/binnie/botany/genetics/AlleleFlowerSpecies.java index 70fff790..884f0105 100644 --- a/src/main/java/binnie/botany/genetics/AlleleFlowerSpecies.java +++ b/src/main/java/binnie/botany/genetics/AlleleFlowerSpecies.java @@ -83,7 +83,7 @@ public class AlleleFlowerSpecies extends AlleleSpecies implements IAlleleFlowerS } @Override - public int getFlowerColour(EnumFlowerStage type, int renderPass) { + public int getFlowerColor(EnumFlowerStage type, int renderPass) { return 0; } diff --git a/src/main/java/binnie/botany/genetics/ColourMix.java b/src/main/java/binnie/botany/genetics/ColourMix.java index 0cf315c7..193fe56a 100644 --- a/src/main/java/binnie/botany/genetics/ColourMix.java +++ b/src/main/java/binnie/botany/genetics/ColourMix.java @@ -1,9 +1,9 @@ package binnie.botany.genetics; -import binnie.botany.api.IColourMix; +import binnie.botany.api.IColorMix; import binnie.botany.api.IFlowerColour; -public class ColourMix implements IColourMix { +public class ColourMix implements IColorMix { IFlowerColour colour1; IFlowerColour colour2; IFlowerColour result; @@ -17,18 +17,18 @@ public class ColourMix implements IColourMix { } @Override - public IFlowerColour getColourFirst() { + public IFlowerColour getColorFirst() { return this.colour1; } @Override - public IFlowerColour getColourSecond() { + public IFlowerColour getColorSecond() { return this.colour2; } @Override - public boolean isMutation(final IFlowerColour a, final IFlowerColour b) { - return (a == this.colour1 && b == this.colour2) || (a == this.colour2 && b == this.colour1); + public boolean isMutation(final IFlowerColour colorFirst, final IFlowerColour colorSecond) { + return (colorFirst == this.colour1 && colorSecond == this.colour2) || (colorFirst == this.colour2 && colorSecond == this.colour1); } @Override diff --git a/src/main/java/binnie/botany/genetics/Flower.java b/src/main/java/binnie/botany/genetics/Flower.java index 9b0c35a8..4168b7fa 100644 --- a/src/main/java/binnie/botany/genetics/Flower.java +++ b/src/main/java/binnie/botany/genetics/Flower.java @@ -17,7 +17,7 @@ import forestry.core.genetics.Individual; import binnie.botany.api.EnumFlowerChromosome; import binnie.botany.api.IAlleleFlowerSpecies; -import binnie.botany.api.IColourMix; +import binnie.botany.api.IColorMix; import binnie.botany.api.IFlower; import binnie.botany.api.IFlowerColour; import binnie.botany.api.IFlowerGenome; @@ -243,7 +243,7 @@ public class Flower extends Individual implements IFlower { IFlowerColour colourFirst = genome0.getPrimaryColor(); IFlowerColour colourSecond = genome2.getPrimaryColor(); if (colourFirst != colourSecond) { - for (final IColourMix mutation : BotanyCore.getFlowerRoot().getColourMixes(true)) { + for (final IColorMix mutation : BotanyCore.getFlowerRoot().getColorMixes(true)) { if (mutation.isMutation(colourFirst, colourSecond) && world.rand.nextFloat() * 100.0f < mutation.getChance()) { parentFirst[EnumFlowerChromosome.PRIMARY.ordinal()] = new Chromosome(mutation.getResult().getAllele()); } @@ -252,7 +252,7 @@ public class Flower extends Individual implements IFlower { colourFirst = genome0.getSecondaryColor(); colourSecond = genome2.getSecondaryColor(); if (colourFirst != colourSecond) { - for (final IColourMix mutation : BotanyCore.getFlowerRoot().getColourMixes(true)) { + for (final IColorMix mutation : BotanyCore.getFlowerRoot().getColorMixes(true)) { if (mutation.isMutation(colourFirst, colourSecond) && world.rand.nextFloat() * 100.0f < mutation.getChance()) { parentFirst[EnumFlowerChromosome.SECONDARY.ordinal()] = new Chromosome(mutation.getResult().getAllele()); } @@ -261,7 +261,7 @@ public class Flower extends Individual implements IFlower { colourFirst = genome0.getStemColor(); colourSecond = genome2.getStemColor(); if (colourFirst != colourSecond) { - for (final IColourMix mutation : BotanyCore.getFlowerRoot().getColourMixes(true)) { + for (final IColorMix mutation : BotanyCore.getFlowerRoot().getColorMixes(true)) { if (mutation.isMutation(colourFirst, colourSecond) && world.rand.nextFloat() * 100.0f < mutation.getChance()) { parentFirst[EnumFlowerChromosome.STEM.ordinal()] = new Chromosome(mutation.getResult().getAllele()); } diff --git a/src/main/java/binnie/botany/genetics/FlowerColorAllele.java b/src/main/java/binnie/botany/genetics/FlowerColorAllele.java index ec065b93..d50237f5 100644 --- a/src/main/java/binnie/botany/genetics/FlowerColorAllele.java +++ b/src/main/java/binnie/botany/genetics/FlowerColorAllele.java @@ -50,7 +50,7 @@ public class FlowerColorAllele implements IFlowerColour, IAlleleInteger { } @Override - public int getColor(final boolean dis) { + public int getColor(boolean dis) { return dis ? this.colorDis : this.color; } diff --git a/src/main/java/binnie/botany/genetics/FlowerFactory.java b/src/main/java/binnie/botany/genetics/FlowerFactory.java index 754b61ed..e0b19497 100644 --- a/src/main/java/binnie/botany/genetics/FlowerFactory.java +++ b/src/main/java/binnie/botany/genetics/FlowerFactory.java @@ -19,8 +19,8 @@ public class FlowerFactory implements IFlowerFactory { } @Override - public IFlowerMutationBuilder createMutation(IAlleleFlowerSpecies parentFlower0, IAlleleFlowerSpecies parentFlower1, IAllele[] result, int chance) { - FlowerMutation mutation = new FlowerMutation(parentFlower0, parentFlower1, result, chance); + public IFlowerMutationBuilder createMutation(IAlleleFlowerSpecies allele0, IAlleleFlowerSpecies allele1, IAllele[] result, int chance) { + FlowerMutation mutation = new FlowerMutation(allele0, allele1, result, chance); FlowerManager.flowerRoot.registerMutation(mutation); return mutation; } diff --git a/src/main/java/binnie/botany/genetics/FlowerGenome.java b/src/main/java/binnie/botany/genetics/FlowerGenome.java index 5a7a3c32..39893ae7 100644 --- a/src/main/java/binnie/botany/genetics/FlowerGenome.java +++ b/src/main/java/binnie/botany/genetics/FlowerGenome.java @@ -1,20 +1,5 @@ package binnie.botany.genetics; -import javax.annotation.Nullable; - -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; - -import forestry.api.core.EnumTemperature; -import forestry.api.genetics.EnumTolerance; -import forestry.api.genetics.IAlleleFloat; -import forestry.api.genetics.IAlleleInteger; -import forestry.api.genetics.IAlleleSpecies; -import forestry.api.genetics.IAlleleTolerance; -import forestry.api.genetics.IChromosome; -import forestry.api.genetics.ISpeciesRoot; -import forestry.core.genetics.Genome; - import binnie.Binnie; import binnie.botany.api.EnumAcidity; import binnie.botany.api.EnumFlowerChromosome; @@ -24,6 +9,19 @@ import binnie.botany.api.IAlleleFlowerSpecies; import binnie.botany.api.IFlowerGenome; import binnie.botany.api.IFlowerType; import binnie.botany.core.BotanyCore; +import forestry.api.core.EnumTemperature; +import forestry.api.genetics.EnumTolerance; +import forestry.api.genetics.IAlleleFloat; +import forestry.api.genetics.IAlleleInteger; +import forestry.api.genetics.IAlleleSpecies; +import forestry.api.genetics.IAlleleTolerance; +import forestry.api.genetics.IChromosome; +import forestry.api.genetics.ISpeciesRoot; +import forestry.core.genetics.Genome; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + +import javax.annotation.Nullable; public class FlowerGenome extends Genome implements IFlowerGenome { public FlowerGenome(final NBTTagCompound nbttagcompound) { @@ -119,24 +117,24 @@ public class FlowerGenome extends Genome implements IFlowerGenome { } @Override - public boolean canTolerate(final EnumAcidity ePH) { - final int pH = ePH.ordinal(); + public boolean canTolerate(final EnumAcidity acidity) { + final int pH = acidity.ordinal(); final int[] pHTol = Binnie.GENETICS.getTolerance(this.getTolerancePH()); final int fPH = this.getPrimary().getPH().ordinal(); return pH >= fPH + pHTol[0] && pH <= fPH + pHTol[1]; } @Override - public boolean canTolerate(final EnumMoisture eMoisture) { - final int moisture = eMoisture.ordinal(); + public boolean canTolerate(final EnumMoisture moist) { + final int moisture = moist.ordinal(); final int[] moistTol = Binnie.GENETICS.getTolerance(this.getToleranceMoisture()); final int fMoisture = this.getPrimary().getMoisture().ordinal(); return moisture >= fMoisture + moistTol[0] && moisture <= fMoisture + moistTol[1]; } @Override - public boolean canTolerate(final EnumTemperature eTemp) { - final int temp = eTemp.ordinal(); + public boolean canTolerate(final EnumTemperature temperature) { + final int temp = temperature.ordinal(); final int[] tempTol = Binnie.GENETICS.getTolerance(this.getToleranceTemperature()); final int fTemp = this.getPrimary().getTemperature().ordinal(); return temp >= fTemp + tempTol[0] && temp <= fTemp + tempTol[1]; diff --git a/src/main/java/binnie/botany/genetics/FlowerMutation.java b/src/main/java/binnie/botany/genetics/FlowerMutation.java index 120dc957..165a82bb 100644 --- a/src/main/java/binnie/botany/genetics/FlowerMutation.java +++ b/src/main/java/binnie/botany/genetics/FlowerMutation.java @@ -16,7 +16,7 @@ import binnie.botany.api.IFlowerRoot; import binnie.botany.core.BotanyCore; public class FlowerMutation extends Mutation implements IFlowerMutation, IFlowerMutationBuilder { - public FlowerMutation(final IAlleleFlowerSpecies allele0, final IAlleleFlowerSpecies allele1, final IAllele[] template, final int chance) { + public FlowerMutation(IAlleleFlowerSpecies allele0, IAlleleFlowerSpecies allele1, IAllele[] template, int chance) { super(allele0, allele1, template, chance); } @@ -31,8 +31,8 @@ public class FlowerMutation extends Mutation implements IFlowerMutation, IFlower } @Override - public float getChance(World world, BlockPos pos, IAlleleFlowerSpecies a0, IAlleleFlowerSpecies a1, IFlowerGenome g0, IFlowerGenome g1) { - float processedChance = super.getChance(world, pos, a0, a1, g0, g1, ForestryAPI.climateManager.getDefaultClimate(world, pos)); + public float getChance(World world, BlockPos pos, IAlleleFlowerSpecies allele0, IAlleleFlowerSpecies allele1, IFlowerGenome genome0, IFlowerGenome genome1) { + float processedChance = super.getChance(world, pos, allele0, allele1, genome0, genome1, ForestryAPI.climateManager.getDefaultClimate(world, pos)); if (processedChance <= 0) { return 0; } diff --git a/src/main/java/binnie/botany/genetics/FlowerRoot.java b/src/main/java/binnie/botany/genetics/FlowerRoot.java index 8fc5e2af..0724fdaa 100644 --- a/src/main/java/binnie/botany/genetics/FlowerRoot.java +++ b/src/main/java/binnie/botany/genetics/FlowerRoot.java @@ -1,5 +1,32 @@ package binnie.botany.genetics; +import binnie.botany.Botany; +import binnie.botany.api.EnumFlowerChromosome; +import binnie.botany.api.EnumFlowerStage; +import binnie.botany.api.IAlleleFlowerSpecies; +import binnie.botany.api.IBotanistTracker; +import binnie.botany.api.IColorMix; +import binnie.botany.api.IFlower; +import binnie.botany.api.IFlowerGenome; +import binnie.botany.api.IFlowerMutation; +import binnie.botany.api.IFlowerRoot; +import binnie.botany.flower.TileEntityFlower; +import com.mojang.authlib.GameProfile; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAllele; +import forestry.api.genetics.IAlyzerPlugin; +import forestry.api.genetics.IChromosomeType; +import forestry.api.genetics.IIndividual; +import forestry.api.genetics.IMutation; +import forestry.api.genetics.ISpeciesType; +import forestry.core.genetics.SpeciesRoot; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + import javax.annotation.Nullable; import java.util.ArrayList; import java.util.Collection; @@ -8,42 +35,12 @@ import java.util.HashMap; import java.util.Map; import java.util.Random; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -import com.mojang.authlib.GameProfile; - -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IAlyzerPlugin; -import forestry.api.genetics.IChromosomeType; -import forestry.api.genetics.IIndividual; -import forestry.api.genetics.IMutation; -import forestry.api.genetics.ISpeciesType; -import forestry.core.genetics.SpeciesRoot; - -import binnie.botany.Botany; -import binnie.botany.api.EnumFlowerChromosome; -import binnie.botany.api.EnumFlowerStage; -import binnie.botany.api.IAlleleFlowerSpecies; -import binnie.botany.api.IBotanistTracker; -import binnie.botany.api.IColourMix; -import binnie.botany.api.IFlower; -import binnie.botany.api.IFlowerGenome; -import binnie.botany.api.IFlowerMutation; -import binnie.botany.api.IFlowerRoot; -import binnie.botany.flower.TileEntityFlower; - public class FlowerRoot extends SpeciesRoot implements IFlowerRoot { static final String UID = "rootFlowers"; public static int flowerSpeciesCount = -1; public static ArrayList flowerTemplates = new ArrayList<>(); private static ArrayList flowerMutations = new ArrayList<>(); - private static ArrayList colourMixes = new ArrayList<>(); + private static ArrayList colourMixes = new ArrayList<>(); Map conversions; public FlowerRoot() { @@ -152,7 +149,7 @@ public class FlowerRoot extends SpeciesRoot implements IFlowerRoot { @Override public IFlowerGenome templateAsGenome(final IAllele[] templateActive, final IAllele[] templateInactive) { - return new FlowerGenome(this.templateAsChromosomes(templateActive, templateInactive)); + return new FlowerGenome(templateAsChromosomes(templateActive, templateInactive)); } @Override @@ -269,12 +266,12 @@ public class FlowerRoot extends SpeciesRoot implements IFlowerRoot { } @Override - public void registerColourMix(final IColourMix colourMix) { - FlowerRoot.colourMixes.add(colourMix); + public void registerColourMix(final IColorMix colorMix) { + FlowerRoot.colourMixes.add(colorMix); } @Override - public Collection getColourMixes(final boolean shuffle) { + public Collection getColorMixes(final boolean shuffle) { if (shuffle) { Collections.shuffle(FlowerRoot.colourMixes); } diff --git a/src/main/java/binnie/core/craftgui/Attribute.java b/src/main/java/binnie/core/craftgui/Attribute.java index 0ca159af..3b1bb0fc 100644 --- a/src/main/java/binnie/core/craftgui/Attribute.java +++ b/src/main/java/binnie/core/craftgui/Attribute.java @@ -5,5 +5,5 @@ public enum Attribute implements IWidgetAttribute { CanFocus, NeedsDeletion, AlwaysOnTop, - BlockTooltip; + BlockTooltip } diff --git a/src/main/java/binnie/core/craftgui/RenderStage.java b/src/main/java/binnie/core/craftgui/RenderStage.java index 92eee4df..66432c25 100644 --- a/src/main/java/binnie/core/craftgui/RenderStage.java +++ b/src/main/java/binnie/core/craftgui/RenderStage.java @@ -3,5 +3,5 @@ package binnie.core.craftgui; public enum RenderStage { PreChildren, PostChildren, - PostSiblings; + PostSiblings } diff --git a/src/main/java/binnie/core/craftgui/Tooltip.java b/src/main/java/binnie/core/craftgui/Tooltip.java index 0e08d67a..d49b9ab9 100644 --- a/src/main/java/binnie/core/craftgui/Tooltip.java +++ b/src/main/java/binnie/core/craftgui/Tooltip.java @@ -91,7 +91,7 @@ public class Tooltip { Help, Information, User, - Power; + Power } public interface ITooltipType { diff --git a/src/main/java/binnie/core/craftgui/database/ControlMutationBox.java b/src/main/java/binnie/core/craftgui/database/ControlMutationBox.java index bb9be862..0c529892 100644 --- a/src/main/java/binnie/core/craftgui/database/ControlMutationBox.java +++ b/src/main/java/binnie/core/craftgui/database/ControlMutationBox.java @@ -55,6 +55,6 @@ class ControlMutationBox extends ControlListBox { enum Type { Resultant, - Further; + Further } } diff --git a/src/main/java/binnie/core/craftgui/database/EnumDiscoveryState.java b/src/main/java/binnie/core/craftgui/database/EnumDiscoveryState.java index fafae0c3..68d038d4 100644 --- a/src/main/java/binnie/core/craftgui/database/EnumDiscoveryState.java +++ b/src/main/java/binnie/core/craftgui/database/EnumDiscoveryState.java @@ -4,5 +4,5 @@ public enum EnumDiscoveryState { Show, Undetermined, Discovered, - Undiscovered; + Undiscovered } diff --git a/src/main/java/binnie/core/craftgui/minecraft/MinecraftGUI.java b/src/main/java/binnie/core/craftgui/minecraft/MinecraftGUI.java index 64363013..d33ffeb8 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/MinecraftGUI.java +++ b/src/main/java/binnie/core/craftgui/minecraft/MinecraftGUI.java @@ -9,6 +9,6 @@ public class MinecraftGUI { Tinted, Coloured, Outline, - TabOutline; + TabOutline } } diff --git a/src/main/java/binnie/core/craftgui/minecraft/MinecraftTooltip.java b/src/main/java/binnie/core/craftgui/minecraft/MinecraftTooltip.java index e94721a3..76402ddf 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/MinecraftTooltip.java +++ b/src/main/java/binnie/core/craftgui/minecraft/MinecraftTooltip.java @@ -19,7 +19,7 @@ public class MinecraftTooltip extends Tooltip { public enum Type implements ITooltipType { Error, - Warning; + Warning } private enum TypeColour { diff --git a/src/main/java/binnie/core/craftgui/renderer/TextureType.java b/src/main/java/binnie/core/craftgui/renderer/TextureType.java index ed4cd5d7..a26a1998 100644 --- a/src/main/java/binnie/core/craftgui/renderer/TextureType.java +++ b/src/main/java/binnie/core/craftgui/renderer/TextureType.java @@ -2,5 +2,5 @@ package binnie.core.craftgui.renderer; public enum TextureType { Stretched, - Tiled; + Tiled } diff --git a/src/main/java/binnie/extrabees/genetics/effect/FireworkCreator.java b/src/main/java/binnie/extrabees/genetics/effect/FireworkCreator.java index be58080a..65de16c3 100644 --- a/src/main/java/binnie/extrabees/genetics/effect/FireworkCreator.java +++ b/src/main/java/binnie/extrabees/genetics/effect/FireworkCreator.java @@ -14,7 +14,7 @@ public class FireworkCreator { LargeBall, Star, Creeper, - Burst; + Burst } public static class Firework { diff --git a/src/main/java/binnie/extrabees/utils/EnumBeeBooleanModifier.java b/src/main/java/binnie/extrabees/utils/EnumBeeBooleanModifier.java index 62e4833e..479482fa 100644 --- a/src/main/java/binnie/extrabees/utils/EnumBeeBooleanModifier.java +++ b/src/main/java/binnie/extrabees/utils/EnumBeeBooleanModifier.java @@ -5,6 +5,6 @@ public enum EnumBeeBooleanModifier { Sealed, SelfLighted, SunlightStimulated, - Hellish; + Hellish } diff --git a/src/main/java/binnie/extrabees/worldgen/WorldGenHiveRock.java b/src/main/java/binnie/extrabees/worldgen/WorldGenHiveRock.java index ab6341d7..1ec04b1d 100644 --- a/src/main/java/binnie/extrabees/worldgen/WorldGenHiveRock.java +++ b/src/main/java/binnie/extrabees/worldgen/WorldGenHiveRock.java @@ -7,7 +7,6 @@ import net.minecraft.block.state.pattern.BlockStateMatcher; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraft.world.gen.feature.WorldGenerator; import binnie.extrabees.ExtraBees; import binnie.extrabees.blocks.BlockExtraBeeHive; diff --git a/src/main/java/binnie/extrabees/worldgen/WorldGenHiveWater.java b/src/main/java/binnie/extrabees/worldgen/WorldGenHiveWater.java index e228131b..927e8009 100644 --- a/src/main/java/binnie/extrabees/worldgen/WorldGenHiveWater.java +++ b/src/main/java/binnie/extrabees/worldgen/WorldGenHiveWater.java @@ -6,7 +6,6 @@ import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraft.world.gen.feature.WorldGenerator; import binnie.extrabees.ExtraBees; import binnie.extrabees.blocks.BlockExtraBeeHive; diff --git a/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java b/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java index 7c8889e2..7943781b 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java +++ b/src/main/java/binnie/extratrees/carpentry/BlockStainedDesign.java @@ -47,7 +47,7 @@ public class BlockStainedDesign extends BlockDesign { player.addExhaustion(0.005F); if (EnchantmentHelper.getEnchantmentLevel(Enchantments.SILK_TOUCH, stack) > 0 && te instanceof TileEntityMetadata) { - java.util.List items = new java.util.ArrayList(); + java.util.List items = new java.util.ArrayList<>(); TileEntityMetadata tile = (TileEntityMetadata) te; int damage = getDroppedMeta(state, tile.getTileMetadata()); ItemStack itemstack = TileEntityMetadata.getItemStack(this, damage); diff --git a/src/main/java/binnie/extratrees/carpentry/ModuleCarpentry.java b/src/main/java/binnie/extratrees/carpentry/ModuleCarpentry.java index b5f2736b..5c5723ca 100644 --- a/src/main/java/binnie/extratrees/carpentry/ModuleCarpentry.java +++ b/src/main/java/binnie/extratrees/carpentry/ModuleCarpentry.java @@ -102,6 +102,6 @@ public class ModuleCarpentry implements IInitializable { enum Axis { Y, X, - Z; + Z } } diff --git a/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java b/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java index 5acac37f..860f0cea 100644 --- a/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java +++ b/src/main/java/binnie/extratrees/genetics/ETTreeDefinition.java @@ -286,7 +286,6 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Lower.getAllele()); template.set(EnumTreeChromosome.SAPPINESS, ForestryAllele.Sappiness.Lower.getAllele()); template.set(EnumTreeChromosome.MATURATION, ForestryAllele.Maturation.Fast.getAllele()); - ; } @Override @@ -332,7 +331,6 @@ public enum ETTreeDefinition implements IStringSerializable, ITreeDefinition, IT template.set(EnumTreeChromosome.FRUITS, AlleleETFruit.SourCherry); template.set(EnumTreeChromosome.YIELD, ForestryAllele.Yield.Lower.getAllele()); template.set(EnumTreeChromosome.SAPPINESS, ForestryAllele.Sappiness.Low.getAllele()); - ; } @Override diff --git a/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeSolidWrapper.java b/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeSolidWrapper.java index 24c46fbc..9192e6ca 100644 --- a/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeSolidWrapper.java +++ b/src/main/java/binnie/extratrees/integration/jei/multifence/MultiFenceRecipeSolidWrapper.java @@ -54,7 +54,6 @@ public class MultiFenceRecipeSolidWrapper extends BlankRecipeWrapper implements for (IPlankType plankTypeSecondary : WoodManager.getAllPlankTypes()) { for (IPlankType plankType : WoodManager.getAllPlankTypes()) { if (plankType != plankTypeSecondary) { - ; fences.add(WoodManager.getFence(plankType, plankTypeSecondary, new FenceType(fenceType.size, false, fenceType.embossed), 1)); outputFences.add(WoodManager.getFence(plankType, plankTypeSecondary, new FenceType(fenceType.size, true, fenceType.embossed), 2)); } diff --git a/src/main/java/binnie/extratrees/item/ItemSetSquare.java b/src/main/java/binnie/extratrees/item/ItemSetSquare.java index ff932675..2f2b7146 100644 --- a/src/main/java/binnie/extratrees/item/ItemSetSquare.java +++ b/src/main/java/binnie/extratrees/item/ItemSetSquare.java @@ -47,6 +47,6 @@ public class ItemSetSquare extends Item implements IToolHammer, IItemModelRegist public enum EnumSetSquareMode { Rotate, Edit, - Swap; + Swap } } diff --git a/src/main/java/binnie/extratrees/kitchen/MachineRendererKitchen.java b/src/main/java/binnie/extratrees/kitchen/MachineRendererKitchen.java index 267d086a..8aba5a99 100644 --- a/src/main/java/binnie/extratrees/kitchen/MachineRendererKitchen.java +++ b/src/main/java/binnie/extratrees/kitchen/MachineRendererKitchen.java @@ -10,7 +10,6 @@ import binnie.core.resource.BinnieResource; public class MachineRendererKitchen { public static MachineRendererKitchen instance = new MachineRendererKitchen(); static int level = 0; - ; BinnieResource texture; public void renderMachine(final Machine machine, final BinnieResource texture, final double x, final double y, final double z, final float var8) { diff --git a/src/main/java/binnie/extratrees/machines/MachineRendererNursery.java b/src/main/java/binnie/extratrees/machines/MachineRendererNursery.java index baec4968..2d3d4cd7 100644 --- a/src/main/java/binnie/extratrees/machines/MachineRendererNursery.java +++ b/src/main/java/binnie/extratrees/machines/MachineRendererNursery.java @@ -12,7 +12,6 @@ import binnie.extratrees.ExtraTrees; public class MachineRendererNursery { public static MachineRendererNursery instance = new MachineRendererNursery(); - ; BinnieResource texture; //private IModelCustom casinoMachine; private ModelNursery model; diff --git a/src/main/java/binnie/genetics/gui/bee/database/ControlProductsBox.java b/src/main/java/binnie/genetics/gui/bee/database/ControlProductsBox.java index 60780ed6..3b413549 100644 --- a/src/main/java/binnie/genetics/gui/bee/database/ControlProductsBox.java +++ b/src/main/java/binnie/genetics/gui/bee/database/ControlProductsBox.java @@ -56,7 +56,7 @@ public class ControlProductsBox extends ControlListBox